nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 14:39:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Started permission relogication

Browse Source
This commit is contained in:
Anand Doshi
2014-05-27 08:39:35 +05:30
parent ffc28faa51
commit fab0904af7
59 changed files with 2811 additions and 2984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/account/account.json
View File

@@ -74,7 +74,7 @@
{ {
"fieldname": "parent_account", "fieldname": "parent_account",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Parent Account", "label": "Parent Account",
"oldfieldname": "parent_account", "oldfieldname": "parent_account",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -298,7 +298,7 @@
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"restrict": 1, "set_user_permissions": 1,
"role": "Accounts Manager", "role": "Accounts Manager",
"submit": 0, "submit": 0,
"write": 1 "write": 1

4
erpnext/accounts/doctype/c_form/c_form.json
View File

@@ -126,7 +126,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"options": "C-Form", "options": "C-Form",
@@ -139,7 +139,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"max_attachments": 3, "max_attachments": 3,
"modified": "2014-05-09 02:18:00.162685", "modified": "2014-05-26 03:05:47.144265",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "C-Form", "name": "C-Form",

6
erpnext/accounts/doctype/cost_center/cost_center.json
View File

@@ -31,7 +31,7 @@
{ {
"fieldname": "parent_cost_center", "fieldname": "parent_cost_center",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Parent Cost Center", "label": "Parent Cost Center",
"oldfieldname": "parent_cost_center", "oldfieldname": "parent_cost_center",
@@ -131,7 +131,7 @@
"fieldname": "old_parent", "fieldname": "old_parent",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1, "hidden": 1,
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "old_parent", "label": "old_parent",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "old_parent", "oldfieldname": "old_parent",
@@ -145,7 +145,7 @@
"icon": "icon-money", "icon": "icon-money",
"idx": 1, "idx": 1,
"in_create": 1, "in_create": 1,
"modified": "2014-05-07 06:37:48.038993", "modified": "2014-05-26 03:05:47.474366",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Cost Center", "name": "Cost Center",

4
erpnext/accounts/doctype/journal_voucher/journal_voucher.json
View File

@@ -426,7 +426,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -440,7 +440,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:16:47.686703", "modified": "2014-05-26 03:05:49.482476",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Journal Voucher", "name": "Journal Voucher",

4
erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
View File

@@ -31,7 +31,7 @@
"description": "Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.", "description": "Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.",
"fieldname": "default_account", "fieldname": "default_account",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Default Account", "label": "Default Account",
"options": "Account", "options": "Account",
@@ -41,7 +41,7 @@
], ],
"icon": "icon-credit-card", "icon": "icon-credit-card",
"idx": 1, "idx": 1,
"modified": "2014-05-07 05:06:13.702313", "modified": "2014-05-26 03:05:50.299354",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Mode of Payment", "name": "Mode of Payment",

4
erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
View File

@@ -44,7 +44,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
@@ -101,7 +101,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:16:36.920034", "modified": "2014-05-26 03:05:50.722547",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Period Closing Voucher", "name": "Period Closing Voucher",

2
erpnext/accounts/doctype/pricing_rule/pricing_rule.json
View File

@@ -278,7 +278,7 @@
"permlevel": 0, "permlevel": 0,
"read": 1, "read": 1,
"report": 1, "report": 1,
"restrict": 1, "set_user_permissions": 1,
"role": "System Manager", "role": "System Manager",
"write": 1 "write": 1
} }

4
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@@ -146,7 +146,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -744,7 +744,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:16:52.618986", "modified": "2014-05-26 03:05:50.996094",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",

13
erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
View File

@@ -31,7 +31,6 @@
"fieldname": "category", "fieldname": "category",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 0, "in_list_view": 0,
"label": "Consider Tax or Charge for", "label": "Consider Tax or Charge for",
@@ -59,7 +58,6 @@
"fieldname": "add_deduct_tax", "fieldname": "add_deduct_tax",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": "Add or Deduct", "label": "Add or Deduct",
@@ -87,7 +85,6 @@
"fieldname": "charge_type", "fieldname": "charge_type",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 1, "in_list_view": 1,
"label": "Type", "label": "Type",
@@ -115,7 +112,6 @@
"fieldname": "row_id", "fieldname": "row_id",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": "Reference Row #", "label": "Reference Row #",
@@ -143,7 +139,6 @@
"fieldname": "description", "fieldname": "description",
"fieldtype": "Small Text", "fieldtype": "Small Text",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 1, "in_list_view": 1,
"label": "Description", "label": "Description",
@@ -171,7 +166,6 @@
"fieldname": "col_break1", "fieldname": "col_break1",
"fieldtype": "Column Break", "fieldtype": "Column Break",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": null, "label": null,
@@ -199,7 +193,6 @@
"fieldname": "account_head", "fieldname": "account_head",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 0, "in_list_view": 0,
"label": "Account Head", "label": "Account Head",
@@ -227,7 +220,6 @@
"fieldname": "cost_center", "fieldname": "cost_center",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 0, "in_list_view": 0,
"label": "Cost Center", "label": "Cost Center",
@@ -255,7 +247,6 @@
"fieldname": "rate", "fieldname": "rate",
"fieldtype": "Float", "fieldtype": "Float",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 1, "in_list_view": 1,
"label": "Rate", "label": "Rate",
@@ -283,7 +274,6 @@
"fieldname": "tax_amount", "fieldname": "tax_amount",
"fieldtype": "Currency", "fieldtype": "Currency",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 1, "in_list_view": 1,
"label": "Amount", "label": "Amount",
@@ -311,7 +301,6 @@
"fieldname": "total", "fieldname": "total",
"fieldtype": "Currency", "fieldtype": "Currency",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": "Total", "label": "Total",
@@ -339,7 +328,6 @@
"fieldname": "item_wise_tax_detail", "fieldname": "item_wise_tax_detail",
"fieldtype": "Small Text", "fieldtype": "Small Text",
"hidden": 1, "hidden": 1,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": "Item Wise Tax Detail ", "label": "Item Wise Tax Detail ",
@@ -367,7 +355,6 @@
"fieldname": "parenttype", "fieldname": "parenttype",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 1, "hidden": 1,
"ignore_restrictions": null,
"in_filter": 1, "in_filter": 1,
"in_list_view": null, "in_list_view": null,
"label": "Parenttype", "label": "Parenttype",

4
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@@ -106,7 +106,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -1180,7 +1180,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:17:00.217556", "modified": "2014-05-26 03:05:52.871209",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",

13
erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
View File

