nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 10:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,045 Commits 638 Branches 1,812 Tags
1150d8e9b0518bc3dce11a2faaf74787c2e5c61a
Commit Graph

56045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sudharsanan Ashok
1150d8e9b0 fix(subcontracting): validate project across the subcontracting flow (#58965) 
(cherry picked from commit fe25746feb)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
#	erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py
#	erpnext/subcontracting/doctype/subcontracting_receipt/mapper.py
 2026-09-13 06:29:16 +00:00
mergify[bot]
f9433683ec fix: Backfill not_applicable on Item Tax Template Details for German companies (backport #54682) (backport #54686) (#58952) 
* fix: Backfill `not_applicable` on Item Tax Template Details for German companies (backport #54682) (#54686)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: Backfill `not_applicable` on Item Tax Template Details for German companies (#54682)
(cherry picked from commit a22d773341)

# Conflicts:
#	erpnext/patches.txt

* chore: resolve conflict

* fix: compare zero-rate row count, not just the identifier set

* chore: correct comment on account name uniqueness

* test: cover German `not_applicable` backfill patch

Run the patch against a company seeded from the shipped German defaults:
matching defaults are backfilled, customised templates and templates with a
duplicate account name are left alone, and a rerun changes nothing.

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2026-09-11 13:21:39 +02:00
mergify[bot]
62b9f31297 fix(accounts): add permission checks on invoice_discounting.get_invoices (backport #58975) (#58989) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-09-11 04:42:54 +00:00
mergify[bot]
85a152946e fix(accounts): add permission checks on execute_repost_payment_ledger (backport #58980) (#58981) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-09-11 09:38:50 +05:30
mergify[bot]
563615c77e fix(stock): recalculate billing status of returned delivery notes (backport #58953) (#58986) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-09-11 00:56:26 +02:00
Mihir Kandoi
52ea7ed606 fix(selling): exclude fully billed orders from the invoice picker (backport #58966) (#58968) 2026-09-10 20:51:03 +05:30
mergify[bot]
f59a6ec882 fix(stock): do not rebuild the Warehouse tree on an account map miss (backport #58956) (#58972) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-09-10 13:09:00 +00:00
Sudharsanan Ashok
bb0140ff3f Merge pull request #58946 from frappe/mergify/bp/version-15-hotfix/pr-58927 
fix(manufacturing): handle empty raw materials in workstation (backport #58927)
 2026-09-10 18:08:52 +05:30
pandiyan
c72bc6925b fix(manufacturing): handle empty raw materials in workstation (#58927) 
(cherry picked from commit 3be0c7801a)
 2026-09-10 11:44:42 +05:30
mergify[bot]
e37ba3f8cf fix(selling): add email permission check on send_emails (backport #58935) (#58937) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-09-09 10:58:21 +00:00
Shllokkk
46c792f976 Merge pull request #58934 from frappe/mergify/bp/version-15-hotfix/pr-58897 
fix: % Amount Billed exceeds 100% on fully rejected Purchase Receipts (backport #58897)
 2026-09-09 15:33:07 +05:30
Shllokkk
c31ae577e4 fix: % Amount Billed exceeds 100% on fully rejected Purchase Receipts (#58897) 
* fix: include rejected qty in Purchase Receipt billing base

* test: per billed stays 100% for fully rejected receipt

(cherry picked from commit 79c8e4db7f)
 2026-09-09 09:34:29 +00:00
mergify[bot]
228108ad4c fix(accounts): stop counting received qty on non-stock invoice returns (backport #58924) (#58928) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-09-09 09:20:26 +00:00
Sudharsanan Ashok
75a5d2b766 Merge pull request #58920 from frappe/mergify/bp/version-15-hotfix/pr-58896 
fix(stock): remove empty delivery stops after mapping (backport #58896)
 2026-09-09 13:33:13 +05:30
Sudharsanan Ashok
27f93a83ef Merge pull request #58914 from frappe/mergify/bp/version-15-hotfix/pr-58911 
fix: validate shelf life for automatically created expiring batches (backport #58911)
 2026-09-09 13:24:59 +05:30
Sudharsanan Ashok
9822ffc334 Merge pull request #58912 from frappe/mergify/bp/version-15-hotfix/pr-58893 
fix: reset price list fallback when changing parties (backport #58893)
 2026-09-09 13:24:12 +05:30
Sudharsanan Ashok
fc6791e57b Merge pull request #58903 from frappe/mergify/bp/version-15-hotfix/pr-58889 
fix(stock): guard inventory dimension lookup without reference document (backport #58889)
 2026-09-09 13:23:46 +05:30
Sudharsanan Ashok
916b581562 Merge pull request #58900 from frappe/mergify/bp/version-15-hotfix/pr-58891 
fix(accounts): reject disabled price lists in buying and selling (backport #58891)
 2026-09-09 13:23:13 +05:30
Khushi Rawat
63e7c2e44f Merge pull request #58907 from frappe/mergify/bp/version-15-hotfix/pr-58227 
fix: keep a dunning claimable until its interest is paid too  (backport #58227)
 2026-09-09 13:09:48 +05:30
pandiyan
0099e7ec4f fix(stock): remove empty delivery stops after mapping (#58896) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
(cherry picked from commit 4b23cee2ea)
 2026-09-09 13:03:06 +05:30
pandiyan
11c6f0d02c fix: keep a dunning claimable until its interest is paid too 
a dunning was resolved as soon as the invoiced sum was settled, because the
status was derived from the invoice outstanding alone. paying an invoice
without the interest and fee therefore closed the dunning and lost the
interest: a fresh dunning finds nothing overdue to charge it on.

the dunning amount is never a receivable, it only reaches the ledger as a
negative deduction on a payment entry made from the dunning. link that row
to the dunning so what has been collected is known, and resolve a dunning
only once the invoiced sum and the dunning amount are both paid. a dunning
resolved by hand keeps its status, so waiving the interest stays possible.

the deduction is a company currency field, so book and measure the dunning
amount through base_dunning_amount instead of the transaction currency one.

an interest-only payment leaves every invoice outstanding untouched, so
update the linked dunnings from the payment entry itself instead of relying
on the outstanding amount to change. such a payment also has to be built
from what is left to collect, not from the totals the dunning was raised
with, which are stale by then.

(cherry picked from commit d5a9d158f9)
 2026-09-09 12:39:18 +05:30
pandiyan
da53283659 test: dunning must stay unpaid when only the invoiced sum is paid 
paying a dunned invoice without its interest and fee marks the dunning
resolved, and the interest can no longer be collected.

(cherry picked from commit fa89552d10)
 2026-09-09 12:39:18 +05:30
Shllokkk
32d8c359ed fix(stock): preserve rates for unsaved mapped rows (backport #58852) (#58898) 
* fix: keep each row's own rate under maintain same rate

* test: cover maintain-same-rate rate lock for batch items
 2026-09-09 12:38:58 +05:30
Pandiyan P
00e02f07ac fix: validate shelf life for automatically created expiring batches (#58911) 
Co-authored-by: Ajish18 <ajishiyappan1@gmail.com>
(cherry picked from commit b2bdeaa672)
 2026-09-09 07:07:22 +00:00
Pandiyan P
f981791012 fix: reset price list fallback when changing parties (#58893) 
(cherry picked from commit 4c32acf300)
 2026-09-09 06:56:26 +00:00
Sudharsanan Ashok
f6870786c5 Merge pull request #58888 from frappe/mergify/bp/version-15-hotfix/pr-58887 
fix(stock): distribute additional costs when incoming items have no value (backport #58842) (backport #58887)
 2026-09-09 11:14:21 +05:30
Sudharsanan11
00729a8d62 fix: resolve conflicts 2026-09-09 10:38:34 +05:30
Sudharsanan11
10987b11cc fix(stock): distribute additional costs when incoming items have no value 
(cherry picked from commit b6035810f0)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/test_stock_entry.py
 2026-09-09 10:38:34 +05:30
pandiyan
47662b9af2 fix(accounts): reject disabled price lists in buying and selling (#58891) 
(cherry picked from commit f8c2f3440b)
 2026-09-09 09:55:37 +05:30
mergify[bot]
3bd194e986 fix: user not able to set valuation rate zero in stock reco (backport #58800) (#58821) 
* fix: user not able to set valuation rate zero in stock reco (#58800)

* fix: user not able to set valuation rate zero in stock reco

* fix: wrong difference amount when valuation rate is zero

* fix: blank valuation rate should not be treated as a change

(cherry picked from commit e85e300f8f)

# Conflicts:
#	erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py

* chore: fix conflicts

Removed unused import statements and cleaned up the code.

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-09-09 04:20:51 +00:00
Pandiyan P
7ee54ba08b fix(stock): guard inventory dimension lookup without reference document (#58889) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
(cherry picked from commit afd93cf867)
 2026-09-09 02:12:59 +00:00
Sudharsanan Ashok
b6120ea56a Merge pull request #58882 from frappe/mergify/bp/version-15-hotfix/pr-58700 
fix(stock): show actual outgoing rate in ledger preview (backport #58700)
 2026-09-08 19:32:09 +05:30
Afsal Syed
372244e6b2 fix(stock): show actual outgoing rate in ledger preview (#58700) 
(cherry picked from commit 71f1edeb1c)
 2026-09-08 19:11:06 +05:30
mergify[bot]
c7d865ef3b fix(pos): use company-currency change amount when netting pos gl entries (backport #58599) (#58677) 
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-09-08 13:23:45 +00:00
mergify[bot]
2c2a3e9f10 fix: fetch accounts by company (backport #58523) (#58878) 
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
 2026-09-08 18:18:36 +05:30
mergify[bot]
96357b4fdc fix(accounts): round journal entry totals to field precision (backport #58629) (#58874) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-09-08 12:47:54 +00:00
Sudharsanan Ashok
13367a5c54 Merge pull request #58872 from frappe/mergify/bp/version-15-hotfix/pr-58869 
fix(stock): recalculate delivery note billing after return (backport #58869)
 2026-09-08 18:10:08 +05:30
Sudharsanan Ashok
28918c8338 Merge pull request #58876 from frappe/mergify/bp/version-15-hotfix/pr-58529 
fix(accounts): reject same-account internal transfers (backport #58529)
 2026-09-08 18:09:11 +05:30
Sudharsanan Ashok
341089ce35 Merge pull request #58863 from frappe/mergify/bp/version-15-hotfix/pr-58631 
fix(gross-profit): include item_name in export (backport #58631)
 2026-09-08 18:05:08 +05:30
Sudharsanan Ashok
a8c6cec5a3 Merge pull request #58861 from frappe/mergify/bp/version-15-hotfix/pr-58858 
fix: persist rendered terms on transaction save (backport #58858)
 2026-09-08 18:04:24 +05:30
Sudharsanan Ashok
89b29eee94 Merge pull request #58762 from frappe/mergify/bp/version-15-hotfix/pr-57330 
fix: add reconciliation after submit logic for bank transactions (backport #57330)
 2026-09-08 18:02:38 +05:30
Pandiyan P
b409ded2f6 fix(stock): recalculate delivery note billing after return (#58869) 
(cherry picked from commit f864333afa)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/services/billing_status.py
 2026-09-08 17:38:48 +05:30
mergify[bot]
69f38a04c8 fix: show cost center for unmatched payments in receivables (backport #58453) (#58880) 
Co-authored-by: Krishna Pramod Shirsath <91021227+krishna-254@users.noreply.github.com>
 2026-09-08 17:33:31 +05:30
Pandiyan P
05a1127587 fix(accounts): reject same-account internal transfers (#58529) 
(cherry picked from commit 36a4dfe797)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/test_payment_entry.py
 2026-09-08 16:51:53 +05:30
Sudharsanan Ashok
940fda3327 Merge pull request #58859 from frappe/mergify/bp/version-15-hotfix/pr-58841 
fix: skip zero quantity items in production plan material requests (backport #58841)
 2026-09-08 15:59:18 +05:30
Sudharsanan11
95b203079a fix: resolve conflicts 2026-09-08 15:21:30 +05:30
Vishnu Priya Baskaran
c752bb34a8 fix(gross-profit): include item_name in export (#58631) 
(cherry picked from commit 467f54162f)
 2026-09-08 09:13:58 +00:00
Pandiyan P
24cac30aa9 fix: persist rendered terms on transaction save (#58858) 
(cherry picked from commit cadc0ca86d)
 2026-09-08 07:58:53 +00:00
Mihir Kandoi
a64b78d283 fix(selling): fetch orders within billing allowance (backport #58751) (#58822) 2026-09-08 09:16:56 +05:30
Mihir Kandoi
4a3a2cbdc4 test(stock): use existing warehouse fixtures in Pick List tests (v15) (#58840) 2026-09-07 15:22:12 +00:00