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

Rate with margin in customer and company currency (#11437)

Browse Source 
* field for company margin

* added base_rate_with_margin

* calculate company margin

* test for item price

* test for delivery note

* test for sales order

* test for quotation

* test for sales invoice
This commit is contained in:
Shreya Shah
2017-11-14 17:22:41 +05:30
committed by Nabin Hait
parent cd13a28417
commit be690ef817
12 changed files with 316 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/taxes_and_totals.py
View File

@@ -62,7 +62,7 @@ class calculate_taxes_and_totals(object):
(1.0 - (item.discount_percentage / 100.0)), item.precision("rate"))
if item.doctype in ['Quotation Item', 'Sales Order Item', 'Delivery Note Item', 'Sales Invoice Item']:
item.rate_with_margin = self.calculate_margin(item)
item.rate_with_margin, item.base_rate_with_margin = self.calculate_margin(item)
item.rate = flt(item.rate_with_margin * (1.0 - (item.discount_percentage / 100.0)), item.precision("rate"))\
if item.rate_with_margin > 0 else item.rate
@@ -503,6 +503,7 @@ class calculate_taxes_and_totals(object):
def calculate_margin(self, item):
rate_with_margin = 0.0
base_rate_with_margin = 0.0
if item.price_list_rate:
if item.pricing_rule and not self.doc.ignore_pricing_rule:
pricing_rule = frappe.get_doc('Pricing Rule', item.pricing_rule)
@@ -512,8 +513,9 @@ class calculate_taxes_and_totals(object):
if item.margin_type and item.margin_rate_or_amount:
margin_value = item.margin_rate_or_amount if item.margin_type == 'Amount' else flt(item.price_list_rate) * flt(item.margin_rate_or_amount) / 100
rate_with_margin = flt(item.price_list_rate) + flt(margin_value)
base_rate_with_margin = flt(rate_with_margin) * flt(self.doc.conversion_rate)
return rate_with_margin
return rate_with_margin, base_rate_with_margin
def set_item_wise_tax_breakup(self):
self.doc.other_charges_calculation = get_itemised_tax_breakup_html(self.doc)