nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 13:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: suggested changes

Browse Source
This commit is contained in:
Anuja Pawar
2021-07-26 18:11:38 +05:30
parent ba31e3695f
commit abc63cffa8
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ class VATAuditReport(object):
def get_sa_vat_accounts(self): def get_sa_vat_accounts(self):
self.sa_vat_accounts = frappe.get_list("South Africa VAT Account", self.sa_vat_accounts = frappe.get_list("South Africa VAT Account",
filters = {"parent":self.filters.company}, pluck="account") filters = {"parent": self.filters.company}, pluck="account")
if not self.sa_vat_accounts and not frappe.flags.in_test and not frappe.flags.in_migrate: if not self.sa_vat_accounts and not frappe.flags.in_test and not frappe.flags.in_migrate:
frappe.throw(_("Please set VAT Accounts in South Africa VAT Settings")) frappe.throw(_("Please set VAT Accounts in South Africa VAT Settings"))
@@ -144,7 +144,7 @@ class VATAuditReport(object):
return conditions return conditions
def get_data(self,doctype): def get_data(self, doctype):
consolidated_data = self.get_consolidated_data() consolidated_data = self.get_consolidated_data()
section_name = _("Purchases") if doctype == "Purchase Invoice" else _("Sales") section_name = _("Purchases") if doctype == "Purchase Invoice" else _("Sales")
@@ -173,20 +173,21 @@ class VATAuditReport(object):
def get_consolidated_data(self): def get_consolidated_data(self):
consolidated_data_map={} consolidated_data_map={}
for inv, inv_data in self.invoices.items(): for inv, inv_data in self.invoices.items():
for rate, items in self.items_based_on_tax_rate.get(inv).items(): if self.items_based_on_tax_rate.get(inv):
consolidated_data_map.setdefault(rate, {"data": []}) for rate, items in self.items_based_on_tax_rate.get(inv).items():
for item in items: consolidated_data_map.setdefault(rate, {"data": []})
row = {} for item in items:
item_details = self.item_tax_rate.get(inv).get(item) row = {}
row["account"] = inv_data.get("account") item_details = self.item_tax_rate.get(inv).get(item)
row["posting_date"] = formatdate(inv_data.get("posting_date"), 'dd-mm-yyyy') row["account"] = inv_data.get("account")
row["invoice_number"] = inv row["posting_date"] = formatdate(inv_data.get("posting_date"), 'dd-mm-yyyy')
row["party"] = inv_data.get("party") row["invoice_number"] = inv
row["remarks"] = inv_data.get("remarks") row["party"] = inv_data.get("party")
row["gross_amount"]= item_details[0].get("gross_amount") row["remarks"] = inv_data.get("remarks")
row["tax_amount"]= item_details[0].get("tax_amount") row["gross_amount"]= item_details[0].get("gross_amount")
row["net_amount"]= item_details[0].get("net_amount") row["tax_amount"]= item_details[0].get("tax_amount")
consolidated_data_map[rate]["data"].append(row) row["net_amount"]= item_details[0].get("net_amount")
consolidated_data_map[rate]["data"].append(row)
return consolidated_data_map return consolidated_data_map

2
erpnext/regional/south_africa/setup.py
View File

@@ -6,7 +6,7 @@ from __future__ import unicode_literals
# import frappe, os, json # import frappe, os, json
from frappe.permissions import add_permission, update_permission_property from frappe.permissions import add_permission, update_permission_property
def setup(): def setup(company=None, patch=True):
add_permissions() add_permissions()
def add_permissions(): def add_permissions():