Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt b/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt
index 95b998d..3205d6e 100644
--- a/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt
+++ b/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:22',
'docstatus': 0,
- 'modified': '2012-03-02 15:12:45',
+ 'modified': '2012-03-02 15:49:26',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -22,7 +22,7 @@
'section_style': u'Tray',
'server_code_error': u' ',
'show_in_menu': 0,
- 'version': 51
+ 'version': 53
},
# These values are common for all DocField
@@ -117,18 +117,15 @@
# DocField
{
- 'default': u'0.00',
'doctype': u'DocField',
- 'fieldname': u'ref_rate',
+ 'fieldname': u'base_ref_rate',
'fieldtype': u'Currency',
- 'label': u'Price List Rate',
- 'oldfieldname': u'ref_rate',
+ 'label': u'Price List Rate*',
+ 'oldfieldname': u'base_ref_rate',
'oldfieldtype': u'Currency',
- 'permlevel': 0,
+ 'permlevel': 1,
'print_hide': 1,
- 'reqd': 0,
- 'trigger': u'Client',
- 'width': u'70px'
+ 'width': u'100px'
},
# DocField
@@ -150,49 +147,6 @@
{
'default': u'0.00',
'doctype': u'DocField',
- 'fieldname': u'export_rate',
- 'fieldtype': u'Currency',
- 'label': u'Rate',
- 'oldfieldname': u'export_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'reqd': 0,
- 'trigger': u'Client',
- 'width': u'100px'
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
- 'fieldname': u'export_amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'no_copy': 0,
- 'oldfieldname': u'export_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'reqd': 0,
- 'width': u'100px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'base_ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Price List Rate*',
- 'oldfieldname': u'base_ref_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1,
- 'width': u'100px'
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
'fieldname': u'basic_rate',
'fieldtype': u'Currency',
'label': u'Basic Rate*',
@@ -223,6 +177,52 @@
# DocField
{
+ 'default': u'0.00',
+ 'doctype': u'DocField',
+ 'fieldname': u'ref_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Price List Rate',
+ 'oldfieldname': u'ref_rate',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 0,
+ 'print_hide': 1,
+ 'reqd': 0,
+ 'trigger': u'Client',
+ 'width': u'70px'
+ },
+
+ # DocField
+ {
+ 'default': u'0.00',
+ 'doctype': u'DocField',
+ 'fieldname': u'export_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Rate',
+ 'oldfieldname': u'export_rate',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 0,
+ 'reqd': 0,
+ 'trigger': u'Client',
+ 'width': u'100px'
+ },
+
+ # DocField
+ {
+ 'default': u'0.00',
+ 'doctype': u'DocField',
+ 'fieldname': u'export_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount',
+ 'no_copy': 0,
+ 'oldfieldname': u'export_amount',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 1,
+ 'reqd': 0,
+ 'width': u'100px'
+ },
+
+ # DocField
+ {
'doctype': u'DocField',
'fieldname': u'reserved_warehouse',
'fieldtype': u'Link',
diff --git a/erpnext/startup/js/feature_setup.js b/erpnext/startup/js/feature_setup.js
index 70674ee..c5518ab 100644
--- a/erpnext/startup/js/feature_setup.js
+++ b/erpnext/startup/js/feature_setup.js
@@ -128,7 +128,7 @@
'Receivable Voucher': {'fields':['conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'entries':['ref_rate','export_amount','export_rate']},
'Item': {'ref_rate_details':['ref_currency']},
'Sales BOM': {'fields':['currency']},
- 'Sales Order': {'fields':['Note1','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'sales_order_details':['base_ref_rate','export_amount','export_rate']}
+ 'Sales Order': {'fields':['Note1','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'sales_order_details':['ref_rate','export_amount','export_rate']}
},
'fs_imports': {
'Payable Voucher': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'entries':['import_amount','import_rate']},
diff --git a/js/all-app.js b/js/all-app.js
index b8c4f73..d38f322 100644
--- a/js/all-app.js
+++ b/js/all-app.js
Binary files differ