Merge branch 'shf_rename'

This commit is contained in:
Anand Doshi 2012-05-18 18:21:43 +05:30
commit df914991c4

View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2012-03-27 14:36:13', 'creation': '2012-05-15 12:14:54',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-27 14:36:13', 'modified': '2012-05-18 18:21:08',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -23,7 +23,7 @@
'section_style': u'Tray', 'section_style': u'Tray',
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 33 'version': 1
}, },
# These values are common for all DocField # These values are common for all DocField
@ -108,6 +108,21 @@
'width': u'100px' 'width': u'100px'
}, },
# DocField
{
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldname': u'stock_uom',
'fieldtype': u'Data',
'label': u'UOM',
'oldfieldname': u'stock_uom',
'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 0,
'reqd': 0,
'width': u'100px'
},
# DocField # DocField
{ {
'default': u'0.00', 'default': u'0.00',
@ -223,21 +238,6 @@
'width': u'100px' 'width': u'100px'
}, },
# DocField
{
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldname': u'stock_uom',
'fieldtype': u'Data',
'label': u'UOM',
'oldfieldname': u'stock_uom',
'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 0,
'reqd': 0,
'width': u'100px'
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',