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

This commit is contained in:
Anand Doshi 2012-03-02 13:13:04 +05:30
commit 31c3190681
7 changed files with 177 additions and 275 deletions

View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:11',
'docstatus': 0,
'modified': '2012-02-27 18:25:38',
'modified': '2012-03-02 12:28:23',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@ -24,7 +24,7 @@
'server_code_error': u' ',
'show_in_menu': 0,
'subject': u'From %(supplier_name)s worth %(grand_total)s due on %(due_date)s | %(outstanding_amount)s outstanding',
'version': 520
'version': 521
},
# These values are common for all DocField
@ -308,22 +308,6 @@
'search_index': 1
},
# DocField
{
'default': u'Today',
'doctype': u'DocField',
'fieldname': u'voucher_date',
'fieldtype': u'Date',
'in_filter': 1,
'label': u'Voucher Date',
'no_copy': 0,
'oldfieldname': u'voucher_date',
'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1,
'search_index': 1
},
# DocField
{
'doctype': u'DocField',
@ -613,7 +597,7 @@
'label': u'More Info',
'oldfieldtype': u'Section Break',
'permlevel': 0,
'print_hide': 0
'print_hide': 1
},
# DocField
@ -622,7 +606,7 @@
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 0,
'print_hide': 1,
'width': u'50%'
},
@ -681,6 +665,7 @@
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
'width': u'50%'
},
@ -750,7 +735,7 @@
'label': u'Advances',
'oldfieldtype': u'Section Break',
'permlevel': 0,
'print_hide': 0
'print_hide': 1
},
# DocField
@ -785,7 +770,8 @@
'fieldtype': u'Section Break',
'label': u'TDS',
'oldfieldtype': u'Section Break',
'permlevel': 0
'permlevel': 0,
'print_hide': 1
},
# DocField
@ -793,6 +779,7 @@
'doctype': u'DocField',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
'width': u'50%'
},
@ -839,6 +826,7 @@
'doctype': u'DocField',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
'width': u'50%'
},
@ -894,6 +882,7 @@
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
'width': u'50%'
},

View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:18',
'docstatus': 0,
'modified': '2012-02-27 17:34:46',
'modified': '2012-03-02 12:22:21',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@ -21,7 +21,7 @@
# These values are common for all DocType
{
'_last_update': u'1330344021',
'_last_update': u'1330593645',
'change_log': u'1. Change in pull_details method dt.-26-06-2009',
'colour': u'White:FFF',
'default_print_format': u'Standard',
@ -34,7 +34,7 @@
'server_code_error': u' ',
'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',
'version': 414
'version': 415
},
# These values are common for all DocFormat
@ -176,6 +176,7 @@
# DocField
{
'colour': u'White:FFF',
'default': u'INV',
'depends_on': u'eval:doc.retail_transaction!="Yes"',
'description': u'To manage multiple series please go to Setup > Manage Series',
'doctype': u'DocField',
@ -185,7 +186,7 @@
'no_copy': 1,
'oldfieldname': u'naming_series',
'oldfieldtype': u'Select',
'options': u'\nINV\nINV/10-11/',
'options': u'INV\nINV/10-11/',
'permlevel': 0,
'print_hide': 1,
'reqd': 1
@ -643,17 +644,6 @@
'reqd': 1
},
# DocField
{
'doctype': u'DocField',
'fieldtype': u'HTML',
'label': u'Rates HTML',
'oldfieldtype': u'HTML',
'options': u'* Rates in standard currency',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
'colour': u'White:FFF',
@ -1072,24 +1062,6 @@
'trigger': u'Client'
},
# DocField
{
'colour': u'White:FFF',
'default': u'Today',
'description': u"This is the date on which this voucher is made in the system. Today's date comes by default.",
'doctype': u'DocField',
'fieldname': u'voucher_date',
'fieldtype': u'Date',
'in_filter': 1,
'label': u'Voucher Date',
'no_copy': 1,
'oldfieldname': u'voucher_date',
'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1,
'search_index': 0
},
# DocField
{
'doctype': u'DocField',
@ -1180,7 +1152,8 @@
'doctype': u'DocField',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0
'permlevel': 0,
'print_hide': 1
},
# DocField
@ -1390,7 +1363,8 @@
'doctype': u'DocField',
'fieldtype': u'Section Break',
'options': u'Simple',
'permlevel': 0
'permlevel': 0,
'print_hide': 1
},
# DocField
@ -1412,7 +1386,8 @@
'doctype': u'DocField',
'fieldtype': u'Section Break',
'label': u'Recurring Invoice',
'permlevel': 0
'permlevel': 0,
'print_hide': 1
},
# DocField
@ -1420,6 +1395,7 @@
'doctype': u'DocField',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
'width': u'50%'
},
@ -1473,6 +1449,7 @@
'fieldtype': u'Column Break',
'no_copy': 0,
'permlevel': 0,
'print_hide': 1,
'width': u'50%'
},

