nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 23:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: sider fixes

Browse Source
This commit is contained in:
Anuja
2021-08-02 23:13:21 +05:30
parent 3bcbc86291
commit f2ee1155c0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches/v13_0/add_custom_field_for_south_africa.py
View File

@@ -3,7 +3,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from erpnext.regional.south_africa.setup import make_custom_fields from erpnext.regional.south_africa.setup import make_custom_fields
def execute(): def execute():
company = frappe.get_all('Company', filters = {'country': 'South Africa'}) company = frappe.get_all('Company', filters = {'country': 'South Africa'})

6
erpnext/regional/report/vat_audit_report/vat_audit_report.py
View File

@@ -78,9 +78,9 @@ class VATAuditReport(object):
for d in items: for d in items:
if d.item_code not in self.invoice_items.get(d.parent, {}): if d.item_code not in self.invoice_items.get(d.parent, {}):
self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code, {}) \ self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code, {}) \
.setdefault("net_amount", sum((i.get("taxable_value", 0) \ .setdefault("net_amount", sum((i.get("taxable_value", 0)
or i.get("base_net_amount", 0)) for i in items \ or i.get("base_net_amount", 0)) for i in items
if (i.item_code == d.item_code and i.parent == d.parent))) if(i.item_code == d.item_code and i.parent == d.parent)))
self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code, {}) \ self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code, {}) \
.setdefault("is_zero_rated", d.is_zero_rated) .setdefault("is_zero_rated", d.is_zero_rated)