Commit Graph

31048 Commits

Author SHA1 Message Date
Anurag Mishra
ee7bcc0350 fix: Added TDS Payable account number and an error message
fix: Added TDS Payable account number and an error message
2020-12-16 13:49:41 +05:30
Anurag Mishra
b16d625b4f Merge pull request #24118 from deepeshgarg007/unique_tax_category_v12
fix: Validation for duplicate Tax Category
2020-12-14 12:39:08 +05:30
Nabin Hait
22e770353f fix: Translation issue 2020-12-14 11:00:59 +05:30
Deepesh Garg
bbce16e00c fix: Validation for duplicate Tax Category 2020-12-14 10:57:29 +05:30
Anuja P
1cd57a324c fix: Added TDS account number and an error message 2020-12-10 22:05:09 +05:30
Marica
fe56b800a6 Merge pull request #24081 from pateljannat/sales-invoice-from-sales-order-v12
fix: sales invoice add button on sales order dashboard
2020-12-10 20:09:20 +05:30
Marica
ccdfbd4f40 Merge pull request #24103 from marination/hotfix-debit-credit-opening-invoice-tool
fix: Handle Account and Item None not found in Opening Invoice Creation Tool
2020-12-10 20:06:13 +05:30
Marica
f7f809aae8 Merge branch 'version-12-hotfix' into hotfix-debit-credit-opening-invoice-tool 2020-12-10 20:04:54 +05:30
Mohammad Hasnain Mohsin Rajan
3f399ee806 fix(acc recv report): columns mismatch (#24085) 2020-12-10 19:15:53 +05:30
Marica
7bbe383232 Merge branch 'version-12-hotfix' into hotfix-debit-credit-opening-invoice-tool 2020-12-10 18:58:31 +05:30
marination
1fcd1e4dc0 fix: add assertRaises for error 2020-12-10 17:34:30 +05:30
Anurag Mishra
800a9ae7c3 Merge pull request #24097 from prssanna/chart-imports
fix: function imports in account_balance_timeline.py
2020-12-10 16:32:59 +05:30
marination
a63b5c1a9e fix: Make new Customers for account missing test and set company 2020-12-10 16:31:23 +05:30
marination
74bcb2977f chore: Add Test for missing debit account 2020-12-10 16:30:39 +05:30
marination
96946fa4a0 fix: Handle missing Account and Item in Opening Invoice Creation Tool 2020-12-10 16:30:13 +05:30
Deepesh Garg
e2fb0c567d Merge pull request #24036 from nextchamp-saqib/abs-value-in-pf-v12
fix: get formatted value in 'taxes' print template
2020-12-10 15:35:15 +05:30
Mohammad Hasnain Mohsin Rajan
5a1d912e6d Merge branch 'version-12-hotfix' into sales-invoice-from-sales-order-v12 2020-12-10 14:07:07 +05:30
Prssanna Desai
e152f9a89a Merge pull request #24099 from prssanna/shopping-cart-fix
fix: get value of allow_items_in_stock even if not an exact match
2020-12-10 12:44:48 +05:30
prssanna
6a718a3fc6 fix: get value of allow_items_in_stock even if not an exact match 2020-12-10 12:39:53 +05:30
Saqib
5062b78718 fix: asset with value zero doesn't show up in fixed asset register (#24098) 2020-12-10 12:33:43 +05:30
prssanna
eed12444e1 fix: function imports in account_balance_timeline.py 2020-12-10 12:20:18 +05:30
rohitwaghchaure
326fccfa00 Merge pull request #24001 from rohitwaghchaure/fixed-stock-entry-multi-consumption
fix: incorrect stock quantity if 'Allow Multiple Material Consumption…
2020-12-10 02:11:20 +05:30
Rohit Waghchaure
e7476914cd fix: incorrect stock quantity if 'Allow Multiple Material Consumption' has enabled 2020-12-10 01:27:54 +05:30
rohitwaghchaure
b1507fdaae Merge pull request #24009 from rohitwaghchaure/shipping-charges-not-added-in-invoice
fix: shipping charges not sync from shopify
2020-12-10 01:06:18 +05:30
Shivam Mishra
91a3ab8e32 Merge pull request #24084 from prssanna/item-configurator-fix
fix(Shopping Cart): allow add to cart for any item if allow_items_not_in_stock is enabled
2020-12-09 16:45:22 +05:30
prssanna
cfb6e3aa30 fix: allow add to cart for any item if allow_items_not_in_stock is enabled 2020-12-08 16:44:38 +05:30
pateljannat
4fe48a30c4 fix: sales invoice add button on sales order dashboard 2020-12-08 12:04:56 +05:30
Jannat Patel
af29bde0e8 Merge pull request #2 from frappe/version-12-hotfix
Version 12 hotfix
2020-12-08 11:39:32 +05:30
Afshan
b83e131b1f fix: throw an error when no pos profile exist (#24026)
* fix: throw an error when no pos profile exist

* fix: tests

* fix: tests

* fix:test
2020-12-08 09:45:14 +05:30
Rucha Mahabal
51015178da fix(POS): do not fetch items until POS Profile is set (#24076) 2020-12-08 09:34:22 +05:30
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