Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,696 Commits 3 Branches 0 Tags 1 GiB
2873f2e7de
Commit Graph

366 Commits

Author SHA1 Message Date
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
Nabin Hait
54361e8651 fixed conflict while merging develop into v5 2014-12-31 13:24:36 +05:30
Rushabh Mehta
f870527e7c [design] wip 2014-12-26 12:52:11 +05:30
Nabin Hait
79f091e2fe field renaming 2014-12-26 11:41:15 +05:30
Nabin Hait
4b8185db19 renaming: entries 2014-12-25 18:19:39 +05:30
Nabin Hait
23d2a53017 Code replacement for journal voucher renaming 2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f Table Field Renaming: code replace, JV and budget distribution renamed 2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71 Table fieldnames renaming: updated json and patch 2014-12-24 17:04:48 +05:30
Nabin Hait
0741ed3a82 Merge pull request #2472 from neilLasrado/expense-claim 
New feature for issue #2419
 2014-12-23 18:07:38 +05:30
Neil Trini Lasrado
41781ce686 test case fix - holiday list 2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
e84fa67f30 Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above 
Time Log Bug Fixed
Manufacturing seetings doctype added.
prod order holiday list time calculation added
 2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
5ec7542519 Holiday List name changed and workstation filter added to time log 2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
637d804abd Operations added in Production Order DocType Auto-Fetch added to operations in Production Order DocType made operations in production order read-only capacity & duration of cycle added to workstation workstation operation timings added operation master added, Time log added Time Log Fixed Test Records added to Production Order Test Recorde for over Production Time Log added Validation added to check if time log timings are within working hours of the workstation. Validation added to check if workstation is closed on time log dates. Test Case added for Time Log 2014-12-23 17:38:59 +05:30
Anand Doshi
f87a622ef0 [minor] use frappe.attach_print() in salary slip and recurring document 2014-12-15 23:14:35 +05:30
Nabin Hait
606af96c9f minor fix 2014-12-15 11:57:19 +05:30
Neil Trini Lasrado
e1f21682fb changes made 2014-12-12 13:09:42 +05:30
Neil Trini Lasrado
f13c4f0145 New feature for issue #2419 2014-12-12 12:33:55 +05:30
Nabin Hait
5cafcf66b0 Leave application fix 2014-12-10 23:59:04 +05:30
Nabin Hait
690bcd7b66 Added leave approver name field in leave application 2014-12-09 16:36:33 +05:30
Rushabh Mehta
3d65d9602e [error-reports] 2014-11-28 14:58:43 +05:30
Rushabh Mehta
6d950d23a8 [merge] 2014-11-28 12:08:51 +05:30
Nabin Hait
eba88919c1 Merge pull request #2431 from mayur-patel/patch-2 
Update leave_application.py : Modified get_holidays function
 2014-11-25 10:55:11 +05:30
Nabin Hait
ea91d2aaf1 Merge pull request #2429 from ankitjavalkarwork/expclaimname 
Add configurable naming series to Expense claim
 2014-11-25 10:51:03 +05:30
Mayur Patel
5d8635a8dc Update leave_application.py 
See issue #2422 for more detail.
 2014-11-24 16:57:53 +00:00
ankitjavalkarwork
7e911bae95 Add configurable naming series to Expense claim 2014-11-24 18:26:17 +05:30
Nabin Hait
0ad7db3bbd Minor fix in salary slip net total calculation 2014-11-24 15:25:13 +05:30
ankitjavalkarwork
16e2c18c64 Delete events linked with employee on deletion of Employee 2014-11-10 18:08:23 +05:30
Nathan Do
8a55d9a795 Remove get_server_field from leave_application 
- Make get_holidays and get_total_leave_days global to module
- Replace get_server_field with using whitelisted function
get_total_leave_days
 2014-11-05 12:32:57 +08:00
Nabin Hait
a5082d6233 Merge pull request #2283 from neilLasrado/employee-reports-to 
employee cannot report to himself validation added to employee doctype
 2014-10-10 15:20:13 +05:30
Neil Trini Lasrado
9b08062bed employee cannot report to himself validation added to employee doctype 2014-10-09 17:26:17 +05:30
Neil Trini Lasrado
9614b552fd fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim 2014-10-09 15:01:12 +05:30