Devin Slauenwhite
aeee334843
Merge remote-tracking branch 'upstream/develop' into feat-user-unique-cart
2022-02-09 11:08:24 -05:00
Devin Slauenwhite
34ad5b1abf
fix: get cart for logged in user.
2022-02-09 10:53:24 -05:00
Devin Slauenwhite
d636c3fb04
test: many users linked to customer shopping cart
2022-02-09 10:52:38 -05:00
Saqib Ansari
b35b637d01
Merge pull request #29701 from nextchamp-saqib/consolidation-round-off-err
...
fix(pos): incorrect grand_total in case of inclusive taxes on item
2022-02-09 16:42:30 +05:30
Saqib Ansari
0ebd32dc63
fix: cancelling of consolidated sales invoice that doesn't have closing entry
2022-02-09 16:08:28 +05:30
Saqib Ansari
4bb557dbd8
fix: flaky point of sale test
2022-02-09 16:07:42 +05:30
Saqib Ansari
75256863c6
fix(test): do not enable negative stock
2022-02-09 16:07:33 +05:30
Ankush Menat
2abc1c244e
Merge pull request #29715 from aaronmenezes/fix_reserved_for_production_calc
...
fix: Reserved for Production calculation considered closed work orders
2022-02-09 15:59:52 +05:30
Saqib Ansari
d106ec88ad
Merge pull request #29374 from nextchamp-saqib/fix-ignore-pricing-rule
...
fix: ignore pricing rule in transactions
2022-02-09 13:31:57 +05:30
Ankush Menat
89959976bd
fix: patch existing bins
2022-02-09 12:21:05 +05:30
Ankush Menat
a8bf3a3f0d
refactor: move reserve quantity computation to work order
2022-02-09 11:26:03 +05:30
Ankush Menat
d2cc5f2482
test: remove dependency on other tests
2022-02-09 11:19:01 +05:30
Saqib Ansari
8ff7587aaa
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-09 10:31:22 +05:30
Saqib Ansari
ab36b27a94
fix: ignore pricing rule in all transactions
2022-02-09 10:10:17 +05:30
aaronmenezes
6a8b7eeffe
fix: Reserved for Production calculation considered closed work orders
2022-02-08 19:25:49 +05:30
Ankush Menat
f2e056dfeb
Merge pull request #29296 from ankush/lifo_valuation
...
feat: LIFO valuation
2022-02-08 18:15:56 +05:30
Saqib Ansari
07dc228e32
Merge branch 'develop' into consolidation-round-off-err
2022-02-08 18:06:41 +05:30
Saqib Ansari
6fa406dd04
fix(test): pass price_list_rate only if pricing rule has to be removed
2022-02-08 17:51:53 +05:30
Ankush Menat
befcca4183
Merge branch 'develop' into lifo_valuation
2022-02-08 17:38:06 +05:30
Saqib Ansari
c2b83a0283
fix(test): case if write off is calculated as negative amount
2022-02-08 17:36:39 +05:30
Saqib Ansari
b51a5d9225
Merge pull request #29709 from nextchamp-saqib/fix-bank-reco-currency
...
fix: currency in bank reconciliation chart
2022-02-08 16:32:35 +05:30
Saqib Ansari
afc5c26d1c
fix(test): ignore stock validation
2022-02-08 16:04:08 +05:30
Saqib Ansari
3f962739fb
Merge branch 'develop' of https://github.com/frappe/erpnext into consolidation-round-off-err
2022-02-08 16:02:18 +05:30
Saqib Ansari
0fc5d2278d
fix: currency in bank reconciliation chart
2022-02-08 15:50:41 +05:30
Rucha Mahabal
bdf38a33cc
Merge pull request #29650 from ruchamahabal/fix-earned-leaves-allocation
2022-02-08 15:47:43 +05:30
Saqib Ansari
4f4395545e
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-08 15:29:28 +05:30
Saqib Ansari
27ced4f082
Merge pull request #29560 from ruthra-kumar/bug_invoice_creation_throws_typeerror
...
fix: typeerror on invoice creation from SO/PO
2022-02-08 15:27:05 +05:30
Rucha Mahabal
b71283aa7d
Merge branch 'develop' into fix-earned-leaves-allocation
2022-02-08 14:39:55 +05:30
Rucha Mahabal
bd1555bd23
fix: handle carry forwarded leaves while checking for duplicate allocation
2022-02-08 14:36:31 +05:30
Ankush Menat
bb105a33b2
test: validate on save instead of on creation
...
(cherry picked from commit 0efd5577bd9bdc0bb900d4d23d85aa86fd09929a)
2022-02-08 14:01:41 +05:30
Bhavesh Maheshwari
3969840ee8
fix: ignore rate validation for work order
...
(cherry picked from commit f29aed7f7130b805810075db1e5e1003e997bef8)
2022-02-08 14:01:41 +05:30
Saqib Ansari
0f913e0173
Merge branch 'develop' into bug_invoice_creation_throws_typeerror
2022-02-08 11:51:26 +05:30
Saqib Ansari
5e32b809cb
Merge pull request #29599 from nemesis189/coupon-code-issue-pos
...
fix: Coupon code item pricing dynamic updation issue in pos screen
2022-02-08 11:50:19 +05:30
Saqib Ansari
8eff2969b0
Merge pull request #29699 from nextchamp-saqib/improve-debit-to-err-msg
...
chore: show credit/debit-to account in error message
2022-02-08 11:42:57 +05:30
Saqib Ansari
4c3d751421
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-08 11:42:33 +05:30
Saqib Ansari
0452d7de20
fix(pos): incorrect grand_total in case of inclusive taxes on item
2022-02-08 11:26:23 +05:30
Saqib Ansari
e93bb8a336
chore: show credit/debit-to account in error message
2022-02-08 10:49:37 +05:30
Ankush Menat
0ca60afc3f
fix: ignore cancelled SLEs ( #29679 )
2022-02-08 10:24:19 +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
2280ae5554
Merge pull request #29549 from frappe/mergify/bp/develop/pr-29290
...
fix: billed amount in delivery note items (backport #29290 )
2022-02-07 23:49:19 +05:30
Deepesh Garg
529cc72863
Merge pull request #29656 from ankush/credit_debit_pr
...
fix: dont ignore items that dont have SVD
2022-02-07 23:46:07 +05:30
Ankush Menat
f82d7eb73f
test: commit item/warehouse creation to db
2022-02-07 22:55:56 +05:30
Ankush Menat
43f8ee1dd1
chore: drop dead field from stock reconciliation
2022-02-07 22:55:56 +05:30
Ankush Menat
699519f7b6
test: product bundle reposting
2022-02-07 22:55:56 +05:30
Ankush Menat
853e658dcc
test: move bundle info to class variables
2022-02-07 22:55:56 +05:30
Ankush Menat
1022db0474
fix: merge stock ledger item warehouse with doc's
2022-02-07 22:55:56 +05:30
Ankush Menat
e6ab8df8f2
refactor: simplify get_items_and_warehouses
...
Also remove dead code related to stock reconciliation_json.
2022-02-07 22:55:56 +05:30
Ankush Menat
c56d07dee3
fix: consider packed items too when reposting
2022-02-07 22:55:56 +05:30
Deepesh Garg
eab10a13e7
fix: Conflicts
2022-02-07 22:12:27 +05:30
Saqib Ansari
4655e115d0
Merge branch 'develop' into bug_invoice_creation_throws_typeerror
2022-02-07 20:04:59 +05:30
