Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,316 Commits 3 Branches 0 Tags 1 GiB
098cb65a54
Commit Graph

396 Commits

Author SHA1 Message Date
Rushabh Mehta
1828c12481 [refactor] added dynamic link in journal entry, #3847 2015-08-12 12:28:33 +05:30
Nabin Hait
d8546c4316 Fixed include holiday logic in leave calculation 2015-07-30 14:53:27 +05:30
Neil Trini Lasrado
e73941b9cc Fixes in leave application 2015-07-29 18:39:27 +05:30
Nabin Hait
d1dc622914 [fix][patch] Reload Leave Type 2015-07-29 16:37:02 +05:30
Nabin Hait
b24d2efc4b [fix] Updated 'Include Holiday' in existing and default leave type records 2015-07-29 16:15:08 +05:30
Nabin Hait
a184fbfa66 Merge branch 'develop' of https://github.com/meatechsupport/erpnext into meatechsupport-develop 2015-07-29 16:05:47 +05:30
Anand Doshi
0e6f2474e8 [minor] removed trailing space in offer letter status 2015-07-29 11:27:02 +05:30
Meatechsupport
e102332f08 removed testcase 2015-07-28 19:03:30 +04:00
Meatechsupport
145227e4ec Edited the Test case 2015-07-28 18:39:04 +04:00
Meatechsupport
8b96fdac12 Indentation Error 
realligned
 2015-07-27 16:55:54 +04:00
Meatechsupport
e319598c51 IndentationError 
alligned code
 2015-07-27 16:42:22 +04:00
Meatechsupport
5c73bafeaa Modifying the number of leave days calculation part. 
we don't need to exclude the Holiday list (that comes in between) from the total number of leaves applied.

Add option in the leave type

added a field in the leave type to include and exclude the holidays from
the tolal leave applied days

Added the field

Added a field Include Holiday to leave Type doctype

changed the lable

changed the lable from "Include Holiday" to "Include holidays within leaves
as leaves"

Rearranged the function

moved holidays = leave_app.get_holidays() under if
Corrected 'total_leave_days' : flt(tot_days)-flt(holidays)

Adding test case

added the test case

Added test case

Added test case to test_leave_application.py

adding default value

added default value and corrected the syntax.

IndentationError

removed extra tabs after
 2015-07-27 13:46:00 +04:00
Anand Doshi
d0d1af2072 Merge pull request #3696 from nabinhait/fix1 
[fix][report] Show only active employee in Employee leave balance report
 2015-07-20 13:27:47 +05:30
Nabin Hait
c9e4fbeda0 [fix][report] Show only active employee in Employee leave balance report 2015-07-20 12:57:48 +05:30
Neil Trini Lasrado
feda4f9bc9 Default Expense Account added to Expense Claim Type. Fetch account while making Bank Entry 2015-07-16 15:44:56 +05:30
Rushabh Mehta
94157334a7 [rename] Material User > Stock User 2015-07-13 15:06:12 +05:30
Neil Trini Lasrado
4089b3d376 Salary Slip renamed to Process Payroll 2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
6cfab43d5f Renamed Depends on LWP field in the Earning and Deduction table of Salary Slip. 2015-07-13 12:41:27 +05:30
Rushabh Mehta
ccb9117ba5 [minor] Added employees in Newsletter List 2015-07-09 13:56:02 +05:30
Nabin Hait
4017bfcd2e Merge pull request #3591 from rmehta/salary-manager-fix 
[fixes] salary manager #3554
 2015-07-08 15:39:33 +05:30
Rushabh Mehta
f9b356992a [fixes] salary manager #3554 2015-07-07 16:30:29 +05:30
Nabin Hait
526957505f Merge pull request #3569 from rmehta/employee-unset-user-id 
[fix] remove user permission if user id is unset #3447
 2015-07-06 14:27:22 +05:30
