nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-04 05:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: update project costing based on child table field and not parent level

Browse Source
This commit is contained in:
Mihir Kandoi
2025-12-11 11:21:35 +05:30
parent 85114eda7c
commit e57d2b4811
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,6 +216,11 @@ class StockEntry(StockController, SubcontractingInwardController):
if self.get("items") and apply_rule: if self.get("items") and apply_rule:
apply_putaway_rule(self.doctype, self.get("items"), self.company, purpose=self.purpose) apply_putaway_rule(self.doctype, self.get("items"), self.company, purpose=self.purpose)
if self.project:
for item in self.items:
if not item.project:
item.project = self.project
def validate(self): def validate(self):
self.pro_doc = frappe._dict() self.pro_doc = frappe._dict()
if self.work_order: if self.work_order:
@@ -525,15 +530,16 @@ class StockEntry(StockController, SubcontractingInwardController):
): ):
return return
if self.project: projects = set(item.project for item in self.items if item.project)
for project in projects:
amount = frappe.db.sql( amount = frappe.db.sql(
""" select ifnull(sum(sed.amount), 0) """ select ifnull(sum(amount), 0)
from from
`tabStock Entry` se, `tabStock Entry Detail` sed `tabStock Entry Detail`
where where
se.docstatus = 1 and se.project = %s and sed.parent = se.name docstatus = 1 and project = %s
and (sed.t_warehouse is null or sed.t_warehouse = '')""", and (t_warehouse is null or t_warehouse = '')""",
self.project, project,
as_list=1, as_list=1,
) )
@@ -545,14 +551,14 @@ class StockEntry(StockController, SubcontractingInwardController):
where where
se.docstatus = 1 and se.project = %s and sed.parent = se.name se.docstatus = 1 and se.project = %s and sed.parent = se.name
and se.purpose = 'Manufacture'""", and se.purpose = 'Manufacture'""",
self.project, project,
as_list=1, as_list=1,
) )
additional_cost_amt = additional_costs[0][0] if additional_costs else 0 additional_cost_amt = additional_costs[0][0] if additional_costs else 0
amount += additional_cost_amt amount += additional_cost_amt
project = frappe.get_doc("Project", self.project) project = frappe.get_doc("Project", project)
project.total_consumed_material_cost = amount project.total_consumed_material_cost = amount
project.save() project.save()