diff --git a/erpnext/patches/v13_0/add_custom_field_for_south_africa.py b/erpnext/patches/v13_0/add_custom_field_for_south_africa.py index 73e9af9e4b9..f882fdedf38 100644 --- a/erpnext/patches/v13_0/add_custom_field_for_south_africa.py +++ b/erpnext/patches/v13_0/add_custom_field_for_south_africa.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import frappe -from erpnext.regional.south_africa.setup import make_custom_fields +from erpnext.regional.south_africa.setup import make_custom_fields def execute(): company = frappe.get_all('Company', filters = {'country': 'South Africa'}) diff --git a/erpnext/regional/report/vat_audit_report/vat_audit_report.py b/erpnext/regional/report/vat_audit_report/vat_audit_report.py index 0c716cdab24..a9c3858bb13 100644 --- a/erpnext/regional/report/vat_audit_report/vat_audit_report.py +++ b/erpnext/regional/report/vat_audit_report/vat_audit_report.py @@ -78,9 +78,9 @@ class VATAuditReport(object): for d in items: if d.item_code not in self.invoice_items.get(d.parent, {}): self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code, {}) \ - .setdefault("net_amount", sum((i.get("taxable_value", 0) \ - or i.get("base_net_amount", 0)) for i in items \ - if (i.item_code == d.item_code and i.parent == d.parent))) + .setdefault("net_amount", sum((i.get("taxable_value", 0) + or i.get("base_net_amount", 0)) for i in items + if(i.item_code == d.item_code and i.parent == d.parent))) self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code, {}) \ .setdefault("is_zero_rated", d.is_zero_rated)