@@ -31,7 +31,6 @@
"fieldname": "charge_type", "fieldname": "charge_type",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 1, "in_list_view": 1,
"label": "Type", "label": "Type",
@@ -59,7 +58,6 @@
"fieldname": "row_id", "fieldname": "row_id",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": "Reference Row #", "label": "Reference Row #",
@@ -87,7 +85,6 @@
"fieldname": "description", "fieldname": "description",
"fieldtype": "Small Text", "fieldtype": "Small Text",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 1, "in_list_view": 1,
"label": "Description", "label": "Description",
@@ -115,7 +112,6 @@
"fieldname": "col_break_1", "fieldname": "col_break_1",
"fieldtype": "Column Break", "fieldtype": "Column Break",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": null, "label": null,
@@ -143,7 +139,6 @@
"fieldname": "account_head", "fieldname": "account_head",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 0, "in_list_view": 0,
"label": "Account Head", "label": "Account Head",
@@ -171,7 +166,6 @@
"fieldname": "cost_center", "fieldname": "cost_center",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 0, "in_list_view": 0,
"label": "Cost Center", "label": "Cost Center",
@@ -199,7 +193,6 @@
"fieldname": "rate", "fieldname": "rate",
"fieldtype": "Float", "fieldtype": "Float",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 1, "in_list_view": 1,
"label": "Rate", "label": "Rate",
@@ -227,7 +220,6 @@
"fieldname": "tax_amount", "fieldname": "tax_amount",
"fieldtype": "Currency", "fieldtype": "Currency",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 1, "in_list_view": 1,
"label": "Amount", "label": "Amount",
@@ -255,7 +247,6 @@
"fieldname": "total", "fieldname": "total",
"fieldtype": "Currency", "fieldtype": "Currency",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": "Total", "label": "Total",
@@ -283,7 +274,6 @@
"fieldname": "included_in_print_rate", "fieldname": "included_in_print_rate",
"fieldtype": "Check", "fieldtype": "Check",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": "Is this Tax included in Basic Rate?", "label": "Is this Tax included in Basic Rate?",
@@ -311,7 +301,6 @@
"fieldname": "tax_amount_after_discount_amount", "fieldname": "tax_amount_after_discount_amount",
"fieldtype": "Currency", "fieldtype": "Currency",
"hidden": 1, "hidden": 1,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": "Tax Amount After Discount Amount", "label": "Tax Amount After Discount Amount",
@@ -339,7 +328,6 @@
"fieldname": "item_wise_tax_detail", "fieldname": "item_wise_tax_detail",
"fieldtype": "Small Text", "fieldtype": "Small Text",
"hidden": 1, "hidden": 1,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": "Item Wise Tax Detail", "label": "Item Wise Tax Detail",
@@ -367,7 +355,6 @@
"fieldname": "parenttype", "fieldname": "parenttype",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 1, "hidden": 1,
"ignore_restrictions": null,
"in_filter": 1, "in_filter": 1,
"in_list_view": null, "in_list_view": null,
"label": "Parenttype", "label": "Parenttype",

4
erpnext/accounts/party.py
View File

@@ -5,7 +5,7 @@ from __future__ import unicode_literals
import frappe import frappe
from frappe import _ from frappe import _
from frappe.defaults import get_restrictions from frappe.defaults import get_user_permissions
from frappe.utils import add_days from frappe.utils import add_days
from erpnext.utilities.doctype.address.address import get_address_display from erpnext.utilities.doctype.address.address import get_address_display
from erpnext.utilities.doctype.contact.contact import get_contact_details from erpnext.utilities.doctype.contact.contact import get_contact_details
@@ -86,7 +86,7 @@ def set_other_values(out, party, party_type):
def set_price_list(out, party, party_type, given_price_list): def set_price_list(out, party, party_type, given_price_list):
# price list # price list
price_list = get_restrictions().get("Price List") price_list = get_user_permissions().get("Price List")
if isinstance(price_list, list): if isinstance(price_list, list):
price_list = None price_list = None

4
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@@ -106,7 +106,7 @@
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -636,7 +636,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:17:04.992233", "modified": "2014-05-26 03:05:51.544591",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",

6
erpnext/buying/doctype/quality_inspection/quality_inspection.json
View File

@@ -56,8 +56,8 @@
"fieldname": "item_code", "fieldname": "item_code",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"in_list_view": 1,
"in_filter": 1, "in_filter": 1,
"in_list_view": 1,
"label": "Item Code", "label": "Item Code",
"oldfieldname": "item_code", "oldfieldname": "item_code",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -169,7 +169,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -206,7 +206,7 @@
"icon": "icon-search", "icon": "icon-search",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-06 08:20:33.015328", "modified": "2014-05-26 03:05:52.140251",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Quality Inspection", "name": "Quality Inspection",

8
erpnext/buying/doctype/supplier/supplier.json
View File

