Rucha Mahabal
|
bf26b10df4
|
Merge branch 'develop' into sla-enhancements
|
2020-06-15 13:15:03 +05:30 |
|
Sahil Khan
|
182c1f860b
|
fix(patch): escape special characters in company field
|
2020-06-12 15:16:20 +05:30 |
|
Rucha Mahabal
|
d7481f59ba
|
fix: patch
|
2020-06-11 17:41:05 +05:30 |
|
Rucha Mahabal
|
5b6d2c2e7b
|
Merge branch 'develop' into sla-enhancements
|
2020-06-10 12:33:19 +05:30 |
|
Rucha Mahabal
|
73326d308b
|
refactor: move pause SLA configuration to SLA DocType
|
2020-06-05 18:23:39 +05:30 |
|
Rucha Mahabal
|
25ef6a9638
|
fix: add default hold statuses in fixtures and patch
|
2020-06-05 16:37:20 +05:30 |
|
Rucha Mahabal
|
3f08350181
|
fix: retain Hold status
|
2020-06-04 15:56:59 +05:30 |
|
Rucha Mahabal
|
b3338a149b
|
fix: code clean-up
|
2020-06-04 12:35:00 +05:30 |
|
Nabin Hait
|
2186c223b9
|
fix: Migrate standard_tax_exemption_amount if field exists (#22036)
|
2020-05-29 21:26:49 +05:30 |
|
Rucha Mahabal
|
43d4397003
|
Merge branch 'develop' into sla-enhancements
|
2020-05-29 11:43:49 +05:30 |
|
Rucha Mahabal
|
bc38289a59
|
fix: added patch for sla enhancements
|
2020-05-29 11:43:05 +05:30 |
|
Marica
|
1a25aa83de
|
fix: Delete Auto Email Reports (#22009)
|
2020-05-28 18:16:24 +05:30 |
|
Marica
|
c2aabb0fbf
|
fix: Buying Module fixes (#21965)
* fix: Buying Module fixes
* fix: Delete Report files as well
* fix: Add Purchase Order Analysis to Stock & Accounting
|
2020-05-27 20:56:39 +05:30 |
|
Rucha Mahabal
|
316d136aca
|
fix(Healthcare): unhide company field in Sample Collection, add field in Rehab DocTypes (#21907)
* fix: unhide company field in Sample Collection
* fix: add and set company field in rehab doctypes
|
2020-05-25 18:41:47 +05:30 |
|
Marica
|
91a9d3fbe5
|
fix: Reload doc in Healthcare company patch (#21808)
|
2020-05-20 16:12:46 +05:30 |
|
Rucha Mahabal
|
99d348ffa3
|
fix: Patch for Setting Missing Company in Healthcare DocTypes (#21790)
* fix: patch for setting missing company in Healthcare DocTypes
* fix: check doctype exists
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
|
2020-05-19 20:28:19 +05:30 |
|
Rohit Waghchaure
|
366bce678f
|
added onboarding for manufacturing
|
2020-05-18 11:57:25 +05:30 |
|
Rohit Waghchaure
|
34f4a2398b
|
feat: manufacturing dashboards
|
2020-05-18 11:57:25 +05:30 |
|
Deepesh Garg
|
a63fda9097
|
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes
|
2020-05-17 23:37:05 +05:30 |
|
Deepesh Garg
|
5ccefdc08a
|
fix: Patch to update old loans
|
2020-05-17 23:26:59 +05:30 |
|
Nabin Hait
|
85a89812a4
|
fix: Run income-tax-slab patch only if slab already exists in payroll period (#21684)
|
2020-05-11 19:23:18 +05:30 |
|
Nabin Hait
|
672b74d89c
|
fix: Patch and tests
|
2020-05-05 15:58:52 +05:30 |
|
Anurag Mishra
|
09572d9892
|
patch: to link additional salary with salary slip and leave encashment, incentive with additional salary
|
2020-05-04 17:07:15 +05:30 |
|
Nabin Hait
|
504a5f3a3a
|
fix: reload income_tax_slab_other_charges in patch (#21447)
* fix: reload income_tax_slab_other_charges in patch
* fix: reload lower_deduction_certificate in patch
|
2020-04-28 11:16:04 +05:30 |
|
Nabin Hait
|
58ee6c1e08
|
feat: Income tax slab (#21399)
* Feat: Multiple tax as per new taxation rule
* patch:for multiple tax slab, fix: payroll and exemption validation
* Test: Fixture
* feat: income tax slab with other charges and tax exempted deduction components
* fix: added missing init file
* fix: Patch fixed
* fix: Patch fixed
* fix: test fixes
* fix: validate duplicate exemption declaration
* fix: payment entry test case
Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
|
2020-04-26 17:45:57 +05:30 |
|