Commit Graph

36924 Commits

Author SHA1 Message Date
Deepesh Garg
302855e160 fix: Auto tax calculations in Payment Entry 2021-06-14 20:09:10 +05:30
Deepesh Garg
4cd0f6ce23 fix: Revert unintended changes 2021-06-14 20:01:04 +05:30
Saqib
80077d215f
fix: patch for adding doctype to sla (#26053) 2021-06-14 19:34:25 +05:30
Himanshu
ec25d5938b
feat(SLA): Apply SLA to any document (#22449) 2021-06-14 19:05:52 +05:30
Marica
326a2e6a99
Merge pull request #26020 from marination/subcontracted-rm-to-transfer-report-develop
fix: Report Subcontracted Raw Materials to be Transferred
2021-06-14 17:11:51 +05:30
Deepesh Garg
cf1fc40b06
Merge pull request #25906 from deepeshgarg007/gst_taxtable_value_with_discount
fix(India): Taxable value for invoices with additional discount
2021-06-14 17:11:08 +05:30
Marica
ff1360a8e6
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop 2021-06-14 16:48:57 +05:30
GangaManoj
75b30efb05 fix(General Ledger): Filter Project drop-down list by Company 2021-06-14 16:42:27 +05:30
GangaManoj
27ec51f021 fix(General Ledger): Filter Cost Center drop-down list by Company 2021-06-14 16:41:56 +05:30
marination
5d082b05a9 fix: Flaky test for Report Subcontracted Raw materials to be transferred 2021-06-14 16:31:45 +05:30
Marica
18833b5ea1
Merge pull request #26043 from marination/subcontracted-rm-transfer-report-test
fix: Flaky test for Report Subcontracted Raw materials to be transferred
2021-06-14 15:25:05 +05:30
marination
3b070d1b05 fix: Flaky test for Report Subcontracted Raw materials to be transferred 2021-06-14 14:51:33 +05:30
Deepesh Garg
9eac4d0af6 fix: Import throw 2021-06-14 14:44:19 +05:30
Deepesh Garg
8718013c96 fix: Add separate function to validate payment entry taxes 2021-06-14 14:34:44 +05:30
GangaManoj
0511ffcf30 fix(General Ledger): Implement multi-account selection 2021-06-14 13:22:44 +05:30
Nabin Hait
580b4d50b5
Merge pull request #26027 from ruchamahabal/add-inactive-status-to-employee
feat: add Inactive status to Employee
2021-06-14 12:34:33 +05:30
Nabin Hait
ad58182395
Merge pull request #26030 from ruchamahabal/add-inactive-status-to-employee-v13
feat: add Inactive status to Employee
2021-06-14 12:33:28 +05:30
Nabin Hait
c8ed863454
Merge pull request #26029 from ruchamahabal/add-inactive-status-to-employee-v13-release
feat: add Inactive status to Employee
2021-06-14 12:32:28 +05:30
Suraj Shetty
d1902dfadb Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing 2021-06-14 12:25:49 +05:30
Deepesh Garg
856484aeb0 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount 2021-06-14 11:29:41 +05:30
Deepesh Garg
580346360f fix: Auto tax calculations in Payment Entry 2021-06-14 11:16:39 +05:30
Marica
d37912fff1
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop 2021-06-12 16:00:14 +05:30
Anoop
28cdff10cf
fix: update linked Customer on Patient update only if Link Customer to Patient is enabled (#25926) 2021-06-12 14:17:04 +05:30
Rucha Mahabal
cf349aadf9
fix: unable to enter score in Assessment Result details grid (#25945) (#26031) 2021-06-12 14:05:12 +05:30
Rucha Mahabal
0ed33aa4e8
fix: unable to enter score in Assessment Result details grid (#25945) 2021-06-12 13:40:58 +05:30
Rucha Mahabal
17550fb4bf feat: add Inactive status to Employee 2021-06-12 13:36:47 +05:30
Rucha Mahabal
efd7d584b2 feat: add Inactive status to Employee 2021-06-12 13:34:20 +05:30
Rucha Mahabal
a38147a8ba feat: add Inactive status to Employee 2021-06-12 13:33:21 +05:30
Anupam Kumar
400205cc8a
fix: payroll entry employee detail issue (#25968)
* fix: payroll entry employee detail issue

* fix: review changes
2021-06-12 12:30:53 +05:30
Ankush Menat
348f04ca82
fix: syntax error in serial/batch selector (#26024) 2021-06-11 21:01:30 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645) 2021-06-11 18:40:22 +05:30
Marica
19d36be624
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop 2021-06-11 17:50:43 +05:30
Marica
d7d5c4c329
Merge pull request #26011 from marination/subcontracted-rm-to-transfer-report
fix: Report Subcontracted Raw Materials to be Transferred
2021-06-11 17:50:30 +05:30
marination
ea3e61d3b0 fix: Test 2021-06-11 17:29:55 +05:30
marination
c4d851e45f fix: Test 2021-06-11 17:27:43 +05:30
Ankush Menat
a424c0c023
test(perf): eliminate repeat creation of HSN codes (bp #25947) 2021-06-11 16:49:39 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +05:30
Ankush Menat
5bb89b0ead
test(perf): eliminate repeat creation of HSN codes (#25947) 2021-06-11 15:57:01 +05:30
marination
a4ed6a3519 fix: Sider 2021-06-11 12:51:36 +05:30
marination
c5da51dd7a fix: Report Raw Materials to be Transferred 2021-06-11 12:51:10 +05:30
marination
ec4a3723cc fix: Sider 2021-06-11 12:47:06 +05:30
rohitwaghchaure
387de3f3fa
Merge pull request #26015 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation-develop
fix: timeout error in the repost item valuation
2021-06-11 12:18:13 +05:30
rohitwaghchaure
da28db3698
Merge pull request #26016 from rohitwaghchaure/fixed-conversion-factor-issue-develop
fix: custom conversion factor field not mapped from job card to stock entry
2021-06-11 12:17:54 +05:30
rohitwaghchaure
49f3e5bbd5
Merge pull request #26017 from rohitwaghchaure/donot-copy-difference-account-develop
fix: on click of duplicate button system has not copied the difference account
2021-06-11 12:17:36 +05:30
rohitwaghchaure
eac07a28e3
Merge pull request #26014 from rohitwaghchaure/fixed-filters-for-item-query-develop
fix: filter type for item query
2021-06-11 12:17:14 +05:30
Rohit Waghchaure
17408c6388 fix: on click of duplicate button system copy the difference account from first row 2021-06-11 10:58:00 +05:30
Rohit Waghchaure
9cfd3adad9 fix: custom conversion factor field not mapped from job card to stock entry 2021-06-11 10:56:44 +05:30
Rohit Waghchaure
b103b24ae1 fix: timeout error in the repost item valuation 2021-06-11 10:55:05 +05:30
Rohit Waghchaure
f310501d7d fix: filter type for item query 2021-06-11 10:53:07 +05:30
marination
687ad9b942 fix: Report Raw Materials to be Transferred 2021-06-10 21:18:19 +05:30