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

Merge branch 'master' into perpetual

Browse Source
This commit is contained in:
Nabin Hait
2013-08-07 12:46:50 +05:30
parent 469ee71615 74506ba060
commit 8daa702a90
23 changed files with 298 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/selling_controller.py
View File

@@ -150,10 +150,10 @@ class SellingController(StockController):
cumulated_tax_fraction += tax.tax_fraction_for_current_item
if cumulated_tax_fraction:
item.basic_rate = flt((item.export_rate * self.doc.conversion_rate) /
(1 + cumulated_tax_fraction), self.precision("basic_rate", item))
item.amount = flt(item.basic_rate * item.qty, self.precision("amount", item))
item.amount = flt((item.export_amount * self.doc.conversion_rate) /
(1 + cumulated_tax_fraction), self.precision("amount", item))
item.basic_rate = flt(item.amount / item.qty, self.precision("basic_rate", item))
if item.adj_rate == 100:
item.base_ref_rate = item.basic_rate