Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/erpnext/setup/doctype/manage_account/manage_account.py b/erpnext/setup/doctype/manage_account/manage_account.py
index 5dd2d06..5b1292a 100644
--- a/erpnext/setup/doctype/manage_account/manage_account.py
+++ b/erpnext/setup/doctype/manage_account/manage_account.py
@@ -42,16 +42,16 @@
def_list = [['fiscal_year',self.doc.current_fiscal_year],
['company',self.doc.default_company],
['currency',self.doc.default_currency],
- ['price_list_name',self.doc.default_price_list],
- ['price_list_currency', self.doc.default_price_list_currency],
- ['item_group',self.doc.default_item_group],
- ['customer_group',self.doc.default_customer_group],
- ['cust_master_name',self.doc.cust_master_name],
- ['supplier_type',self.doc.default_supplier_type],
+ ['price_list_name',self.doc.default_price_list or ''],
+ ['price_list_currency', self.doc.default_price_list_currency or ''],
+ ['item_group',self.doc.default_item_group or ''],
+ ['customer_group',self.doc.default_customer_group or ''],
+ ['cust_master_name',self.doc.cust_master_name or ''],
+ ['supplier_type',self.doc.default_supplier_type or ''],
['supp_master_name',self.doc.supp_master_name],
- ['territory',self.doc.default_territory],
- ['stock_uom',self.doc.default_stock_uom],
- ['fraction_currency',self.doc.default_currency_fraction],
+ ['territory',self.doc.default_territory or ''],
+ ['stock_uom',self.doc.default_stock_uom or ''],
+ ['fraction_currency',self.doc.default_currency_fraction or ''],
['valuation_method',self.doc.default_valuation_method]]
for d in def_list: