Default Price List Currency fld added in Global Defaults
diff --git a/erpnext/setup/doctype/manage_account/manage_account.py b/erpnext/setup/doctype/manage_account/manage_account.py
index 651794f..5dd2d06 100644
--- a/erpnext/setup/doctype/manage_account/manage_account.py
+++ b/erpnext/setup/doctype/manage_account/manage_account.py
@@ -43,6 +43,7 @@
['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],
diff --git a/erpnext/setup/doctype/manage_account/manage_account.txt b/erpnext/setup/doctype/manage_account/manage_account.txt
index 21306cf..c5bdc56 100644
--- a/erpnext/setup/doctype/manage_account/manage_account.txt
+++ b/erpnext/setup/doctype/manage_account/manage_account.txt
@@ -5,18 +5,19 @@
{
'creation': '2010-08-08 17:09:09',
'docstatus': 0,
- 'modified': '2011-12-14 15:08:22',
+ 'modified': '2011-12-20 12:27:30',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1323855454',
+ '_last_update': '1323943888',
'allow_copy': 1,
'allow_email': 1,
'allow_print': 1,
'colour': 'White:FFF',
+ 'default_print_format': 'Standard',
'doctype': 'DocType',
'hide_toolbar': 0,
'in_create': 1,
@@ -27,7 +28,7 @@
'section_style': 'Tabbed',
'server_code_error': ' ',
'show_in_menu': 1,
- 'version': 516
+ 'version': 515
},
# These values are common for all DocField
@@ -315,20 +316,6 @@
# DocField
{
'doctype': 'DocField',
- 'fieldtype': 'Column Break'
- },
-
- # DocField
- {
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'label': 'Acccount Info',
- 'options': '<div class="help-box">For more accounting defaults, Open <a href="#!List/Company">Company</a></div>'
- },
-
- # DocField
- {
- 'doctype': 'DocField',
'fieldtype': 'Section Break',
'label': 'Selling'
},
@@ -381,6 +368,13 @@
# DocField
{
'doctype': 'DocField',
+ 'fieldtype': 'Column Break',
+ 'width': '50%'
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
'fieldname': 'default_price_list',
'fieldtype': 'Link',
'label': 'Default Price List',
@@ -390,8 +384,10 @@
# DocField
{
'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'fieldname': 'default_price_list_currency',
+ 'fieldtype': 'Link',
+ 'label': 'Default Price List Currency',
+ 'options': 'Currency'
},
# DocField