shipping address on top for delivery note
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.txt b/erpnext/stock/doctype/delivery_note/delivery_note.txt
index e4de1cc..6f9cb3d 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.txt
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2012-04-13 11:56:34',
+ 'creation': '2012-05-01 17:10:32',
'docstatus': 0,
- 'modified': '2012-05-01 12:33:31',
+ 'modified': '2012-05-03 10:26:43',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -72,14 +72,26 @@
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Material User',
- 'submit': 0,
- 'write': 0
+ 'permlevel': 0,
+ 'role': u'Sales User',
+ 'submit': 1,
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material Master Manager',
+ 'submit': 1,
+ 'write': 1
},
# DocPerm
@@ -96,72 +108,29 @@
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Material Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
'amend': 1,
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
- 'role': u'Sales User',
+ 'role': u'Sales Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
- 'role': u'Sales User',
- 'submit': 0,
+ 'role': u'All',
'write': 0
},
# DocPerm
{
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Accounts User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Accounts User'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'match': u'customer_name',
- 'permlevel': 0,
- 'role': u'Customer'
- },
-
- # DocPerm
- {
'doctype': u'DocPerm',
'permlevel': 2,
- 'role': u'All',
- 'write': 1
+ 'role': u'All'
},
# DocField
@@ -233,6 +202,18 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'customer_address',
+ 'fieldtype': u'Link',
+ 'in_filter': 1,
+ 'label': u'Select Shipping Address',
+ 'options': u'Address',
+ 'permlevel': 0,
+ 'print_hide': 1
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
'fieldname': u'address_display',
'fieldtype': u'Small Text',
'hidden': 1,
@@ -895,18 +876,6 @@
# DocField
{
'doctype': u'DocField',
- 'fieldname': u'customer_address',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Shipping Address',
- 'options': u'Address',
- 'permlevel': 0,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
'fieldname': u'contact_person',
'fieldtype': u'Link',
'in_filter': 1,