Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/accounts/page/financial_statements/financial_statements.txt b/accounts/page/financial_statements/financial_statements.txt
index 78c2c30..18f8904 100644
--- a/accounts/page/financial_statements/financial_statements.txt
+++ b/accounts/page/financial_statements/financial_statements.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-27 16:30:52",
"docstatus": 0,
- "modified": "2013-07-11 14:41:59",
+ "modified": "2013-08-14 12:47:45",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -19,14 +19,18 @@
"name": "__common__",
"parent": "Financial Statements",
"parentfield": "roles",
- "parenttype": "Page",
- "role": "Accounts Manager"
+ "parenttype": "Page"
},
{
"doctype": "Page",
"name": "Financial Statements"
},
{
- "doctype": "Page Role"
+ "doctype": "Page Role",
+ "role": "Accounts Manager"
+ },
+ {
+ "doctype": "Page Role",
+ "role": "Analytics"
}
]
\ No newline at end of file
diff --git a/manufacturing/doctype/production_order/production_order.py b/manufacturing/doctype/production_order/production_order.py
index 90a74e9..f86a55d 100644
--- a/manufacturing/doctype/production_order/production_order.py
+++ b/manufacturing/doctype/production_order/production_order.py
@@ -148,6 +148,7 @@
stock_entry.doc.production_order = production_order_id
stock_entry.doc.company = production_order.doc.company
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)
if purpose=="Material Transfer":
@@ -155,5 +156,5 @@
else:
stock_entry.doc.from_warehouse = production_order.doc.wip_warehouse
stock_entry.doc.to_warehouse = production_order.doc.fg_warehouse
-
+
return [d.fields for d in stock_entry.doclist]
diff --git a/selling/utils.py b/selling/utils.py
index 7ccad6a..120469f 100644
--- a/selling/utils.py
+++ b/selling/utils.py
@@ -69,7 +69,8 @@
if cint(args.is_pos):
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