Discount in purchase cycle
diff --git a/erpnext/accounts/doctype/pv_detail/pv_detail.txt b/erpnext/accounts/doctype/pv_detail/pv_detail.txt
index 557697f..6d4c788 100755
--- a/erpnext/accounts/doctype/pv_detail/pv_detail.txt
+++ b/erpnext/accounts/doctype/pv_detail/pv_detail.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:17',
'docstatus': 0,
- 'modified': '2011-12-08 15:58:58',
+ 'modified': '2011-12-08 16:51:09',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -21,7 +21,7 @@
'section_style': 'Tray',
'server_code_error': ' ',
'show_in_menu': 0,
- 'version': 28
+ 'version': 30
},
# These values are common for all DocField
@@ -126,6 +126,15 @@
# DocField
{
'doctype': 'DocField',
+ 'fieldname': 'purchase_ref_rate',
+ 'fieldtype': 'Currency',
+ 'label': 'Ref Rate *',
+ 'permlevel': 0
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
'fieldname': 'import_rate',
'fieldtype': 'Currency',
'label': 'Rate ',
@@ -140,6 +149,15 @@
# DocField
{
'doctype': 'DocField',
+ 'fieldname': 'import_ref_rate',
+ 'fieldtype': 'Currency',
+ 'label': 'Ref Rate ',
+ 'permlevel': 0
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
'fieldname': 'discount_rate',
'fieldtype': 'Currency',
'label': 'Discount %',
@@ -303,23 +321,5 @@
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
- },
-
- # DocField
- {
- 'doctype': 'DocField',
- 'fieldname': 'purchase_ref_rate',
- 'fieldtype': 'Currency',
- 'label': 'Ref Rate *',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': 'DocField',
- 'fieldname': 'import_ref_rate',
- 'fieldtype': 'Currency',
- 'label': 'Ref Rate ',
- 'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/buying/doctype/po_detail/po_detail.txt b/erpnext/buying/doctype/po_detail/po_detail.txt
index ec854c3..c64112bc 100755
--- a/erpnext/buying/doctype/po_detail/po_detail.txt
+++ b/erpnext/buying/doctype/po_detail/po_detail.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:12',
'docstatus': 0,
- 'modified': '2011-12-08 16:05:27',
+ 'modified': '2011-12-08 16:46:57',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -21,7 +21,7 @@
'section_style': 'Tray',
'server_code_error': ' ',
'show_in_menu': 0,
- 'version': 54
+ 'version': 56
},
# These values are common for all DocField
diff --git a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
index 3816e45..3c0c43d 100755
--- a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
+++ b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:16',
'docstatus': 0,
- 'modified': '2011-12-08 16:06:08',
+ 'modified': '2011-12-08 16:49:08',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -21,7 +21,7 @@
'section_style': 'Tray',
'server_code_error': ' ',
'show_in_menu': 0,
- 'version': 64
+ 'version': 66
},
# These values are common for all DocField