Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

incoming rate in serial no should be valuation rate instead of pur rate

Browse Source
This commit is contained in:
Nabin Hait 2011-11-25 14:43:11 +05:30
parent e92066fa80
commit 28b793c88a
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/doctype/bin/bin.py
View File

@ -146,7 +146,7 @@ class DocType:
in_rate = flt(sql("select ifnull(avg(purchase_rate), 0) from `tabSerial No` where name in (%s)" % (serial_nos))[0][0]) in_rate = flt(sql("select ifnull(avg(purchase_rate), 0) from `tabSerial No` where name in (%s)" % (serial_nos))[0][0])
if in_rate and val_rate == 0: # First entry if in_rate and val_rate == 0: # First entry
val_rate = in_rate val_rate = in_rate
# val_rate is same as previous entry if val_rate is negative # val_rate is same as previous entry if val_rate is negative
# Otherwise it will be calculated as per moving average # Otherwise it will be calculated as per moving average
elif opening_qty + actual_qty > 0 and ((opening_qty * val_rate) + (actual_qty * in_rate)) > 0: elif opening_qty + actual_qty > 0 and ((opening_qty * val_rate) + (actual_qty * in_rate)) > 0:

42
erpnext/stock/doctype/stock_ledger/stock_ledger.py
View File

@ -93,27 +93,27 @@ class DocType:
# --------------------- # ---------------------
def set_pur_serial_no_values(self, obj, serial_no, d, s, new_rec): def set_pur_serial_no_values(self, obj, serial_no, d, s, new_rec):
item_details = sql("select item_group, warranty_period from `tabItem` where name = '%s' and (ifnull(end_of_life,'')='' or end_of_life = '0000-00-00' or end_of_life > now()) " %(d.item_code), as_dict=1) item_details = sql("select item_group, warranty_period from `tabItem` where name = '%s' and (ifnull(end_of_life,'')='' or end_of_life = '0000-00-00' or end_of_life > now()) " %(d.item_code), as_dict=1)
s.purchase_document_type= obj.doc.doctype s.purchase_document_type = obj.doc.doctype
s.purchase_document_no = obj.doc.name s.purchase_document_no = obj.doc.name
s.purchase_date = obj.doc.posting_date s.purchase_date = obj.doc.posting_date
s.purchase_time = obj.doc.posting_time s.purchase_time = obj.doc.posting_time
s.purchase_rate = d.purchase_rate or d.incoming_rate s.purchase_rate = d.valuation_rate or d.incoming_rate
s.item_code = d.item_code s.item_code = d.item_code
s.brand = d.brand s.brand = d.brand
s.description = d.description s.description = d.description
s.item_group = item_details and item_details[0]['item_group'] or '' s.item_group = item_details and item_details[0]['item_group'] or ''
s.warranty_period = item_details and item_details[0]['warranty_period'] or 0 s.warranty_period = item_details and item_details[0]['warranty_period'] or 0
s.supplier = obj.doc.supplier s.supplier = obj.doc.supplier
s.supplier_name = obj.doc.supplier_name s.supplier_name = obj.doc.supplier_name
s.supplier_address = obj.doc.supplier_address s.supplier_address = obj.doc.supplier_address
s.warehouse = d.warehouse or d.t_warehouse s.warehouse = d.warehouse or d.t_warehouse
s.docstatus = 0 s.docstatus = 0
s.status = 'In Store' s.status = 'In Store'
s.modified = nowdate() s.modified = nowdate()
s.modified_by = session['user'] s.modified_by = session['user']
s.serial_no = serial_no s.serial_no = serial_no
s.fiscal_year = obj.doc.fiscal_year s.fiscal_year = obj.doc.fiscal_year
s.company = obj.doc.company s.company = obj.doc.company
s.save(new_rec) s.save(new_rec)