Discount in purchase cycle Merge branch 'master' of git://github.com/nijil/erpnext

Conflicts:
	erpnext/accounts/doctype/pv_detail/pv_detail.txt
	erpnext/buying/doctype/po_detail/po_detail.txt
	erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
This commit is contained in:
Nijil Y
2011-12-08 17:29:24 +05:30
7 changed files with 51 additions and 153 deletions

View File

@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:12',
'docstatus': 0,
'modified': '2011-12-08 16:46:57',
'modified': '2011-12-08 16:05:27',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -21,7 +21,7 @@
'section_style': 'Tray',
'server_code_error': ' ',
'show_in_menu': 0,
'version': 56
'version': 54
},
# These values are common for all DocField
@@ -435,4 +435,4 @@
'permlevel': 0,
'print_hide': 1
}
]
]