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

moved shipping address in basic info section

Browse Source
This commit is contained in:
Anand Doshi 2012-05-09 11:07:15 +05:30
parent a6b8e84f09
commit c241a476ab
1 changed files with 118 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

216
erpnext/selling/doctype/sales_order/sales_order.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2012-04-13 11:56:28', 'creation': '2012-05-09 10:56:36',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-04-30 20:07:31', 'modified': '2012-05-09 11:06:28',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -58,89 +58,19 @@
'name': u'Sales Order' 'name': u'Sales Order'
}, },
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Sales Manager',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 1,
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Sales Manager',
'submit': 1,
'write': 1
},
# DocPerm # DocPerm
{ {
'amend': 1, 'amend': 1,
'cancel': 1, 'cancel': 1,
'create': 1, 'create': 1,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'match': u'owner',
'permlevel': 0, 'permlevel': 0,
'role': u'Sales User', 'role': u'Sales User',
'submit': 1, 'submit': 1,
'write': 1 'write': 1
}, },
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Sales User',
'submit': 0,
'write': 0
},
# DocPerm
{
'doctype': u'DocPerm',
'match': u'customer_name',
'permlevel': 0,
'role': u'Customer'
},
# DocPerm
{
'doctype': u'DocPerm',
'permlevel': 2,
'role': u'Accounts User',
'write': 1
},
# DocPerm
{
'amend': 1,
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Maintenance Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Maintenance Manager'
},
# DocPerm # DocPerm
{ {
'amend': 1, 'amend': 1,
@ -155,9 +85,99 @@
# DocPerm # DocPerm
{ {
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'permlevel': 1, 'permlevel': 1,
'role': u'Maintenance User' 'role': u'Maintenance Manager',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 1,
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Maintenance Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
'amend': 1,
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Sales Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Sales Manager',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 2,
'role': u'Accounts User',
'submit': 0,
'write': 1
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'match': u'customer',
'permlevel': 0,
'role': u'Customer',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Sales User',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Maintenance User',
'submit': 0,
'write': 0
}, },
# DocField # DocField
@ -369,6 +389,30 @@
'width': u'100px' 'width': u'100px'
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'shipping_address_name',
'fieldtype': u'Data',
'hidden': 1,
'in_filter': 1,
'label': u'Shipping Address Name',
'options': u'Address',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'shipping_address',
'fieldtype': u'Small Text',
'in_filter': 0,
'label': u'Shipping Address',
'permlevel': 1,
'print_hide': 1
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
@ -929,30 +973,6 @@
'search_index': 1 'search_index': 1
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'shipping_address_name',
'fieldtype': u'Data',
'hidden': 1,
'in_filter': 1,
'label': u'Shipping Address Name',
'options': u'Address',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'shipping_address',
'fieldtype': u'Small Text',
'in_filter': 0,
'label': u'Shipping Address',
'permlevel': 1,
'print_hide': 1
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',