Tsutomu Mimori
5a0fbff1a3 #3402 2015-07-03 16:08:02 +09:00
Rushabh Mehta
5688a6c31a [fix] remove user permission if user id is unset #3447 2015-07-03 11:34:53 +05:30
Neil Trini Lasrado
086f8942eb Fixed bugs in Calender View for Leave Application 2015-06-22 13:51:56 +05:30
Nabin Hait
5d0ce7939f Show only users with Expense Approver role in Expense Claim Approver field 2015-06-15 17:59:37 +05:30
Neil Trini Lasrado
82cc2921d1 Validation added to prevent user from creating salary structure with 'From Date' before employee 'Date of joining' 2015-06-12 18:34:08 +05:30
Nabin Hait
0b18a2d347 Reset values in tools like Payment Tool 2015-06-05 12:01:29 +05:30
Nabin Hait
3ebfad7115 minor fixes 2015-06-01 14:01:56 +05:30
Nabin Hait
e2c200a91e Make gl entry for rounded-off amount 2015-05-29 10:39:09 +05:30
Nabin Hait
2eba53f763 test case fixes 2015-05-22 16:55:55 +05:30
Rushabh Mehta
9dd8aab211 [fix] status updater 2015-05-18 11:19:10 +05:30
Neil Trini Lasrado
2edc91bc52 Leave Type - LWP changed to Leave Without Pay 2015-05-11 14:38:21 +05:30
Neil Trini Lasrado
ec2f3d6e63 leave_allocation layout changed 2015-05-11 14:38:20 +05:30
Rushabh Mehta
82ee5fdba6 [email] changes in email_account api 2015-05-04 18:17:22 +05:30
Nabin Hait
fb1f4a5c58 User permissions for Expense Claim 2015-05-02 18:46:29 +05:30
Rushabh Mehta
5e13799704 [fixes] leave approver selection and cleaned up layout 2015-04-30 12:55:10 +05:30
Nabin Hait
4669fe3e85 minor fix 2015-04-22 15:34:44 +05:30
Neil Trini Lasrado
ecb5d11e2d Today added as default date for posting date in expense claim 2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
5e317d2b72 fixes in Expense Claim and get_avtivity_cost function 2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
d4b33d3c14 Costing added in Time log Batch, Sales Order added to Project + more fixes 2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
4e6e4726a4 filters added, ui change, update project moved to project.py 2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
ec5c66f8f0 Title Feild added to Expense Claim 2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
05f15bbb88 fixes in Test Cases 2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
2679b247b3 fixes in Expense Claim 2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
7f9ea3bf6a expense claim test records 2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
a11770f06f in Time Log - Server side validations added to recalculate cost on save 2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
50234cb0fe Task added to expense claim 
all cost (expense claim and time log) against Task; task updates project cost.
 2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
458b8885f0 New Document Activity Cost created. 
In TL - billing rate and internal rate added
In Project - total expense claim and total activity cost. Buttons addded - show time logs and show expense claims.
In Expense Claim - Employee and project link added. update cost in project on submit and on trash. Validation added to check sanctioned amount is not greater than claim amount.
 2015-04-22 11:25:57 +05:30
Rushabh Mehta
80f8b7be2f [minor] [perms] Expense Claim Type 2015-04-19 16:18:15 +05:30
Rushabh Mehta
2dea40f7be [leave-allocation] can cancel and re-submit or make a new one, fixes frappe/erpnext#3042 2015-04-15 15:08:48 +05:30
Anand Doshi
00a07de426 fixed test earning type 2015-04-08 21:49:11 +05:30
Anand Doshi
2f87fb41fa Merge pull request #3069 from neilLasrado/dob 
validation added - dob cannot accept a future date
 2015-04-08 13:25:01 +05:30
Anand Doshi
a1a3468704 Merge pull request #3068 from neilLasrado/leaves 
Bug Fixes
 2015-04-08 13:20:18 +05:30
Neil Trini Lasrado
4b29ccc2b0 Salary Structure - Earnings made mandatory 2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
4ba4d9dbef fix - update button didnt work in leave allocation after submit 2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
20f0ef2515 validation added - dob cannot accept a future date 2015-04-08 12:29:01 +05:30
Neil Trini Lasrado
28b0cc4d0b fixes in offer letter 2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
496e277d8a print format added 2015-04-08 12:28:21 +05:30
Rushabh Mehta
aca5cb6513 [fixes] offer letter 2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
8ca547b7f2 terms view added 2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
e1d620b168 Offer Letter - New Doctype added and job_applicant naming changed 2015-04-08 12:28:20 +05:30
Rushabh Mehta
ffc190d34d Merge pull request #3013 from neilLasrado/expense 
Expense Claim - 'Total Amount Reimbursed' feild added
 2015-04-02 14:29:29 +05:30
