Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Nabin Hait 2018-05-05 14:33:33 +05:30
commit 02a40e9d7b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.29' __version__ = '10.1.30'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

4
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -344,8 +344,8 @@ class SalesInvoice(SellingController):
self.terms = frappe.db.get_value("Terms and Conditions", self.tc_name, "terms") self.terms = frappe.db.get_value("Terms and Conditions", self.tc_name, "terms")
# fetch charges # fetch charges
if self.taxes_and_charges: if self.taxes_and_charges and not len(self.get("taxes")):
self.set_other_charges() self.set_taxes()
return pos return pos