nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-02 04:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Invoice copy, state code in gst print format, hsn code in other sales/purchase docs (#9658)

Browse Source 
* Invoice copy, state code in gst print format, hsn code in other sales/purchase docs

* Formatted Net Amount in item-tax-breakup

* GST print format fixes

* removed trailing whitespace

* removed trailing whitespace
This commit is contained in:
Nabin Hait
2017-07-06 14:49:34 +05:30
committed by Makarand Bauskar
parent 5d5a81f375
commit f3f0dfef2a
12 changed files with 74 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/controllers/taxes_and_totals.py
View File

@@ -511,14 +511,15 @@ class calculate_taxes_and_totals(object):
def set_item_wise_tax_breakup(self):
item_tax = {}
tax_accounts = []
company_currency = erpnext.get_company_currency(self.doc.company)
item_tax, tax_accounts = self.get_item_tax(item_tax, tax_accounts)
item_tax, tax_accounts = self.get_item_tax(item_tax, tax_accounts, company_currency)
headings = get_table_column_headings(tax_accounts)
distinct_items = self.get_distinct_items()
rows = get_table_rows(distinct_items, item_tax, tax_accounts)
rows = get_table_rows(distinct_items, item_tax, tax_accounts, company_currency)
if not rows:
self.doc.other_charges_calculation = ""
@@ -534,9 +535,7 @@ class calculate_taxes_and_totals(object):
"rows": "\n".join(rows)
})
def get_item_tax(self, item_tax, tax_accounts):
company_currency = erpnext.get_company_currency(self.doc.company)
def get_item_tax(self, item_tax, tax_accounts, company_currency):
for tax in self.doc.taxes:
tax_amount_precision = tax.precision("tax_amount")
tax_rate_precision = tax.precision("rate");
@@ -588,7 +587,7 @@ def get_table_column_headings(tax_accounts):
return headings
def get_table_rows(distinct_items, item_tax, tax_accounts):
def get_table_rows(distinct_items, item_tax, tax_accounts, company_currency):
rows = []
for item in distinct_items:
item_tax_record = item_tax.get(item.item_code or item.item_name)
@@ -605,7 +604,7 @@ def get_table_rows(distinct_items, item_tax, tax_accounts):
rows.append("<tr><td>{item_name}</td><td class='text-right'>{taxable_amount}</td>{taxes}</tr>".format(**{
"item_name": item.item_name,
"taxable_amount": item.net_amount,
"taxable_amount": fmt_money(item.net_amount, item.precision("net_amount"), company_currency),
"taxes": "\n".join(taxes)
}))