View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:15',
'docstatus': 0,
'modified': '2012-02-27 17:51:53',
'modified': '2012-03-02 12:23:50',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@ -35,7 +35,7 @@
'server_code_error': u' ',
'show_in_menu': 0,
'subject': u'To %(supplier_name)s on %(transaction_date)s | %(per_received)s% delivered',
'version': 500
'version': 501
},
# These values are common for all DocFormat
@ -569,17 +569,6 @@
'trigger': u'Client'
},
# DocField
{
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldtype': u'HTML',
'label': u'Note HTML',
'options': u'<div style="margin-top:16px"><b>Note :</b> * In Base Currency\n</div>',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
'colour': u'White:FFF',
@ -665,17 +654,6 @@
'print_hide': 1
},
# DocField
{
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldtype': u'HTML',
'label': u'Note HTML',
'options': u'<div style="margin-top:16px"><b>Note :</b> * In Base Currency\n</div>',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
'colour': u'White:FFF',
@ -1019,6 +997,7 @@
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
'width': u'50%'
},
@ -1073,7 +1052,8 @@
'fieldtype': u'Section Break',
'label': u'Raw Material Details',
'oldfieldtype': u'Section Break',
'permlevel': 0
'permlevel': 0,
'print_hide': 1
},
# DocField

View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:17',
'docstatus': 0,
'modified': '2012-02-27 17:14:54',
'modified': '2012-03-02 12:20:40',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@ -41,7 +41,7 @@
'show_in_menu': 0,
'subject': u'To %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s',
'tag_fields': u'status',
'version': 617
'version': 618
},
# These values are common for all DocFormat
@ -675,18 +675,6 @@
'width': u'100px'
},
# DocField
{
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldtype': u'HTML',
'label': u'Note HTML',
'oldfieldtype': u'HTML',
'options': u'<div style="margin-top:16px"><b>Note :</b> * In Base Currency\n</div>',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
'colour': u'White:FFF',

View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:21',
'docstatus': 0,
'modified': '2012-02-27 17:07:40',
'modified': '2012-03-02 12:19:01',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@ -21,7 +21,7 @@
# These values are common for all DocType
{
'_last_update': u'1330082514',
'_last_update': u'1330593645',
'allow_attach': 0,
'colour': u'White:FFF',
'default_print_format': u'Standard',
@ -38,7 +38,7 @@
'show_in_menu': 0,
'subject': u'From %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s | %(per_delivered)s% delivered | %(per_billed)s% billed',
'tag_fields': u'delivery_status,billing_status',
'version': 629
'version': 630
},
# These values are common for all DocFormat
@ -322,6 +322,36 @@
'print_hide': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'territory',
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Territory',
'options': u'Territory',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1
},
# DocField
{
'colour': u'White:FFF',
'description': u'Category of customer as entered in Customer master',
'doctype': u'DocField',
'fieldname': u'customer_group',
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Customer Group',
'options': u'Customer Group',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1
},
# DocField
{
'doctype': u'DocField',
@ -488,36 +518,6 @@
'width': u'100px'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'territory',
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Territory',
'options': u'Territory',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1
},
# DocField
{
'colour': u'White:FFF',
'description': u'Category of customer as entered in Customer master',
'doctype': u'DocField',
'fieldname': u'customer_group',
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Customer Group',
'options': u'Customer Group',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1
},
# DocField
{
'doctype': u'DocField',
@ -542,6 +542,40 @@
'print_hide': 1
},
# DocField
{
'colour': u'White:FFF',
'description': u'Purchase Order sent by customer',
'doctype': u'DocField',
'fieldname': u'po_no',
'fieldtype': u'Data',
'hidden': 0,
'label': u'P.O. No',
'oldfieldname': u'po_no',
'oldfieldtype': u'Data',
'permlevel': 0,
'print_hide': 0,
'reqd': 0,
'width': u'100px'
},
# DocField
{
'colour': u'White:FFF',
'depends_on': u'eval:doc.po_no',
'doctype': u'DocField',
'fieldname': u'po_date',
'fieldtype': u'Date',
'hidden': 0,
'label': u'P.O. Date',
'oldfieldname': u'po_date',
'oldfieldtype': u'Date',
'permlevel': 0,
'print_hide': 0,
'reqd': 0,
'width': u'100px'
},
# DocField
{
'colour': u'White:FFF',
@ -965,7 +999,7 @@
'oldfieldtype': u'Button',
'options': u'get_tc_details',
'permlevel': 0,
'print_hide': 0
'print_hide': 1
},
# DocField
@ -1059,40 +1093,6 @@
'print_hide': 1
},
# DocField
{
'colour': u'White:FFF',
'description': u'Purchase Order sent by customer',
'doctype': u'DocField',
'fieldname': u'po_no',
'fieldtype': u'Data',
'hidden': 0,
'label': u'P.O. No',
'oldfieldname': u'po_no',
'oldfieldtype': u'Data',
'permlevel': 0,
'print_hide': 0,
'reqd': 0,
'width': u'100px'
},
# DocField
{
'colour': u'White:FFF',
'depends_on': u'eval:doc.po_no',
'doctype': u'DocField',
'fieldname': u'po_date',
'fieldtype': u'Date',
'hidden': 0,
'label': u'P.O. Date',
'oldfieldname': u'po_date',
'oldfieldtype': u'Date',
'permlevel': 0,
'print_hide': 0,
'reqd': 0,
'width': u'100px'
},
# DocField
{
'doctype': u'DocField',
@ -1240,6 +1240,7 @@
'doctype': u'DocField',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
'width': u'50%'
},
@ -1267,6 +1268,7 @@
'doctype': u'DocField',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
'width': u'50%'
},
@ -1302,7 +1304,8 @@
'doctype': u'DocField',
'fieldtype': u'Section Break',
'options': u'Simple',
'permlevel': 0
'permlevel': 0,
'print_hide': 1
},
# DocField

