nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-18 00:48:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,210 Commits 607 Branches 1,799 Tags
d2c8df9451824dcf1519425bd14b48585bdbe3b0
Commit Graph

186 Commits

Author SHA1 Message Date
Mihir Kandoi
3abadc7a5f fix(controllers): fix supplier-RFQ portal list query (wrong column + Postgres DISTINCT) 
rfq_transaction_list had two defects introduced when it was converted to the query
builder:

1. `party.supplier == party[0]` compared supplier to a column literally named "0"
   (a stray index on the DocType, not the intended `parties[0]` value). This renders
   as `supplier = \`0\`` / `supplier = "0"` and errors on BOTH engines
   (MariaDB: Unknown column '0'; Postgres: column "0" does not exist), so the
   supplier portal RFQ list was completely broken.
2. SELECT DISTINCT ordered by `creation`, which is not in the select list. Postgres
   rejects this ("for SELECT DISTINCT, ORDER BY expressions must appear in select list").

Compare against `parties[0]` and add `creation` to the select list.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit a7d9078bf4)

# Conflicts:
#	erpnext/controllers/tests/test_website_list_for_contact.py
 2026-06-29 08:24:18 +00:00
ruthra kumar
1a9fcfb0cc refactor(test): broken test case in accounts controller 
(cherry picked from commit 59a69fc497)
 2026-06-29 09:41:48 +05:30
ruthra kumar
a8aa73baae refactor(test): remove even more dead code 
(cherry picked from commit 3d109571ee)
 2026-06-29 09:41:48 +05:30
ruthra kumar
65202d2be1 refactor(tests): reuse persistent master data instead of creating company per test 
Replace per-test company creation in setUp() with persistent master data
from BootStrapTestData. Add Test PCV Company to test_records.json so it
becomes a persistent fixture rather than a throwaway created per test run.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 6e62750c2f)

# Conflicts:
#	erpnext/accounts/report/financial_ratios/test_financial_ratios.py
 2026-06-29 09:41:47 +05:30
