nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 18:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,208 Commits 636 Branches 1,812 Tags
105f62fa2c673be5576d9146a0e079693f5fdbbb
Commit Graph

59208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sudharsanan Ashok
105f62fa2c Merge pull request #59013 from frappe/mergify/bp/version-16-hotfix/pr-58997 
fix: prevent disabled items from being used in BOM (backport #58997)
 2026-09-15 22:07:31 +05:30
Sudharsanan Ashok
05e69f6777 Merge pull request #58943 from frappe/mergify/bp/version-16-hotfix/pr-58925 
fix(stock): set item_name to fetch if empty in packing slip item (backport #58925)
 2026-09-15 17:59:09 +05:30
MochaMind
6f01469613 chore: update POT file (#59046) 2026-09-15 12:14:29 +02:00
Krishna Pramod Shirsath
05e89fe53f Merge pull request #59005 from frappe/mergify/bp/version-16-hotfix/pr-58037 
feat(stock): multi select item and warehouse filters in warehouse wise item balance (backport #58037)
 2026-09-15 15:00:21 +05:30
Mihir Kandoi
7db6303ac2 fix(stock): value stock entry rows as of the posting date (backport #59042) (#59048) 2026-09-15 12:14:04 +05:30
MochaMind
442fcd33e9 fix: sync translations from crowdin (version-16-hotfix) (#59052) 
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
 2026-09-14 19:05:44 +02:00
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
pandiyan
f1a7fd006d fix: prevent disabled items from being used in bom (#58997) 
Co-authored-by: Ajish18 <ajishiyappan1@gmail.com>
(cherry picked from commit e6f431a8d6)
 2026-09-12 21:58:25 +05:30
Sudharsanan11
b86e7c672c test(stock): cover multi select item and warehouse filters in warehouse wise item balance 
three cases: multiple warehouses get a column each plus the total qty
column, a selected group warehouse still expands to its children, and
multiple items report side by side while unselected items stay out.

(cherry picked from commit eb4bb2cbce)

# Conflicts:
#	erpnext/stock/report/warehouse_wise_item_balance_age_and_value/test_warehouse_wise_item_balance_age_and_value.py
 2026-09-12 14:31:28 +05:30
Sudharsanan11
bf33bc17c0 feat(stock): multi select item and warehouse filters in warehouse wise item balance 
the item and warehouse filters took one value at a time, so comparing a
few warehouses meant re-running the report for each one.

both are multiselectlist now, matching the stock balance report. the
warehouse column list unions the subtree of every selected warehouse,
and get_items passes a list through instead of wrapping it. plain string
values still work, so saved filters and existing callers are unaffected.

(cherry picked from commit 3c92a9e853)
 2026-09-12 14:31:28 +05:30
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
Afsal Syed
9e5d87ac4a fix(stock): set item_name to fetch if empty in packing slip item (#58925) 
(cherry picked from commit f130c64530)
 2026-09-09 11:37:38 +00:00
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