diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 800e6a91b81..90b36e06883 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -13,6 +13,7 @@ from erpnext.exceptions import InvalidAccountCurrency, InvalidCurrency
from erpnext.stock.doctype.serial_no.serial_no import SerialNoWarehouseError
from frappe.model.naming import make_autoname
from erpnext.accounts.doctype.account.test_account import get_inventory_account
+from erpnext.controllers.taxes_and_totals import get_itemised_tax_breakup_data
class TestSalesInvoice(unittest.TestCase):
def make(self):
@@ -1105,10 +1106,75 @@ class TestSalesInvoice(unittest.TestCase):
for i, k in enumerate(expected_values["keys"]):
self.assertEquals(d.get(k), expected_values[d.item_code][i])
- def test_item_wise_tax_breakup(self):
+ def test_item_wise_tax_breakup_india(self):
+ frappe.flags.country = "India"
+
+ si = self.create_si_to_test_tax_breakup()
+ itemised_tax, itemised_taxable_amount = get_itemised_tax_breakup_data(si)
+
+ expected_itemised_tax = {
+ "999800": {
+ "Service Tax": {
+ "tax_rate": 10.0,
+ "tax_amount": 1500.0
+ }
+ }
+ }
+ expected_itemised_taxable_amount = {
+ "999800": 15000.0
+ }
+
+ self.assertEqual(itemised_tax, expected_itemised_tax)
+ self.assertEqual(itemised_taxable_amount, expected_itemised_taxable_amount)
+
+ frappe.flags.country = None
+
+ def test_item_wise_tax_breakup_outside_india(self):
+ frappe.flags.country = "United States"
+
+ si = self.create_si_to_test_tax_breakup()
+
+ itemised_tax, itemised_taxable_amount = get_itemised_tax_breakup_data(si)
+
+ expected_itemised_tax = {
+ "_Test Item": {
+ "Service Tax": {
+ "tax_rate": 10.0,
+ "tax_amount": 1000.0
+ }
+ },
+ "_Test Item 2": {
+ "Service Tax": {
+ "tax_rate": 10.0,
+ "tax_amount": 500.0
+ }
+ }
+ }
+ expected_itemised_taxable_amount = {
+ "_Test Item": 10000.0,
+ "_Test Item 2": 5000.0
+ }
+
+ self.assertEqual(itemised_tax, expected_itemised_tax)
+ self.assertEqual(itemised_taxable_amount, expected_itemised_taxable_amount)
+
+ frappe.flags.country = None
+
+ def create_si_to_test_tax_breakup(self):
si = create_sales_invoice(qty=100, rate=50, do_not_save=True)
si.append("items", {
"item_code": "_Test Item",
+ "gst_hsn_code": "999800",
+ "warehouse": "_Test Warehouse - _TC",
+ "qty": 100,
+ "rate": 50,
+ "income_account": "Sales - _TC",
+ "expense_account": "Cost of Goods Sold - _TC",
+ "cost_center": "_Test Cost Center - _TC"
+ })
+ si.append("items", {
+ "item_code": "_Test Item 2",
+ "gst_hsn_code": "999800",
"warehouse": "_Test Warehouse - _TC",
"qty": 100,
"rate": 50,
@@ -1125,11 +1191,7 @@ class TestSalesInvoice(unittest.TestCase):
"rate": 10
})
si.insert()
-
- tax_breakup_html = '''\n\n\t
\n\t\t| Item Name | Taxable Amount | _Test Account Service Tax - _TC |
|---|
\n\t\t| _Test Item | \u20b9 10,000.00 | (10.0%) \u20b9 1,000.00 |
\n\t
\n
' + (head or "") + " | ")
- else:
- headings.append('' + (head or "") + " | ")
-
- return headings
-
-def get_table_rows(distinct_items, item_tax, tax_accounts, company_currency, taxable_amount):
- rows = []
- for item in distinct_items:
- item_tax_record = item_tax.get(item.item_code or item.item_name)
- if not item_tax_record:
- continue
-
- taxes = []
- for head in tax_accounts:
- if item_tax_record[head[0]]:
- taxes.append("(" + item_tax_record[head[0]][0] + ") "
- + item_tax_record[head[0]][1] + " | ")
+ itemised_tax[item_code][tax.description] = frappe._dict(dict(
+ tax_rate=flt(tax_data[0], precision),
+ tax_amount=flt(tax_data[1], tax_amount_precision)
+ ))
else:
- taxes.append(" | ")
+ itemised_tax[item_code][tax.description] = frappe._dict(dict(
+ tax_rate=flt(tax_data, tax_rate_precision),
+ tax_amount=0.0
+ ))
+ return itemised_tax
+
+def get_itemised_taxable_amount(items):
+ itemised_taxable_amount = frappe._dict()
+ for item in items:
item_code = item.item_code or item.item_name
- rows.append("| {item_name} | {taxable_amount} | {taxes}
".format(**{
- "item_name": item.item_name,
- "taxable_amount": fmt_money(taxable_amount.get(item_code, 0), item.precision("net_amount"), company_currency),
- "taxes": "".join(taxes)
- }))
-
- return rows
\ No newline at end of file
+ itemised_taxable_amount.setdefault(item_code, 0)
+ itemised_taxable_amount[item_code] += item.net_amount
+
+ return itemised_taxable_amount
\ No newline at end of file
diff --git a/erpnext/docs/assets/img/regional/india/sample-gst-tax-invoice.png b/erpnext/docs/assets/img/regional/india/sample-gst-tax-invoice.png
index cb657248178..654351880a5 100644
Binary files a/erpnext/docs/assets/img/regional/india/sample-gst-tax-invoice.png and b/erpnext/docs/assets/img/regional/india/sample-gst-tax-invoice.png differ
diff --git a/erpnext/docs/license.html b/erpnext/docs/license.html
index 4740c5c1455..1d50b78b305 100644
--- a/erpnext/docs/license.html
+++ b/erpnext/docs/license.html
@@ -640,8 +640,8 @@ attach them to the start of each source file to most effectively state
the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+ <one line="" to="" give="" the="" program's="" name="" and="" a="" brief="" idea="" of="" what="" it="" does.="">
+ Copyright (C) <year> <name of="" author="">
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index fedc6d5caed..173531d94b7 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -209,6 +209,8 @@ payment_gateway_enabled = "erpnext.accounts.utils.create_payment_gateway_account
regional_overrides = {
'India': {
- 'erpnext.tests.test_regional.test_method': 'erpnext.regional.india.utils.test_method'
+ 'erpnext.tests.test_regional.test_method': 'erpnext.regional.india.utils.test_method',
+ 'erpnext.controllers.taxes_and_totals.get_itemised_tax_breakup_header': 'erpnext.regional.india.utils.get_itemised_tax_breakup_header',
+ 'erpnext.controllers.taxes_and_totals.get_itemised_tax_breakup_data': 'erpnext.regional.india.utils.get_itemised_tax_breakup_data'
}
}
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 837097b4907..3a010c60229 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -54,7 +54,6 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
this.manipulate_grand_total_for_inclusive_tax();
this.calculate_totals();
this._cleanup();
- this.show_item_wise_taxes();
},
validate_conversion_rate: function() {
@@ -634,99 +633,5 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
}
this.calculate_outstanding_amount(false)
- },
-
- show_item_wise_taxes: function() {
- if(this.frm.fields_dict.other_charges_calculation) {
- this.frm.toggle_display("other_charges_calculation", this.frm.doc.other_charges_calculation);
- }
- },
-
- set_item_wise_tax_breakup: function() {
- if(this.frm.fields_dict.other_charges_calculation) {
- var html = this.get_item_wise_taxes_html();
- // console.log(html);
- this.frm.set_value("other_charges_calculation", html);
- this.show_item_wise_taxes();
- }
- },
-
- get_item_wise_taxes_html: function() {
- var item_tax = {};
- var tax_accounts = [];
- var company_currency = this.get_company_currency();
-
- $.each(this.frm.doc["taxes"] || [], function(i, tax) {
- var tax_amount_precision = precision("tax_amount", tax);
- var tax_rate_precision = precision("rate", tax);
- $.each(JSON.parse(tax.item_wise_tax_detail || '{}'),
- function(item_code, tax_data) {
- if(!item_tax[item_code]) item_tax[item_code] = {};
- if($.isArray(tax_data)) {
- var tax_rate = "";
- if(tax_data[0] != null) {
- tax_rate = (tax.charge_type === "Actual") ?
- format_currency(flt(tax_data[0], tax_amount_precision),
- company_currency, tax_amount_precision) :
- (flt(tax_data[0], tax_rate_precision) + "%");
- }
- var tax_amount = format_currency(flt(tax_data[1], tax_amount_precision),
- company_currency, tax_amount_precision);
-
- item_tax[item_code][tax.name] = [tax_rate, tax_amount];
- } else {
- item_tax[item_code][tax.name] = [flt(tax_data, tax_rate_precision) + "%", "0.00"];
- }
- });
- tax_accounts.push([tax.name, tax.account_head]);
- });
-
- var headings = $.map([__("Item Name"), __("Taxable Amount")].concat($.map(tax_accounts,
- function(head) { return head[1]; })), function(head) {
- if(head==__("Item Name")) {
- return '| ' + (head || "") + " | ";
- } else {
- return '' + (head || "") + " | ";
- }
- }
- ).join("");
-
- var distinct_item_names = [];
- var distinct_items = [];
- var taxable_amount = {};
- $.each(this.frm.doc["items"] || [], function(i, item) {
- var item_code = item.item_code || item.item_name;
- if(distinct_item_names.indexOf(item_code)===-1) {
- distinct_item_names.push(item_code);
- distinct_items.push(item);
- taxable_amount[item_code] = item.net_amount;
- } else {
- taxable_amount[item_code] = taxable_amount[item_code] + item.net_amount;
- }
- });
-
- var rows = $.map(distinct_items, function(item) {
- var item_code = item.item_code || item.item_name;
- var item_tax_record = item_tax[item_code];
- if(!item_tax_record) { return null; }
-
- return repl("| %(item_name)s | %(taxable_amount)s | %(taxes)s
", {
- item_name: item.item_name,
- taxable_amount: format_currency(taxable_amount[item_code],
- company_currency, precision("net_amount", item)),
- taxes: $.map(tax_accounts, function(head) {
- return item_tax_record[head[0]] ?
- "(" + item_tax_record[head[0]][0] + ") " + item_tax_record[head[0]][1] + " | " :
- " | ";
- }).join("")
- });
- }).join("");
-
- if(!rows) return "";
- return '\
-
\
- ' + headings + '
\
- ' + rows + ' \
-
+
+
+
+ {% set i = 0 %}
+ {% for key in headers %}
+ {% if i==0 %}
+ | {{ key }} |
+ {% else %}
+ {{ key }} |
+ {% endif %}
+ {% set i = i + 1 %}
+ {% endfor%}
+
+
+
+ {% for item, taxes in itemised_tax.items() %}
+
+ | {{ item }} |
+
+ {{ frappe.utils.fmt_money(itemised_taxable_amount.get(item), None, company_currency) }}
+ |
+ {% for tax_account in tax_accounts %}
+ {% set tax_details = taxes.get(tax_account) %}
+ {% if tax_details %}
+
+ ({{ tax_details.tax_rate }})
+ {{ frappe.utils.fmt_money(tax_details.tax_amount, None, company_currency) }}
+ |
+ {% else %}
+ |
+ {% endif %}
+ {% endfor %}
+
+ {% endfor %}
+
+
+