Permission relogication continued

erpnext/setup/doctype/brand/brand.json

@@ -33,14 +33,13 @@
  "icon": "icon-certificate", 
  "idx": 1, 
  "in_dialog": 0, 
- "modified": "2014-05-06 12:13:17.646235", 
+ "modified": "2014-05-27 03:49:08.217867", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Brand", 
  "owner": "Administrator", 
  "permissions": [
   {
-   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
@@ -53,7 +52,7 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
+   "apply_user_permissions": 1, 
    "create": 0, 
    "delete": 0, 
    "email": 1, 
@@ -66,6 +65,7 @@
    "write": 0
   }, 
   {
+   "apply_user_permissions": 1, 
    "delete": 0, 
    "email": 1, 
    "permlevel": 0, 
@@ -75,6 +75,7 @@
    "role": "Sales User"
   }, 
   {
+   "apply_user_permissions": 1, 
    "delete": 0, 
    "email": 1, 
    "permlevel": 0, 
@@ -84,6 +85,7 @@
    "role": "Purchase User"
   }, 
   {
+   "apply_user_permissions": 1, 
    "delete": 0, 
    "email": 1, 
    "permlevel": 0, 

erpnext/setup/doctype/company/company.json

@@ -348,7 +348,7 @@
  ], 
  "icon": "icon-building", 
  "idx": 1, 
- "modified": "2014-05-26 03:05:47.284171", 
+ "modified": "2014-05-27 03:49:08.597191", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Company", 
@@ -356,7 +356,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
@@ -369,6 +368,7 @@
    "write": 1
   }, 
   {
+   "apply_user_permissions": 1, 
    "delete": 0, 
    "email": 1, 
    "permlevel": 0, 

erpnext/setup/doctype/country/country.json

@@ -1,7 +1,7 @@
 {
  "allow_import": 1, 
  "autoname": "field:country_name", 
- "creation": "2013-01-19 10:23:30.000000", 
+ "creation": "2013-01-19 10:23:30", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Master", 
@@ -9,6 +9,7 @@
   {
    "fieldname": "country_name", 
    "fieldtype": "Data", 
+   "in_list_view": 1, 
    "label": "Country Name", 
    "oldfieldname": "country_name", 
    "oldfieldtype": "Data", 
@@ -18,18 +19,21 @@
   {
    "fieldname": "date_format", 
    "fieldtype": "Data", 
+   "in_list_view": 1, 
    "label": "Date Format", 
    "permlevel": 0
   }, 
   {
    "fieldname": "time_zones", 
    "fieldtype": "Text", 
+   "in_list_view": 1, 
    "label": "Time Zones", 
    "permlevel": 0
   }, 
   {
    "fieldname": "code", 
    "fieldtype": "Data", 
+   "in_list_view": 1, 
    "label": "Code", 
    "permlevel": 0
   }
@@ -37,7 +41,7 @@
  "icon": "icon-globe", 
  "idx": 1, 
  "in_create": 0, 
- "modified": "2014-03-05 14:36:16.000000", 
+ "modified": "2014-05-27 03:49:08.984710", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Country", 
@@ -45,7 +49,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 1, 
    "email": 1, 
    "permlevel": 0, 
@@ -68,6 +71,7 @@
    "write": 1
   }, 
   {
+   "apply_user_permissions": 1, 
    "create": 1, 
    "email": 1, 
    "permlevel": 0, 
@@ -90,6 +94,7 @@
    "write": 1
   }, 
   {
+   "apply_user_permissions": 1, 
    "email": 1, 
    "permlevel": 0, 
    "print": 1, 

erpnext/setup/doctype/currency/currency.json

@@ -1,6 +1,6 @@
 {
  "autoname": "field:currency_name", 
- "creation": "2013-01-28 10:06:02.000000", 
+ "creation": "2013-01-28 10:06:02", 
  "description": "**Currency** Master", 
  "docstatus": 0, 
  "doctype": "DocType", 
@@ -58,14 +58,13 @@
  "icon": "icon-bitcoin", 
  "idx": 1, 
  "in_create": 0, 
- "modified": "2014-01-20 17:48:31.000000", 
+ "modified": "2014-05-27 03:49:09.038451", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Currency", 
  "owner": "Administrator", 
  "permissions": [
   {
-   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
@@ -79,7 +78,6 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
@@ -93,7 +91,6 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 1, 
    "delete": 0, 
    "email": 1, 
@@ -106,6 +103,7 @@
    "write": 1
   }, 
   {
+   "apply_user_permissions": 1, 
    "delete": 0, 
    "email": 1, 
    "permlevel": 0, 

erpnext/setup/doctype/currency_exchange/currency_exchange.json

@@ -1,6 +1,6 @@
 {
  "allow_import": 1, 
- "creation": "2013-06-20 15:40:29.000000", 
+ "creation": "2013-06-20 15:40:29", 
  "description": "Specify Exchange Rate to convert one currency into another", 
  "docstatus": 0, 
  "doctype": "DocType", 
@@ -9,6 +9,7 @@
   {
    "fieldname": "from_currency", 
    "fieldtype": "Link", 
+   "in_list_view": 1, 
    "label": "From Currency", 
    "options": "Currency", 
    "permlevel": 0, 
@@ -17,6 +18,7 @@
   {
    "fieldname": "to_currency", 
    "fieldtype": "Link", 
+   "in_list_view": 1, 
    "label": "To Currency", 
    "options": "Currency", 
    "permlevel": 0, 
@@ -25,6 +27,7 @@
   {
    "fieldname": "exchange_rate", 
    "fieldtype": "Float", 
+   "in_list_view": 1, 
    "label": "Exchange Rate", 
    "permlevel": 0, 
    "reqd": 1
@@ -32,14 +35,13 @@
  ], 
  "icon": "icon-exchange", 
  "idx": 1, 
- "modified": "2014-01-20 17:48:31.000000", 
+ "modified": "2014-05-27 03:49:09.092389", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Currency Exchange", 
  "owner": "Administrator", 
  "permissions": [
   {
-   "cancel": 1, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
@@ -51,6 +53,7 @@
    "write": 1
   }, 
   {
+   "apply_user_permissions": 1, 
    "delete": 0, 
    "email": 1, 
    "permlevel": 0, 
@@ -60,6 +63,7 @@
    "role": "Accounts User"
   }, 
   {
+   "apply_user_permissions": 1, 
    "delete": 0, 
    "email": 1, 
    "permlevel": 0, 
@@ -69,6 +73,7 @@
    "role": "Sales User"
   }, 
   {
+   "apply_user_permissions": 1, 
    "delete": 0, 
    "email": 1, 
    "permlevel": 0, 

erpnext/setup/doctype/customer_group/customer_group.json

@@ -101,7 +101,7 @@
  "icon": "icon-sitemap", 
  "idx": 1, 
  "in_create": 1, 
- "modified": "2014-05-26 03:05:47.746202", 
+ "modified": "2014-05-27 03:49:09.397308", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Customer Group", 
@@ -109,7 +109,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 0, 
    "delete": 0, 
    "email": 1, 
@@ -123,7 +122,7 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
+   "apply_user_permissions": 1, 
    "create": 0, 
    "delete": 0, 
    "email": 1, 
@@ -137,7 +136,6 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 

erpnext/setup/doctype/item_group/item_group.json

@@ -162,7 +162,7 @@
  "in_create": 1, 
  "issingle": 0, 
  "max_attachments": 3, 
- "modified": "2014-05-26 03:05:49.376278", 
+ "modified": "2014-05-27 03:49:12.086044", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Item Group", 
@@ -170,7 +170,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 0, 
    "delete": 0, 
    "email": 1, 
@@ -184,7 +183,7 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
+   "apply_user_permissions": 1, 
    "create": 0, 
    "delete": 0, 
    "email": 1, 
@@ -197,7 +196,6 @@
    "write": 0
   }, 
   {
-   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
@@ -210,7 +208,7 @@
    "write": 1
   }, 
   {
-   "cancel": 0, 
+   "apply_user_permissions": 1, 
    "delete": 0, 
    "email": 1, 
    "permlevel": 0, 
@@ -220,7 +218,7 @@
    "role": "Sales User"
   }, 
   {
-   "cancel": 0, 
+   "apply_user_permissions": 1, 
    "delete": 0, 
    "email": 1, 
    "permlevel": 0, 
@@ -230,7 +228,7 @@
    "role": "Purchase User"
   }, 
   {
-   "cancel": 0, 
+   "apply_user_permissions": 1, 
    "delete": 0, 
    "email": 1, 
    "permlevel": 0, 

erpnext/setup/doctype/print_heading/print_heading.json

@@ -30,14 +30,13 @@
  ], 
  "icon": "icon-font", 
  "idx": 1, 
- "modified": "2014-05-07 06:39:39.352519", 
+ "modified": "2014-05-27 03:49:14.944690", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Print Heading", 
  "owner": "Administrator", 
  "permissions": [
   {
-   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
@@ -50,6 +49,7 @@
    "write": 1
   }, 
   {
+   "apply_user_permissions": 1, 
    "permlevel": 0, 
    "read": 1, 
    "role": "All"

erpnext/setup/doctype/sales_partner/sales_partner.json

@@ -1,7 +1,7 @@
 {
  "allow_import": 1, 
  "autoname": "field:partner_name", 
- "creation": "2013-04-12 15:34:06.000000", 
+ "creation": "2013-04-12 15:34:06", 
  "description": "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.", 
  "docstatus": 0, 
  "doctype": "DocType", 
@@ -11,6 +11,7 @@
    "fieldname": "partner_name", 
    "fieldtype": "Data", 
    "in_filter": 1, 
+   "in_list_view": 1, 
    "label": "Sales Partner Name", 
    "oldfieldname": "partner_name", 
    "oldfieldtype": "Data", 
@@ -22,6 +23,7 @@
    "fieldname": "partner_type", 
    "fieldtype": "Select", 
    "in_filter": 1, 
+   "in_list_view": 1, 
    "label": "Partner Type", 
    "oldfieldname": "partner_type", 
    "oldfieldtype": "Select", 
@@ -33,6 +35,7 @@
    "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>", 
    "fieldname": "territory", 
    "fieldtype": "Link", 
+   "in_list_view": 1, 
    "label": "Territory", 
    "options": "Territory", 
    "permlevel": 0, 
@@ -48,6 +51,7 @@
   {
    "fieldname": "commission_rate", 
    "fieldtype": "Float", 
+   "in_list_view": 1, 
    "label": "Commission Rate", 
    "oldfieldname": "commission_rate", 
    "oldfieldtype": "Currency", 
@@ -194,7 +198,7 @@
  "icon": "icon-user", 
  "idx": 1, 
  "in_create": 0, 
- "modified": "2014-02-20 18:30:32.000000", 
+ "modified": "2014-05-27 03:49:18.661354", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Sales Partner", 
@@ -202,7 +206,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 0, 
    "delete": 0, 
    "email": 1, 
@@ -216,7 +219,7 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
+   "apply_user_permissions": 1, 
    "create": 0, 
    "delete": 0, 
    "email": 1, 
@@ -230,7 +233,6 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 1, 
    "delete": 0, 
    "email": 1, 

erpnext/setup/doctype/sales_person/sales_person.json

@@ -143,7 +143,7 @@
  "icon": "icon-user", 
  "idx": 1, 
  "in_create": 1, 
- "modified": "2014-05-26 03:05:53.652608", 
+ "modified": "2014-05-27 03:49:18.900175", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Sales Person", 
@@ -151,7 +151,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 0, 
    "delete": 0, 
    "email": 1, 
@@ -165,7 +164,7 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
+   "apply_user_permissions": 1, 
    "create": 0, 
    "delete": 0, 
    "email": 1, 
@@ -179,7 +178,6 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 

erpnext/setup/doctype/supplier_type/supplier_type.json

@@ -20,7 +20,7 @@
  ], 
  "icon": "icon-flag", 
  "idx": 1, 
- "modified": "2014-05-07 06:39:39.516612", 
+ "modified": "2014-05-27 03:49:20.505739", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Supplier Type", 
@@ -28,7 +28,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 0, 
    "delete": 0, 
    "email": 1, 
@@ -42,7 +41,7 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
+   "apply_user_permissions": 1, 
    "create": 0, 
    "delete": 0, 
    "email": 1, 
@@ -56,7 +55,6 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 

erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json

@@ -32,7 +32,7 @@
  ], 
  "icon": "icon-legal", 
  "idx": 1, 
- "modified": "2014-05-07 06:48:23.870645", 
+ "modified": "2014-05-27 03:49:20.923172", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Terms and Conditions", 
@@ -40,7 +40,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
@@ -54,7 +53,7 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
+   "apply_user_permissions": 1, 
    "create": 0, 
    "delete": 0, 
    "email": 0, 
@@ -67,12 +66,12 @@
    "write": 0
   }, 
   {
+   "apply_user_permissions": 1, 
    "permlevel": 0, 
    "read": 1, 
    "role": "Purchase User"
   }, 
   {
-   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
@@ -85,7 +84,7 @@
    "write": 1
   }, 
   {
-   "cancel": 0, 
+   "apply_user_permissions": 1, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
@@ -98,6 +97,7 @@
    "write": 1
   }, 
   {
+   "apply_user_permissions": 1, 
    "permlevel": 0, 
    "read": 1, 
    "role": "Material User"

erpnext/setup/doctype/territory/territory.json

@@ -136,7 +136,7 @@
  "icon": "icon-map-marker", 
  "idx": 1, 
  "in_create": 1, 
- "modified": "2014-05-26 03:05:54.517648", 
+ "modified": "2014-05-27 03:49:20.981624", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Territory", 
@@ -145,7 +145,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
@@ -159,7 +158,6 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 0, 
    "delete": 0, 
    "email": 1, 
@@ -173,7 +171,7 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
+   "apply_user_permissions": 1, 
    "create": 0, 
    "delete": 0, 
    "email": 1, 
@@ -186,11 +184,13 @@
    "write": 0
   }, 
   {
+   "apply_user_permissions": 1, 
    "permlevel": 0, 
    "read": 1, 
    "role": "Material User"
   }, 
   {
+   "apply_user_permissions": 1, 
    "permlevel": 0, 
    "read": 1, 
    "role": "Maintenance User"

erpnext/setup/doctype/uom/uom.json

@@ -1,7 +1,7 @@
 {
  "allow_import": 1, 
  "autoname": "field:uom_name", 
- "creation": "2013-01-10 16:34:24.000000", 
+ "creation": "2013-01-10 16:34:24", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Master", 
@@ -9,6 +9,7 @@
   {
    "fieldname": "uom_name", 
    "fieldtype": "Data", 
+   "in_list_view": 1, 
    "label": "UOM Name", 
    "oldfieldname": "uom_name", 
    "oldfieldtype": "Data", 
@@ -19,13 +20,14 @@
    "description": "Check this to disallow fractions. (for Nos)", 
    "fieldname": "must_be_whole_number", 
    "fieldtype": "Check", 
+   "in_list_view": 1, 
    "label": "Must be Whole Number", 
    "permlevel": 0
   }
  ], 
  "icon": "icon-compass", 
  "idx": 1, 
- "modified": "2014-01-20 17:49:34.000000", 
+ "modified": "2014-05-27 03:49:22.050899", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "UOM", 
@@ -33,7 +35,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
@@ -47,7 +48,6 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
    "create": 0, 
    "delete": 0, 
    "email": 1, 
@@ -61,7 +61,7 @@
   }, 
   {
    "amend": 0, 
-   "cancel": 0, 
+   "apply_user_permissions": 1, 
    "create": 0, 
    "delete": 0, 
    "email": 1,