Commit Graph

22463 Commits

Author SHA1 Message Date
Nabin Hait
9036b9ee85 Merge branch 'master' into develop 2018-05-08 16:31:42 +05:30
Nabin Hait
9fc5ddc26e Merge branch 'hotfix' 2018-05-08 16:31:38 +05:30
Nabin Hait
0ff31f0ebf bumped to version 10.1.31 2018-05-08 17:01:38 +06:00
Nabin Hait
247bd94824 Merge branch 'staffing' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-staffing 2018-05-08 16:30:18 +05:30
Zarrar
f2df7f32fa update subscription to auto_repeat across dashboards (#13956) 2018-05-08 16:06:36 +05:30
Nabin Hait
3e47fbb2f0 assign salary structure custom button 2018-05-08 16:05:04 +05:30
Saurabh
40349f4b00 [fix] add stock entry link on Material Request Dashboard (#13950) 2018-05-08 15:23:51 +05:30
Saurabh
b36517158b [fix] cheque print template coordinates (#13959) 2018-05-08 15:23:29 +05:30
Jamsheer
bec950428c HR Utils - Trailing whitespace 2018-05-08 12:50:14 +05:30
Manas Solanki
3b9720f0be
Merge pull request #13952 from manassolanki/minor-report-fix
[minor] fix for the student report card
2018-05-08 12:43:43 +05:30
Manas Solanki
cf26b2ca1c [minor] fix for the student report card 2018-05-08 12:39:02 +05:30
Jamsheer
fe882bc68a Leave Application - Test - Leave allowed, applicable after, maximum continuos days 2018-05-08 12:36:51 +05:30
Jamsheer
3153734e7e Leave Application - validate applicable after for leave type 2018-05-08 12:36:51 +05:30
Jamsheer
62a93533fc Leave Policy - Validate Annual alloction for leave type 2018-05-08 12:36:51 +05:30
Jamsheer
d7bfa2303f Leave allocation - validate max leave allocation days for a leave type 2018-05-08 12:36:51 +05:30
Jamsheer
b42f3d41ab Compensatory Leave Request - Validate and Create leave allocation for compnsatory leave type 2018-05-08 12:36:51 +05:30
Jamsheer
b408b158dd Leave allocation - link to leave period and compensatory leave request 2018-05-08 12:35:40 +05:30
Jamsheer
8c4386f016 Leave Type - new field is_compensatory 2018-05-08 12:35:40 +05:30
Jamsheer
c7aaf0ba67 Leave Period - Validate and Create Leave Allocation 2018-05-08 12:35:40 +05:30
Jamsheer
0e2cc5574d HR Util methods 2018-05-08 12:35:40 +05:30
Jamsheer
9d857579af Attendance Request - validate and create attendance 2018-05-08 12:35:40 +05:30
Jamsheer
b41baa228c Attendance Request - link to company 2018-05-08 12:35:40 +05:30
Jamsheer
a9c82b6464 Attendance - link to attendance request 2018-05-08 12:35:40 +05:30
Shreya Shah
204c3bc37e Remove Production Planning Tool docs (#13946)
* Remove Production Planning Tool docs

* Remove Offer Letter Occurrences

* Rename Employee Loan Occurrences
2018-05-07 18:21:03 +05:30
bghayad
1184a7300a Adding Payments View for Fees (#13939)
* Adding View Payments For Fees

* Adding View Payments For Fees

* Adding Payments View For Fees
2018-05-07 18:20:37 +05:30
Nabin Hait
b7613af73c Merge branch 'enterprise_sprint' of https://github.com/frappe/erpnext into enterprise_sprint 2018-05-07 16:13:33 +05:30
Nabin Hait
be10cfed92 Merge branch 'shreyashah115-multi-company-transations' into enterprise_sprint 2018-05-07 16:12:23 +05:30
Nabin Hait
330fae8652 minor fixes 2018-05-07 16:11:35 +05:30
Shreya Shah
7bd83f3d8e Rename occurrences for Production Order to Work Order (#13944) 2018-05-07 15:27:21 +05:30
Ranjith
c36578e8d3 Job Opening - display vacancies only on staffing plan 2018-05-07 14:19:40 +05:30
Ranjith
f220e89d9f Job Opening - get planned opening, validate vacancies by Staffing Plan 2018-05-07 13:58:54 +05:30
Ranjith
e4cda0380a Staffing Plan - validations, get employee count on designation change, calc estimated cost 2018-05-07 13:54:49 +05:30
Nabin Hait
fdc67a577f Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations 2018-05-07 13:12:16 +05:30
Ranjith Kurungadam
95c5c055f8 Optional leave (#13931)
* Optional Holiday - move holiday list from leave type to leave period

* Optional Leave - validate on Leave Application

* test Optional Leaves
2018-05-07 12:43:08 +05:30
Nabin Hait
420c140c48 Merge branch 'ESS-LLP-employee_promotion_transfer' into enterprise_sprint 2018-05-07 12:23:22 +05:30
Nabin Hait
d5220c0ff4 minor fix 2018-05-07 12:22:57 +05:30
Nabin Hait
01f5df72cc Merge branch 'employee_promotion_transfer' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-employee_promotion_transfer 2018-05-07 11:55:52 +05:30
Rah Yuliantoro
b3882cacd9 update coa and company default (#13937)
* Update standard_chart_of_accounts.py

adding account for employee advances

* Update standard_chart_of_accounts_with_account_number.py

adding account for employee advances

* Update company.py

adding accounts for default fields in company doctypes

* Update company.py

Missing some default accounts for fields in company doctype
2018-05-07 11:39:35 +05:30
Nabin Hait
ba70ff0904
Exchange rate revaluation (#13932)
* Added account data on child table

* Added Journal Entry button and functionality

* Add docs

* Refactoring and cleanup of Exchange Rate Revaluation
2018-05-05 18:22:56 +05:30
Ranjith
86b81e99e5 codacy fixes 2018-05-05 16:49:51 +05:30
Nabin Hait
338e1b6e91 Merge branch 'master' into develop 2018-05-05 14:33:35 +05:30
Nabin Hait
02a40e9d7b Merge branch 'hotfix' 2018-05-05 14:33:33 +05:30
Nabin Hait
ea199f9cd9 bumped to version 10.1.30 2018-05-05 15:03:33 +06:00
Ranjith
9505ea93cf codacy fixes 2018-05-05 14:32:42 +05:30
Nabin Hait
161f35a687
Update sales_invoice.py 2018-05-05 14:32:31 +05:30
Ranjith
715780b78b Employee Promotion, Transfer - documentation 2018-05-05 13:51:34 +05:30
Ranjith
a68a108234 Employee Promotion, Transfer - test submit before date, create new employee 2018-05-05 13:43:15 +05:30
Ranjith
56b58017d1 Employee Promotion, Transfer - validate, submit, cancel workflow 2018-05-05 13:41:48 +05:30
Ranjith
fddfffd3e6 Employee Promotion, Transfer - modal to add details to child table 2018-05-05 13:27:26 +05:30
Ranjith
ea60225760 Employee Promotion, Transfer - update child table, added fields 2018-05-05 13:25:46 +05:30