moved shipping address in basic info section
diff --git a/erpnext/selling/doctype/sales_order/sales_order.txt b/erpnext/selling/doctype/sales_order/sales_order.txt
index ea86285..ca24ce2 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.txt
+++ b/erpnext/selling/doctype/sales_order/sales_order.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2012-04-13 11:56:28',
+ 'creation': '2012-05-09 10:56:36',
'docstatus': 0,
- 'modified': '2012-04-30 20:07:31',
+ 'modified': '2012-05-09 11:06:28',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -60,34 +60,11 @@
# 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
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
+ 'match': u'owner',
'permlevel': 0,
'role': u'Sales User',
'submit': 1,
@@ -96,53 +73,6 @@
# 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
- {
'amend': 1,
'cancel': 1,
'create': 1,
@@ -155,9 +85,99 @@
# DocPerm
{
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
'doctype': u'DocPerm',
'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
@@ -371,6 +391,30 @@
# 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
+ {
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldname': u'items',
@@ -931,30 +975,6 @@
# 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
- {
'colour': u'White:FFF',
'description': u'Filling in additional information about the Sales Order will help you analyze your data better.',
'doctype': u'DocField',