nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-12 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,732 Commits 592 Branches 1,797 Tags
0ede7759dff0668a85217efd5ddcc6dee2ccbfc3
Commit Graph

57732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mihir Kandoi
0ede7759df Merge pull request #55289 from frappe/mergify/bp/version-16-hotfix/pr-55286 
fix: single variant creation error (backport #55286)
 2026-05-26 13:57:01 +05:30
diptanilsaha
1f14ef2344 fix: pos profile form cleanup (backport #52436) (#55285) 
fix: pos profile form cleanup (#52436)
 2026-05-26 13:49:39 +05:30
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
Mihir Kandoi
82b0372d5b fix: single variant creation error 
(cherry picked from commit bda75135c3)
 2026-05-26 08:05:43 +00:00
mergify[bot]
69c6ed3cd9 fix: job card buttons color (backport #55252) (#55261) 
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2026-05-26 13:16:41 +05:30
mergify[bot]
ca6bcb57d3 refactor: remove unused customer field in Item DocType (backport #55277) (#55283) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-26 05:47:16 +00:00
ruthra kumar
03d96c7b85 Merge pull request #55281 from frappe/mergify/bp/version-16-hotfix/pr-55256 
refactor: handle processes stuck in running state in process pcv (backport #55256)
 2026-05-26 10:56:24 +05:30
mergify[bot]
bfd37dcc21 fix: prevent AttributeError in batch query filters (backport #55257) (#55279) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
fix: prevent AttributeError in batch query filters (#55257)
 2026-05-26 05:20:04 +00:00
mergify[bot]
9600ecd61c fix(stock): remove precision for valuation rate while creating sle (backport #55249) (#55260) 
Co-authored-by: Sudharsanan11 <sudharsananashok1975@gmail.com>
 2026-05-26 10:29:39 +05:30
ruthra kumar
5dc37b1130 refactor: atomic summarization step for process pcv 
(cherry picked from commit 6cb7971342)
 2026-05-26 04:58:22 +00:00
ruthra kumar
a19611a2e9 refactor: handle processes stuck in running state in process pcv 
(cherry picked from commit f414778486)
 2026-05-26 04:58:22 +00:00
ruthra kumar
6755101654 refactor: summarize in background 
(cherry picked from commit 1c3a9f7dd9)
 2026-05-26 04:58:21 +00:00
mergify[bot]
705814f066 fix(payment_entry): sync paid/received amounts for cross-currency entries (backport #55270) (#55272) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
fix(payment_entry): sync paid/received amounts for cross-currency entries (#55270)
 2026-05-25 23:22:02 +05:30
mergify[bot]
1a75c14308 fix: corrected the pricing rule taking the wrong value (backport #54894) (#55124) 
fix: corrected the pricing rule taking the wrong value (#54894)

(cherry picked from commit 06477119d1)

Co-authored-by: Jatin3128 <140256508+Jatin3128@users.noreply.github.com>
 2026-05-25 16:02:26 +05:30
rohitwaghchaure
56d99152f9 Merge pull request #55244 from frappe/mergify/bp/version-16-hotfix/pr-55216 
fix: fg valuation rate in repack entry when multiple FGs (backport #55216)
 2026-05-25 15:34:16 +05:30
mergify[bot]
a618f4cca4 feat: add party groups functionality to party specific item (backport #54988) (#55245) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-25 12:38:44 +05:30
Rohit Waghchaure
7b6adce89a fix: fg valuation rate in repack entry when multiple FGs 
(cherry picked from commit a47e4c04f7)
 2026-05-25 06:15:29 +00:00
mergify[bot]
7752f703d2 refactor: stock ageing report (backport #55231) (#55237) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-24 18:30:45 +05:30
MochaMind
7159b13ee2 chore: update POT file (#55234) 2026-05-24 14:48:11 +02:00
mergify[bot]
ea60efd91a refactor: use frappe.db.bulk_update instead of Case queries in subcon… (backport #55232) (#55233) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-24 09:56:53 +00:00
mergify[bot]
a1457c759d fix: consider batchwise valuation in stock ageing report (backport #54919) (#55230) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: consider batchwise valuation in stock ageing report (#54919)
 2026-05-24 07:18:07 +00:00
rohitwaghchaure
ab9e30b487 Merge pull request #55183 from frappe/mergify/bp/version-16-hotfix/pr-55091 
feat: pending qty in job card (backport #55091)
 2026-05-24 09:30:01 +05:30
Nishka Gosalia
9596e6e1e9 Merge pull request #55196 from frappe/mergify/bp/version-16-hotfix/pr-55189 
fix(project): update customer and sales order as no copy (backport #55189)
 2026-05-23 15:32:06 +05:30
nareshkannasln
1e61ca162f fix(project): update customer and sales order as no copy 
(cherry picked from commit 9d8f3863f2)
 2026-05-22 12:21:34 +00:00
mergify[bot]
edf6bea2ee fix(stock): apply posting datetime filters while fetching available batches (backport #54976) (#55185) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
fix(stock): apply posting datetime filters while fetching available batches (#54976)
 2026-05-22 11:23:24 +00:00
mergify[bot]
ea863477a4 fix: invalid filter on item_group (backport #55186) (#55188) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: invalid filter on item_group (#55186)
 2026-05-22 16:49:23 +05:30
rohitwaghchaure
171cd41928 chore: fix conflicts 2026-05-22 15:25:34 +05:30
Rohit Waghchaure
d2a793b03b refactor: better timer and complete button 
(cherry picked from commit 1be92f6d05)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.js
 2026-05-22 09:52:50 +00:00
Rohit Waghchaure
3081368aad refactor: job_card.js code for better readability 
(cherry picked from commit 0a215b0717)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.js
 2026-05-22 09:52:49 +00:00
Rohit Waghchaure
b372e6f118 feat: pending qty in job card 
(cherry picked from commit db64f451c1)
 2026-05-22 09:52:49 +00:00
rohitwaghchaure
e2558b6e51 Merge pull request #55182 from frappe/mergify/bp/version-16-hotfix/pr-55159 
fix: slow query (backport #55159)
 2026-05-22 15:22:18 +05:30
Rohit Waghchaure
66c9170465 fix: slow query 
(cherry picked from commit d44f574581)
 2026-05-22 09:18:04 +00:00
mergify[bot]
123b4ad563 fix: edit stock uom qty for purchase documents (backport #55135) (#55179) 
Co-authored-by: Nishka Gosalia <58264710+nishkagosalia@users.noreply.github.com>
fix: edit stock uom qty for purchase documents (#55135)
 2026-05-22 09:14:32 +00:00
ruthra kumar
92689e05da perf: skip delink_original_entry during cancellation when Immutable Ledger is enabled (backport #55130) (#55166) 
perf: skip delink_original_entry during cancellation when Immutable Ledger is enabled (#55130)

* perf: get payment ledger and remove update from delink when immutable ledger is enabled

* revert: changes of get_payment_ledger_entries

* perf: skip delink_original_entry during cancellation when Immutable Ledger is enabled

* test: for immutable ledger

* test: add posting_date in create_sales_invoice

* fix: link validation err with immutable ledger on

* test: update testcase of the immutable ledger

* refactor(test): simpler test for immutable invariants

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit 9eeccecd30)

# Conflicts:
#	erpnext/accounts/general_ledger.py

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
 2026-05-22 14:25:32 +05:30
mergify[bot]
bde7f1660e fix(manufacturing): remove forecast_qty and adjust_qty fields from sa… (backport #55129) (#55136) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
fix(manufacturing): remove forecast_qty and adjust_qty fields from sa… (#55129)
 2026-05-22 14:23:51 +05:30
Nihantra C. Patel
8a4cb28d90 perf: skip delink_original_entry during cancellation when Immutable Ledger is enabled (#55130) 
* perf: get payment ledger and remove update from delink when immutable ledger is enabled

* revert: changes of get_payment_ledger_entries

* perf: skip delink_original_entry during cancellation when Immutable Ledger is enabled

* test: for immutable ledger

* test: add posting_date in create_sales_invoice

* fix: link validation err with immutable ledger on

* test: update testcase of the immutable ledger

* refactor(test): simpler test for immutable invariants

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit 9eeccecd30)

# Conflicts:
#	erpnext/accounts/general_ledger.py
 2026-05-22 12:49:43 +05:30
diptanilsaha
498bd2fb4b Merge pull request #55144 from frappe/mergify/bp/version-16-hotfix/pr-55127 
refactor: migrate get_tax_template to query builder with hierarchical group matching (backport #55127)
 2026-05-22 01:48:45 +05:30
Khushi Rawat
bfb7a0e941 Merge pull request #55152 from frappe/mergify/bp/version-16-hotfix/pr-55146 
fix: correct remarks for foreign currency payment entries (backport #55146)
 2026-05-21 20:33:30 +05:30
khushi8112
f3f8f327df fix: correct remarks for foreign currency payment entries 
(cherry picked from commit c6cde700b5)
 2026-05-21 14:42:44 +00:00
Khushi Rawat
0d816010dd Merge pull request #55148 from frappe/mergify/bp/version-16-hotfix/pr-55147 
fix: correct description for Is Rate Adjustment Entry (Debit Note) checkbox (backport #55147)
 2026-05-21 20:08:20 +05:30
khushi8112
a39733ddd0 fix: correct description for Is Rate Adjustment Entry (Debit Note) checkbox 
(cherry picked from commit 92c969478e)
 2026-05-21 12:38:23 +00:00
Khushi Rawat
5c9149c5a5 Merge pull request #55145 from frappe/mergify/bp/version-16-hotfix/pr-55142 
fix: don't reset net_purchase_amount for Composite Asset if already set (backport #55142)
 2026-05-21 17:11:24 +05:30
khushi8112
99642b9636 fix: don't reset net_purchase_amount for Composite Asset if already set 
(cherry picked from commit 98dae6e43a)
 2026-05-21 11:38:28 +00:00
diptanilsaha
a63b344a0a test: add tests for supplier group hierarchy and use_for_shopping_cart filter 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 8c43118725)
 2026-05-21 11:36:30 +00:00
diptanilsaha
54be4ee275 fix: default use_for_shopping_cart to 0 in set_taxes 
Ensures regular transactions only match tax rules where
use_for_shopping_cart = 0, preventing webshop-specific rules
from applying to standard documents.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 4d43c74f5f)
 2026-05-21 11:36:30 +00:00
diptanilsaha
c45d2a3487 refactor: rewrite get_tax_template using query builder 
Migrates from raw frappe.db.sql with string interpolation to frappe.qb.
Adds hierarchical supplier_group matching (mirrors customer_group behaviour).
Removes unused get_customer_group_condition helper.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit f98975f51a)
 2026-05-21 11:36:30 +00:00
diptanilsaha
82793cbd4d feat: add get_parent_supplier_groups using query builder 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit cb610b79d2)
 2026-05-21 11:36:29 +00:00
diptanilsaha
620161c526 refactor: migrate get_parent_customer_groups to query builder 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 91a2a7b0a0)
 2026-05-21 11:36:29 +00:00
mergify[bot]
dfc91441b4 fix: consumed operation cost calculation (backport #54858) (#55133) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: consumed operation cost calculation (#54858)
 2026-05-21 10:33:43 +00:00
rohitwaghchaure
e630ab64eb Merge pull request #55139 from frappe/mergify/bp/version-16-hotfix/pr-55134 
fix: removed redundant code (backport #55134)
 2026-05-21 15:56:28 +05:30