nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 08:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(stock entry): use fg item expense account for direct manufacturing entry

Browse Source 
(cherry picked from commit ce1312764f)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py
This commit is contained in:
Pugazhendhi Velu
2025-11-30 05:14:02 +00:00
committed by Mergify
parent 25a9327b14
commit 4ca5e9eef8
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -462,6 +462,7 @@ class StockEntry(StockController):
"project": self.project,
"uom": item.uom,
"s_warehouse": item.s_warehouse,
"is_finished_item": item.is_finished_item,
}
),
for_update=True,
@@ -491,6 +492,15 @@ class StockEntry(StockController):
flt(item.qty) * flt(item.conversion_factor), self.precision("transfer_qty", item)
)
<<<<<<< HEAD
=======
if self.purpose == "Subcontracting Delivery":
item.expense_account = frappe.get_value("Company", self.company, "default_expense_account")
if self.purpose == "Manufacture":
item.set("expense_account", item_details.get("expense_account"))
>>>>>>> ce1312764f (fix(stock entry): use fg item expense account for direct manufacturing entry)
def validate_fg_completed_qty(self):
item_wise_qty = {}
if self.purpose == "Manufacture" and self.work_order:
@@ -1774,7 +1784,9 @@ class StockEntry(StockController):
if self.purpose == "Material Issue":
ret["expense_account"] = item.get("expense_account") or item_group_defaults.get("expense_account")
if self.purpose == "Manufacture" or not ret.get("expense_account"):
if (self.purpose == "Manufacture" and not args.get("is_finished_item")) or not ret.get(
"expense_account"
):
ret["expense_account"] = frappe.get_cached_value(
"Company", self.company, "stock_adjustment_account"
)