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

[minor] fixed conflict while merging perpetual branch into master

Browse Source
This commit is contained in:
Nabin Hait
2013-09-24 14:36:55 +05:30
parent 66adb3c0cf 2b9cfcbe0b
commit 11f41955c9
107 changed files with 2671 additions and 2122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utilities/demo/make_demo.py
View File

@@ -271,7 +271,9 @@ def make_stock_entry_from_pro(pro_id, purpose, current_date):
st = webnotes.bean(make_stock_entry(pro_id, purpose))
st.doc.posting_date = current_date
st.doc.fiscal_year = "2013"
st.doc.expense_adjustment_account = "Stock in Hand - WP"
for d in st.doclist.get({"parentfield": "mtn_details"}):
d.expense_account = "Stock Adjustment - " + company_abbr
d.cost_center = "Main - " + company_abbr
st.insert()
webnotes.conn.commit()
st.submit()
@@ -414,4 +416,4 @@ def import_data(dt, submit=False, overwrite=False):
if submit:
webnotes.form_dict["params"] = json.dumps({"_submit": 1})
webnotes.uploaded_file = os.path.join(os.path.dirname(__file__), "demo_docs", doctype+".csv")
upload(overwrite=overwrite)
upload(overwrite=overwrite)