Commit Graph

22383 Commits

Author SHA1 Message Date
Shreya
8e386167b8 Set Mandatory from client-side 2018-05-15 16:09:53 +05:30
Shreya
f636503dc1 [minor] Fix customer doctype 2018-05-15 15:57:27 +05:30
Saurabh
12f708d155
Merge pull request #14035 from saurabh6790/v11_patch_fix
[fix] reload Leave Period and Staffing Plan doctypes
2018-05-15 10:49:53 +05:30
rohitwaghchaure
ae41e5ffae
Merge pull request #14036 from rohitwaghchaure/hcl_leave_application_issue
[Fix] Global name 'Approved' is not defined
2018-05-15 10:44:14 +05:30
Rohit Waghchaure
3f02820384 [Fix] Global name 'Approved' is not defined 2018-05-15 10:30:06 +05:30
Saurabh
d217fbaa45 [fix] reload Leave Period and Staffing Plan doctypes 2018-05-15 08:35:25 +05:30
Saurabh
ff85c49330
Merge pull request #14030 from saurabh6790/field_fixes
remove duplicate fields occurred due to merge conflicts
2018-05-14 22:14:17 +05:30
Saurabh
99400bd958 remove duplicate fields occured due to merge conflicts 2018-05-14 22:11:17 +05:30
rohitwaghchaure
4f2e39cd09
Merge pull request #14028 from rohitwaghchaure/get_approved_leaves_for_period_issue
[Fix] get_approved_leaves_for_period module import failed
2018-05-14 21:39:09 +05:30
Rohit Waghchaure
9ba72f7897 [Fix] get_approved_leaves_for_period module import failed 2018-05-14 21:37:55 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
Saurabh
8b04d431c0
Merge pull request #13951 from ESS-LLP/jam_enterprise_sprint
Attendance Request, Leave Period, Compensatory Leave Request, Leave Policy
2018-05-14 20:57:55 +05:30
Saurabh
1f1dd96f57
Merge branch 'enterprise_sprint' into jam_enterprise_sprint 2018-05-14 20:57:40 +05:30
rohitwaghchaure
451bc04d4c
Merge pull request #13982 from ESS-LLP/tax_exemption
Employee Tax Exemption Declaration, Proof Submission
2018-05-14 20:47:51 +05:30
rohitwaghchaure
3f0c735e53
Merge branch 'enterprise_sprint' into tax_exemption 2018-05-14 20:47:35 +05:30
rohitwaghchaure
2b8fc49205
Merge pull request #14027 from saurabh6790/TDS_sprint
Tds sprint
2018-05-14 20:43:33 +05:30
Saurabh
4ae089d6a1 Provision to deduct TDS on Advance 2018-05-14 20:42:08 +05:30
Saurabh
f3f438ad18 tds fixed for PI 2018-05-14 20:42:08 +05:30
Saurabh
b9d3385fec calculate TDS on Sales Invoice Amount 2018-05-14 20:42:08 +05:30
Saurabh
3b4a6be4d0 Supplier Tax Withholding Config 2018-05-14 20:42:08 +05:30
Saurabh
2d8a7ee81f Bootstrap 'TDS' via fixture 2018-05-14 20:41:38 +05:30
rohitwaghchaure
d9faba962b
Merge pull request #13746 from Zlash65/supplier-group
[Enhance] Rename Supplier Type to Supplier Group - tree structure implemented
2018-05-14 20:40:30 +05:30
rohitwaghchaure
7c6bef4905
Merge branch 'enterprise_sprint' into supplier-group 2018-05-14 20:39:01 +05:30
rohitwaghchaure
8137f0402a
Merge pull request #13984 from manassolanki/employee-boarding
[feature] added the employee onboarding and separation doctype
2018-05-14 20:35:49 +05:30
Manas Solanki
094e1841e0 minor changes and fixed the conflicts 2018-05-14 20:33:28 +05:30
rohitwaghchaure
67da5f7671
Merge pull request #14023 from mntechnique/accounting_period
Accounting Period
2018-05-14 20:33:09 +05:30
rohitwaghchaure
3282191aae
Merge pull request #14025 from shreyashah115/html-table
Show pending leaves as an HTML table in leave application
2018-05-14 20:32:26 +05:30
Manas Solanki
b698846c30 [feature] added the employee onboarding and separation doctype 2018-05-14 20:27:00 +05:30
rohitwaghchaure
48199842aa
Merge pull request #13750 from rohitwaghchaure/asset_purchase_link
Asset linked to purchase and serial no
2018-05-14 20:24:37 +05:30
rohitwaghchaure
8d626e6888
Merge pull request #14024 from ESS-LLP/jam_additional_sal_comp
Additional Salary Component
2018-05-14 20:24:10 +05:30
Shreya
4bd5583e11 Make Available Leave HTML Table 2018-05-14 19:32:59 +05:30
Jamsheer
75c53e5022 Fix - missing semicolon 2018-05-14 19:17:16 +05:30
Rohit Waghchaure
d644e6da16 Code cleanup 2018-05-14 19:09:44 +05:30
Rohit Waghchaure
11679884e4 Patch to move asset fields to Asset Finance Book table 2018-05-14 19:08:57 +05:30
Rohit Waghchaure
352df95976 Patch to make location 2018-05-14 19:08:56 +05:30
Rohit Waghchaure
16bc853f6a Reschedule for future depreciations and booked difference amount in accumulated depreciation account 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
aa7b434270 Create asset adjustment doctype, post gl entry for the asset 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
0ea6fe4397 Added new doctype Finance Book Detail in asset, asset category 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f2684ae83a Commonify get_asset_category_account and get_fixed_asset_account method 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f41e1ed191 Added default asset accounts in COA, CWIP account in asset category 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
255cd44aba Treeview for Location 2018-05-14 19:07:39 +05:30
Rohit Waghchaure
af05995418 Asset accounting 2018-05-14 19:07:39 +05:30
Rohit Waghchaure
c6deb13fb4 Added account fields in the company, fixes in auto creation of the asset from PR 2018-05-14 19:07:39 +05:30
Rohit Waghchaure
ab84254188 Asset linked to purchase receipt and serial no 2018-05-14 19:07:39 +05:30
Jamsheer
47039e801e Remove unused import 2018-05-14 18:54:10 +05:30
Jamsheer
70a998d428 Remove unused variable 2018-05-14 18:51:04 +05:30
rohitwaghchaure
17aec2d16c
Merge pull request #13808 from mntechnique/cost-center-number
Cost center number
2018-05-14 18:35:38 +05:30
Jamsheer
f5e67213fd Attendance Request - half day check is enabled 2018-05-14 18:34:34 +05:30
rohitwaghchaure
044d6908cf
Merge pull request #13564 from sathishpy/develop
Bank Statement Import
2018-05-14 18:27:53 +05:30
rohitwaghchaure
3069943bce
Merge pull request #13718 from Zlash65/enterprise
Department tree improv and moved Currency field up the list in Company
2018-05-14 18:26:37 +05:30