Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: rounded total issue

Browse Source
This commit is contained in:
Rohit Waghchaure 2019-12-26 13:26:39 +05:30
parent 6e1ba43c3c
commit 2469fb9e35
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
View File

@ -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);
} }
}
}); });

8
erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
View File

@ -74,7 +74,7 @@ class ImportSupplierInvoice(Document):
supplier_name = create_supplier(self.supplier_group, supp_dict) supplier_name = create_supplier(self.supplier_group, supp_dict)
address = create_address(supplier_name, 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 self.file_count += 1
if pi_name: if pi_name:
@ -309,7 +309,7 @@ def create_address(supplier_name, args):
else: else:
return None 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) args = frappe._dict(args)
pi = frappe.get_doc({ pi = frappe.get_doc({
"doctype": "Purchase Invoice", "doctype": "Purchase Invoice",
@ -324,6 +324,7 @@ def create_purchase_invoice(supplier_name, file_name, args):
"bill_date": args.bill_date, "bill_date": args.bill_date,
"destination_code": args.destination_code, "destination_code": args.destination_code,
"document_type": args.document_type, "document_type": args.document_type,
"disable_rounded_total": 1,
"items": args["items"], "items": args["items"],
"taxes": args["taxes"] "taxes": args["taxes"]
}) })
@ -355,8 +356,9 @@ def create_purchase_invoice(supplier_name, file_name, args):
pi.save() pi.save()
return pi.name return pi.name
except Exception as e: except Exception as e:
frappe.db.set_value("Import Supplier Invoice", name, "status", "Error")
frappe.log_error(message=e, 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 return None
def get_country(code): def get_country(code):