mirror of
https://github.com/frappe/erpnext.git
synced 2026-02-17 00:25:01 +00:00
fix(stock entry): use fg item expense account for direct manufacturing entry
This commit is contained in:
@@ -577,6 +577,7 @@ class StockEntry(StockController, SubcontractingInwardController):
|
||||
"project": self.project,
|
||||
"uom": item.uom,
|
||||
"s_warehouse": item.s_warehouse,
|
||||
"is_finished_item": item.is_finished_item,
|
||||
}
|
||||
),
|
||||
for_update=True,
|
||||
@@ -609,6 +610,9 @@ class StockEntry(StockController, SubcontractingInwardController):
|
||||
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"))
|
||||
|
||||
def validate_fg_completed_qty(self):
|
||||
if self.purpose != "Manufacture":
|
||||
return
|
||||
@@ -2078,7 +2082,9 @@ class StockEntry(StockController, SubcontractingInwardController):
|
||||
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"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user