View File

@ -5,7 +5,7 @@
{
'creation': '2011-04-18 15:58:20',
'docstatus': 0,
'modified': '2012-02-27 17:35:31',
'modified': '2012-03-02 12:15:44',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@ -21,7 +21,7 @@
# These values are common for all DocType
{
'_last_update': u'1330343754',
'_last_update': u'1330593645',
'colour': u'White:FFF',
'default_print_format': u'Standard',
'doctype': 'DocType',
@ -37,7 +37,7 @@
'show_in_menu': 0,
'subject': u'To %(customer_name)s on %(transaction_date)s | %(per_billed)s% billed',
'tag_fields': u'billing_status',
'version': 474
'version': 475
},
# These values are common for all DocFormat
@ -285,29 +285,37 @@
# DocField
{
'doctype': u'DocField',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0
'fieldname': u'territory',
'fieldtype': u'Link',
'hidden': 0,
'in_filter': 1,
'label': u'Territory',
'options': u'Territory',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1
},
# DocField
{
'colour': u'White:FFF',
'default': u'Today',
'description': u'The date at which current entry is made in system.',
'doctype': u'DocField',
'fieldname': u'transaction_date',
'fieldtype': u'Date',
'fieldname': u'customer_group',
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Voucher Date',
'no_copy': 1,
'oldfieldname': u'transaction_date',
'oldfieldtype': u'Date',
'label': u'Customer Group',
'options': u'Customer Group',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1,
'width': u'100px'
'search_index': 1
},
# DocField
{
'doctype': u'DocField',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0
},
# DocField
@ -467,30 +475,41 @@
# DocField
{
'colour': u'White:FFF',
'description': u'Track this Delivery Note against any Project',
'doctype': u'DocField',
'fieldname': u'territory',
'fieldname': u'project_name',
'fieldtype': u'Link',
'hidden': 0,
'in_filter': 1,
'label': u'Territory',
'options': u'Territory',
'label': u'Project Name',
'oldfieldname': u'project_name',
'oldfieldtype': u'Link',
'options': u'Project',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1
'search_index': 1,
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'customer_group',
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Customer Group',
'options': u'Customer Group',
'permlevel': 0,
'print_hide': 1,
'search_index': 1
'fieldname': u'challan_no',
'fieldtype': u'Data',
'label': u'Challan No',
'oldfieldname': u'challan_no',
'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'challan_date',
'fieldtype': u'Date',
'label': u'Challan Date',
'oldfieldname': u'challan_date',
'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
@ -885,6 +904,7 @@
'oldfieldtype': u'Button',
'options': u'get_tc_details',
'permlevel': 0,
'print_hide': 1,
'trigger': u'Server'
},
@ -917,7 +937,8 @@
'doctype': u'DocField',
'fieldtype': u'Section Break',
'label': u'Transporter Info',
'permlevel': 0
'permlevel': 0,
'print_hide': 1
},
# DocField
@ -925,6 +946,7 @@
'doctype': u'DocField',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
'width': u'50%'
},
@ -979,36 +1001,6 @@
'width': u'100px'
},
# DocField
{
'doctype': u'DocField',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'challan_no',
'fieldtype': u'Data',
'label': u'Challan No',
'oldfieldname': u'challan_no',
'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'challan_date',
'fieldtype': u'Date',
'label': u'Challan Date',
'oldfieldname': u'challan_date',
'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
'colour': u'White:FFF',
@ -1017,7 +1009,8 @@
'fieldtype': u'Section Break',
'label': u'More Info',
'oldfieldtype': u'Section Break',
'permlevel': 0
'permlevel': 0,
'print_hide': 1
},
# DocField
@ -1056,29 +1049,13 @@
'width': u'150px'
},
# DocField
{
'colour': u'White:FFF',
'description': u'Track this Delivery Note against any Project',
'doctype': u'DocField',
'fieldname': u'project_name',
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Project Name',
'oldfieldname': u'project_name',
'oldfieldtype': u'Link',
'options': u'Project',
'permlevel': 0,
'search_index': 1,
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
'width': u'50%'
},
@ -1244,7 +1221,8 @@
'fieldtype': u'Section Break',
'label': u'Packing List',
'oldfieldtype': u'Section Break',
'permlevel': 0
'permlevel': 0,
'print_hide': 1
},
# DocField
@ -1268,7 +1246,7 @@
'label': u'Sales Team',
'oldfieldtype': u'Section Break',
'permlevel': 0,
'print_hide': 0
'print_hide': 1
},
# DocField
@ -1276,6 +1254,7 @@
'doctype': u'DocField',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
'width': u'50%'
},
@ -1300,6 +1279,7 @@
'doctype': u'DocField',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
'width': u'50%'
},
@ -1338,7 +1318,8 @@
'doctype': u'DocField',
'fieldtype': u'Section Break',
'options': u'Simple',
'permlevel': 0
'permlevel': 0,
'print_hide': 1
},
# DocField

