From 2469fb9e351b23ebdd205fb512424d7d37b323d1 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 26 Dec 2019 13:26:39 +0530 Subject: [PATCH] fix: rounded total issue --- .../import_supplier_invoice.js | 15 +++++++++++++++ .../import_supplier_invoice.py | 8 +++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js index 9f1a092d17..c2d6edfc77 100644 --- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js +++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js @@ -27,5 +27,20 @@ frappe.ui.form.on('Import Supplier Invoice', { } }; }); + }, + + refresh: function(frm) { + frm.trigger("toggle_read_only_fields"); + }, + + toggle_read_only_fields: function(frm) { + if (in_list(["File Import Completed", "Processing File Data"], frm.doc.status)) { + cur_frm.set_read_only(); + cur_frm.refresh_fields(); + frm.set_df_property("import_invoices", "hidden", 1); + } else { + frm.set_df_property("import_invoices", "hidden", 0); + } } + }); \ No newline at end of file diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py index 9478ce2b19..72fe17fb37 100644 --- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py +++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py @@ -74,7 +74,7 @@ class ImportSupplierInvoice(Document): supplier_name = create_supplier(self.supplier_group, supp_dict) address = create_address(supplier_name, supp_dict) - pi_name = create_purchase_invoice(supplier_name, file_name, invoices_args) + pi_name = create_purchase_invoice(supplier_name, file_name, invoices_args, self.name) self.file_count += 1 if pi_name: @@ -309,7 +309,7 @@ def create_address(supplier_name, args): else: return None -def create_purchase_invoice(supplier_name, file_name, args): +def create_purchase_invoice(supplier_name, file_name, args, name): args = frappe._dict(args) pi = frappe.get_doc({ "doctype": "Purchase Invoice", @@ -324,6 +324,7 @@ def create_purchase_invoice(supplier_name, file_name, args): "bill_date": args.bill_date, "destination_code": args.destination_code, "document_type": args.document_type, + "disable_rounded_total": 1, "items": args["items"], "taxes": args["taxes"] }) @@ -355,8 +356,9 @@ def create_purchase_invoice(supplier_name, file_name, args): pi.save() return pi.name except Exception as e: + frappe.db.set_value("Import Supplier Invoice", name, "status", "Error") frappe.log_error(message=e, - title="Create Purchase Invoice: " + args.bill_no + "File Name: " + file_name) + title="Create Purchase Invoice: " + args.get("bill_no") + "File Name: " + file_name) return None def get_country(code):