@@ -123,7 +123,7 @@
{ {
"fieldname": "default_currency", "fieldname": "default_currency",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Currency", "label": "Default Currency",
"no_copy": 1, "no_copy": 1,
"options": "Currency", "options": "Currency",
@@ -132,7 +132,7 @@
{ {
"fieldname": "default_price_list", "fieldname": "default_price_list",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Price List", "label": "Price List",
"options": "Price List", "options": "Price List",
"permlevel": 0 "permlevel": 0
@@ -140,7 +140,7 @@
{ {
"fieldname": "default_taxes_and_charges", "fieldname": "default_taxes_and_charges",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Taxes and Charges", "label": "Taxes and Charges",
"options": "Purchase Taxes and Charges Master", "options": "Purchase Taxes and Charges Master",
"permlevel": 0 "permlevel": 0
@@ -186,7 +186,7 @@
], ],
"icon": "icon-user", "icon": "icon-user",
"idx": 1, "idx": 1,
"modified": "2014-05-07 06:08:33.836379", "modified": "2014-05-26 03:05:54.108284",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier", "name": "Supplier",

4
erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
View File

@@ -106,7 +106,7 @@
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 1, "hidden": 1,
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -562,7 +562,7 @@
"icon": "icon-shopping-cart", "icon": "icon-shopping-cart",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:17:10.664189", "modified": "2014-05-26 03:05:54.245409",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation", "name": "Supplier Quotation",

4
erpnext/contacts/doctype/party_type/party_type.json
View File

@@ -32,7 +32,7 @@
{ {
"fieldname": "default_price_list", "fieldname": "default_price_list",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Price List", "label": "Default Price List",
"options": "Price List", "options": "Price List",
"permlevel": 0 "permlevel": 0
@@ -64,7 +64,7 @@
"read_only": 1 "read_only": 1
} }
], ],
"modified": "2014-05-07 05:18:29.669293", "modified": "2014-05-26 03:05:50.667527",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Contacts", "module": "Contacts",
"name": "Party Type", "name": "Party Type",

8
erpnext/home/doctype/feed/feed.py
View File

@@ -17,20 +17,20 @@ def on_doctype_update():
add index feed_doctype_docname_index(doc_type, doc_name)""") add index feed_doctype_docname_index(doc_type, doc_name)""")
def get_permission_query_conditions(): def get_permission_query_conditions():
restrictions = frappe.defaults.get_restrictions() user_permissions = frappe.defaults.get_user_permissions()
can_read = frappe.user.get_can_read() can_read = frappe.user.get_can_read()
can_read_doctypes = ['"{}"'.format(doctype) for doctype in can_read_doctypes = ['"{}"'.format(doctype) for doctype in
list(set(can_read) - set(restrictions.keys()))] list(set(can_read) - set(user_permissions.keys()))]
if not can_read_doctypes: if not can_read_doctypes:
return "" return ""
conditions = ["tabFeed.doc_type in ({})".format(", ".join(can_read_doctypes))] conditions = ["tabFeed.doc_type in ({})".format(", ".join(can_read_doctypes))]
if restrictions: if user_permissions:
can_read_docs = [] can_read_docs = []
for doctype, names in restrictions.items(): for doctype, names in user_permissions.items():
for n in names: for n in names:
can_read_docs.append('"{}|{}"'.format(doctype, n)) can_read_docs.append('"{}|{}"'.format(doctype, n))

6
erpnext/hr/doctype/appraisal/appraisal.json
View File

@@ -181,7 +181,7 @@
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 1, "hidden": 1,
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -196,13 +196,14 @@
"icon": "icon-thumbs-up", "icon": "icon-thumbs-up",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:16:37.334857", "modified": "2014-05-26 03:05:46.761819",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Appraisal", "name": "Appraisal",
"owner": "ashwini@webnotestech.com", "owner": "ashwini@webnotestech.com",
"permissions": [ "permissions": [
{ {
"apply_user_permissions": 1,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 0, "delete": 0,
@@ -211,7 +212,6 @@
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"restricted": 1,
"role": "Employee", "role": "Employee",
"submit": 0, "submit": 0,
"write": 1 "write": 1

4
erpnext/hr/doctype/attendance/attendance.json
View File

@@ -117,7 +117,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"options": "Attendance", "options": "Attendance",
@@ -129,7 +129,7 @@
"icon": "icon-ok", "icon": "icon-ok",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:16:37.761770", "modified": "2014-05-26 03:05:46.906637",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Attendance", "name": "Attendance",

11
erpnext/hr/doctype/employee/employee.json
View File

@@ -346,7 +346,7 @@
{ {
"fieldname": "reports_to", "fieldname": "reports_to",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Reports to", "label": "Reports to",
"oldfieldname": "reports_to", "oldfieldname": "reports_to",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -672,7 +672,7 @@
], ],
"icon": "icon-user", "icon": "icon-user",
"idx": 1, "idx": 1,
"modified": "2014-05-21 07:49:56.180832", "modified": "2014-05-26 03:05:48.422199",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employee", "name": "Employee",
@@ -680,6 +680,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@@ -688,7 +689,6 @@
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"restricted": 1,
"role": "Employee", "role": "Employee",
"submit": 0, "submit": 0,
"write": 0 "write": 0
@@ -703,7 +703,6 @@
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"restrict": 0,
"role": "HR User", "role": "HR User",
"submit": 0, "submit": 0,
"write": 1 "write": 1
@@ -718,15 +717,15 @@
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"restrict": 1, "set_user_permissions": 1,
"role": "HR Manager", "role": "HR Manager",
"submit": 0, "submit": 0,
"write": 1 "write": 1
}, },
{ {
"apply_user_permissions": 1,
"permlevel": 0, "permlevel": 0,
"read": 1, "read": 1,
"restricted": 1,
"role": "Leave Approver" "role": "Leave Approver"
} }
], ],

6
erpnext/hr/doctype/employee/employee.py
View File

@@ -8,7 +8,7 @@ from frappe.utils import getdate, validate_email_add, cint
from frappe.model.naming import make_autoname from frappe.model.naming import make_autoname
from frappe import throw, _ from frappe import throw, _
import frappe.permissions import frappe.permissions
from frappe.defaults import get_restrictions from frappe.defaults import get_user_permissions
from frappe.model.document import Document from frappe.model.document import Document
from frappe.model.mapper import get_mapped_doc from frappe.model.mapper import get_mapped_doc
@@ -72,9 +72,9 @@ class Employee(Document):
def add_restriction_if_required(self, doctype, user): def add_restriction_if_required(self, doctype, user):
if frappe.permissions.has_only_non_restrict_role(doctype, user) \ if frappe.permissions.has_only_non_restrict_role(doctype, user) \
and self.name not in get_restrictions(user).get("Employee", []): and self.name not in get_user_permissions(user).get("Employee", []):
frappe.defaults.add_default("Employee", self.name, user, "Restriction") frappe.defaults.add_default("Employee", self.name, user, "User Permission")
def update_user(self): def update_user(self):
# add employee role if missing # add employee role if missing

6
erpnext/hr/doctype/expense_claim/expense_claim.json
View File

@@ -172,7 +172,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -187,13 +187,14 @@
"icon": "icon-money", "icon": "icon-money",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:16:38.198490", "modified": "2014-05-26 03:05:48.690180",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Expense Claim", "name": "Expense Claim",
"owner": "harshada@webnotestech.com", "owner": "harshada@webnotestech.com",
"permissions": [ "permissions": [
{ {
"apply_user_permissions": 1,
"create": 1, "create": 1,
"delete": 0, "delete": 0,
"email": 1, "email": 1,
@@ -201,7 +202,6 @@
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"restricted": 1,
"role": "Employee", "role": "Employee",
"write": 1 "write": 1
}, },

6
erpnext/hr/doctype/leave_allocation/leave_allocation.json
View File

@@ -123,7 +123,7 @@
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -136,7 +136,7 @@
"icon": "icon-ok", "icon": "icon-ok",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:16:39.508488", "modified": "2014-05-26 03:05:49.674303",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Leave Allocation", "name": "Leave Allocation",
@@ -144,6 +144,7 @@
"permissions": [ "permissions": [
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@@ -152,7 +153,6 @@
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"restricted": 1,
"role": "HR User", "role": "HR User",
"submit": 1, "submit": 1,
"write": 1 "write": 1

6
erpnext/hr/doctype/leave_application/leave_application.json
View File

@@ -169,7 +169,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"options": "Leave Application", "options": "Leave Application",
@@ -182,7 +182,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"max_attachments": 3, "max_attachments": 3,
"modified": "2014-05-15 19:30:47.331357", "modified": "2014-05-26 03:05:49.838899",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Leave Application", "name": "Leave Application",
@@ -219,7 +219,7 @@
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"restrict": 1, "set_user_permissions": 1,
"role": "HR User", "role": "HR User",
"submit": 1, "submit": 1,
"write": 1 "write": 1

4
erpnext/hr/doctype/leave_application/test_leave_application.py
View File

@@ -5,7 +5,7 @@ import frappe
import unittest import unittest
from erpnext.hr.doctype.leave_application.leave_application import LeaveDayBlockedError, OverlapError from erpnext.hr.doctype.leave_application.leave_application import LeaveDayBlockedError, OverlapError
from frappe.core.page.user_properties.user_properties import clear_restrictions from frappe.core.page.user_permissions.user_permissions import clear_user_permissions
test_dependencies = ["Leave Allocation", "Leave Block List"] test_dependencies = ["Leave Allocation", "Leave Block List"]
@@ -91,7 +91,7 @@ class TestLeaveApplication(unittest.TestCase):
from frappe.utils.user import add_role from frappe.utils.user import add_role
add_role("test1@example.com", "HR User") add_role("test1@example.com", "HR User")
clear_restrictions("Employee") clear_user_permissions("Employee")
frappe.db.set_value("Department", "_Test Department", frappe.db.set_value("Department", "_Test Department",
"leave_block_list", "_Test Leave Block List") "leave_block_list", "_Test Leave Block List")

5
erpnext/hr/doctype/salary_slip/salary_slip.json
View File

@@ -182,7 +182,7 @@
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -325,7 +325,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:17:14.634335", "modified": "2014-05-26 03:05:52.624169",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Salary Slip", "name": "Salary Slip",
@@ -361,7 +361,6 @@
{ {
"permlevel": 0, "permlevel": 0,
"read": 1, "read": 1,
"restricted": 0,
"role": "Employee" "role": "Employee"
} }
], ],

4
erpnext/manufacturing/doctype/bom/bom.json
View File

@@ -194,7 +194,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"options": "BOM", "options": "BOM",
@@ -233,7 +233,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2014-05-09 02:16:39.975486", "modified": "2014-05-26 03:05:46.985950",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM", "name": "BOM",

4
erpnext/manufacturing/doctype/production_order/production_order.json
View File

@@ -211,7 +211,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -224,7 +224,7 @@
"idx": 1, "idx": 1,
"in_create": 0, "in_create": 0,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-07 05:41:33.127710", "modified": "2014-05-26 03:05:50.799576",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Production Order", "name": "Production Order",

4
erpnext/patches.txt
View File

@@ -1,8 +1,10 @@
execute:import unidecode # new requirement execute:import unidecode # new requirement
erpnext.patches.v4_0.validate_v3_patch erpnext.patches.v4_0.validate_v3_patch
erpnext.patches.v4_0.fix_employee_user_id
erpnext.patches.v4_0.update_user_properties erpnext.patches.v4_0.update_user_properties
erpnext.patches.v4_0.move_warehouse_user_to_restrictions erpnext.patches.v4_0.move_warehouse_user_to_restrictions
execute:frappe.delete_doc_if_exists("DocType", "Warehouse User")
erpnext.patches.v4_0.new_permissions erpnext.patches.v4_0.new_permissions
erpnext.patches.v4_0.global_defaults_to_system_settings erpnext.patches.v4_0.global_defaults_to_system_settings
erpnext.patches.v4_0.update_incharge_name_to_sales_person_in_maintenance_schedule erpnext.patches.v4_0.update_incharge_name_to_sales_person_in_maintenance_schedule
@@ -30,7 +32,6 @@ erpnext.patches.v4_0.customer_discount_to_pricing_rule
execute:frappe.db.sql("""delete from `tabWebsite Item Group` where ifnull(item_group, '')=''""") execute:frappe.db.sql("""delete from `tabWebsite Item Group` where ifnull(item_group, '')=''""")
erpnext.patches.v4_0.remove_module_home_pages erpnext.patches.v4_0.remove_module_home_pages
erpnext.patches.v4_0.split_email_settings erpnext.patches.v4_0.split_email_settings
erpnext.patches.v4_0.fix_employee_user_id
erpnext.patches.v4_0.import_country_codes erpnext.patches.v4_0.import_country_codes
erpnext.patches.v4_0.countrywise_coa erpnext.patches.v4_0.countrywise_coa
execute:frappe.delete_doc("DocType", "MIS Control") execute:frappe.delete_doc("DocType", "MIS Control")
@@ -39,7 +40,6 @@ execute:frappe.delete_doc("DocType", "Stock Ledger")
execute:frappe.db.sql("update `tabJournal Voucher` set voucher_type='Journal Entry' where ifnull(voucher_type, '')=''") execute:frappe.db.sql("update `tabJournal Voucher` set voucher_type='Journal Entry' where ifnull(voucher_type, '')=''")
execute:frappe.delete_doc("DocType", "Grade") execute:frappe.delete_doc("DocType", "Grade")
erpnext.patches.v4_0.remove_india_specific_fields erpnext.patches.v4_0.remove_india_specific_fields
execute:frappe.delete_doc_if_exists("DocType", "Warehouse User")
execute:frappe.db.sql("delete from `tabWebsite Item Group` where ifnull(item_group, '')=''") execute:frappe.db.sql("delete from `tabWebsite Item Group` where ifnull(item_group, '')=''")
execute:frappe.delete_doc("Print Format", "SalesInvoice") execute:frappe.delete_doc("Print Format", "SalesInvoice")
execute:import frappe.defaults;frappe.defaults.clear_default("price_list_currency") execute:import frappe.defaults;frappe.defaults.clear_default("price_list_currency")

4
erpnext/patches/v4_0/move_warehouse_user_to_restrictions.py
View File

@@ -5,9 +5,9 @@ from __future__ import unicode_literals
import frappe import frappe
def execute(): def execute():
from frappe.core.page.user_properties import user_properties from frappe.core.page.user_permissions import user_permissions
for warehouse, user in frappe.db.sql("""select parent, user from `tabWarehouse User`"""): for warehouse, user in frappe.db.sql("""select parent, user from `tabWarehouse User`"""):
user_properties.add(user, "Warehouse", warehouse) user_permissions.add(user, "Warehouse", warehouse)
frappe.delete_doc("DocType", "Warehouse User") frappe.delete_doc("DocType", "Warehouse User")
frappe.reload_doc("stock", "doctype", "warehouse") frappe.reload_doc("stock", "doctype", "warehouse")

22
erpnext/patches/v4_0/update_user_properties.py
View File

@@ -9,15 +9,15 @@ import frappe.defaults
def execute(): def execute():
frappe.reload_doc("core", "doctype", "docperm") frappe.reload_doc("core", "doctype", "docperm")
frappe.reload_doc("hr", "doctype", "employee") frappe.reload_doc("hr", "doctype", "employee")
update_user_properties() update_user_permissions()
update_user_match() update_user_match()
add_employee_restrictions_to_leave_approver() add_employee_user_permissions_to_leave_approver()
update_permissions() update_permissions()
remove_duplicate_restrictions() remove_duplicate_user_permissions()
frappe.defaults.clear_cache() frappe.defaults.clear_cache()
frappe.clear_cache() frappe.clear_cache()
def update_user_properties(): def update_user_permissions():
frappe.reload_doc("core", "doctype", "docfield") frappe.reload_doc("core", "doctype", "docfield")
for d in frappe.db.sql("""select parent, defkey, defvalue from tabDefaultValue for d in frappe.db.sql("""select parent, defkey, defvalue from tabDefaultValue
@@ -27,7 +27,7 @@ def update_user_properties():
if df: if df:
frappe.db.sql("""update tabDefaultValue frappe.db.sql("""update tabDefaultValue
set defkey=%s, parenttype='Restriction' set defkey=%s, parenttype='User Permission'
where defkey=%s and where defkey=%s and
parent not in ('__global', '__default')""", (df[0].options, d.defkey)) parent not in ('__global', '__default')""", (df[0].options, d.defkey))
@@ -71,17 +71,17 @@ def update_user_match():
for name in frappe.db.sql_list("""select name from `tab{doctype}` for name in frappe.db.sql_list("""select name from `tab{doctype}`
where `{field}`=%s""".format(doctype=doctype, field=match.split(":")[0]), user): where `{field}`=%s""".format(doctype=doctype, field=match.split(":")[0]), user):
frappe.defaults.add_default(doctype, name, user, "Restriction") frappe.defaults.add_default(doctype, name, user, "User Permission")
def add_employee_restrictions_to_leave_approver(): def add_employee_user_permissions_to_leave_approver():
from frappe.core.page.user_properties import user_properties from frappe.core.page.user_permissions import user_permissions
# add restrict rights to HR User and HR Manager # add restrict rights to HR User and HR Manager
frappe.db.sql("""update `tabDocPerm` set `restrict`=1 where parent in ('Employee', 'Leave Application') frappe.db.sql("""update `tabDocPerm` set `restrict`=1 where parent in ('Employee', 'Leave Application')
and role in ('HR User', 'HR Manager') and permlevel=0 and `read`=1""") and role in ('HR User', 'HR Manager') and permlevel=0 and `read`=1""")
frappe.clear_cache() frappe.clear_cache()
# add Employee restrictions (in on_update method) # add Employee user_permissions (in on_update method)
for employee in frappe.db.sql_list("""select name from `tabEmployee` for employee in frappe.db.sql_list("""select name from `tabEmployee`
where (exists(select leave_approver from `tabEmployee Leave Approver` where (exists(select leave_approver from `tabEmployee Leave Approver`
where `tabEmployee Leave Approver`.parent=`tabEmployee`.name) where `tabEmployee Leave Approver`.parent=`tabEmployee`.name)
@@ -94,8 +94,8 @@ def update_permissions():
frappe.db.sql("""update tabDocPerm set `match`='' frappe.db.sql("""update tabDocPerm set `match`=''
where ifnull(`match`,'') not in ('', 'owner')""") where ifnull(`match`,'') not in ('', 'owner')""")
def remove_duplicate_restrictions(): def remove_duplicate_user_permissions():
# remove duplicate restrictions (if they exist) # remove duplicate user_permissions (if they exist)
for d in frappe.db.sql("""select parent, defkey, defvalue, for d in frappe.db.sql("""select parent, defkey, defvalue,
count(*) as cnt from tabDefaultValue count(*) as cnt from tabDefaultValue
where parent not in ('__global', '__default') where parent not in ('__global', '__default')

6
erpnext/projects/doctype/time_log/time_log.json
View File

@@ -140,7 +140,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"options": "Time Log", "options": "Time Log",
@@ -152,7 +152,7 @@
"icon": "icon-time", "icon": "icon-time",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-06 11:53:04.133874", "modified": "2014-05-26 03:05:54.597160",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Time Log", "name": "Time Log",
@@ -160,6 +160,7 @@
"permissions": [ "permissions": [
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@@ -168,7 +169,6 @@
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"restricted": 1,
"role": "Projects User", "role": "Projects User",
"submit": 1, "submit": 1,
"write": 1 "write": 1

6
erpnext/projects/doctype/time_log_batch/time_log_batch.json
View File

@@ -1,6 +1,6 @@
{ {
"autoname": "naming_series:", "autoname": "naming_series:",
"creation": "2013-02-28 17:57:33.000000", "creation": "2013-02-28 17:57:33",
"description": "Batch Time Logs for Billing.", "description": "Batch Time Logs for Billing.",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
@@ -71,7 +71,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"options": "Time Log Batch", "options": "Time Log Batch",
@@ -83,7 +83,7 @@
"icon": "icon-time", "icon": "icon-time",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-01-20 17:49:34.000000", "modified": "2014-05-26 03:05:54.728928",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Time Log Batch", "name": "Time Log Batch",

145
erpnext/selling/doctype/campaign/campaign.json
View File

@@ -1,163 +1,58 @@
{ {
"_last_update": null,
"_user_tags": null,
"allow_attach": null,
"allow_copy": null,
"allow_email": null,
"allow_import": 1, "allow_import": 1,
"allow_print": null,
"allow_rename": 1, "allow_rename": 1,
"allow_trash": null,
"autoname": "naming_series:", "autoname": "naming_series:",
"change_log": null,
"client_script": null,
"client_script_core": null,
"client_string": null,
"colour": null,
"creation": "2013-01-10 16:34:18", "creation": "2013-01-10 16:34:18",
"custom": null,
"default_print_format": null,
"description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ", "description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Master", "document_type": "Master",
"dt_template": null,
"fields": [ "fields": [
{ {
"allow_on_submit": null,
"default": null,
"depends_on": null,
"description": null,
"fieldname": "campaign", "fieldname": "campaign",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": null,
"ignore_restrictions": null,
"in_filter": null,
"in_list_view": 0, "in_list_view": 0,
"label": "Campaign", "label": "Campaign",
"no_column": null,
"no_copy": null,
"oldfieldname": null,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": null, "permlevel": 0
"permlevel": 0,
"print_hide": null,
"print_width": null,
"read_only": null,
"report_hide": null,
"reqd": null,
"search_index": null,
"set_only_once": null,
"trigger": null,
"width": null
}, },
{ {
"allow_on_submit": null,
"default": null,
"depends_on": null,
"description": null,
"fieldname": "campaign_name", "fieldname": "campaign_name",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": null,
"ignore_restrictions": null,
"in_filter": null,
"in_list_view": 1, "in_list_view": 1,
"label": "Campaign Name", "label": "Campaign Name",
"no_column": null,
"no_copy": null,
"oldfieldname": "campaign_name", "oldfieldname": "campaign_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
"options": null,
"permlevel": 0, "permlevel": 0,
"print_hide": null, "reqd": 1
"print_width": null,
"read_only": null,
"report_hide": null,
"reqd": 1,
"search_index": null,
"set_only_once": null,
"trigger": null,
"width": null
}, },
{ {
"allow_on_submit": null,
"default": null,
"depends_on": null,
"description": null,
"fieldname": "naming_series", "fieldname": "naming_series",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": null,
"ignore_restrictions": null,
"in_filter": null,
"in_list_view": 0, "in_list_view": 0,
"label": "Naming Series", "label": "Naming Series",
"no_column": null,
"no_copy": null,
"oldfieldname": null,
"oldfieldtype": null,
"options": "Campaign-.####", "options": "Campaign-.####",
"permlevel": 0, "permlevel": 0,
"print_hide": null, "reqd": 0
"print_width": null,
"read_only": null,
"report_hide": null,
"reqd": 0,
"search_index": null,
"set_only_once": null,
"trigger": null,
"width": null
}, },
{ {
"allow_on_submit": null,
"default": null,
"depends_on": null,
"description": null,
"fieldname": "description", "fieldname": "description",
"fieldtype": "Text", "fieldtype": "Text",
"hidden": null,
"ignore_restrictions": null,
"in_filter": null,
"in_list_view": 1, "in_list_view": 1,
"label": "Description", "label": "Description",
"no_column": null,
"no_copy": null,
"oldfieldname": "description", "oldfieldname": "description",
"oldfieldtype": "Text", "oldfieldtype": "Text",
"options": null,
"permlevel": 0, "permlevel": 0,
"print_hide": null,
"print_width": null,
"read_only": null,
"report_hide": null,
"reqd": null,
"search_index": null,
"set_only_once": null,
"trigger": null,
"width": "300px" "width": "300px"
} }
], ],
"hide_heading": null,
"hide_toolbar": null,
"icon": "icon-bullhorn", "icon": "icon-bullhorn",
"idx": 1, "idx": 1,
"in_create": null, "modified": "2014-05-26 03:45:48.713672",
"in_dialog": null,
"is_submittable": null,
"is_transaction_doc": null,
"issingle": null,
"istable": null,
"max_attachments": null,
"menu_index": null,
"modified": "2014-04-16 12:36:34.606593",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Campaign", "name": "Campaign",
"name_case": null,
"owner": "Administrator", "owner": "Administrator",
"parent": null,
"parent_node": null,
"parentfield": null,
"parenttype": null,
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
@@ -165,15 +60,11 @@
"create": 0, "create": 0,
"delete": 0, "delete": 0,
"email": 1, "email": 1,
"export": null,
"import": 0, "import": 0,
"match": null,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 0, "report": 0,
"restrict": null,
"restricted": null,
"role": "Sales Manager", "role": "Sales Manager",
"submit": 0, "submit": 0,
"write": 0 "write": 0
@@ -184,15 +75,10 @@
"create": 0, "create": 0,
"delete": 0, "delete": 0,
"email": 1, "email": 1,
"export": null,
"import": null,
"match": null,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"restrict": null,
"restricted": null,
"role": "Sales User", "role": "Sales User",
"submit": 0, "submit": 0,
"write": 0 "write": 0
@@ -203,34 +89,13 @@
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": null,
"import": null,
"match": null,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"restrict": null,
"restricted": null,
"role": "Sales Master Manager", "role": "Sales Master Manager",
"submit": 0, "submit": 0,
"write": 1 "write": 1
} }
], ]
"plugin": null,
"print_outline": null,
"read_only": null,
"read_only_onload": null,
"search_fields": null,
"server_code": null,
"server_code_compiled": null,
"server_code_core": null,
"server_code_error": null,
"show_in_menu": null,
"smallicon": null,
"subject": null,
"tag_fields": null,
"title_field": null,
"use_template": null,
"version": null
} }

12
erpnext/selling/doctype/customer/customer.json
View File

@@ -190,7 +190,7 @@
{ {
"fieldname": "default_currency", "fieldname": "default_currency",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Currency", "label": "Currency",
"no_copy": 1, "no_copy": 1,
"options": "Currency", "options": "Currency",
@@ -199,7 +199,7 @@
{ {
"fieldname": "default_price_list", "fieldname": "default_price_list",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Price List", "label": "Price List",
"options": "Price List", "options": "Price List",
"permlevel": 0 "permlevel": 0
@@ -207,7 +207,7 @@
{ {
"fieldname": "default_taxes_and_charges", "fieldname": "default_taxes_and_charges",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Taxes and Charges", "label": "Taxes and Charges",
"options": "Sales Taxes and Charges Master", "options": "Sales Taxes and Charges Master",
"permlevel": 0 "permlevel": 0
@@ -246,7 +246,7 @@
{ {
"fieldname": "default_sales_partner", "fieldname": "default_sales_partner",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Sales Partner", "label": "Sales Partner",
"oldfieldname": "default_sales_partner", "oldfieldname": "default_sales_partner",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -282,7 +282,7 @@
], ],
"icon": "icon-user", "icon": "icon-user",
"idx": 1, "idx": 1,
"modified": "2014-05-07 05:36:46.466246", "modified": "2014-05-26 03:05:47.563605",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Customer", "name": "Customer",
@@ -319,7 +319,7 @@
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"restrict": 1, "set_user_permissions": 1,
"role": "Sales Master Manager", "role": "Sales Master Manager",
"submit": 0, "submit": 0,
"write": 1 "write": 1

4
erpnext/selling/doctype/installation_note/installation_note.json
View File

@@ -196,7 +196,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -235,7 +235,7 @@
"icon": "icon-wrench", "icon": "icon-wrench",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:17:16.592562", "modified": "2014-05-26 03:05:48.899177",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Installation Note", "name": "Installation Note",

4
erpnext/selling/doctype/opportunity/opportunity.json
View File

@@ -386,7 +386,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -409,7 +409,7 @@
"icon": "icon-info-sign", "icon": "icon-info-sign",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:16:41.042535", "modified": "2014-05-26 03:05:50.362530",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Opportunity", "name": "Opportunity",

4
erpnext/selling/doctype/quotation/quotation.json
View File

@@ -140,7 +140,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -818,7 +818,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"max_attachments": 1, "max_attachments": 1,
"modified": "2014-05-09 02:17:19.143693", "modified": "2014-05-26 03:05:52.328681",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation", "name": "Quotation",

4
erpnext/selling/doctype/sales_order/sales_order.json
View File

@@ -114,7 +114,7 @@
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 1, "hidden": 1,
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -874,7 +874,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"modified": "2014-05-09 02:17:52.206802", "modified": "2014-05-26 03:05:53.316938",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",

4
erpnext/selling/doctype/sales_order/test_sales_order.py
View File

@@ -283,7 +283,7 @@ class TestSalesOrder(unittest.TestCase):
so.get("sales_order_details")[0].warehouse, 20.0) so.get("sales_order_details")[0].warehouse, 20.0)
def test_warehouse_user(self): def test_warehouse_user(self):
frappe.defaults.add_default("Warehouse", "_Test Warehouse 1 - _TC1", "test@example.com", "Restriction") frappe.defaults.add_default("Warehouse", "_Test Warehouse 1 - _TC1", "test@example.com", "User Permission")
frappe.get_doc("User", "test@example.com")\ frappe.get_doc("User", "test@example.com")\
.add_roles("Sales User", "Sales Manager", "Material User", "Material Manager") .add_roles("Sales User", "Sales Manager", "Material User", "Material Manager")
@@ -302,7 +302,7 @@ class TestSalesOrder(unittest.TestCase):
frappe.set_user("test2@example.com") frappe.set_user("test2@example.com")
so.insert() so.insert()
frappe.defaults.clear_default("Warehouse", "_Test Warehouse 1 - _TC1", "test@example.com", parenttype="Restriction") frappe.defaults.clear_default("Warehouse", "_Test Warehouse 1 - _TC1", "test@example.com", parenttype="User Permission")
test_dependencies = ["Sales BOM", "Currency Exchange"] test_dependencies = ["Sales BOM", "Currency Exchange"]

11
erpnext/selling/doctype/selling_settings/selling_settings.json
View File

@@ -31,7 +31,6 @@
"fieldname": "cust_master_name", "fieldname": "cust_master_name",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 1, "in_list_view": 1,
"label": "Customer Naming By", "label": "Customer Naming By",
@@ -59,7 +58,6 @@
"fieldname": "campaign_naming_by", "fieldname": "campaign_naming_by",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 1, "in_list_view": 1,
"label": "Campaign Naming By", "label": "Campaign Naming By",
@@ -87,7 +85,6 @@
"fieldname": "customer_group", "fieldname": "customer_group",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 1, "in_list_view": 1,
"label": "Default Customer Group", "label": "Default Customer Group",
@@ -115,7 +112,6 @@
"fieldname": "territory", "fieldname": "territory",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 1, "in_list_view": 1,
"label": "Default Territory", "label": "Default Territory",
@@ -143,7 +139,6 @@
"fieldname": "selling_price_list", "fieldname": "selling_price_list",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": 1, "in_list_view": 1,
"label": "Default Price List", "label": "Default Price List",
@@ -171,7 +166,6 @@
"fieldname": "column_break_5", "fieldname": "column_break_5",
"fieldtype": "Column Break", "fieldtype": "Column Break",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": null, "label": null,
@@ -199,7 +193,6 @@
"fieldname": "so_required", "fieldname": "so_required",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": "Sales Order Required", "label": "Sales Order Required",
@@ -227,7 +220,6 @@
"fieldname": "dn_required", "fieldname": "dn_required",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": "Delivery Note Required", "label": "Delivery Note Required",
@@ -255,7 +247,6 @@
"fieldname": "maintain_same_sales_rate", "fieldname": "maintain_same_sales_rate",
"fieldtype": "Check", "fieldtype": "Check",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": "Maintain Same Rate Throughout Sales Cycle", "label": "Maintain Same Rate Throughout Sales Cycle",
@@ -283,7 +274,6 @@
"fieldname": "editable_price_list_rate", "fieldname": "editable_price_list_rate",
"fieldtype": "Check", "fieldtype": "Check",
"hidden": null, "hidden": null,
"ignore_restrictions": null,
"in_filter": null, "in_filter": null,
"in_list_view": null, "in_list_view": null,
"label": "Allow user to edit Price List Rate in transactions", "label": "Allow user to edit Price List Rate in transactions",
@@ -341,7 +331,6 @@
"read": 1, "read": 1,
"report": null, "report": null,
"restrict": null, "restrict": null,
"restricted": null,
"role": "System Manager", "role": "System Manager",
"submit": null, "submit": null,
"write": 1 "write": 1

27
erpnext/setup/doctype/company/company.json
View File

@@ -63,7 +63,6 @@
{ {
"fieldname": "country", "fieldname": "country",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Country", "label": "Country",
"options": "Country", "options": "Country",
@@ -73,7 +72,7 @@
{ {
"fieldname": "chart_of_accounts", "fieldname": "chart_of_accounts",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Chart of Accounts", "label": "Chart of Accounts",
"options": "Chart of Accounts", "options": "Chart of Accounts",
"permlevel": 0 "permlevel": 0
@@ -90,7 +89,7 @@
"depends_on": "eval:!doc.__islocal", "depends_on": "eval:!doc.__islocal",
"fieldname": "default_bank_account", "fieldname": "default_bank_account",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Bank Account", "label": "Default Bank Account",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "default_bank_account", "oldfieldname": "default_bank_account",
@@ -102,7 +101,7 @@
{ {
"fieldname": "default_cash_account", "fieldname": "default_cash_account",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Cash Account", "label": "Default Cash Account",
"no_copy": 1, "no_copy": 1,
"options": "Account", "options": "Account",
@@ -113,7 +112,7 @@
"depends_on": "eval:!doc.__islocal", "depends_on": "eval:!doc.__islocal",
"fieldname": "receivables_group", "fieldname": "receivables_group",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Receivables Group", "label": "Receivables Group",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "receivables_group", "oldfieldname": "receivables_group",
@@ -126,7 +125,7 @@
"depends_on": "eval:!doc.__islocal", "depends_on": "eval:!doc.__islocal",
"fieldname": "payables_group", "fieldname": "payables_group",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Payables Group", "label": "Payables Group",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "payables_group", "oldfieldname": "payables_group",
@@ -138,7 +137,7 @@
{ {
"fieldname": "default_expense_account", "fieldname": "default_expense_account",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Expense Account", "label": "Default Expense Account",
"no_copy": 1, "no_copy": 1,
"options": "Account", "options": "Account",
@@ -147,7 +146,7 @@
{ {
"fieldname": "default_income_account", "fieldname": "default_income_account",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Income Account", "label": "Default Income Account",
"no_copy": 1, "no_copy": 1,
"options": "Account", "options": "Account",
@@ -164,7 +163,7 @@
{ {
"fieldname": "default_currency", "fieldname": "default_currency",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Currency", "label": "Default Currency",
"options": "Currency", "options": "Currency",
"permlevel": 0, "permlevel": 0,
@@ -175,7 +174,7 @@
"depends_on": "eval:!doc.__islocal", "depends_on": "eval:!doc.__islocal",
"fieldname": "cost_center", "fieldname": "cost_center",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Cost Center", "label": "Cost Center",
"no_copy": 1, "no_copy": 1,
"options": "Cost Center", "options": "Cost Center",
@@ -235,7 +234,7 @@
{ {
"fieldname": "stock_received_but_not_billed", "fieldname": "stock_received_but_not_billed",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Stock Received But Not Billed", "label": "Stock Received But Not Billed",
"no_copy": 1, "no_copy": 1,
"options": "Account", "options": "Account",
@@ -245,7 +244,7 @@
{ {
"fieldname": "stock_adjustment_account", "fieldname": "stock_adjustment_account",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Stock Adjustment Account", "label": "Stock Adjustment Account",
"no_copy": 1, "no_copy": 1,
"options": "Account", "options": "Account",
@@ -255,7 +254,7 @@
{ {
"fieldname": "expenses_included_in_valuation", "fieldname": "expenses_included_in_valuation",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Expenses Included In Valuation", "label": "Expenses Included In Valuation",
"no_copy": 1, "no_copy": 1,
"options": "Account", "options": "Account",
@@ -349,7 +348,7 @@
], ],
"icon": "icon-building", "icon": "icon-building",
"idx": 1, "idx": 1,
"modified": "2014-05-07 06:39:40.682148", "modified": "2014-05-26 03:05:47.284171",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Company", "name": "Company",

8
erpnext/setup/doctype/customer_group/customer_group.json
View File

@@ -22,7 +22,7 @@
"description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>", "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
"fieldname": "parent_customer_group", "fieldname": "parent_customer_group",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Parent Customer Group", "label": "Parent Customer Group",
"oldfieldname": "parent_customer_group", "oldfieldname": "parent_customer_group",
@@ -51,7 +51,7 @@
{ {
"fieldname": "default_price_list", "fieldname": "default_price_list",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Price List", "label": "Default Price List",
"options": "Price List", "options": "Price List",
"permlevel": 0 "permlevel": 0
@@ -87,7 +87,7 @@
"fieldname": "old_parent", "fieldname": "old_parent",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1, "hidden": 1,
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "old_parent", "label": "old_parent",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "old_parent", "oldfieldname": "old_parent",
@@ -101,7 +101,7 @@
"icon": "icon-sitemap", "icon": "icon-sitemap",
"idx": 1, "idx": 1,
"in_create": 1, "in_create": 1,
"modified": "2014-05-07 06:39:41.073285", "modified": "2014-05-26 03:05:47.746202",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Customer Group", "name": "Customer Group",

6
erpnext/setup/doctype/global_defaults/global_defaults.json
View File

@@ -24,7 +24,7 @@
"default": "INR", "default": "INR",
"fieldname": "default_currency", "fieldname": "default_currency",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Default Currency", "label": "Default Currency",
"options": "Currency", "options": "Currency",
@@ -53,7 +53,7 @@
{ {
"fieldname": "default_company", "fieldname": "default_company",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Company", "label": "Default Company",
"options": "Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
@@ -105,7 +105,7 @@
"idx": 1, "idx": 1,
"in_create": 1, "in_create": 1,
"issingle": 1, "issingle": 1,
"modified": "2014-05-07 05:25:24.237036", "modified": "2014-05-26 03:05:48.838329",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Global Defaults", "name": "Global Defaults",

6
erpnext/setup/doctype/item_group/item_group.json
View File

@@ -39,7 +39,7 @@
"description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>", "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"fieldname": "parent_item_group", "fieldname": "parent_item_group",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Parent Item Group", "label": "Parent Item Group",
"no_copy": 0, "no_copy": 0,
@@ -145,7 +145,7 @@
"fieldname": "old_parent", "fieldname": "old_parent",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1, "hidden": 1,
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "old_parent", "label": "old_parent",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "old_parent", "oldfieldname": "old_parent",
@@ -162,7 +162,7 @@
"in_create": 1, "in_create": 1,
"issingle": 0, "issingle": 0,
"max_attachments": 3, "max_attachments": 3,
"modified": "2014-05-16 15:26:47.322787", "modified": "2014-05-26 03:05:49.376278",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Item Group", "name": "Item Group",

9
erpnext/setup/doctype/sales_person/sales_person.json
View File

@@ -2,7 +2,7 @@
"allow_import": 1, "allow_import": 1,
"allow_rename": 1, "allow_rename": 1,
"autoname": "field:sales_person_name", "autoname": "field:sales_person_name",
"creation": "2013-01-10 16:34:24.000000", "creation": "2013-01-10 16:34:24",
"description": "All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.", "description": "All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
@@ -19,6 +19,7 @@
"fieldname": "sales_person_name", "fieldname": "sales_person_name",
"fieldtype": "Data", "fieldtype": "Data",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1,
"label": "Sales Person Name", "label": "Sales Person Name",
"oldfieldname": "sales_person_name", "oldfieldname": "sales_person_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -30,7 +31,8 @@
"description": "Select company name first.", "description": "Select company name first.",
"fieldname": "parent_sales_person", "fieldname": "parent_sales_person",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"in_list_view": 1,
"label": "Parent Sales Person", "label": "Parent Sales Person",
"oldfieldname": "parent_sales_person", "oldfieldname": "parent_sales_person",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -41,6 +43,7 @@
{ {
"fieldname": "is_group", "fieldname": "is_group",
"fieldtype": "Select", "fieldtype": "Select",
"in_list_view": 1,
"label": "Has Child Node", "label": "Has Child Node",
"oldfieldname": "is_group", "oldfieldname": "is_group",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -140,7 +143,7 @@
"icon": "icon-user", "icon": "icon-user",
"idx": 1, "idx": 1,
"in_create": 1, "in_create": 1,
"modified": "2014-01-20 17:49:25.000000", "modified": "2014-05-26 03:05:53.652608",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Sales Person", "name": "Sales Person",

6
erpnext/setup/doctype/territory/territory.json
View File

@@ -23,7 +23,7 @@
"description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>", "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"fieldname": "parent_territory", "fieldname": "parent_territory",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Parent Territory", "label": "Parent Territory",
"oldfieldname": "parent_territory", "oldfieldname": "parent_territory",
@@ -95,7 +95,7 @@
"fieldname": "old_parent", "fieldname": "old_parent",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1, "hidden": 1,
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "old_parent", "label": "old_parent",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "old_parent", "oldfieldname": "old_parent",
@@ -136,7 +136,7 @@
"icon": "icon-map-marker", "icon": "icon-map-marker",
"idx": 1, "idx": 1,
"in_create": 1, "in_create": 1,
"modified": "2014-05-07 06:32:11.724588", "modified": "2014-05-26 03:05:54.517648",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Territory", "name": "Territory",

4
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@@ -130,7 +130,7 @@
"allow_on_submit": 0, "allow_on_submit": 0,
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -999,7 +999,7 @@
"idx": 1, "idx": 1,
"in_create": 0, "in_create": 0,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:17:22.579628", "modified": "2014-05-26 03:05:48.020967",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note", "name": "Delivery Note",

22
erpnext/stock/doctype/item/item.json
View File

@@ -72,7 +72,7 @@
"description": "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).", "description": "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).",
"fieldname": "stock_uom", "fieldname": "stock_uom",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Unit of Measure", "label": "Default Unit of Measure",
"oldfieldname": "stock_uom", "oldfieldname": "stock_uom",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -179,7 +179,7 @@
"description": "Mandatory if Stock Item is \"Yes\". Also the default warehouse where reserved quantity is set from Sales Order.", "description": "Mandatory if Stock Item is \"Yes\". Also the default warehouse where reserved quantity is set from Sales Order.",
"fieldname": "default_warehouse", "fieldname": "default_warehouse",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Warehouse", "label": "Default Warehouse",
"oldfieldname": "default_warehouse", "oldfieldname": "default_warehouse",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -313,7 +313,7 @@
"depends_on": "eval:doc.is_stock_item==\"Yes\"", "depends_on": "eval:doc.is_stock_item==\"Yes\"",
"fieldname": "weight_uom", "fieldname": "weight_uom",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Weight UOM", "label": "Weight UOM",
"options": "UOM", "options": "UOM",
"permlevel": 0, "permlevel": 0,
@@ -385,7 +385,7 @@
{ {
"fieldname": "default_supplier", "fieldname": "default_supplier",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Supplier", "label": "Default Supplier",
"options": "Supplier", "options": "Supplier",
"permlevel": 0 "permlevel": 0
@@ -407,7 +407,7 @@
"description": "Default Purchase Account in which cost of the item will be debited.", "description": "Default Purchase Account in which cost of the item will be debited.",
"fieldname": "expense_account", "fieldname": "expense_account",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Expense Account", "label": "Default Expense Account",
"oldfieldname": "purchase_account", "oldfieldname": "purchase_account",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -420,7 +420,7 @@
"description": "Default Cost Center for tracking expense for this item.", "description": "Default Cost Center for tracking expense for this item.",
"fieldname": "buying_cost_center", "fieldname": "buying_cost_center",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Buying Cost Center", "label": "Default Buying Cost Center",
"oldfieldname": "cost_center", "oldfieldname": "cost_center",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -537,7 +537,7 @@
"depends_on": "eval:doc.is_sales_item==\"Yes\"", "depends_on": "eval:doc.is_sales_item==\"Yes\"",
"fieldname": "income_account", "fieldname": "income_account",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Income Account", "label": "Default Income Account",
"options": "Account", "options": "Account",
"permlevel": 0, "permlevel": 0,
@@ -547,7 +547,7 @@
"depends_on": "eval:doc.is_sales_item==\"Yes\"", "depends_on": "eval:doc.is_sales_item==\"Yes\"",
"fieldname": "selling_cost_center", "fieldname": "selling_cost_center",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default Selling Cost Center", "label": "Default Selling Cost Center",
"options": "Cost Center", "options": "Cost Center",
"permlevel": 0, "permlevel": 0,
@@ -651,7 +651,7 @@
"depends_on": "eval:doc.is_manufactured_item==\"Yes\"", "depends_on": "eval:doc.is_manufactured_item==\"Yes\"",
"fieldname": "default_bom", "fieldname": "default_bom",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Default BOM", "label": "Default BOM",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "default_bom", "oldfieldname": "default_bom",
@@ -764,7 +764,7 @@
"description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.", "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.",
"fieldname": "website_warehouse", "fieldname": "website_warehouse",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Website Warehouse", "label": "Website Warehouse",
"options": "Warehouse", "options": "Warehouse",
"permlevel": 0, "permlevel": 0,
@@ -815,7 +815,7 @@
{ {
"fieldname": "parent_website_route", "fieldname": "parent_website_route",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Parent Website Route", "label": "Parent Website Route",
"no_copy": 1, "no_copy": 1,
"options": "Website Route", "options": "Website Route",

4
erpnext/stock/doctype/material_request/material_request.json
View File

@@ -42,7 +42,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -229,7 +229,7 @@
"icon": "icon-ticket", "icon": "icon-ticket",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:17:25.742502", "modified": "2014-05-26 03:05:50.138188",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Material Request", "name": "Material Request",

4
erpnext/stock/doctype/packing_slip/packing_slip.json
View File

@@ -168,7 +168,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"options": "Packing Slip", "options": "Packing Slip",
@@ -180,7 +180,7 @@
"icon": "icon-suitcase", "icon": "icon-suitcase",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-26 03:19:59.409839", "modified": "2014-05-26 03:07:50.514014",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Packing Slip", "name": "Packing Slip",

4
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@@ -518,7 +518,7 @@
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 1, "hidden": 1,
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -754,7 +754,7 @@
"icon": "icon-truck", "icon": "icon-truck",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:17:29.990590", "modified": "2014-05-26 03:05:51.846204",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt", "name": "Purchase Receipt",

4
erpnext/stock/doctype/stock_entry/stock_entry.json
View File

@@ -539,7 +539,7 @@
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"in_filter": 0, "in_filter": 0,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
@@ -580,7 +580,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2014-05-09 02:17:33.093429", "modified": "2014-05-26 03:05:53.832569",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Entry", "name": "Stock Entry",

8
erpnext/stock/doctype/stock_entry/test_stock_entry.py
View File

@@ -774,8 +774,8 @@ class TestStockEntry(unittest.TestCase):
def test_warehouse_user(self): def test_warehouse_user(self):
set_perpetual_inventory(0) set_perpetual_inventory(0)
frappe.defaults.add_default("Warehouse", "_Test Warehouse 1 - _TC", "test@example.com", "Restriction") frappe.defaults.add_default("Warehouse", "_Test Warehouse 1 - _TC", "test@example.com", "User Permission")
frappe.defaults.add_default("Warehouse", "_Test Warehouse 2 - _TC1", "test2@example.com", "Restriction") frappe.defaults.add_default("Warehouse", "_Test Warehouse 2 - _TC1", "test2@example.com", "User Permission")
frappe.get_doc("User", "test@example.com")\ frappe.get_doc("User", "test@example.com")\
.add_roles("Sales User", "Sales Manager", "Material User", "Material Manager") .add_roles("Sales User", "Sales Manager", "Material User", "Material Manager")
frappe.get_doc("User", "test2@example.com")\ frappe.get_doc("User", "test2@example.com")\
@@ -795,9 +795,9 @@ class TestStockEntry(unittest.TestCase):
st1.submit() st1.submit()
frappe.defaults.clear_default("Warehouse", "_Test Warehouse 1 - _TC", frappe.defaults.clear_default("Warehouse", "_Test Warehouse 1 - _TC",
"test@example.com", parenttype="Restriction") "test@example.com", parenttype="User Permission")
frappe.defaults.clear_default("Warehouse", "_Test Warehouse 2 - _TC1", frappe.defaults.clear_default("Warehouse", "_Test Warehouse 2 - _TC1",
"test2@example.com", parenttype="Restriction") "test2@example.com", parenttype="User Permission")
def test_freeze_stocks (self): def test_freeze_stocks (self):
self._clear_stock_account_balance() self._clear_stock_account_balance()

4
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
View File

@@ -34,7 +34,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"options": "Stock Reconciliation", "options": "Stock Reconciliation",
@@ -119,7 +119,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"max_attachments": 1, "max_attachments": 1,
"modified": "2014-05-09 02:17:34.080012", "modified": "2014-05-26 03:05:54.024413",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Reconciliation", "name": "Stock Reconciliation",

4
erpnext/support/doctype/customer_issue/customer_issue.json
View File

@@ -381,7 +381,7 @@
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 1, "hidden": 1,
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -394,7 +394,7 @@
"icon": "icon-bug", "icon": "icon-bug",
"idx": 1, "idx": 1,
"is_submittable": 0, "is_submittable": 0,
"modified": "2014-05-09 02:16:43.267003", "modified": "2014-05-26 03:05:47.828178",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Support", "module": "Support",
"name": "Customer Issue", "name": "Customer Issue",

4
erpnext/support/doctype/maintenance_visit/maintenance_visit.json
View File

@@ -191,7 +191,7 @@
{ {
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"ignore_restrictions": 1, "ignore_user_permissions": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@@ -278,7 +278,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-09 02:16:43.663232", "modified": "2014-05-26 03:05:50.014543",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Support", "module": "Support",
"name": "Maintenance Visit", "name": "Maintenance Visit",

1
erpnext/utilities/doctype/note/note.json
View File

@@ -60,7 +60,6 @@
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"restricted": 1,
"role": "All", "role": "All",
"write": 1 "write": 1
} }