nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 15:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source 
Removed the expense account assignment for subcontracting delivery.
This commit is contained in:
rohitwaghchaure
2025-12-02 17:42:18 +05:30
committed by GitHub
parent 4553d04c38
commit b2ea5620b2
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -492,15 +492,9 @@ class StockEntry(StockController):
flt(item.qty) * flt(item.conversion_factor), self.precision("transfer_qty", item) 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": if self.purpose == "Manufacture":
item.set("expense_account", item_details.get("expense_account")) 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): def validate_fg_completed_qty(self):
item_wise_qty = {} item_wise_qty = {}
if self.purpose == "Manufacture" and self.work_order: if self.purpose == "Manufacture" and self.work_order: