nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-14 01:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,198 Commits 646 Branches 1,810 Tags
d40d16c260bb8bcaec9d93953ec083dd61046b44
Commit Graph

59198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sudharsanan Ashok
d40d16c260 Merge pull request #59041 from frappe/mergify/bp/version-16-hotfix/pr-58965 
fix(subcontracting): validate project across the subcontracting flow  (backport #58965)
 2026-09-13 17:53:51 +05:30
Sudharsanan11
2add72ba36 fix: resolve conflicts 2026-09-13 12:12:10 +05:30
Sudharsanan Ashok
0095560dc7 fix(subcontracting): validate project across the subcontracting flow (#58965) 
(cherry picked from commit fe25746feb)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py
#	erpnext/subcontracting/doctype/subcontracting_receipt/mapper.py
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
 2026-09-13 06:29:25 +00:00
mergify[bot]
d4bacb7354 refactor(manufacturing): rename secondary item valuation type to "% of Component Cost" (backport #59021) (#59022) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-09-12 06:19:45 +00:00
mergify[bot]
8672a6e604 fix(selling): list billable sales orders oldest first (backport #59010) (#59011) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-09-11 12:19:12 +00:00
Shllokkk
ee2474aa9c Merge pull request #58984 from Shllokkk/bom-cost-allocation-per-type-v16 
fix: coerce cost_allocation_per to float in BOM cost allocation
 2026-09-11 14:17:07 +05:30
mergify[bot]
a9f3d69fbe fix(accounts): add permission checks on invoice_discounting.get_invoices (backport #58975) (#58990) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-09-11 04:30:00 +00:00
mergify[bot]
d0b8379404 fix(regional)!: remove irs_1099_print whitelisted method (backport #58976) (#58992) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-09-11 04:22:56 +00:00
mergify[bot]
9bc98efe2f fix(accounts): add permission checks on execute_repost_payment_ledger (backport #58980) (#58982) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-09-11 09:38:32 +05:30
Shllokkk
1918ed6a3c fix: coerce cost_allocation_per to float in BOM cost allocation 2026-09-10 22:23:57 +05:30
Mihir Kandoi
5d9cbd9755 fix(selling): exclude fully billed orders from the invoice picker (backport #58966) (#58967) 2026-09-10 20:50:40 +05:30
Khushi Rawat
c1f37750af Merge pull request #58983 from khushi8112/fix/asset-type-toggle-reqd 
fix(asset): recompute reference doc reqd on asset type change
 2026-09-10 20:22:28 +05:30
khushi8112
6d447f6847 fix(asset): recompute reference doc reqd on asset type change 
The asset_type change handler no longer called toggle_reference_doc, so
switching the asset type never cleared the mandatory flags on
purchase_receipt/purchase_invoice, throwing a mandatory error on the
first save.
 2026-09-10 20:20:37 +05:30
mergify[bot]
6fb76eba71 fix(stock): do not rebuild the Warehouse tree on an account map miss (backport #58956) (#58973) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-09-10 13:00:18 +00:00
Sudharsanan Ashok
8e73c94976 Merge pull request #58971 from frappe/mergify/bp/version-16-hotfix/pr-58969 
fix: avoid TypeError on new Work Order when company is not set (backport #58969)
 2026-09-10 18:09:35 +05:30
Sudharsanan Ashok
2b15ad1389 Merge pull request #58947 from frappe/mergify/bp/version-16-hotfix/pr-58927 
fix(manufacturing): handle empty raw materials in workstation (backport #58927)
 2026-09-10 18:09:19 +05:30
Sudharsanan Ashok
baf68a9ce7 Merge pull request #58945 from frappe/mergify/bp/version-16-hotfix/pr-58939 
fix(manufacturing): handle empty bom cost allocation (backport #58939)
 2026-09-10 18:08:11 +05:30
Pandiyan P
e20501a15c fix: avoid TypeError on new Work Order when company is not set (#58969) 
Co-authored-by: Ajish18 <ajishiyappan1@gmail.com>
(cherry picked from commit d82c35aae9)
 2026-09-10 12:33:20 +00:00
Sudharsanan Ashok
2788704d81 Merge pull request #58970 from frappe/mergify/bp/version-16-hotfix/pr-58963 
fix(mrp): align monthly bucket labels with demand dates  (backport #58963)
 2026-09-10 17:57:57 +05:30
Sudharsanan Ashok
c5773e7899 fix(mrp): align monthly bucket labels with demand dates (#58963) 
(cherry picked from commit b1e99a70ac)
 2026-09-10 12:14:04 +00:00
pandiyan
3b787c9443 fix(manufacturing): handle empty raw materials in workstation (#58927) 
(cherry picked from commit 3be0c7801a)
 2026-09-10 11:38:15 +05:30
mergify[bot]
df62766157 fix(subcontracting): cannot select Against Finished Good on customer receipt (backport #58949) (#58951) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-09-09 14:50:43 +00:00
Pandiyan P
77d8d5b3e2 fix(manufacturing): handle empty bom cost allocation (#58939) 
(cherry picked from commit 33a066d568)
 2026-09-09 12:34:42 +00:00
Shllokkk
33a74a2730 Merge pull request #58944 from Shllokkk/maintain-same-rate-unsaved-rows-v16 
fix(stock): preserve rates for unsaved mapped rows (backport #58852)
 2026-09-09 17:35:17 +05:30
Shllokkk
277c9a3b63 test: cover maintain-same-rate rate lock for batch items 2026-09-09 17:17:56 +05:30
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