From 0a37f5575fa9a101b1a5c6df331a2ba40c279beb Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 13 Aug 2015 15:53:20 +0530 Subject: [PATCH] [hotfix] [patch] stock entry additional cost for docstatus < 2 --- .../v5_4/stock_entry_additional_costs.py | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/erpnext/patches/v5_4/stock_entry_additional_costs.py b/erpnext/patches/v5_4/stock_entry_additional_costs.py index e064690c18..96d6b3ddef 100644 --- a/erpnext/patches/v5_4/stock_entry_additional_costs.py +++ b/erpnext/patches/v5_4/stock_entry_additional_costs.py @@ -9,34 +9,35 @@ def execute(): frappe.reload_doctype("Stock Entry") frappe.reload_doctype("Stock Entry Detail") frappe.reload_doctype("Landed Cost Taxes and Charges") - + frappe.db.sql("""update `tabStock Entry Detail` sed, `tabStock Entry` se set sed.valuation_rate=sed.incoming_rate, sed.basic_rate=sed.incoming_rate, sed.basic_amount=sed.amount - where sed.parent = se.name + where sed.parent = se.name and (se.purpose not in ('Manufacture', 'Repack') or ifnull(additional_operating_cost, 0)=0) """) - - stock_entries = frappe.db.sql_list("""select name from `tabStock Entry` - where purpose in ('Manufacture', 'Repack') and ifnull(additional_operating_cost, 0)!=0""") - + + stock_entries = frappe.db.sql_list("""select name from `tabStock Entry` + where purpose in ('Manufacture', 'Repack') and ifnull(additional_operating_cost, 0)!=0 + and docstatus < 2""") + for d in stock_entries: stock_entry = frappe.get_doc("Stock Entry", d) stock_entry.append("additional_costs", { "description": "Additional Operating Cost", "amount": stock_entry.additional_operating_cost }) - + number_of_fg_items = len([t.t_warehouse for t in stock_entry.get("items") if t.t_warehouse]) - + for d in stock_entry.get("items"): d.valuation_rate = d.incoming_rate - - if d.bom_no or (d.t_warehouse and number_of_fg_items == 1): + + if d.bom_no or (d.t_warehouse and number_of_fg_items == 1): d.additional_cost = stock_entry.additional_operating_cost - + d.basic_rate = flt(d.valuation_rate) - flt(d.additional_cost) d.basic_amount = flt(flt(d.basic_rate) *flt(d.transfer_qty), d.precision("basic_amount")) - + stock_entry.flags.ignore_validate = True stock_entry.flags.ignore_validate_update_after_submit = True - stock_entry.save() \ No newline at end of file + stock_entry.save()