Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Anand Doshi 2012-03-02 15:17:28 +05:30
commit 066f7b5aff

View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:22',
'docstatus': 0,
'modified': '2012-02-24 10:38:06',
'modified': '2012-03-02 15:12:45',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@ -22,7 +22,7 @@
'section_style': u'Tray',
'server_code_error': u' ',
'show_in_menu': 0,
'version': 49
'version': 51
},
# These values are common for all DocField
@ -398,41 +398,6 @@
'report_hide': 1
},
# DocField
{
'colour': u'White:FFF',
'description': u'required for production. will be used later.',
'doctype': u'DocField',
'fieldname': u'delivery_date',
'fieldtype': u'Date',
'hidden': 1,
'label': u'Expected Delivery Date',
'oldfieldname': u'delivery_date',
'oldfieldtype': u'Date',
'permlevel': 1,
'print_hide': 1,
'report_hide': 1
},
# DocField
{
'allow_on_submit': 1,
'colour': u'White:FFF',
'description': u'required for production. will be used later.',
'doctype': u'DocField',
'fieldname': u'confirmation_date',
'fieldtype': u'Date',
'hidden': 0,
'in_filter': 1,
'label': u'Confirmed Delivery Date',
'oldfieldname': u'confirmation_date',
'oldfieldtype': u'Date',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1,
'search_index': 0
},
# DocField
{
'colour': u'White:FFF',