nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-23 20:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: patch (#25014)

Browse Source 
* fix: patch

* fix: pricing_rule test cases
This commit is contained in:
rohitwaghchaure
2021-03-28 15:51:32 +05:30
committed by GitHub
parent f4901b4f22
commit b38ea0cc8b
5 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/stock_controller.py
View File

@@ -405,7 +405,7 @@ class StockController(AccountsController):
def set_rate_of_stock_uom(self):
if self.doctype in ["Purchase Receipt", "Purchase Invoice", "Purchase Order", "Sales Invoice", "Sales Order", "Delivery Note", "Quotation"]:
for d in self.get("items"):
d.stock_uom_rate = d.rate / d.conversion_factor
d.stock_uom_rate = d.rate / (d.conversion_factor or 1)
def validate_internal_transfer(self):
if self.doctype in ('Sales Invoice', 'Delivery Note', 'Purchase Invoice', 'Purchase Receipt') \

8
erpnext/controllers/taxes_and_totals.py
View File

@@ -111,10 +111,12 @@ class calculate_taxes_and_totals(object):
item.rate_with_margin, item.base_rate_with_margin = self.calculate_margin(item)
if flt(item.rate_with_margin) > 0:
item.rate = flt(item.rate_with_margin * (1.0 - (item.discount_percentage / 100.0)), item.precision("rate"))
if not item.discount_amount:
if item.discount_amount and not item.discount_percentage:
item.rate = item.rate_with_margin - item.discount_amount
else:
item.discount_amount = item.rate_with_margin - item.rate
elif not item.discount_percentage:
item.rate -= item.discount_amount
elif flt(item.price_list_rate) > 0:
item.discount_amount = item.price_list_rate - item.rate
elif flt(item.price_list_rate) > 0 and not item.discount_amount: