nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 04:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix' into 17902

Browse Source
This commit is contained in:
Mangesh-Khairnar
2019-07-13 12:01:27 +05:30
committed by GitHub
parent ceaedd0f95 373d90f802
commit 0ef08618c9
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/controllers/taxes_and_totals.py
View File

@@ -15,6 +15,9 @@ class calculate_taxes_and_totals(object):
self.calculate() self.calculate()
def calculate(self): def calculate(self):
if not len(self.doc.get("items")):
return
self.discount_amount_applied = False self.discount_amount_applied = False
self._calculate() self._calculate()

2
erpnext/shopping_cart/cart.py
View File

@@ -60,7 +60,7 @@ def place_order():
quotation.flags.ignore_permissions = True quotation.flags.ignore_permissions = True
quotation.submit() quotation.submit()
if quotation.lead: if quotation.quotation_to == 'Lead' and quotation.party_name:
# company used to create customer accounts # company used to create customer accounts
frappe.defaults.set_user_default("company", quotation.company) frappe.defaults.set_user_default("company", quotation.company)