account conflict

erpnext/setup/doctype/manage_account/manage_account.py

@@ -43,6 +43,7 @@ class DocType:
                 ['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], 

erpnext/setup/doctype/manage_account/manage_account.txt

@@ -5,13 +5,14 @@
 	{
 		'creation': '2010-08-08 17:09:09',
 		'docstatus': 0,
-		'modified': '2011-12-20 11:14:24',
+		'modified': '2011-12-21 13:22:33',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
+
 		'_last_update': '1323855502',
 		'allow_copy': 1,
 		'allow_email': 1,
@@ -322,6 +323,20 @@
 		'options': 'Role'
 	},
 
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'HTML',
+		'label': 'Account Info',
+		'options': '<div class="help-box">For more accounting defaults, Open <a href="#!List/Company">Company</a></div>'
+	},
+
 	# DocField
 	{
 		'doctype': 'DocField',
@@ -374,6 +389,13 @@
 		'options': '<a href="javascript:cur_frm.cscript.TreePage(\'Territory\');">To manage Territory, click here</a>'
 	},
 
+	# DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Column Break',
+		'width': '50%'
+	},
+
 	# DocField
 	{
 		'doctype': 'DocField',
@@ -386,8 +408,10 @@
 	# DocField
 	{
 		'doctype': 'DocField',
-		'fieldtype': 'Column Break',
-		'width': '50%'
+		'fieldname': 'default_price_list_currency',
+		'fieldtype': 'Link',
+		'label': 'Default Price List Currency',
+		'options': 'Currency'
 	},
 
 	# DocField
@@ -486,4 +510,4 @@
 		'label': 'Employee Records to be created by ',
 		'options': '\nNaming Series\nEmployee Number'
 	}
-]
+]