nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,059 Commits 473 Branches 1,756 Tags
af3e7f53acc3266ff0cc614dc1df59efd6b3fa39
Commit Graph

55059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
rohitwaghchaure
be1f1e8781 Merge pull request #55138 from frappe/mergify/bp/version-15-hotfix/pr-55134 
fix: removed redundant code (backport #55134)
 2026-05-21 16:17:03 +05:30
Rohit Waghchaure
259f499e25 fix: removed redundant code 
(cherry picked from commit 14b17cd8a6)
 2026-05-21 09:55:19 +00:00
rohitwaghchaure
fc05c38b9b Merge pull request #54977 from frappe/mergify/bp/version-15-hotfix/pr-54962 
fix: incoming rate for legacy serial no (backport #54962)
 2026-05-21 15:00:09 +05:30
rohitwaghchaure
da8d25d80a chore: fix linters issue 
Added a setting to control fetching incoming rates for serial numbers.
 2026-05-21 14:38:05 +05:30
rohitwaghchaure
6981599103 chore: fix conflicts 
Removed fields related to parallel reposting and column breaks, and updated the modified date.
 2026-05-21 14:31:22 +05:30
rohitwaghchaure
5557e982bf chore: fix conflicts 
Removed legacy fields related to incoming rate and parallel reposting.
 2026-05-21 14:30:26 +05:30
rohitwaghchaure
08466218d8 chore: fix conflicts 
Removed legacy code for fetching incoming rates from serial numbers.
 2026-05-21 14:28:29 +05:30
Pandiyan P
1c90c3bbc2 fix(stock): remove recalculate current qty function (#55121) 2026-05-21 06:11:41 +00:00
mergify[bot]
aa79247c39 fix: set bin details when adding item using update items (backport #55096) (#55097) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: set bin details when adding item using update items (#55096)
 2026-05-20 16:21:25 +05:30
mergify[bot]
04e28f9556 fix: incorrect error message string in sales order (backport #55090) (#55094) 
Co-authored-by: Shllokkk <140623894+Shllokkk@users.noreply.github.com>
fix: incorrect error message string in sales order (#55090)
 2026-05-20 09:31:21 +00:00
ruthra kumar
d666871d86 Merge pull request #55077 from frappe/mergify/bp/version-15-hotfix/pr-55072 
perf: faster opening balance range calculation in process period closing voucher (backport #55072)
 2026-05-20 12:08:30 +05:30
ruthra kumar
d81b6ab5dc refactor: ppcv select with for update and skip locked 
(cherry picked from commit eba58b2837)
 2026-05-20 06:18:41 +00:00
ruthra kumar
bf27f2d869 fix: faster range calculation on process period closing voucher 
(cherry picked from commit ee33574a6d)
 2026-05-20 06:18:41 +00:00
Nabin Hait
0b41df5ac8 fix: item leaderboard uses Sales/Purchase Invoice instead of Orders (#55038) 
Fixes https://github.com/frappe/erpnext/issues/46657
 2026-05-20 00:49:39 +05:30
ruthra kumar
08f4437902 Merge pull request #55056 from frappe/mergify/bp/version-15-hotfix/pr-55053 
fix(patch): drop dead procedures first before other changes (backport #55053)
 2026-05-19 17:01:32 +05:30
mergify[bot]
5ad80b8fb9 fix: validate company region in uae vat 201 (backport #54899) (#55054) 
Co-authored-by: Ravibharathi <131471282+ravibharathi656@users.noreply.github.com>
fix: validate company region in uae vat 201 (#54899)
 2026-05-19 16:51:59 +05:30
ruthra kumar
67d67616ca fix(patch): drop dead procedures first before other changes 
(cherry picked from commit 61d24ba55f)
 2026-05-19 11:08:24 +00:00
rohitwaghchaure
1983204112 Merge pull request #55047 from frappe/mergify/bp/version-15-hotfix/pr-55046 
fix: stock balance showing incorrect value because of incorrect SLE (backport #55046)
 2026-05-19 14:14:47 +05:30
Rohit Waghchaure
dbacfd13b8 fix: stock balance showing incorrect value because of incorrect SLE 
(cherry picked from commit 94b95d6c2f)
 2026-05-19 08:22:09 +00:00
Ravibharathi
3b3e33d354 Merge pull request #55041 from frappe/mergify/bp/version-15-hotfix/pr-54761 
fix: normalize date comparison to avoid datatype mismatch (backport #54761)
 2026-05-19 11:53:32 +05:30
ervishnucs
49b4830785 fix: normalize date comparison to avoid datatype mismatch 
(cherry picked from commit 01e382b106)

# Conflicts:
#	erpnext/accounts/party.py
 2026-05-19 11:38:21 +05:30
mergify[bot]
5e1880f09e fix(stock): update buying amount calculation in gross profit report (backport #55020) (#55023) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
fix(stock): update buying amount calculation in gross profit report (#55020)
 2026-05-19 09:44:37 +05:30
ruthra kumar
470bf628c7 Merge pull request #55014 from frappe/mergify/bp/version-15-hotfix/pr-55001 
fix: remove sql procedure method from AR report (backport #55001)
 2026-05-18 14:05:49 +05:30
ruthra kumar
c705a93776 fix: remove sql procedure method from AR report 
(cherry picked from commit 63a7142b9b)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.py
#	erpnext/accounts/report/accounts_receivable/accounts_receivable.py
#	erpnext/patches.txt
 2026-05-18 13:49:25 +05:30
Nishka Gosalia
9ef783cd48 Merge pull request #55010 from frappe/mergify/bp/version-15-hotfix/pr-55009 
fix: toast message for item price insert (backport #55009)
 2026-05-18 12:04:48 +05:30
Nishka Gosalia
8512eb4493 fix: merge conflicts 2026-05-18 11:44:57 +05:30
Nishka Gosalia
9309aec209 fix: toast message for item price insert (#55009) 
(cherry picked from commit ae9c632e39)

# Conflicts:
#	erpnext/stock/get_item_details.py
 2026-05-18 06:11:11 +00:00
ruthra kumar
d02314935d Merge pull request #55003 from frappe/mergify/bp/version-15-hotfix/pr-51197 
refactor: remove custom sql function in AR SQL procedure approach (backport #51197)
 2026-05-18 11:11:54 +05:30
ruthra kumar
f5d83599cc refactor: remove custom sql function in AR SQL procedure approach 
(cherry picked from commit d1e0992253)

# Conflicts:
#	erpnext/accounts/report/accounts_receivable/accounts_receivable.py
 2026-05-18 10:55:04 +05:30
Rohit Waghchaure
6e6ef83d60 fix: incoming rate for legacy serial no 
(cherry picked from commit 2773b7c002)

# Conflicts:
#	erpnext/stock/deprecated_serial_batch.py
#	erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
#	erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py
 2026-05-15 16:40:08 +00:00
mergify[bot]
651af67b26 fix(payment_entry): fix paid/received amount calculation for multi-currency accounts (backport #54963) (#54969) 
* fix(payment_entry): `paid_amount` and `received_amount` calculation depending upon `account_currency`

(cherry picked from commit 69642860ee)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.json

* chore: resolve conflicts

---------

Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-05-15 10:33:07 +00:00
ruthra kumar
2b2eb2fa27 Merge pull request #54956 from frappe/mergify/bp/version-15-hotfix/pr-54941 
fix: flag to disable opening balance calculation in general ledger (backport #54941)
 2026-05-15 13:01:01 +05:30
ruthra kumar
d1d4480187 refactor: flag to disable opening balance calculation 
(cherry picked from commit 28a2230d02)
 2026-05-15 06:50:58 +00:00