Ranjith
|
ded636097e
|
Tax Declaration, Proof Submission tests
|
2018-05-10 15:42:04 +05:30 |
|
Ranjith
|
5a8e6427f4
|
Tax Declaration, Proof Submission, validation
|
2018-05-10 15:06:49 +05:30 |
|
Ranjith
|
85d2d571c5
|
update hr menu, field subcategory in child table
|
2018-05-10 15:04:32 +05:30 |
|
Ranjith
|
e1c556b7e0
|
Doctype Employee Tax Exemption Sub Category
|
2018-05-10 15:02:57 +05:30 |
|
Ranjith
|
96121c598e
|
Tax Declaration, Proof Submission, field company
|
2018-05-10 15:02:00 +05:30 |
|
rohitwaghchaure
|
fdb7156c0b
|
Merge pull request #13979 from KanchanChauhan/driver-filter
[Minor] Show only active driver in Delivery Trip
|
2018-05-10 12:36:42 +05:30 |
|
Kanchan Chauhan
|
d560da950d
|
[Minor] Show only active driver in Delivery Trip
|
2018-05-10 10:42:56 +05:30 |
|
Jamsheer
|
9032c9d91d
|
Documentation - updated
|
2018-05-09 19:19:34 +05:30 |
|
Nabin Hait
|
9d215c2d9b
|
Set operations on production order while making from Material Request
|
2018-05-09 18:32:54 +05:30 |
|
Nabin Hait
|
56f0328bed
|
Merge branch 'finance-book' into enterprise_sprint
|
2018-05-09 15:10:52 +05:30 |
|
Nabin Hait
|
b9fed2aa38
|
Removed company from Finance Book and related changes
|
2018-05-09 15:10:29 +05:30 |
|
Gaurav Naik
|
a78a0e241f
|
Added finance book filtering logic to financial_statements.py
|
2018-05-09 15:03:40 +05:30 |
|
Gaurav Naik
|
8cbbdfdf30
|
Added finance book filter to financial_statements.js
|
2018-05-09 15:03:05 +05:30 |
|
Gaurav Naik
|
40559d5f5c
|
Added finance book filter logic to ReceivablePayable
|
2018-05-09 15:02:55 +05:30 |
|
Gaurav Naik
|
70ac2d2c51
|
Added finance book filter in accounts_receivable.js
|
2018-05-09 15:02:23 +05:30 |
|
Gaurav Naik
|
cddda8ac5f
|
Added finance book filter in accounts_payable.js
|
2018-05-09 15:02:11 +05:30 |
|
Gaurav Naik
|
57856b475c
|
Added finance book filter logic in general_ledger.py
|
2018-05-09 14:58:15 +05:30 |
|
Gaurav Naik
|
460d96f16d
|
Added finance book filter to General Ledger
|
2018-05-09 14:57:36 +05:30 |
|
Gaurav Naik
|
a6d3cbfbc5
|
Added finance book field to GL Entry doctype
|
2018-05-09 14:56:52 +05:30 |
|
Gaurav Naik
|
30f9e0f547
|
Set finance book in make_gl_entries
|
2018-05-09 14:56:39 +05:30 |
|
Gaurav Naik
|
a948726ddd
|
Added Finance Book doctype
|
2018-05-09 14:53:51 +05:30 |
|
Manas Solanki
|
fbe548e4be
|
[Enterprise] Bank Guarantee Enhancements (#13960)
|
2018-05-09 14:49:53 +05:30 |
|
Vishal Dhayagude
|
3cf0d51e65
|
[fix] Compounding error in task weight (#13958)
* [fix] Compounding error in task weight
* [minor] minor changes
* [fix] Requested Changes added
|
2018-05-09 10:42:39 +05:30 |
|
Jamsheer
|
63a8f83076
|
Leaves - Documentation
|
2018-05-08 18:45:41 +05:30 |
|
Nabin Hait
|
2b16712c83
|
Merge branch 'ESS-LLP-staffing' into enterprise_sprint
|
2018-05-08 18:36:53 +05:30 |
|
Nabin Hait
|
3881e98000
|
Staffing plan for group company
|
2018-05-08 18:36:14 +05:30 |
|
Jamsheer
|
4573e6609f
|
Leave Type - remove field is_parental_leave
|
2018-05-08 18:33:49 +05:30 |
|
Nabin Hait
|
b2800eeb2a
|
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
|
2018-05-08 16:34:35 +05:30 |
|
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 |
|