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

listview indicator fix

Browse Source
This commit is contained in:
Nabin Hait
2015-02-18 12:23:18 +05:30
parent da5f766dd5
commit fe81da2dd1
8 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/accounts_controller.py
View File

@@ -52,8 +52,8 @@ class AccountsController(TransactionBase):
break
def calculate_taxes_and_totals(self):
from erpnext.controllers.taxes_and_totals import taxes_and_totals
taxes_and_totals(self).calculate()
from erpnext.controllers.taxes_and_totals import calculate_taxes_and_totals
calculate_taxes_and_totals(self)
if self.doctype in ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"]:
self.calculate_commission()

4
erpnext/controllers/taxes_and_totals.py
View File

@@ -8,10 +8,12 @@ from frappe.utils import cint, flt, rounded
from erpnext.setup.utils import get_company_currency
from erpnext.controllers.accounts_controller import validate_conversion_rate
class taxes_and_totals(object):
class calculate_taxes_and_totals(object):
def __init__(self, doc):
self.doc = doc
self.calculate()
def calculate(self):
self.discount_amount_applied = False
self._calculate()