Commit Graph

31972 Commits

Author SHA1 Message Date
Afshan
e39dd079c4 fix: double exception in payroll (#24080) 2020-12-08 09:32:08 +05:30
Afshan
7459dc4105 fix: po orverride (#24023)
* fix: po orverride

* fix: po

* fix: spelling error

* fix: refactor condition

* fix: condition
2020-12-08 09:28:01 +05:30
Deepesh Garg
0796d6b5d0 Merge pull request #24071 from deepeshgarg007/gstr_3b_report_ims_v12
fix: Show tax amount in base currencies
2020-12-07 09:14:29 +05:30
Deepesh Garg
5b08241dc6 fix: Show tax amount in base currencies 2020-12-07 09:12:58 +05:30
rohitwaghchaure
5318a159a9 Merge pull request #24068 from rohitwaghchaure/delete-receive-at-warehouse-entry
fix: delete Receive at Warehouse entry on cancellation of Send to War…
2020-12-06 20:57:31 +05:30
Rohit Waghchaure
26723d10af fix: delete Receive at Warehouse entry on cancellation of Send to Warehouse entry 2020-12-06 17:21:30 +05:30
rohitwaghchaure
3ec6bc1838 Merge pull request #24064 from rohitwaghchaure/additional-product-incorrect-rate-v12
fix: pricing rule with transaction not working for additional product
2020-12-06 13:20:39 +05:30
Rohit Waghchaure
29f92e0405 fix: pricing rule with transaction not working for additional product 2020-12-05 19:30:17 +05:30
rohitwaghchaure
2c9f33a916 Merge pull request #24034 from rohitwaghchaure/fixed-job-card-cacncel-flow
fix: don't cancel job card if manufacturing entry has made
2020-12-04 14:15:19 +05:30
Rohit Waghchaure
b09da9bcfc fix: don't cancel job card if manufacturing entry has made 2020-12-04 11:37:50 +05:30
rohitwaghchaure
771a7276c9 Merge pull request #24037 from rohitwaghchaure/fixed-calculate-depreciation-table-issue
fix: Depreciation Posting Date is mandatory even if Calculate Depreci…
2020-12-03 18:24:51 +05:30
Anurag Mishra
2c6c1aa97a fix: payroll attendance error
fix: payroll attendance error
2020-12-03 16:13:07 +05:30
Afshan
482996f8d1 fix: using ORM 2020-12-03 15:14:30 +05:30
Afshan
785579e67b fix: payroll attendance error 2020-12-03 15:11:34 +05:30
Deepesh Garg
74224d90bf Merge pull request #23966 from deepeshgarg007/unpaid_subscription_fix
fix: Invoice generation for Unpaid subscriptions
2020-12-02 20:03:42 +05:30
Rohit Waghchaure
e5d4b4c1ed fix: Depreciation Posting Date is mandatory even if Calculate Depreciation has disabled 2020-11-30 17:20:51 +05:30
Saqib Ansari
39fa5e3266 fix: get formatted value in 'taxes' print template 2020-11-30 15:56:44 +05:30
Deepesh Garg
f940a3494f Merge pull request #24020 from deepeshgarg007/gstr-1-b2c_large
fix: Opening invoices in GSTR-1 report
2020-11-30 10:57:49 +05:30
Deepesh Garg
f08c2a5cef Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into unpaid_subscription_fix 2020-11-29 22:48:46 +05:30
Deepesh Garg
d8b4044ee1 fix: Add check to generate new invoices 2020-11-29 22:48:05 +05:30
rohitwaghchaure
78e737de5a Merge pull request #24013 from rohitwaghchaure/fixed-incoming-rate-for-finished-good
fix: incoming rate for finished good
2020-11-28 19:37:21 +05:30
Deepesh Garg
02feab9f3c fix: Opening invoices in GSTR-1 report 2020-11-27 21:55:02 +05:30
Rohit Waghchaure
3ef60dbfdb fix: incoming rate for finished good 2020-11-27 17:21:05 +05:30
Rohit Waghchaure
75a54361d7 fix: shipping chanrges not sync in erpnext from shopify 2020-11-26 12:55:27 +05:30
Jannat Patel
42b24cc9eb fix: job card error handling for operations field (#23996)
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
2020-11-25 09:07:57 +05:30
rohitwaghchaure
ca05945e92 fix: incorrect balance value in stock balance report (#23997) 2020-11-25 08:58:58 +05:30
rohitwaghchaure
a69b9f95cc Merge pull request #23993 from rohitwaghchaure/bom-stock-project-item-color
fix: bom stock report color showing always red
2020-11-24 17:00:49 +05:30
Rohit Waghchaure
f9e62b74d0 fix: bom stock report color showing always red 2020-11-24 16:56:20 +05:30
Afshan
2b3a20ed5b fix: clear error message when approval not availab (#23972)
le
2020-11-24 08:01:43 +05:30
pateljannat
3252d9d943 fix: enabling track changes for stock settings 2020-11-23 16:41:51 +05:30
pateljannat
9655edabd9 fix: enabling track changes for stock settings 2020-11-23 16:37:00 +05:30
pateljannat
2704327029 fix: enabling track changes for stock settings 2020-11-23 16:34:40 +05:30
Jannat Patel
3d84d324d7 fix: purchase receipt to purchase invoice bill date mapping (#23968)
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-11-23 16:29:42 +05:30
pateljannat
3e526b8ca8 fix: enabling track changes for stock settings 2020-11-23 16:19:50 +05:30
Anurag Mishra
47bdbf1e78 Merge pull request #23979 from rohitwaghchaure/color-not-showing-in-bom-stock-report
fix: bom stock report color issue
2020-11-23 16:14:01 +05:30
Rohit Waghchaure
0cb6ce3a89 fix: bom stock report color issue 2020-11-23 14:11:24 +05:30
rohitwaghchaure
5597737dca Merge pull request #23958 from rohitwaghchaure/incorrect-delink-serial-no-and-batch-v12-hotfix
fix: incorrect delink serial no and batch
2020-11-20 13:45:32 +05:30
Rohit Waghchaure
77b9fa0d06 fix: incorrect delink serial no and batch 2020-11-20 00:26:36 +05:30
Deepesh Garg
224006aebd fix: Invoice generation for Unpaid subscriptions 2020-11-19 19:39:08 +05:30
Smit Vora
c630be6781 fix: remove unused imports 2020-11-19 19:13:06 +05:30
Smit Vora
51a153d8c2 fix: removed unused code 2020-11-19 19:03:22 +05:30
Smit Vora
707b630851 fix: add remarks to sales invoice 2020-11-19 18:42:39 +05:30
Saurabh
fdacb5643b Merge branch 'v12-pre-release' into version-12 v12.14.0 2020-11-19 15:39:04 +05:30
Saurabh
ec89a65859 bumped to version 12.14.0 2020-11-19 15:59:04 +05:50
rohitwaghchaure
1e4a6e845b Merge pull request #23956 from rohitwaghchaure/split-mysql-query-to_update-quantity-hotfix
fix: Table 'tabStock Entry Detail' is specified twice
2020-11-19 14:06:09 +05:30
Rohit Waghchaure
0433fa58f3 fix: Table 'tabStock Entry Detail' is specified twice 2020-11-19 12:52:17 +05:30
rohitwaghchaure
5c72ad2498 fix: Table 'tabStock Entry Detail' is specified twice (#23952) 2020-11-19 12:45:40 +05:30
rohitwaghchaure
c976d080ea fix: stock ledger entries for stock reco (#23955) 2020-11-19 08:15:41 +05:30
Deepesh Garg
fac940042b Merge pull request #23954 from vorasmit/fix-sez-v12
fix(regional): set proper state code in ewaybill JSON when GST category is SEZ
2020-11-18 21:51:12 +05:30
Smit Vora
3e36d774d2 fix(regional): set proper state code in ewaybill JSON when GST category is SEZ 2020-11-18 21:03:45 +05:30