mergify[bot]
f5d05b969b fix: update round off account functions to accept document context for regional overrides (backport #55758) (#55771) 
Co-authored-by: Lakshit Jain <ljain112@gmail.com>
fix: update round off account functions to accept document context for regional overrides (#55758)
 2026-06-22 12:30:09 +00:00
ruthra kumar
2c482ff4c9 refactor(test): speed up item wise inventory test 
(cherry picked from commit 627f2058b5)
 2026-06-16 07:00:51 +00:00
mergify[bot]
9a6fae9fdd fix(taxes): add category and add_deduct_tax fields to tax entries (backport #55753) (#55773) 
Co-authored-by: Lakshit Jain <ljain112@gmail.com>
fix(taxes): add category and add_deduct_tax fields to tax entries (#55753)
 2026-06-09 12:59:13 +00:00
mergify[bot]
ceb10422ae fix: unable to submit subcontracted job card (backport #55537) (#55540) 
* fix: unable to submit subcontracted job card (#55537)

(cherry picked from commit 0a49403838)

# Conflicts:
#	erpnext/controllers/subcontracting_controller.py

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-06-02 10:47:30 +00:00
Mihir Kandoi
27db98d222 feat: allow creation of any number of variants in multiple item variant creation dialog 
(cherry picked from commit 090c25d848)
 2026-05-26 08:05:44 +00:00
Lakshit Jain
52a4ca9c41 feat: add support for 'not applicable' tax in item tax templates (#50898) 
* feat: add support for 'not applicable' tax in item tax templates

* refactor: remove unused imports

* fix: import NOT_APPLICABLE_TAX in get_item_tax_map function

* fix: add item wise tax details for not applicable taxes

* test: added test case for `not_applicable`

* fix: do not create item wise tax details for not applicable tax

* fix: ensure tax rate is set to 0 for not applicable tax rows

* refactor: changes as per review

* test: update selling settings

* test: correct settings

* fix: return both net and current tax amounts for not applicable tax

(cherry picked from commit 453fe376ab)
 2026-04-18 06:05:36 +00:00
mergify[bot]
45052ce8a7 fix: reset base_rounded_total when rounded_total resets (backport #54241) (#54304) 
* fix: reset base_rounded_total when rounded_total resets

(cherry picked from commit f8d278b733)

# Conflicts:
#	erpnext/controllers/tests/test_taxes_and_totals.py

* chore: spelling mistake

(cherry picked from commit e2ac476587)

* chore: resolve conflicts

---------

Co-authored-by: ljain112 <ljain112@gmail.com>
 2026-04-16 10:39:17 +05:30
Lakshit Jain
53fc0beae5 Merge pull request #53969 from frappe/mergify/bp/version-16-hotfix/pr-53961 
fix: ensure accurate rounding for item-wise tax and taxable amounts (backport #53961)
 2026-04-01 14:43:15 +05:30
Mihir Kandoi
8db397bdae feat: co product by product support (#52979) (#53975) 2026-04-01 07:41:39 +00:00
ljain112
9386c1328a test: improve test case 
(cherry picked from commit b73b161cbe)
 2026-03-31 14:21:12 +00:00
ljain112
c4c76cc1b2 fix: ensure accurate rounding for item-wise tax and taxable amounts 
(cherry picked from commit 9b37f2d95c)
 2026-03-31 14:21:12 +00:00
khushi8112
8674aafc86 fix(test): do not use is_group enabled customer group in test 
(cherry picked from commit 75fa2b2277)
 2026-03-31 11:17:17 +00:00
ruthra kumar
ee61d79631 refactor(test): remove AccountsTestMixin from reactivity 
(cherry picked from commit d2ee967383)
 2026-03-31 15:05:17 +05:30
ruthra kumar
85b08e4706 refactor(test): remove AccountsTestMixin from distributed discount 
(cherry picked from commit 0b6546ea06)
 2026-03-31 09:32:44 +00:00
ruthra kumar
a8d0fb5ac9 refactor(test): erpnext testsuite should be primary superclass 
(cherry picked from commit f3148e052c)
 2026-03-31 09:32:44 +00:00
ljain112
0dcacad793 chore: resolve conflicts 2026-03-31 11:05:46 +05:30
ljain112
5922d25210 test: update item-wise tax detail test for high conversion rates 
(cherry picked from commit fc8437c499)

# Conflicts:
#	erpnext/controllers/tests/test_item_wise_tax_details.py
 2026-03-30 15:17:09 +00:00
Smit Vora
6ad5e89607 fix(taxes): improve tax calculation accuracy and update test assertions 
(cherry picked from commit a18196f584)
 2026-03-30 15:17:09 +00:00
ljain112
6689b17b88 fix(tests): update item code and quantity in tax detail test case 
(cherry picked from commit 3449ab063a)
 2026-03-30 15:17:09 +00:00
ljain112
3592637b5c fix(taxes): increase rounding threshold for tax breakup calculations 
(cherry picked from commit 7f87a5e5c6)
 2026-03-30 15:17:08 +00:00
ruthra kumar
941375877e refactor(test): move dimension setup to test data bootstrap 
and remove create_dimension() and disable_dimension()

(cherry picked from commit 342ce65401)
 2026-03-24 17:52:37 +05:30
ruthra kumar
021789baf1 refactor(test): hardcoded names over dynamic 2026-03-19 12:57:12 +05:30
ruthra kumar
7d0779c73c refactor(test): remove explicit call to master data setup 2026-03-19 12:57:12 +05:30
ruthra kumar
495e585ab6 refactor(test): hardcoded names over dynamic ones 
Much faster bootstrap without those get_doc calls
 2026-03-19 12:57:12 +05:30
ruthra kumar
bfffbcfee9 refactor(test): make queries deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
b680aeb62c refactor(test): make item wise details deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
da85534118 refactor(test): make accounts controller deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
d69b9d1a54 refactor(test): make subcontracting controller deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
6c9b32287c refactor(test): make test mapper deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
a58ba3e7d4 refactor(test): make item wise inventory account deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
c96f5e3d8c refactor(test): make distributed discount deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
63908ad6dc refactor(test): remove redundant tearDown, tearDownClass and rollback 2026-03-19 12:57:11 +05:30
ruthra kumar
020e28235a refactor(test): make subcontracting order deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
29cf028f9a refactor: replace all IntegrationTestCase -> ERPNextTestSuite 2026-03-19 12:57:10 +05:30
ruthra kumar
f1dfac417d refactor: replace IntegrationTestCase with ERPNextTestCase repo-wide 
- import ERPNextTestSuite
 - use it on test class
 2026-03-19 12:57:07 +05:30
ruthra kumar
de34cf227a chore: remove EXTRA_TEST_RECORD_DEPENDENCIES 2026-03-19 11:33:34 +05:30
ljain112
0e2e89c355 fix: prevent precision errors in discount distribution with inclusive tax 
(cherry picked from commit 2068299766)
 2026-02-24 11:29:05 +00:00
Mihir Kandoi
02e6c49130 test: add test case 
(cherry picked from commit e2c3d0fa94)
 2026-01-30 11:41:46 +00:00
Rohit Waghchaure
20320c4a6c perf: SABB taking time to save the record 2026-01-06 18:47:35 +05:30
Sudharsanan11
f6a96e5563 test(accounts): add validation test for dispatch address with drop ship enabled 2025-12-12 13:14:40 +05:30
Diptanil Saha
9f599ee52d Merge pull request #50372 from aerele/validate-company-linked-address-field 2025-12-02 20:14:06 +05:30
Akhil Narang
1cf9f903e5 fix: adapt to query builder 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2025-11-19 21:36:37 +05:30
Lakshit Jain
91f3c82bdf feat!: Item Wise Tax Details Table (#48692) 
* fix: Add `Item Wise Tax Detail` Table and update related doctypes

* fix: remove setting item_wise_tax_details in client side

* fix: Remove redundant code for updating item_wise_tax_details after rename

* fix: Add 'dont_recompute_tax' field to Item Wise Tax Detail

* fix: update item_wise_tax_details after validations

* chore: remove redundant code from payment_entry.js

* fix: changes in POS for item_wise_tax_details

* fix: handle merge taxes

* fix: update test case and fix precision issue

* chore: remove debugging statement

* chore: remove redundant import

* chore: linters

* chore: remove redundant code and minor refactor

* fix: correct function args

* fix: fix test cases

* fix: item wise sales register report

* fix: remove dont recompute from item wise tax details and calculation for deduct

* fix: do not retain old rows

* fix: added validation for item wise tax details

* fix: tax merging for pos

* fix: vat audit report(regional report)

* fix: query issue in item-wise sales register

* fix: set other_charges using temp object

* fix: precision issue in validation

* fix: changes as per failing test cases

* fix: tax merging

* fix: set no_copy for item wise tax detail

* fix: correct select field in query and other charged in item_wise_purchase_register

* fix: do not include rows with missing item or tax in merge_taxes

* fix: respect row wise rounding

* chore: remove unused import

* chore: incorrect tuple creation

* fix: handle rounding adjustment

* fix: currency option in item wise tax detail doctype

* fix: patch to migrate item_wise tax_details to table

* chore: remove item_wise_tax_detail from taxes table

* fix: use base_tax_withholding_net_total instead of tax_withholding_net_total

* fix: implemet item_wise_tax_detail for e-invoice (italy)

* fix: fetch document by doctypes in migration patch

* fix: fix multiple syntax errors and inconsistent variable usage

* fix: remove deprecated settings and update item wise tax details flag

* fix: enhance validation for item wise tax details and handle discrepancies

* fix: increase chunk size for migration and improve item-wise tax detail calculations

* fix: delete existing item-wise tax details to prevent duplicates during migration

* fix: remove unnecessary docstatus filter from tax details query

* fix: streamline validation checks in item wise tax details adjustment

* fix: update additional fields to reference item and invoice attributes in tax detail queries

* fix: Restrict tax query to the selected invoices in vat audit report

* fix: use `base_tax_withholding_net_total` for calculation in patch

* fix: set tax row_id and idx to None instead of empty strings

* fix: remove unused precision parameter from rounding differences handler

* fix: update docstatus in item_wise_tax_details as per doc

* fix: remove empty on_update method from SalesOrder class

* fix: remove empty on_update method from PurchaseOrder class

* fix: incorporate zero cutoff in tax calculation logic

* fix: increase threshold for rounding diff
 2025-11-17 19:02:31 +05:30
Mihir Kandoi
e5e26cd92a feat: phantom bom (#50351) 
* feat: add phantom bom settings in bom doctype

* feat: new explosion logic for production plan, subcontracting and work order/manufacturing

* feat: modify explosion logic in reports and bom creator

* fix: failing test

* feat: add convert to phantom item support in bom creator

* test: added test cases

* fix: always fetch rm rate if phantom bom

* refactor: PP phantom explosion logic

* fix: report test cases

* feat: add phantom item in description of item if phantom item in bom tree

* fix: hide create button if bom is phantom

* fix: bugs found by coderabbit
 2025-11-16 15:08:08 +05:30
Mihir Kandoi
9b303a2272 Merge pull request #50235 from mihir-kandoi/sre-sco 
feat: stock reservation for subcontracting order
 2025-11-16 13:06:21 +05:30
Pugazhendhi Velu
e64b6db2eb test: add minimal test case 2025-11-11 13:18:05 +00:00