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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi
2013-08-14 14:23:07 +05:30
parent 9618cb8ef1 29c8327a2f
commit 379acbbd77
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
accounts/page/financial_statements/financial_statements.txt
View File

@@ -2,7 +2,7 @@
{ {
"creation": "2013-01-27 16:30:52", "creation": "2013-01-27 16:30:52",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-11 14:41:59", "modified": "2013-08-14 12:47:45",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@@ -19,14 +19,18 @@
"name": "__common__", "name": "__common__",
"parent": "Financial Statements", "parent": "Financial Statements",
"parentfield": "roles", "parentfield": "roles",
"parenttype": "Page", "parenttype": "Page"
"role": "Accounts Manager"
}, },
{ {
"doctype": "Page", "doctype": "Page",
"name": "Financial Statements" "name": "Financial Statements"
}, },
{ {
"doctype": "Page Role" "doctype": "Page Role",
"role": "Accounts Manager"
},
{
"doctype": "Page Role",
"role": "Analytics"
} }
] ]

1
manufacturing/doctype/production_order/production_order.py
View File

@@ -148,6 +148,7 @@ def make_stock_entry(production_order_id, purpose):
stock_entry.doc.production_order = production_order_id stock_entry.doc.production_order = production_order_id
stock_entry.doc.company = production_order.doc.company stock_entry.doc.company = production_order.doc.company
stock_entry.doc.bom_no = production_order.doc.bom_no stock_entry.doc.bom_no = production_order.doc.bom_no
stock_entry.doc.use_multi_level_bom = production_order.doc.use_multi_level_bom
stock_entry.doc.fg_completed_qty = flt(production_order.doc.qty) - flt(production_order.doc.produced_qty) stock_entry.doc.fg_completed_qty = flt(production_order.doc.qty) - flt(production_order.doc.produced_qty)
if purpose=="Material Transfer": if purpose=="Material Transfer":

3
selling/utils.py
View File

@@ -69,7 +69,8 @@ def get_item_details(args):
if cint(args.is_pos): if cint(args.is_pos):
pos_settings = get_pos_settings(args.company) pos_settings = get_pos_settings(args.company)
out.update(apply_pos_settings(pos_settings, out)) if pos_settings:
out.update(apply_pos_settings(pos_settings, out))
return out return out