From 69be01aa1b4e4abce5679d54258930c9413b06d2 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 19 Oct 2016 16:20:59 +0530 Subject: [PATCH] [Stock Entry] Show total amount for purpose Material Issue/Receipt/Transfer --- erpnext/patches.txt | 3 +- .../doctype/stock_entry/stock_entry.json | 67 ++++++++++++++++++- .../stock/doctype/stock_entry/stock_entry.py | 4 +- 3 files changed, 70 insertions(+), 4 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 7d599d7475..e5cdb1adad 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -340,4 +340,5 @@ erpnext.patches.v7_0.update_status_of_zero_amount_sales_order erpnext.patches.v7_1.add_field_for_task_dependent erpnext.patches.v7_0.repost_bin_qty_and_item_projected_qty erpnext.patches.v7_1.set_prefered_contact_email -execute:frappe.db.sql("update `tabSingles` set value = 1 where field = 'unlink_payment_on_cancellation_of_invoice' and doctype = 'Accounts Settings'") \ No newline at end of file +execute:frappe.db.sql("update `tabSingles` set value = 1 where field = 'unlink_payment_on_cancellation_of_invoice' and doctype = 'Accounts Settings'") +execute:frappe.db.sql("update `tabStock Entry` set total_amount = null where purpose in('Repack', 'Manufacture')") \ No newline at end of file diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json index 0ab80c28fe..8e31332b8b 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.json +++ b/erpnext/stock/doctype/stock_entry/stock_entry.json @@ -3,16 +3,20 @@ "allow_import": 1, "allow_rename": 0, "autoname": "naming_series:", + "beta": 0, "creation": "2013-04-09 11:43:55", "custom": 0, "docstatus": 0, "doctype": "DocType", "document_type": "Document", + "editable_grid": 0, + "engine": "InnoDB", "fields": [ { "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "items_section", "fieldtype": "Section Break", "hidden": 0, @@ -38,6 +42,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "default": "{purpose}", "fieldname": "title", "fieldtype": "Data", @@ -64,6 +69,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "naming_series", "fieldtype": "Select", "hidden": 0, @@ -91,6 +97,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "default": "Material Issue", "fieldname": "purpose", "fieldtype": "Select", @@ -119,6 +126,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "company", "fieldtype": "Link", "hidden": 0, @@ -146,6 +154,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:in_list([\"Material Transfer for Manufacture\", \"Manufacture\"], doc.purpose)", "fieldname": "production_order", "fieldtype": "Link", @@ -174,6 +183,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.purpose==\"Subcontract\"", "fieldname": "purchase_order", "fieldtype": "Link", @@ -201,6 +211,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.purpose==\"Sales Return\"", "fieldname": "delivery_note_no", "fieldtype": "Link", @@ -229,6 +240,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.purpose==\"Sales Return\"", "fieldname": "sales_invoice_no", "fieldtype": "Link", @@ -255,6 +267,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.purpose==\"Purchase Return\"", "fieldname": "purchase_receipt_no", "fieldtype": "Link", @@ -283,6 +296,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:in_list([\"Material Issue\", \"Material Transfer\", \"Manufacture\", \"Repack\", \t\t\t\t\t\"Subcontract\", \"Material Transfer for Manufacture\"], doc.purpose)", "fieldname": "from_bom", "fieldtype": "Check", @@ -309,6 +323,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col2", "fieldtype": "Column Break", "hidden": 0, @@ -335,6 +350,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "Today", "fieldname": "posting_date", "fieldtype": "Date", @@ -362,6 +378,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "posting_time", "fieldtype": "Time", "hidden": 0, @@ -388,6 +405,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval: doc.from_bom && (doc.purpose!==\"Sales Return\" && doc.purpose!==\"Purchase Return\")", "fieldname": "sb1", "fieldtype": "Section Break", @@ -413,6 +431,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "from_bom", "fieldname": "bom_no", "fieldtype": "Link", @@ -439,6 +458,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "from_bom", "description": "As per Stock UOM", "fieldname": "fg_completed_qty", @@ -467,6 +487,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "cb1", "fieldtype": "Column Break", "hidden": 0, @@ -490,6 +511,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "1", "depends_on": "from_bom", "description": "Including items for sub assemblies", @@ -517,6 +539,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "from_bom", "fieldname": "get_items", "fieldtype": "Button", @@ -543,6 +566,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_12", "fieldtype": "Section Break", "hidden": 0, @@ -567,6 +591,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "from_warehouse", "fieldtype": "Link", "hidden": 0, @@ -594,6 +619,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "cb0", "fieldtype": "Column Break", "hidden": 0, @@ -617,6 +643,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "to_warehouse", "fieldtype": "Link", "hidden": 0, @@ -644,6 +671,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sb0", "fieldtype": "Section Break", "hidden": 0, @@ -668,6 +696,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "items", "fieldtype": "Table", "hidden": 0, @@ -695,6 +724,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "get_stock_and_rate", "fieldtype": "Button", @@ -722,6 +752,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_19", "fieldtype": "Section Break", "hidden": 0, @@ -746,6 +777,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total_incoming_value", "fieldtype": "Currency", "hidden": 0, @@ -772,6 +804,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_22", "fieldtype": "Column Break", "hidden": 0, @@ -796,6 +829,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total_outgoing_value", "fieldtype": "Currency", "hidden": 0, @@ -822,6 +856,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "value_difference", "fieldtype": "Currency", "hidden": 0, @@ -849,6 +884,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "total_additional_costs", + "columns": 0, "fieldname": "additional_costs_section", "fieldtype": "Section Break", "hidden": 0, @@ -874,6 +910,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "additional_costs", "fieldtype": "Table", "hidden": 0, @@ -900,6 +937,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total_additional_costs", "fieldtype": "Currency", "hidden": 0, @@ -926,6 +964,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "depends_on": "eval: in_list([\"Sales Return\", \"Purchase Return\", \"Subcontract\"], doc.purpose)", "fieldname": "contact_section", "fieldtype": "Section Break", @@ -951,6 +990,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Subcontract\"", "fieldname": "supplier", "fieldtype": "Link", @@ -979,6 +1019,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Subcontract\"", "fieldname": "supplier_name", "fieldtype": "Data", @@ -1006,6 +1047,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Subcontract\"", "fieldname": "supplier_address", "fieldtype": "Small Text", @@ -1033,6 +1075,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_39", "fieldtype": "Column Break", "hidden": 0, @@ -1057,6 +1100,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.purpose==\"Sales Return\"", "fieldname": "customer", "fieldtype": "Link", @@ -1085,6 +1129,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.purpose==\"Sales Return\"", "fieldname": "customer_name", "fieldtype": "Data", @@ -1112,6 +1157,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.purpose==\"Sales Return\"", "fieldname": "customer_address", "fieldtype": "Small Text", @@ -1139,6 +1185,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "printing_settings", "fieldtype": "Section Break", "hidden": 0, @@ -1164,6 +1211,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "select_print_heading", "fieldtype": "Link", "hidden": 0, @@ -1191,6 +1239,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "letter_head", "fieldtype": "Link", "hidden": 0, @@ -1217,6 +1266,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "more_info", "fieldtype": "Section Break", "hidden": 0, @@ -1242,6 +1292,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "project", "fieldtype": "Link", "hidden": 0, @@ -1268,6 +1319,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "remarks", "fieldtype": "Text", "hidden": 0, @@ -1294,6 +1346,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col5", "fieldtype": "Column Break", "hidden": 0, @@ -1319,6 +1372,8 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, + "depends_on": "total_amount", "fieldname": "total_amount", "fieldtype": "Currency", "hidden": 0, @@ -1332,7 +1387,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 0, - "print_hide_if_no_value": 0, + "print_hide_if_no_value": 1, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -1344,6 +1399,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "amended_from", "fieldtype": "Link", "hidden": 0, @@ -1371,6 +1427,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "credit_note", "fieldtype": "Link", "hidden": 1, @@ -1398,13 +1455,14 @@ "hide_toolbar": 0, "icon": "icon-file-text", "idx": 1, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 1, "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-09-08 06:40:03.284036", + "modified": "2016-10-19 16:11:22.110926", "modified_by": "Administrator", "module": "Stock", "name": "Stock Entry", @@ -1420,6 +1478,7 @@ "export": 0, "if_owner": 0, "import": 0, + "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, @@ -1440,6 +1499,7 @@ "export": 0, "if_owner": 0, "import": 0, + "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, @@ -1460,6 +1520,7 @@ "export": 0, "if_owner": 0, "import": 0, + "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, @@ -1480,6 +1541,7 @@ "export": 0, "if_owner": 0, "import": 0, + "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, @@ -1491,6 +1553,7 @@ "write": 1 } ], + "quick_entry": 0, "read_only": 0, "read_only_onload": 0, "search_fields": "posting_date, from_warehouse, to_warehouse, purpose, remarks", diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 44782d517c..ec3873e8a2 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -319,7 +319,9 @@ class StockEntry(StockController): self.value_difference = self.total_incoming_value - self.total_outgoing_value def set_total_amount(self): - self.total_amount = sum([flt(item.amount) for item in self.get("items")]) + self.total_amount = None + if self.purpose not in ['Manufacture', 'Repack']: + self.total_amount = sum([flt(item.amount) for item in self.get("items")]) def validate_purchase_order(self): """Throw exception if more raw material is transferred against Purchase Order than in