changed field position of net total(import)
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt
index 586fef1..3c2143a 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt
@@ -5,7 +5,7 @@
{
'creation': '2012-04-13 11:56:17',
'docstatus': 0,
- 'modified': '2012-05-01 15:03:52',
+ 'modified': '2012-05-10 14:02:05',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.txt b/erpnext/buying/doctype/purchase_order/purchase_order.txt
index 592fa18..f8d3f63 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.txt
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.txt
@@ -5,7 +5,7 @@
{
'creation': '2012-04-13 11:56:19',
'docstatus': 0,
- 'modified': '2012-05-01 13:13:28',
+ 'modified': '2012-05-10 14:00:49',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -335,6 +335,19 @@
# DocField
{
+ 'doctype': u'DocField',
+ 'fieldname': u'net_total_import',
+ 'fieldtype': u'Currency',
+ 'label': u'Net Total (Import)',
+ 'no_copy': 0,
+ 'oldfieldname': u'net_total_import',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 1,
+ 'print_hide': 1
+ },
+
+ # DocField
+ {
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldname': u'get_last_purchase_rate',
@@ -609,19 +622,6 @@
# DocField
{
'doctype': u'DocField',
- 'fieldname': u'net_total_import',
- 'fieldtype': u'Currency',
- 'label': u'Net Total (Import)',
- 'no_copy': 0,
- 'oldfieldname': u'net_total_import',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
'fieldname': u'grand_total_import',
'fieldtype': u'Currency',
'label': u'Grand Total (Import)',
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt
index 913380c..ea50db2 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2012-05-07 16:44:47',
+ 'creation': '2012-05-10 12:42:13',
'docstatus': 0,
- 'modified': '2012-05-07 16:54:34',
+ 'modified': '2012-05-10 14:01:16',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -58,6 +58,54 @@
# DocPerm
{
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material Manager',
+ 'submit': 1,
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material User',
+ 'submit': 1,
+ 'write': 1
+ },
+
+ # DocPerm
+ {
'amend': 1,
'cancel': 1,
'create': 1,
@@ -91,54 +139,6 @@
'write': 1
},
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Material Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Material Manager',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Material User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Material User',
- 'submit': 1,
- 'write': 1
- },
-
# DocField
{
'colour': u'White:FFF',
@@ -384,6 +384,18 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'net_total_import',
+ 'fieldtype': u'Currency',
+ 'label': u'Net Total (Import)',
+ 'oldfieldname': u'net_total_import',
+ 'oldfieldtype': u'Currency',
+ 'permlevel': 1,
+ 'print_hide': 1
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
'fieldname': u'recalculate_values',
'fieldtype': u'Button',
'label': u'Re-Calculate Values',
@@ -649,18 +661,6 @@
# DocField
{
'doctype': u'DocField',
- 'fieldname': u'net_total_import',
- 'fieldtype': u'Currency',
- 'label': u'Net Total (Import)',
- 'oldfieldname': u'net_total_import',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
'fieldname': u'grand_total_import',
'fieldtype': u'Currency',
'label': u'Grand Total (Import)',