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

fix get_server_fields in stock_entry.js

Browse Source
This commit is contained in:
Rushabh Mehta 2014-04-27 12:30:20 +05:30
parent 8e5b2af0fb
commit 41d126586e
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@ -350,7 +350,7 @@ cur_frm.cscript.item_code = function(doc, cdt, cdn) {
'cost_center' : d.cost_center, 'cost_center' : d.cost_center,
'company' : cur_frm.doc.company 'company' : cur_frm.doc.company
}; };
return get_server_fields('get_item_details', {arg: JSON.stringify(args)}, return get_server_fields('get_item_details', JSON.stringify(args),
'mtn_details', doc, cdt, cdn, 1); 'mtn_details', doc, cdt, cdn, 1);
} }

18
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -11,8 +11,6 @@ from frappe import _
from erpnext.stock.utils import get_incoming_rate from erpnext.stock.utils import get_incoming_rate
from erpnext.stock.stock_ledger import get_previous_sle from erpnext.stock.stock_ledger import get_previous_sle
from erpnext.controllers.queries import get_match_cond from erpnext.controllers.queries import get_match_cond
import json
class NotUpdateStockError(frappe.ValidationError): pass class NotUpdateStockError(frappe.ValidationError): pass
class StockOverReturnError(frappe.ValidationError): pass class StockOverReturnError(frappe.ValidationError): pass
@ -340,23 +338,22 @@ class StockEntry(StockController):
"planned_qty": (self.docstatus==1 and -1 or 1 ) * flt(self.fg_completed_qty) "planned_qty": (self.docstatus==1 and -1 or 1 ) * flt(self.fg_completed_qty)
}) })
def get_item_details(self, arg): def get_item_details(self, args):
arg = json.loads(arg)
item = frappe.db.sql("""select stock_uom, description, item_name, item = frappe.db.sql("""select stock_uom, description, item_name,
expense_account, buying_cost_center from `tabItem` expense_account, buying_cost_center from `tabItem`
where name = %s and (ifnull(end_of_life,'')='' or end_of_life > now())""", where name = %s and (ifnull(end_of_life,'')='' or end_of_life > now())""",
(arg.get('item_code')), as_dict = 1) (args.get('item_code')), as_dict = 1)
if not item: if not item:
frappe.throw(_("Item {0} is not active or end of life has been reached").format(arg.get("item_code"))) frappe.throw(_("Item {0} is not active or end of life has been reached").format(args.get("item_code")))
ret = { ret = {
'uom' : item and item[0]['stock_uom'] or '', 'uom' : item and item[0]['stock_uom'] or '',
'stock_uom' : item and item[0]['stock_uom'] or '', 'stock_uom' : item and item[0]['stock_uom'] or '',
'description' : item and item[0]['description'] or '', 'description' : item and item[0]['description'] or '',
'item_name' : item and item[0]['item_name'] or '', 'item_name' : item and item[0]['item_name'] or '',
'expense_account' : item and item[0]['expense_account'] or arg.get("expense_account") \ 'expense_account' : item and item[0]['expense_account'] or args.get("expense_account") \
or frappe.db.get_value("Company", arg.get("company"), "default_expense_account"), or frappe.db.get_value("Company", args.get("company"), "default_expense_account"),
'cost_center' : item and item[0]['buying_cost_center'] or arg.get("cost_center"), 'cost_center' : item and item[0]['buying_cost_center'] or args.get("cost_center"),
'qty' : 0, 'qty' : 0,
'transfer_qty' : 0, 'transfer_qty' : 0,
'conversion_factor' : 1, 'conversion_factor' : 1,
@ -364,7 +361,7 @@ class StockEntry(StockController):
'actual_qty' : 0, 'actual_qty' : 0,
'incoming_rate' : 0 'incoming_rate' : 0
} }
stock_and_rate = arg.get('warehouse') and self.get_warehouse_details(json.dumps(arg)) or {} stock_and_rate = args.get('warehouse') and self.get_warehouse_details(args) or {}
ret.update(stock_and_rate) ret.update(stock_and_rate)
return ret return ret
@ -383,7 +380,6 @@ class StockEntry(StockController):
return ret return ret
def get_warehouse_details(self, args): def get_warehouse_details(self, args):
args = json.loads(args)
ret = {} ret = {}
if args.get('warehouse') and args.get('item_code'): if args.get('warehouse') and args.get('item_code'):
args.update({ args.update({