Commit Graph

41182 Commits

Author SHA1 Message Date
Deepesh Garg
be56efad26 fix: Itemised tax rate updation 2022-03-14 17:17:01 +05:30
Ankush Menat
02d64a32c2 fix(ux): negative stock warning 2022-03-14 17:16:39 +05:30
Sagar Sharma
884cd814bc test: add test for planned_qty
(cherry picked from commit b22bdc5ff762d41242c742bb3f6fda64eb98fd2e)
2022-03-14 11:31:52 +00:00
Sagar Sharma
3b86d6c73c fix: max_qty validation condition
(cherry picked from commit d198c488a4071d13d0891d87f790562febd44b3e)
2022-03-14 11:31:52 +00:00
Marica
fda60da07b
Merge pull request #30229 from marination/sq-currency
fix: Add missing currency option in Supplier Quotation's `rounded_total` field
2022-03-14 17:00:31 +05:30
Deepesh Garg
3cc2e53b08 fix: Linting Issue 2022-03-14 16:27:04 +05:30
marination
a579a211fd chore: Re-arrange fields for consistency with base currency LHS 2022-03-14 16:15:12 +05:30
Deepesh Garg
b37559c535 fix: KSA E-Invoice QR Code showing wrong VAT amount 2022-03-14 16:13:35 +05:30
marination
dcd88ddc87 fix: Add missing currency option in Supplier Quotation's rounded_total field 2022-03-14 15:57:24 +05:30
Deepesh Garg
2b6e7963f6
Merge branch 'develop' into implicit_pricing_rule_enable 2022-03-14 15:49:21 +05:30
Noah Jacob
60c4593f7b chore: removed unrequired batch_no parameter while fetching stock_balance 2022-03-14 15:36:56 +05:30
Noah Jacob
00797fa02d test: checking balance serial nos in stock ledger report 2022-03-14 15:36:56 +05:30
Noah Jacob
e8ba1f4e74 fix: incorrect balance serial no in stock ledger report 2022-03-14 15:36:56 +05:30
Ankush Menat
6ee904d641 test: dont resubmit work order 2022-03-14 15:13:37 +05:30
mergify[bot]
12696ffeb4
fix: Search query of payroll entry reference in Journal Entry (#30225) (#30226)
(cherry picked from commit 98a67967a38c4e5b7b1977c4257bd0b23c57eded)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2022-03-14 14:44:02 +05:30
Ankush Menat
d3e90ed8c8 fix(patch): remove dead links to ProdPlan Item 2022-03-14 14:15:43 +05:30
Ankush Menat
1af13ca4bf fix(ux): remove get item buttons from submitted production plan 2022-03-14 14:15:43 +05:30
Saqib Ansari
c1740ced97
fix: cannot create multicurrency sales order with product bundles (#30166) 2022-03-14 13:43:55 +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
935218598a
Merge pull request #30198 from nextchamp-saqib/pos-fixes-#12
fix(pos): do not reset mode of payments in case of consolidation
2022-03-14 12:34:40 +05:30
Saqib Ansari
58804b8436 fix: cannot create purchase order from sales order 2022-03-14 12:31:13 +05:30
Saqib Ansari
2e265d9bf6 test: mode of payments in case of consolidation 2022-03-14 11:02:33 +05:30
Ankush Menat
941ea1ec74 fix(ux): skip items without batch series 2022-03-14 10:25:18 +05:30
Ankush Menat
91fd9d917a test: negative fifo test 2022-03-14 10:25:18 +05:30
Rucha Mahabal
87d9863a71
Merge pull request #29439 from ruchamahabal/leave-opening-balance 2022-03-13 20:55:50 +05:30
Rucha Mahabal
211916bfce
Merge branch 'develop' into leave-opening-balance 2022-03-13 20:30:36 +05:30
Rucha Mahabal
d61c437588 fix: flaky tests 2022-03-13 20:30:18 +05:30
Deepesh Garg
835c029e53
Merge pull request #29979 from deepeshgarg007/bank_reco_multicurrency_fix
fix: Multi-currency bank reconciliation fixes
2022-03-13 20:27:04 +05:30
Rucha Mahabal
558650bc3a fix: add more type hints 2022-03-13 20:02:51 +05:30
Deepesh Garg
5ae610bd32
Merge pull request #30039 from deepeshgarg007/gstr_3b_nil_exempt_fixed
fix: Nil and Exempted values in GSTR-3B Report
2022-03-13 20:00:48 +05:30
Ankush Menat
1a256c62c4 fix: attach sr no si standalone credit note 2022-03-13 19:00:34 +05:30
Ankush Menat
1c37d2711a test: standalone SI creates and attaches serial nos 2022-03-13 19:00:34 +05:30
Deepesh Garg
6308e1be91 fix: Do not consider cancelled entries 2022-03-13 18:13:12 +05:30
Deepesh Garg
96b5cedcf8 fix: Do not update ignore prcing rule check implicitly 2022-03-13 17:48:37 +05:30
Deepesh Garg
22dfd5a4b1
Merge pull request #30152 from deepeshgarg007/sales_purchase_retrun_optimization
fix: Sales and Purchase return optimization
2022-03-13 17:13:53 +05:30
Deepesh Garg
7b0d1a6d12
Merge pull request #30155 from deepeshgarg007/loan_cost_center
fix: Add cost center in loan document
2022-03-13 17:13:04 +05:30
Deepesh Garg
60ba0ba219
Merge branch 'develop' into loan_cost_center 2022-03-13 12:50:27 +05:30
Deepesh Garg
e4e38ad60b
Merge branch 'develop' into sales_purchase_retrun_optimization 2022-03-13 12:45:10 +05:30
Saqib Ansari
e8a7a54d5a fix(pos): do not reset mode of payments in case of consolidation 2022-03-12 19:20:48 +05:30
mergify[bot]
b085e96a12
revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" (#29782) (#29807)
* Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount"

This reverts commit 038f94955006c88209f9df28e3a785c59a4ddb28, reversing
changes made to c7b491843476bca89be02851ccafb7e409876609.

* fix: linter

(cherry picked from commit 7fa46f77e0bdbc516b3c0cb0fb20594ee7fa398b)

# Conflicts:
#	erpnext/patches.txt

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
2022-03-11 18:28:50 +05:30
Ankush Menat
94d0f8d4e7 test: actual bom naming test 2022-03-11 17:11:22 +05:30
Rohan Bansal
67d8a7ba86 fix: cancelled document check 2022-03-11 17:11:22 +05:30
Ankush Menat
6b58d53403 refactor: split versioning code for testability 2022-03-11 17:11:22 +05:30
Rohan Bansal
7f2670941c fix: improve bom autoname logic 2022-03-11 17:11:22 +05:30
Ankush Menat
e2c99e02a9 test: bom for item_code that is >VARCHAR_LEN 2022-03-11 17:11:22 +05:30
Rohan Bansal
d9c91748f4 fix: if an item code is too long, truncate before setting BOM name 2022-03-11 17:11:22 +05:30
Rucha Mahabal
8173e6a8ea fix: simplify insufficient leave balance message 2022-03-11 15:30:01 +05:30
Deepesh Garg
13dce71c21
Merge pull request #30181 from deepeshgarg007/shipping_rule_application
fix: Shipping rule application fixes
2022-03-11 12:04:12 +05:30
Deepesh Garg
d596e0e4df fix: Shipping rule application fixes 2022-03-10 20:56:36 +05:30
Ankush Menat
472fe8e319 test: submit PR directly 2022-03-10 18:08:29 +05:30