nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-09 15:29:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,173 Commits 631 Branches 1,810 Tags
855d0385da62ce6b4998d0e8c8286d85c363f946
Commit Graph

59173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shllokkk
855d0385da fix: keep each row's own rate under maintain same rate 2026-09-09 17:17:56 +05:30
mergify[bot]
a79abc0462 fix(selling): add email permission check on send_emails (backport #58935) (#58938) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-09-09 16:04:33 +05:30
mergify[bot]
53e53390f4 fix(stock): ignore disabled price lists on transactions (backport #58926) (#58931) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-09-09 10:10:27 +00:00
Shllokkk
79c8e4db7f 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
 2026-09-09 15:03:59 +05:30
mergify[bot]
3856638d01 fix(accounts): stop counting received qty on non-stock invoice returns (backport #58924) (#58929) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-09-09 09:11:46 +00:00
Sudharsanan Ashok
777480bab3 Merge pull request #58921 from frappe/mergify/bp/version-16-hotfix/pr-58896 
fix(stock): remove empty delivery stops after mapping (backport #58896)
 2026-09-09 13:29:47 +05:30
Sudharsanan Ashok
834afed494 Merge pull request #58902 from frappe/mergify/bp/version-16-hotfix/pr-58792 
fix: calculate holiday list totals for half days (backport #58792)
 2026-09-09 13:25:46 +05:30
Sudharsanan Ashok
4e3a3a3300 Merge pull request #58915 from frappe/mergify/bp/version-16-hotfix/pr-58911 
fix: validate shelf life for automatically created expiring batches (backport #58911)
 2026-09-09 13:25:07 +05:30
Sudharsanan Ashok
38f26d248e Merge pull request #58913 from frappe/mergify/bp/version-16-hotfix/pr-58893 
fix: reset price list fallback when changing parties (backport #58893)
 2026-09-09 13:24:23 +05:30
Sudharsanan Ashok
add1d9f4e4 Merge pull request #58904 from frappe/mergify/bp/version-16-hotfix/pr-58889 
fix(stock): guard inventory dimension lookup without reference document (backport #58889)
 2026-09-09 13:23:54 +05:30
Sudharsanan Ashok
7e16239d9a Merge pull request #58901 from frappe/mergify/bp/version-16-hotfix/pr-58891 
fix(accounts): reject disabled price lists in buying and selling (backport #58891)
 2026-09-09 13:23:23 +05:30
pandiyan
ca33019fdf 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:10:34 +05:30
Khushi Rawat
40d3ce5a5d Merge pull request #58918 from frappe/mergify/bp/version-16-hotfix/pr-58909 
fix: read posting date confirmation setting from boot data (backport #58909)
 2026-09-09 13:03:37 +05:30
khushi8112
a404d9b4e8 fix: refresh posting date confirmation setting 
(cherry picked from commit bcade8f0ba)
 2026-09-09 07:21:05 +00:00
khushi8112
1349e0b3ab fix: read posting date confirmation setting from boot data 
(cherry picked from commit db9e93306a)
 2026-09-09 07:21:04 +00:00
Khushi Rawat
a4a2e5e36c Merge pull request #58908 from frappe/mergify/bp/version-16-hotfix/pr-58227 
fix: keep a dunning claimable until its interest is paid too  (backport #58227)
 2026-09-09 12:42:41 +05:30
Pandiyan P
fa504b87db 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:29 +00:00
Pandiyan P
6751264ba5 fix: reset price list fallback when changing parties (#58893) 
(cherry picked from commit 4c32acf300)
 2026-09-09 06:56:32 +00:00
pandiyan
7723f5aaed 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:20:58 +05:30
pandiyan
d2920915d2 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:20:58 +05:30
Krishna Pramod Shirsath
70f391d5e7 fix(stock): use correct field when reading previous stock closing balance (backport #55898) (#58854) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Fixes #54819
 2026-09-09 09:52:00 +05:30
pandiyan
3d6afffcef fix: calculate holiday list totals for half days (#58792) 
(cherry picked from commit 51fb261b6b)

Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
Co-authored-by: nareshkannasln <nareshkannashanmugam@gmail.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-09-09 09:40:32 +05:30
Pandiyan P
b21ca36428 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:13:05 +00:00
Pandiyan P
5bd623c4dd fix(accounts): reject disabled price lists in buying and selling (#58891) 
(cherry picked from commit f8c2f3440b)
 2026-09-09 01:28:13 +00:00
Sudharsanan Ashok
596e086e1c Merge pull request #58887 from aerele/fix/additional-cost-zero-valued-items-v16 
fix(stock): distribute additional costs when incoming items have no value (backport #58842)
 2026-09-08 19:55:54 +05:30
Sudharsanan11
b6035810f0 fix(stock): distribute additional costs when incoming items have no value 2026-09-08 19:13:04 +05:30
Sudharsanan Ashok
2e6a9aad60 Merge pull request #58883 from frappe/mergify/bp/version-16-hotfix/pr-58700 
fix(stock): show actual outgoing rate in ledger preview (backport #58700)
 2026-09-08 19:08:04 +05:30
Afsal Syed
5edb7e2abc test(stock): add ledger preview unit tests (#58700) 2026-09-08 18:56:21 +05:30
Afsal Syed
2932793af0 fix(stock): show actual outgoing rate in ledger preview (#58700) 2026-09-08 18:56:21 +05:30
mergify[bot]
59b80b903a fix(gross-profit): include item_name in export (backport #58631) (#58864) 
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
 2026-09-08 18:20:34 +05:30
mergify[bot]
06057ccfc0 fix(pos): use company-currency change amount when netting pos gl entries (backport #58599) (#58678) 
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
 2026-09-08 12:47:05 +00:00
mergify[bot]
9fff01db32 fix(accounts): round journal entry totals to field precision (backport #58629) (#58875) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
 2026-09-08 12:43:14 +00:00
Sudharsanan Ashok
db8974fb95 Merge pull request #58873 from frappe/mergify/bp/version-16-hotfix/pr-58869 
fix(stock): recalculate delivery note billing after return (backport #58869)
 2026-09-08 18:08:17 +05:30
Sudharsanan Ashok
bf8a703709 Merge pull request #58862 from frappe/mergify/bp/version-16-hotfix/pr-58858 
fix: persist rendered terms on transaction save (backport #58858)
 2026-09-08 18:04:30 +05:30
Sudharsanan Ashok
a8c6cf4ad3 Merge pull request #58763 from frappe/mergify/bp/version-16-hotfix/pr-57330 
fix: add reconciliation after submit logic for bank transactions (backport #57330)
 2026-09-08 18:03:02 +05:30
Sudharsanan Ashok
6d3cf262ed Merge pull request #58760 from frappe/mergify/bp/version-16-hotfix/pr-58705 
fix: prevent duplicate Batch messages and Project links (backport #58705)
 2026-09-08 18:01:38 +05:30
Sudharsanan Ashok
dd60f2867e Merge pull request #58548 from aerele/lcv-taxes-accounting-dimensions-v16 
fix(stock): carry accounting dimensions from Landed Cost Voucher char…
 2026-09-08 17:59:20 +05:30
mergify[bot]
6ec30350d2 fix(accounts): reject same-account internal transfers (backport #58529) (#58877) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
 2026-09-08 17:43:05 +05:30
mergify[bot]
75cb796477 fix: fetch accounts by company (backport #58523) (#58879) 
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
 2026-09-08 17:41:09 +05:30
mergify[bot]
51bf7cb241 fix: show cost center for unmatched payments in receivables (backport #58453) (#58881) 
fix: show cost center for unmatched payments in receivables (#58453)

(cherry picked from commit cee9f4949a)

Co-authored-by: Krishna Pramod Shirsath <91021227+krishna-254@users.noreply.github.com>
 2026-09-08 17:33:13 +05:30
Pandiyan P
7bb19c89b1 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 16:46:23 +05:30
Lakshit Jain
fdac2843fa Merge pull request #58865 from frappe/mergify/bp/version-16-hotfix/pr-58682 
fix(subcontracting): add condition to exclude tax withholding accounts in purchase receipt mapping (backport #58682)
 2026-09-08 16:36:45 +05:30
mergify[bot]
b1bf95d5b3 fix: use account currency in Bank Reconciliation Statement print (backport #58692) (#58871) 
Co-authored-by: Krishna Pramod Shirsath <91021227+krishna-254@users.noreply.github.com>
 2026-09-08 10:48:15 +00:00
Sudharsanan Ashok
605ec444ed Merge pull request #58860 from frappe/mergify/bp/version-16-hotfix/pr-58841 
fix: skip zero quantity items in production plan material requests (backport #58841)
 2026-09-08 15:40:47 +05:30
Sudharsanan11
d4b52c236a fix: resolve conflicts 2026-09-08 15:21:30 +05:30
ljain112
1998027177 chore: resolve conflicts 2026-09-08 14:57:13 +05:30
ljain112
15a531f03f fix(subcontracting): add condition to exclude tax withholding accounts in purchase receipt mapping 
(cherry picked from commit 13031d6d5d)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/mapper.py
 2026-09-08 09:24:14 +00:00
Pandiyan P
89872ebb37 fix: persist rendered terms on transaction save (#58858) 
(cherry picked from commit cadc0ca86d)
 2026-09-08 07:58:59 +00:00
mergify[bot]
6e39b42137 fix(accounts): enforce account field allow-list on financial report filters (backport #58790) (#58849) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-09-08 11:58:51 +05:30
Mihir Kandoi
cfdf97601a fix(manufacturing): account for process loss in Production Plan Work Orders (backport #58799) (#58838) 2026-09-08 04:20:47 +00:00