nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait
2013-08-07 12:36:13 +05:30
parent c478349379 3ae2542bb8
commit 74506ba060
22 changed files with 294 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
selling/doctype/sales_common/sales_common.js
View File

@@ -359,11 +359,11 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
});
if(cumulated_tax_fraction) {
item.basic_rate = flt(
(item.export_rate * me.frm.doc.conversion_rate) / (1 + cumulated_tax_fraction),
precision("basic_rate", item));
item.amount = flt(item.basic_rate * item.qty, precision("amount", item));
item.amount = flt(
(item.export_amount * me.frm.doc.conversion_rate) / (1 + cumulated_tax_fraction),
precision("amount", item));
item.basic_rate = flt(item.amount / item.qty, precision("basic_rate", item));
if(item.adj_rate == 100) {
item.base_ref_rate = item.basic_rate;