Anand Doshi
7b6daafbb9 [minor] left aligned email footer, raise duplicate entry error for common email id in Employee and Sales Person 2015-04-01 16:26:59 +05:30
Anand Doshi
ee57a8d2a4 [hotfix] unique job applicant 2015-04-01 12:29:30 +05:30
Anand Doshi
d6a360b51b [fix] check job application unique email id 2015-03-30 21:11:34 +05:30
Neil Trini Lasrado
a6b3415cdd Expense Claim - 'Total Amount Reimbursed' feild added 2015-03-26 14:13:44 +05:30
Rushabh Mehta
04f907efcf [fix] job applicant (test via import) 2015-03-23 15:44:54 +05:30
Rushabh Mehta
c2eae25d0e [cleanup] validate_email_add 2015-03-23 14:10:51 +05:30
Anand Doshi
9d8154dd40 fixed test cases 2015-03-18 16:22:13 +05:30
Anand Doshi
ec5ec60764 Fixed Test Cases 2015-03-05 19:31:40 +05:30
Rushabh Mehta
2cc585f180 [git fixes] salary manager, time log title, notificaitons 2015-03-03 16:06:54 +05:30
Nabin Hait
56c6a65a22 argument name fix in sendmail 2015-03-03 15:48:33 +05:30
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Nabin Hait
786472279a salary slip calculation: trigger on 2015-03-03 14:07:21 +05:30
Rushabh Mehta
c37281e59c Merge pull request #2897 from neilLasrado/job-application 
job application fixed
 2015-03-02 19:01:16 +05:30
Neil Trini Lasrado
96bc31db27 job application fixed 2015-03-02 18:54:45 +05:30
Rushabh Mehta
910ba02f49 Merge pull request #2896 from neilLasrado/employee-report 
employee information report fix
 2015-03-02 18:31:47 +05:30
Neil Trini Lasrado
71a651ec21 employee information report fix 2015-03-02 18:13:25 +05:30
Neil Trini Lasrado
fd0920fe83 Fixes in Appraisal doc 2015-03-02 17:33:48 +05:30
Anand Doshi
d35354cc06 Merge remote-tracking branch 'frappe/develop' into v5.0 
Conflicts:
	erpnext/__version__.py
	erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
	erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
	erpnext/hooks.py
	erpnext/patches.txt
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	erpnext/stock/get_item_details.py
	erpnext/translations/ar.csv
	erpnext/translations/bs.csv
	erpnext/translations/ca.csv
	erpnext/translations/el.csv
	erpnext/translations/es.csv
	erpnext/translations/fr.csv
	erpnext/translations/hr.csv
	erpnext/translations/id.csv
	erpnext/translations/is.csv
	erpnext/translations/ja.csv
	erpnext/translations/nl.csv
	erpnext/translations/pl.csv
	erpnext/translations/pt-BR.csv
	erpnext/translations/ru.csv
	erpnext/translations/tr.csv
	erpnext/translations/zh-cn.csv
	erpnext/translations/zh-tw.csv
	setup.py
 2015-02-24 18:12:17 +05:30
Anand Doshi
d57e793bf3 [fix] Added unicode_literals if missing in py files 2015-02-24 12:24:53 +05:30
Rushabh Mehta
d54031f3b5 [tests] [projects] merged tasks and projects and added quick edit of tasks from projects 2015-02-22 22:32:39 +05:30
Rushabh Mehta
813f0eda05 [form] section labels 2015-02-20 16:02:48 +05:30
Rushabh Mehta
50dc4e90e3 [cleanup] item grid views, removed desc etc 2015-02-19 20:05:45 +05:30
Rushabh Mehta
d60acb9f26 [fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation 2015-02-19 14:53:31 +05:30
Nabin Hait
8fa503e177 Fixed conflict while merging v4 into v5 2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e Fixed conflict while merging v4 into v5 2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f Moved flags like ignore_mandatory, ignore_validate etc to doc.flags 2015-02-10 14:41:27 +05:30
Rushabh Mehta
a232c80d77 [share] add share permission 2015-02-05 15:52:58 +05:30
Do Le Bao Nguyen
f9b63dd36a Look like a minor bug 
- There is no frappe.get_default but only frappe.db.get_default ?
- Error return if selecting Employee in Salary Slip without specifying the Fiscal Year first
 2015-02-03 11:10:09 +08:00
Rushabh Mehta
06fa46fafe [fix] onshow > on_page_show 2015-01-29 18:09:11 +05:30
Rushabh Mehta
5bceebc6a1 [fix] fixes birthday reminders #2021 2015-01-23 15:22:30 +05:30
Rushabh Mehta
0335005eea [minor] added allow rename 2015-01-15 15:29:22 +05:30
Nabin Hait
fff3ab752c Fixed conflict 2015-01-14 16:27:13 +05:30
Nabin Hait
024b537b7f Merge pull request #2557 from neilLasrado/spelling-of-approver 
Spelling Correction - Leave application #2552
 2015-01-12 17:02:10 +05:30
Rushabh Mehta
d49a123fd0 [ui] listviews 2015-01-07 16:43:47 +05:30
Neil Trini Lasrado
1b7d66fab6 Update leave_application.js 2015-01-07 11:16:41 +05:30
Nabin Hait
56ac3fb29d some fixes for renaming patch 2015-01-01 13:40:54 +05:30
Rushabh Mehta
419ae33c3e [merge] v5-design 2014-12-31 15:03:14 +05:30