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 '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

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;

4
selling/doctype/sales_common/sales_common.py
View File

@@ -115,6 +115,10 @@ class DocType(TransactionBase):
reserved_qty_for_main_item = 0
if obj.doc.doctype == "Sales Order":
if (webnotes.conn.get_value("Item", d.item_code, "is_stock_item") == 'Yes' or
self.has_sales_bom(d.item_code)) and not d.reserved_warehouse:
webnotes.throw(_("Please enter Reserved Warehouse for item ") +
d.item_code + _(" as it is stock Item or packing item"))
reserved_warehouse = d.reserved_warehouse
if flt(d.qty) > flt(d.delivered_qty):
reserved_qty_for_main_item = flt(d.qty) - flt(d.delivered_qty)