schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[item-variants] get table values from template if not set in variant #2224

Browse Source
This commit is contained in:
Rushabh Mehta
2014-10-07 15:29:58 +05:30
parent baef96b5a2
commit 724f9e57e3
11 changed files with 136 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/buying_controller.py
View File

@@ -8,6 +8,7 @@ from frappe.utils import flt, rounded
from erpnext.setup.utils import get_company_currency
from erpnext.accounts.party import get_party_details
from erpnext.stock.get_item_details import get_conversion_factor
from erpnext.controllers.stock_controller import StockController
@@ -194,9 +195,8 @@ class BuyingController(StockController):
self.round_floats_in(item)
item.conversion_factor = item.conversion_factor or flt(frappe.db.get_value(
"UOM Conversion Detail", {"parent": item.item_code, "uom": item.uom},
"conversion_factor")) or 1
item.conversion_factor = get_conversion_factor(item.item_code, item.uom).get("conversion_factor")
qty_in_stock_uom = flt(item.qty * item.conversion_factor)
rm_supp_cost = flt(item.rm_supp_cost) if self.doctype=="Purchase Receipt" else 0.0