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

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

Browse Source
This commit is contained in:
Rushabh Mehta 2012-03-06 06:39:18 +01:00
commit 1be5dbcc19
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt
View File

@ -5,7 +5,7 @@
{ {
'creation': '2010-08-08 17:09:18', 'creation': '2010-08-08 17:09:18',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-02 12:22:21', 'modified': '2012-03-06 11:05:53',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -21,7 +21,7 @@
# These values are common for all DocType # These values are common for all DocType
{ {
'_last_update': u'1330593645', '_last_update': u'1330671142',
'change_log': u'1. Change in pull_details method dt.-26-06-2009', 'change_log': u'1. Change in pull_details method dt.-26-06-2009',
'colour': u'White:FFF', 'colour': u'White:FFF',
'default_print_format': u'Standard', 'default_print_format': u'Standard',
@ -34,7 +34,7 @@
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'subject': u'To %(customer_name)s worth %(currency)s %(grand_total_export)s due on %(due_date)s | %(outstanding_amount)s outstanding', 'subject': u'To %(customer_name)s worth %(currency)s %(grand_total_export)s due on %(due_date)s | %(outstanding_amount)s outstanding',
'version': 415 'version': 416
}, },
# These values are common for all DocFormat # These values are common for all DocFormat
@ -176,7 +176,6 @@
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
'default': u'INV',
'depends_on': u'eval:doc.retail_transaction!="Yes"', 'depends_on': u'eval:doc.retail_transaction!="Yes"',
'description': u'To manage multiple series please go to Setup > Manage Series', 'description': u'To manage multiple series please go to Setup > Manage Series',
'doctype': u'DocField', 'doctype': u'DocField',

6
erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
View File

@ -5,7 +5,7 @@
{ {
'creation': '2010-08-08 17:09:16', 'creation': '2010-08-08 17:09:16',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-05 15:01:58', 'modified': '2012-03-05 17:44:23',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -22,7 +22,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': 77 'version': 78
}, },
# These values are common for all DocField # These values are common for all DocField
@ -295,7 +295,7 @@
'oldfieldname': u'serial_no', 'oldfieldname': u'serial_no',
'oldfieldtype': u'Text', 'oldfieldtype': u'Text',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 0,
'report_hide': 0 'report_hide': 0
}, },