Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rushabh Mehta 2012-10-26 13:16:36 +02:00
commit 5b8eb06652
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
setup/doctype/global_defaults/global_defaults.txt
View File

@ -5,7 +5,7 @@
{
u'creation': '2012-07-03 13:30:02',
u'docstatus': 0,
u'modified': '2012-10-23 10:57:41',
u'modified': '2012-10-26 16:42:29',
u'modified_by': u'Administrator',
u'owner': u'Administrator'
},
@ -173,6 +173,15 @@
'options': u'UOM'
},
# DocField
{
u'doctype': u'DocField',
'fieldname': u'default_valuation_method',
'fieldtype': u'Select',
'label': u'Default Valuation Method',
'options': u'FIFO\nMoving Average'
},
# DocField
{
'colour': u'White:FFF',

12
stock/doctype/item/item.txt
View File

@ -5,7 +5,7 @@
{
u'creation': '2012-07-12 22:19:45',
u'docstatus': 0,
u'modified': '2012-10-23 11:02:09',
u'modified': '2012-10-26 16:39:16',
u'modified_by': u'Administrator',
u'owner': u'Administrator'
},
@ -291,6 +291,16 @@
'permlevel': 0
},
# DocField
{
u'doctype': u'DocField',
'fieldname': u'valuation_method',
'fieldtype': u'Select',
'label': u'Valuation Method',
'options': u'\nFIFO\nMoving Average',
'permlevel': 0
},
# DocField
{
'colour': u'White:FFF',