fix: fixed zero tax rate issue by adding custom field
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 feb2a16..bce8586 100644
--- a/erpnext/regional/report/vat_audit_report/vat_audit_report.py
+++ b/erpnext/regional/report/vat_audit_report/vat_audit_report.py
@@ -20,10 +20,10 @@
def run(self):
self.get_sa_vat_accounts()
+ self.get_columns()
for doctype in self.doctypes:
- self.get_columns(doctype)
self.select_columns = """
- name as invoice_number,
+ name as voucher_no,
posting_date, remarks"""
columns = ", supplier as party, credit_to as account" if doctype=="Purchase Invoice" \
else ", customer as party, debit_to as account"
@@ -44,7 +44,7 @@
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"))
- def get_invoice_data(self,doctype):
+ def get_invoice_data(self, doctype):
conditions = self.get_conditions()
self.invoices = frappe._dict()
@@ -62,9 +62,9 @@
where_conditions=conditions), self.filters, as_dict=1)
for d in invoice_data:
- self.invoices.setdefault(d.invoice_number, d)
+ self.invoices.setdefault(d.voucher_no, d)
- def get_invoice_items(self,doctype):
+ def get_invoice_items(self, doctype):
self.invoice_items = frappe._dict()
self.item_tax_rate = frappe._dict()
@@ -82,7 +82,7 @@
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))
- def get_items_based_on_tax_rate(self,doctype):
+ def get_items_based_on_tax_rate(self, doctype):
self.items_based_on_tax_rate = frappe._dict()
self.tax_doctype = "Purchase Taxes and Charges" if doctype=="Purchase Invoice" \
else "Sales Taxes and Charges"
@@ -107,6 +107,9 @@
else:
continue
for item_code, taxes in item_wise_tax_detail.items():
+ is_zero_rated = frappe.get_value("Item", item_code, "is_zero_rated")
+ if taxes[0] == 0 and not is_zero_rated:
+ continue
tax_rate, item_amount_map = self.get_item_amount_map(parent, item_code, taxes)
if tax_rate is not None:
@@ -145,12 +148,12 @@
return conditions
def get_data(self, doctype):
- consolidated_data = self.get_consolidated_data()
+ consolidated_data = self.get_consolidated_data(doctype)
section_name = _("Purchases") if doctype == "Purchase Invoice" else _("Sales")
for rate, section in consolidated_data.items():
rate = int(rate)
- label = frappe.bold(_("Standard Rate") + " " + section_name + " " + str(rate) + "%")
+ label = frappe.bold(section_name + "- " + "Rate" + " " + str(rate) + "%")
section_head = {"posting_date": label}
total_gross = total_tax = total_net = 0
self.data.append(section_head)
@@ -170,7 +173,7 @@
self.data.append(total)
self.data.append({})
- def get_consolidated_data(self):
+ def get_consolidated_data(self, doctype):
consolidated_data_map={}
for inv, inv_data in self.invoices.items():
if self.items_based_on_tax_rate.get(inv):
@@ -181,8 +184,8 @@
item_details = self.item_tax_rate.get(inv).get(item)
row["account"] = inv_data.get("account")
row["posting_date"] = formatdate(inv_data.get("posting_date"), 'dd-mm-yyyy')
- row["invoice_number"] = inv
- row["party"] = inv_data.get("party")
+ row["voucher_type"] = doctype
+ row["voucher_no"] = inv
row["remarks"] = inv_data.get("remarks")
row["gross_amount"]= item_details[0].get("gross_amount")
row["tax_amount"]= item_details[0].get("tax_amount")
@@ -191,7 +194,7 @@
return consolidated_data_map
- def get_columns(self,doctype):
+ def get_columns(self):
self.columns = [
{
"fieldname": "posting_date",
@@ -204,44 +207,44 @@
"label": "Account",
"fieldtype": "Link",
"options": "Account",
- "width": 140
+ "width": 150
},
{
- "fieldname": "invoice_number",
+ "fieldname": "voucher_type",
+ "label": "Voucher Type",
+ "fieldtype": "Data",
+ "width": 140,
+ "hidden": 1
+ },
+ {
+ "fieldname": "voucher_no",
"label": "Reference",
- "fieldtype": "Link",
- "options": doctype,
- "width": 140
- },
- {
- "fieldname": "party",
- "label": "Party",
- "fieldtype": "Link",
- "options": "Supplier" if doctype == "Purchase Invoice" else "Customer",
- "width": 140
+ "fieldtype": "Dynamic Link",
+ "options": "voucher_type",
+ "width": 150
},
{
"fieldname": "remarks",
"label": "Details",
"fieldtype": "Data",
- "width": 140
+ "width": 150
},
{
"fieldname": "net_amount",
"label": "Net Amount",
"fieldtype": "Currency",
- "width": 140
+ "width": 150
},
{
"fieldname": "tax_amount",
"label": "Tax Amount",
"fieldtype": "Currency",
- "width": 140
+ "width": 150
},
{
"fieldname": "gross_amount",
"label": "Gross Amount",
"fieldtype": "Currency",
- "width": 140
+ "width": 150
},
]
diff --git a/erpnext/regional/south_africa/setup.py b/erpnext/regional/south_africa/setup.py
index a4335bd..ac783b8 100644
--- a/erpnext/regional/south_africa/setup.py
+++ b/erpnext/regional/south_africa/setup.py
@@ -4,11 +4,28 @@
from __future__ import unicode_literals
# import frappe, os, json
+from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
from frappe.permissions import add_permission, update_permission_property
def setup(company=None, patch=True):
add_permissions()
+def make_custom_fields(update=True):
+ is_zero_rated = dict(fieldname='is_zero_rated', label='Is Zero Rated',
+ fieldtype='Check', fetch_from='item_code.is_zero_rated',
+ insert_after='description', print_hide=1)
+ custom_fields = {
+ 'Item': [
+ dict(fieldname='is_zero_rated', label='Is Zero Rated',
+ fieldtype='Check', insert_after='item_group',
+ print_hide=1)
+ ],
+ 'Sales Invoice Item': is_zero_rated,
+ 'Purchase Invoice Item': is_zero_rated
+ }
+
+ create_custom_fields(custom_fields, update=update)
+
def add_permissions():
"""Add Permissions for South Africa VAT Settings and South Africa VAT Account"""
for doctype in ('South Africa VAT Settings', 'South Africa VAT Account'):