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

[merge] item-variants

Browse Source
This commit is contained in:
Rushabh Mehta
2014-10-21 13:24:46 +05:30
parent ab43942b35 be1a8d82c5
commit 39dbf73de7
70 changed files with 3923 additions and 3893 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/stock/utils.py
View File

@@ -5,7 +5,6 @@ import frappe
from frappe import _
import json
from frappe.utils import flt, cstr, nowdate, nowtime
from frappe.defaults import get_global_default
class InvalidWarehouseCompany(frappe.ValidationError): pass
@@ -113,7 +112,7 @@ def get_valuation_method(item_code):
"""get valuation method from item or default"""
val_method = frappe.db.get_value('Item', item_code, 'valuation_method')
if not val_method:
val_method = get_global_default('valuation_method') or "FIFO"
val_method = frappe.db.get_value("Stock Settings", None, "valuation_method") or "FIFO"
return val_method
def get_fifo_rate(previous_stock_queue, qty):