Commit Graph

2875 Commits

Author SHA1 Message Date
Saqib Ansari
4aabe97565
Merge branch 'develop' into fix-pos-issues-again 2022-03-24 11:18:13 +05:30
Deepesh Garg
405dcb1d3c fix: Add ignore pricelist for missing flows 2022-03-23 09:04:03 +05:30
Deepesh Garg
66ca085e39 fix: Changing item prices on converting orders/receipts to invoices 2022-03-22 23:03:41 +05:30
Saqib Ansari
aff7408775 fix(pos): allow validating stock on save 2022-03-21 14:08:56 +05:30
Saqib Ansari
4afb47e869 fix(pos): specific case when serialized item not removed 2022-03-21 13:24:11 +05:30
Saqib Ansari
2f82e237ef fix(pos): customer group filter in customer selector 2022-03-21 12:47:35 +05:30
Saqib Ansari
d5fd8e0ba6 fix: prevent multiple save on applying coupon code 2022-03-21 11:36:30 +05:30
barredterra
36df21067c refactor: sales analytics 2022-03-20 03:58:24 +01:00
rohitwaghchaure
da16ee159a
Merge pull request #30238 from KrithiRamani/bulk_create_PL_and_DN
feat: Create single PL/DN from several SO.
2022-03-17 15:39:45 +05:30
Deepesh Garg
2958f60b46
Merge pull request #30269 from deepeshgarg007/implicit_pricing_rule_enable_v2
fix: Do not update ignore pricing rule check implicitly
2022-03-16 12:32:25 +05:30
Deepesh Garg
1f79b47a17 fix: Do not update ignore prcing rule check implicitly 2022-03-16 11:55:43 +05:30
Krithi Ramani
9f7fee7a4f Added new field in SO - % Picked 2022-03-15 21:40:51 +05:30
Krithi Ramani
a68213d82e added new field - Picked Qty, in Sales Order Item 2022-03-15 20:18:23 +05:30
Deepesh Garg
2b6e7963f6
Merge branch 'develop' into implicit_pricing_rule_enable 2022-03-14 15:49:21 +05:30
Saqib Ansari
f5f6650779
Merge pull request #30217 from nextchamp-saqib/fix-so-to-po
fix: cannot create purchase order from sales order
2022-03-14 12:35:32 +05:30
Saqib Ansari
58804b8436 fix: cannot create purchase order from sales order 2022-03-14 12:31:13 +05:30
Deepesh Garg
96b5cedcf8 fix: Do not update ignore prcing rule check implicitly 2022-03-13 17:48:37 +05:30
Deepesh Garg
d596e0e4df fix: Shipping rule application fixes 2022-03-10 20:56:36 +05:30
Saqib Ansari
baee5d109e
Merge pull request #30110 from nextchamp-saqib/fix-customer-credit-limit-update
fix: customer credit limit validation on update
2022-03-09 11:42:14 +05:30
Deepesh Garg
9be3bc1dbf
Merge pull request #30080 from deepeshgarg007/item_wise_sales_history
fix: Item-wise sales history report
2022-03-09 10:18:14 +05:30
Saqib Ansari
1061256358
Merge branch 'develop' into fix-customer-credit-limit-update 2022-03-08 16:01:17 +05:30
Saqib Ansari
a0dc79332d fix: customer credit limit validation on update 2022-03-08 15:21:27 +05:30
Deepesh Garg
83dd3bd7fc
Merge pull request #29940 from deepeshgarg007/item_discounts_quotation
fix: Item discounts for quotation and other docs
2022-03-08 09:08:51 +05:30
Deepesh Garg
e2c144e9e3 fix: Item-wise sales history report 2022-03-06 19:05:02 +05:30
Saqib Ansari
89f87cee87
Merge branch 'develop' into ordered-qty-for-packed-items 2022-03-02 12:13:56 +05:30
Ankush Menat
afb69b0b7f
Merge branch 'develop' into item_discounts_quotation 2022-03-01 11:49:25 +05:30
Ankush Menat
b0d1e6db54 test(refactor): use FrappeTestCase 2022-02-28 17:23:32 +05:30
Deepesh Garg
1b186682ea Merge branch 'develop' of https://github.com/frappe/erpnext into grant_commission_check 2022-02-28 12:42:21 +05:30
Saqib Ansari
cde711151e
Merge branch 'develop' into ordered-qty-for-packed-items 2022-02-28 11:35:42 +05:30
Saqib Ansari
81514516f3 fix(pos): coupon code is applied even if ignore pricing rule is check 2022-02-25 15:18:06 +05:30
Deepesh Garg
0373914704 fix: Commission not applied while making Sales Order from Quotation 2022-02-24 14:42:56 +05:30
Deepesh Garg
3a547cb0d9 fix: Item discounts for quotation 2022-02-22 16:25:32 +05:30
Saqib Ansari
8e3f1e306d test: po updates packed item's ordered_qty 2022-02-22 15:34:26 +05:30
Saqib Ansari
8005fee656 feat: update ordered qty for packed items 2022-02-22 15:06:19 +05:30
Marica
e952cce17d
chore: Show 'Produced Qty' field in Sales Order Item (#29903) 2022-02-21 14:22:14 +05:30
Saqib Ansari
fa38c291bd fix(pos): removal of coupon code 2022-02-21 11:38:16 +05:30
Saqib Ansari
2743999785 fix: coupon code is applied even if ignore_pricing_rule is enabled 2022-02-17 16:03:43 +05:30
Deepesh Garg
d251bec380
Merge pull request #29137 from ruthra-kumar/payment_terms_report
feat: Payment Terms Status report
2022-02-16 14:15:24 +05:30
Deepesh Garg
2f5bfcc055
Merge branch 'develop' into payment_terms_report 2022-02-16 10:06:12 +05:30
Marica
e6fa33012f
Merge branch 'develop' into so-mr-wo-back-update 2022-02-15 17:51:54 +05:30
ruthra kumar
48f37c7659 test: added test for alternate currency
- Sales Order and Invoice will be submitted in USD with exchange rate
of 70 with the default company currency
- Report will display in defauly company currency
2022-02-15 17:21:08 +05:30
ruthra kumar
49fdc6c52e test: refactor and fix failing test case 2022-02-15 17:20:29 +05:30
Ankush Menat
f89a64db48
fix: dont attempt to set batch number if item doesn't have batch no (#29812)
This causes other triggers and unnecessary changes (e.g. price list)
2022-02-15 16:10:35 +05:30
marination
0ca58d7627 chore: Patch to update SO work_order_qty and Linter fix 2022-02-15 14:28:00 +05:30
marination
f9d52e7346 test: SO > MR > WO flow 2022-02-15 13:38:15 +05:30
ruthra kumar
a4b8d67323 refactor: create invoices list without if else 2022-02-15 12:20:41 +05:30
ruthra kumar
85ed0fb8d6 fix: default to company currency in report output 2022-02-15 12:20:06 +05:30
ruthra kumar
bc244d0740 refactor: currency field and code cleanup 2022-02-14 17:48:16 +05:30
Mohammed Yusuf Shaikh
a3e69cf75d
feat: Bulk Transaction Processing (#28580)
* feat: Bulk Transaction Processing

* fix: add flags to ignore validations and exception handling correction

* fix: remove duplicate code, added logger functionality and improved notifications

* fix: linting and sider issues

* test: added tests

* fix: linter issues

* fix: failing test case

* fix: sider issues and test cases

* refactor: mapping function calls to create order/invoice

* fix: added more test cases to increase coverage

* fix: test cases

* fix: sider issue

* fix: rename doctype, improve formatting and minor refactor

* fix: update doctype name in hooks and sider issues

* fix: entry log test case

* fix: typos, translations and company name in tests

* fix: linter issues and translations

* fix: linter issue

* fix: split into separate function for marking failed transaction

* fix: typos, retry failed transaction logic and make log read only

* fix: hide retry button when no failed transactions and remove test cases not rrelevant

* fix: sider issues and indentation to tabs

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-02-08 01:00:37 +05:30
Deepesh Garg
4284017e9d
fix: Copyright info 2022-02-07 12:26:01 +05:30