Merge branch 'stock_reco' of github.com:webnotes/erpnext into stock_reco

This commit is contained in:
Anand Doshi
2013-01-14 11:17:54 +05:30
12 changed files with 245 additions and 269 deletions

View File

@@ -4,6 +4,7 @@ def execute():
webnotes.reload_doc("stock", "doctype", "stock_ledger_entry")
rename_fields()
move_remarks_to_comments()
store_stock_reco_json()
def rename_fields():
@@ -13,6 +14,21 @@ def rename_fields():
webnotes.conn.sql("""update `tab%s` set `%s`=`%s`""" %
(doctype, new_fieldname, old_fieldname))
def move_remarks_to_comments():
from webnotes.utils import get_fullname
result = webnotes.conn.sql("""select name, remark, modified_by from `tabStock Reconciliation`
where ifnull(remark, '')!=''""")
fullname_map = {}
for reco, remark, modified_by in result:
webnotes.model_wrapper([{
"doctype": "Comment",
"comment": remark,
"comment_by": modified_by,
"comment_by_fullname": fullname_map.setdefault(modified_by, get_fullname(modified_by)),
"comment_doctype": "Stock Reconciliation",
"comment_docname": reco
}]).insert()
def store_stock_reco_json():
import os
import json
@@ -40,6 +56,7 @@ def store_stock_reco_json():
with open(stock_reco_file_path, "r") as open_reco_file:
content = open_reco_file.read()
content = read_csv_content(content)
webnotes.conn.set_value("Stock Reconciliation", reco, "reconciliation_json",
json.dumps(content, separators=(',', ': ')))
reconciliation_json = json.dumps(content, separators=(',', ': '))
webnotes.conn.sql("""update `tabStock Reconciliation`
set reconciliation_json=%s where name=%s""", (reconciliation_json, name))