View File

@ -5,14 +5,14 @@
{
'creation': '2010-08-08 17:09:15',
'docstatus': 0,
'modified': '2012-02-27 17:54:59',
'modified': '2012-03-02 12:26:39',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
# These values are common for all DocType
{
'_last_update': u'1330345245',
'_last_update': u'1330593645',
'colour': u'White:FFF',
'default_print_format': u'Standard',
'doctype': 'DocType',
@ -26,7 +26,7 @@
'server_code_error': u' ',
'show_in_menu': 0,
'subject': u'From %(supplier_name)s against %(purchase_order)s on %(transaction_date)s',
'version': 324
'version': 325
},
# These values are common for all DocField
@ -302,25 +302,6 @@
'width': u'50%'
},
# DocField
{
'colour': u'White:FFF',
'description': u'The date at which current entry is made in system.',
'doctype': u'DocField',
'fieldname': u'transaction_date',
'fieldtype': u'Date',
'in_filter': 1,
'label': u'Transaction Date',
'no_copy': 1,
'oldfieldname': u'transaction_date',
'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
'trigger': u'Client',
'width': u'100px'
},
# DocField
{
'colour': u'White:FFF',
@ -948,6 +929,7 @@
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
'width': u'50%'
},
@ -1120,7 +1102,8 @@
'fieldtype': u'Section Break',
'label': u'Raw Material Details',
'oldfieldtype': u'Section Break',
'permlevel': 1
'permlevel': 1,
'print_hide': 1
},
# DocField
@ -1130,7 +1113,8 @@
'label': u'Get Current Stock',
'oldfieldtype': u'Button',
'options': u'get_current_stock',
'permlevel': 0
'permlevel': 0,
'print_hide': 1
},
# DocField