nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-04 18:23:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,149 Commits 574 Branches 1,792 Tags
e314d0cfc5dfd5a22264d38abacaa2c77377f537
Commit Graph

55149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
e314d0cfc5 refactor: color coded status in list view 
(cherry picked from commit cfeffbb354)
 2026-06-01 19:13:36 +05:30
ruthra kumar
94e15ae9ef refactor: tabbed view for process period closing voucher 
(cherry picked from commit 1960c81619)
 2026-06-01 18:09:46 +05:30
ruthra kumar
4a6af25d11 fix: only consider non-opening balance for Balance sheet accounts 
(cherry picked from commit a2b8334046)
 2026-06-01 18:09:41 +05:30
Frappe PR Bot
1c5220b86f chore(release): Bumped to Version 15.109.2 
## [15.109.2](https://github.com/frappe/erpnext/compare/v15.109.1...v15.109.2) (2026-06-01)

### Bug Fixes

* billing address does not belongs to the company error ([c2063c4](c2063c4707))
v15.109.2 		2026-06-01 06:08:30 +00:00
rohitwaghchaure
779f1b6104 Merge pull request #55474 from frappe/mergify/bp/version-15/pr-55424 
fix: billing address does not belongs to the company error (backport #55417) (backport #55424)
 2026-06-01 11:36:58 +05:30
Rohit Waghchaure
c2063c4707 fix: billing address does not belongs to the company error 
(cherry picked from commit 9df07b367a)
(cherry picked from commit 5c392d6123)
 2026-06-01 06:01:45 +00:00
Frappe PR Bot
9e7b03173d chore(release): Bumped to Version 15.109.1 
## [15.109.1](https://github.com/frappe/erpnext/compare/v15.109.0...v15.109.1) (2026-05-29)

### Bug Fixes

* material transfer in transit issue (backport [#55320](https://github.com/frappe/erpnext/issues/55320)) (backport [#55324](https://github.com/frappe/erpnext/issues/55324)) ([#55404](https://github.com/frappe/erpnext/issues/55404)) ([bfdf1e4](bfdf1e43f9))
v15.109.1 		2026-05-29 12:07:01 +00:00
mergify[bot]
bfdf1e43f9 fix: material transfer in transit issue (backport #55320) (backport #55324) (#55404) 
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
fix: material transfer in transit issue (backport #55320) (#55324)
 2026-05-29 17:35:20 +05:30
Frappe PR Bot
16fbf8299f chore(release): Bumped to Version 15.109.0 
# [15.109.0](https://github.com/frappe/erpnext/compare/v15.108.3...v15.109.0) (2026-05-27)

### Bug Fixes

* consider batchwise valuation in stock ageing report (backport [#54919](https://github.com/frappe/erpnext/issues/54919)) ([#55229](https://github.com/frappe/erpnext/issues/55229)) ([418a7fb](418a7fb301))
* consumed operation cost calculation (backport [#54858](https://github.com/frappe/erpnext/issues/54858)) ([#55132](https://github.com/frappe/erpnext/issues/55132)) ([46d5395](46d5395148))
* default use_for_shopping_cart to 0 in set_taxes ([960be3e](960be3e081))
* edit stock uom qty for purchase documents (backport [#55135](https://github.com/frappe/erpnext/issues/55135)) ([#55178](https://github.com/frappe/erpnext/issues/55178)) ([425e6c5](425e6c52f4))
* ERPNextTestSuite to change_settings ([76078a7](76078a7fb9))
* faster range calculation on process period closing voucher ([bf27f2d](bf27f2d869))
* fg valuation rate in repack entry when multiple FGs ([238f168](238f1685f1))
* **general-ledger:** show raw GL entries when categorize_by is empty (backport [#54816](https://github.com/frappe/erpnext/issues/54816)) ([#54829](https://github.com/frappe/erpnext/issues/54829)) ([b972b7c](b972b7c307))
* import change_settings ([9d21199](9d211990c3))
* inclusive tax amount not considered while setting LCV from purchase invoice ([cba4c9f](cba4c9f0ee))
* incoming rate for legacy serial no ([6e6ef83](6e6ef83d60))
* incorrect error message string in sales order (backport [#55090](https://github.com/frappe/erpnext/issues/55090)) ([#55094](https://github.com/frappe/erpnext/issues/55094)) ([04e28f9](04e28f9556))
* invalid filter on item_group (backport [#55186](https://github.com/frappe/erpnext/issues/55186)) ([#55187](https://github.com/frappe/erpnext/issues/55187)) ([25739ae](25739ae217))
* merge conflicts ([59e9f51](59e9f5192c))
* **payment_entry:** sync paid/received amounts for cross-currency entries (backport [#55270](https://github.com/frappe/erpnext/issues/55270)) ([#55271](https://github.com/frappe/erpnext/issues/55271)) ([d31a051](d31a051c74))
* prevent AttributeError in batch query filters (backport [#55257](https://github.com/frappe/erpnext/issues/55257)) ([#55278](https://github.com/frappe/erpnext/issues/55278)) ([4f89f3a](4f89f3a856))
* **project:** update customer and sales order as no copy ([9145760](914576040e))
* removed redundant code ([259f499](259f499e25))
* set bin details when adding item using update items (backport [#55096](https://github.com/frappe/erpnext/issues/55096)) ([#55097](https://github.com/frappe/erpnext/issues/55097)) ([aa79247](aa79247c39))
* single variant creation error (backport [#55286](https://github.com/frappe/erpnext/issues/55286)) ([#55288](https://github.com/frappe/erpnext/issues/55288)) ([937eb87](937eb87932))
* **stock:** apply posting datetime filters while fetching available batches (backport [#54976](https://github.com/frappe/erpnext/issues/54976)) ([#55184](https://github.com/frappe/erpnext/issues/55184)) ([ff442cd](ff442cd8e7))
* **stock:** remove precision for valuation rate while creating sle (backport [#55249](https://github.com/frappe/erpnext/issues/55249)) ([#55259](https://github.com/frappe/erpnext/issues/55259)) ([8b241b4](8b241b45e2))
* **stock:** remove recalculate current qty function ([#55121](https://github.com/frappe/erpnext/issues/55121)) ([1c90c3b](1c90c3bbc2))
* update import ([31c251d](31c251d956))
* use passed posting date in make_reverse_gl_entries ([4436585](4436585aa0))

### Features

* add get_parent_supplier_groups using query builder ([6517ed7](6517ed72b4))

### Performance Improvements

* skip delink_original_entry during cancellation when Immutable Ledger is enabled ([#55130](https://github.com/frappe/erpnext/issues/55130)) ([034e159](034e159ee4))
v15.109.0 		2026-05-27 00:23:04 +00:00
Diptanil Saha
7ce7e3d5e5 Merge pull request #55316 from frappe/version-15-hotfix 
chore: release v15
 2026-05-27 05:51:33 +05:30
Diptanil Saha
60fdc6bc1a Merge branch 'version-15' into version-15-hotfix 2026-05-27 05:31:52 +05:30
mergify[bot]
b972b7c307 fix(general-ledger): show raw GL entries when categorize_by is empty (backport #54816) (#54829) 
fix(general-ledger): show raw GL entries when categorize_by is empty (#54816)

(cherry picked from commit dfbe847307)

# Conflicts:
#	erpnext/accounts/report/general_ledger/general_ledger.py

Co-authored-by: Jatin3128 <140256508+Jatin3128@users.noreply.github.com>
 2026-05-26 23:34:47 +00:00
Nihantra C. Patel
4927d346c8 Merge pull request #55294 from frappe/mergify/bp/version-15-hotfix/pr-55268 
fix: use passed posting date for period closing validation in reverse GL entries (backport #55268)
 2026-05-26 23:13:14 +05:30
Nihantra Patel
8f164cff1d test: immutable ledger reverse entry 2026-05-26 22:53:14 +05:30
Nihantra C. Patel
31c251d956 fix: update import 2026-05-26 22:17:23 +05:30
rohitwaghchaure
bc81992a40 Merge pull request #55296 from frappe/mergify/bp/version-15-hotfix/pr-55290 
fix: inclusive tax amount not considered while setting LCV from purchase invoice (backport #55290)
 2026-05-26 16:23:13 +05:30
rohitwaghchaure
66267cf99a chore: fix conflicts 2026-05-26 15:57:24 +05:30
Nihantra C. Patel
9d211990c3 fix: import change_settings 2026-05-26 15:56:38 +05:30
Nihantra C. Patel
76078a7fb9 fix: ERPNextTestSuite to change_settings 2026-05-26 15:48:41 +05:30
Rohit Waghchaure
cba4c9f0ee fix: inclusive tax amount not considered while setting LCV from purchase invoice 
(cherry picked from commit 048ddfc265)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
 2026-05-26 10:15:01 +00:00
mergify[bot]
46d5395148 fix: consumed operation cost calculation (backport #54858) (#55132) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: consumed operation cost calculation (#54858)
 2026-05-26 10:14:19 +00:00
Nihantra Patel
b8b2141e20 test: update testcase 
(cherry picked from commit 9c39b01f1c)
 2026-05-26 10:13:33 +00:00
Nihantra Patel
4436585aa0 fix: use passed posting date in make_reverse_gl_entries 
(cherry picked from commit f040bdf165)
 2026-05-26 10:13:33 +00:00
mergify[bot]
937eb87932 fix: single variant creation error (backport #55286) (#55288) 
* fix: single variant creation error

(cherry picked from commit bda75135c3)

* feat: allow creation of any number of variants in multiple item variant creation dialog

(cherry picked from commit 090c25d848)

# Conflicts:
#	erpnext/controllers/item_variant.py

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-26 08:25:21 +00:00
ruthra kumar
6a21d28030 Merge pull request #55280 from frappe/mergify/bp/version-15-hotfix/pr-55256 
refactor: handle processes stuck in running state in process pcv (backport #55256)
 2026-05-26 10:52:25 +05:30
mergify[bot]
4f89f3a856 fix: prevent AttributeError in batch query filters (backport #55257) (#55278) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
fix: prevent AttributeError in batch query filters (#55257)
 2026-05-26 05:11:11 +00:00
mergify[bot]
8b241b45e2 fix(stock): remove precision for valuation rate while creating sle (backport #55249) (#55259) 
Co-authored-by: Sudharsanan11 <sudharsananashok1975@gmail.com>
 2026-05-26 10:29:27 +05:30
ruthra kumar
b517f26085 refactor: atomic summarization step for process pcv 
(cherry picked from commit 6cb7971342)
 2026-05-26 04:57:58 +00:00
ruthra kumar
f28b948e1b refactor: handle processes stuck in running state in process pcv 
(cherry picked from commit f414778486)
 2026-05-26 04:57:57 +00:00
ruthra kumar
a797ab3482 refactor: summarize in background 
(cherry picked from commit 1c3a9f7dd9)
 2026-05-26 04:57:57 +00:00
mergify[bot]
d31a051c74 fix(payment_entry): sync paid/received amounts for cross-currency entries (backport #55270) (#55271) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
fix(payment_entry): sync paid/received amounts for cross-currency entries (#55270)
 2026-05-25 23:21:43 +05:30
rohitwaghchaure
aad270914a Merge pull request #55243 from frappe/mergify/bp/version-15-hotfix/pr-55216 
fix: fg valuation rate in repack entry when multiple FGs (backport #55216)
 2026-05-25 15:34:30 +05:30
mergify[bot]
af3e7f53ac refactor: stock ageing report (backport #55231) (#55236) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-25 12:44:55 +05:30
Rohit Waghchaure
238f1685f1 fix: fg valuation rate in repack entry when multiple FGs 
(cherry picked from commit a47e4c04f7)
 2026-05-25 06:15:07 +00:00
mergify[bot]
418a7fb301 fix: consider batchwise valuation in stock ageing report (backport #54919) (#55229) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-24 09:48:12 +00:00
Nishka Gosalia
304474d2f7 Merge pull request #55195 from frappe/mergify/bp/version-15-hotfix/pr-55189 
fix(project): update customer and sales order as no copy (backport #55189)
 2026-05-23 16:00:12 +05:30
Nishka Gosalia
59e9f5192c fix: merge conflicts 2026-05-23 15:35:19 +05:30
nareshkannasln
914576040e fix(project): update customer and sales order as no copy 
(cherry picked from commit 9d8f3863f2)

# Conflicts:
#	erpnext/projects/doctype/project/project.json
 2026-05-22 12:21:04 +00:00
mergify[bot]
ff442cd8e7 fix(stock): apply posting datetime filters while fetching available batches (backport #54976) (#55184) 
fix(stock): apply posting datetime filters while fetching available batches

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-22 11:34:43 +00:00
mergify[bot]
25739ae217 fix: invalid filter on item_group (backport #55186) (#55187) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: invalid filter on item_group (#55186)
 2026-05-22 16:49:10 +05:30
mergify[bot]
425e6c52f4 fix: edit stock uom qty for purchase documents (backport #55135) (#55178) 
Co-authored-by: Nishka Gosalia <58264710+nishkagosalia@users.noreply.github.com>
fix: edit stock uom qty for purchase documents (#55135)
 2026-05-22 09:12:19 +00:00
ruthra kumar
97d2152a36 Merge pull request #55165 from frappe/mergify/bp/version-15-hotfix/pr-55130 
perf: skip delink_original_entry during cancellation when Immutable Ledger is enabled (backport #55130)
 2026-05-22 14:26:00 +05:30
Nihantra C. Patel
034e159ee4 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/doctype/payment_ledger_entry/test_payment_ledger_entry.py
#	erpnext/accounts/general_ledger.py
 2026-05-22 12:52:49 +05:30
diptanilsaha
fff023bf7b Merge pull request #55143 from frappe/mergify/bp/version-15-hotfix/pr-55127 
refactor: migrate get_tax_template to query builder with hierarchical group matching (backport #55127)
 2026-05-22 02:32:22 +05:30
mergify[bot]
429e02e6f9 chore: migrate Address/Contact custom fields from JSON fixtures to install (backport #55084) (#55087) 
fixtures to install (backport #55084)
 2026-05-21 20:41:36 +00:00
diptanilsaha
eb96f0429f 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-22 02:08:38 +05:30
diptanilsaha
960be3e081 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-22 02:08:38 +05:30
diptanilsaha
2a91c7229a 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-22 02:08:26 +05:30
diptanilsaha
6517ed72b4 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:35:54 +00:00
diptanilsaha
c125d1489c 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:35:54 +00:00