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

[rename] Material User > Stock User

Browse Source
This commit is contained in:
Rushabh Mehta
2015-07-13 15:06:12 +05:30
parent 2212ae12d8
commit 94157334a7
41 changed files with 755 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/__init__.py
View File

@@ -1,8 +1,8 @@
from __future__ import unicode_literals
install_docs = [
{"doctype":"Role", "role_name":"Material Manager", "name":"Material Manager"},
{"doctype":"Role", "role_name":"Material Master Manager", "name":"Material Master Manager"},
{"doctype":"Role", "role_name":"Material User", "name":"Material User"},
{"doctype":"Role", "role_name":"Stock Manager", "name":"Stock Manager"},
{"doctype":"Role", "role_name":"Item Manager", "name":"Item Manager"},
{"doctype":"Role", "role_name":"Stock User", "name":"Stock User"},
{"doctype":"Role", "role_name":"Quality Manager", "name":"Quality Manager"},
{"doctype":"Item Group", "item_group_name":"All Item Groups", "is_group":"Yes"},
{"doctype":"Item Group", "item_group_name":"Default",

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

@@ -62,7 +62,7 @@
"icon": "icon-archive",
"idx": 1,
"max_attachments": 5,
"modified": "2015-02-05 05:11:34.824412",
"modified": "2015-07-13 05:28:24.973774",
"modified_by": "Administrator",
"module": "Stock",
"name": "Batch",
@@ -77,7 +77,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material Master Manager",
"role": "Item Manager",
"share": 1,
"submit": 0,
"write": 1

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

@@ -162,7 +162,7 @@
"hide_toolbar": 1,
"idx": 1,
"in_create": 1,
"modified": "2014-05-27 03:49:07.654364",
"modified": "2015-07-13 05:28:24.087304",
"modified_by": "Administrator",
"module": "Stock",
"name": "Bin",
@@ -197,7 +197,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material User",
"role": "Stock User",
"submit": 0,
"write": 0
}

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

@@ -1070,7 +1070,7 @@
"idx": 1,
"in_create": 0,
"is_submittable": 1,
"modified": "2015-07-07 02:37:08.064584",
"modified": "2015-07-13 05:28:29.814096",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",
@@ -1087,7 +1087,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material User",
"role": "Stock User",
"share": 1,
"submit": 1,
"write": 1
@@ -1102,7 +1102,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material Manager",
"role": "Stock Manager",
"share": 1,
"submit": 1,
"write": 1
@@ -1151,7 +1151,7 @@
{
"permlevel": 1,
"read": 1,
"role": "Material Manager",
"role": "Stock Manager",
"write": 1
}
],

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

@@ -903,7 +903,7 @@
"icon": "icon-tag",
"idx": 1,
"max_attachments": 1,
"modified": "2015-07-09 02:23:47.669199",
"modified": "2015-07-13 05:28:28.698107",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item",
@@ -918,7 +918,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material Master Manager",
"role": "Item Manager",
"share": 1,
"submit": 0,
"write": 1
@@ -932,7 +932,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material Manager",
"role": "Stock Manager",
"submit": 0,
"write": 0
},
@@ -946,7 +946,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material User",
"role": "Stock User",
"submit": 0,
"write": 0
},

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

@@ -54,7 +54,7 @@
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"modified": "2015-02-05 05:11:39.794192",
"modified": "2015-07-13 05:28:20.561939",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item Attribute",
@@ -74,7 +74,7 @@
"print": 0,
"read": 1,
"report": 1,
"role": "Material Master Manager",
"role": "Item Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,

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

@@ -102,7 +102,7 @@
],
"icon": "icon-usd",
"is_submittable": 1,
"modified": "2015-02-11 16:21:49.528566",
"modified": "2015-07-13 05:28:22.039577",
"modified_by": "Administrator",
"module": "Stock",
"name": "Landed Cost Voucher",
@@ -118,7 +118,7 @@
"permlevel": 0,
"read": 1,
"report": 1,
"role": "Material Manager",
"role": "Stock Manager",
"share": 1,
"submit": 1,
"write": 1

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

@@ -75,7 +75,7 @@
"is_submittable": 0,
"issingle": 1,
"istable": 0,
"modified": "2015-06-30 13:40:59.946655",
"modified": "2015-07-13 05:28:29.057918",
"modified_by": "Administrator",
"module": "Stock",
"name": "Manage Variants",
@@ -91,7 +91,7 @@
"print": 1,
"read": 1,
"report": 0,
"role": "Material Master Manager",
"role": "Item Manager",
"share": 1,
"write": 1
}

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

@@ -221,7 +221,7 @@
"icon": "icon-ticket",
"idx": 1,
"is_submittable": 1,
"modified": "2015-06-09 05:47:05.934432",
"modified": "2015-07-13 05:28:25.935998",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request",
@@ -252,7 +252,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material Manager",
"role": "Stock Manager",
"share": 1,
"submit": 1,
"write": 1
@@ -268,7 +268,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material User",
"role": "Stock User",
"share": 1,
"submit": 1,
"write": 1

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

@@ -197,7 +197,7 @@
"icon": "icon-suitcase",
"idx": 1,
"is_submittable": 1,
"modified": "2015-02-20 05:09:24.405911",
"modified": "2015-07-13 05:28:24.850528",
"modified_by": "Administrator",
"module": "Stock",
"name": "Packing Slip",
@@ -214,7 +214,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material User",
"role": "Stock User",
"share": 1,
"submit": 1,
"write": 1
@@ -245,7 +245,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material Master Manager",
"role": "Item Manager",
"share": 1,
"submit": 1,
"write": 1
@@ -260,7 +260,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material Manager",
"role": "Stock Manager",
"share": 1,
"submit": 1,
"write": 1

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

@@ -854,7 +854,7 @@
"icon": "icon-truck",
"idx": 1,
"is_submittable": 1,
"modified": "2015-06-15 15:38:43.754869",
"modified": "2015-07-13 05:28:27.389559",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",
@@ -870,7 +870,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material Manager",
"role": "Stock Manager",
"share": 1,
"submit": 1,
"write": 1
@@ -886,7 +886,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material User",
"role": "Stock User",
"share": 1,
"submit": 1,
"write": 1
@@ -928,7 +928,7 @@
{
"permlevel": 1,
"read": 1,
"role": "Material Manager",
"role": "Stock Manager",
"write": 1
}
],

8
erpnext/stock/doctype/serial_no/serial_no.json
View File

@@ -418,7 +418,7 @@
"icon": "icon-barcode",
"idx": 1,
"in_create": 0,
"modified": "2015-05-28 21:35:58.378231",
"modified": "2015-07-13 05:28:27.961178",
"modified_by": "Administrator",
"module": "Stock",
"name": "Serial No",
@@ -432,7 +432,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material Master Manager",
"role": "Item Manager",
"share": 1,
"submit": 0,
"write": 1
@@ -446,7 +446,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material Manager",
"role": "Stock Manager",
"submit": 0,
"write": 0
},
@@ -460,7 +460,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material User",
"role": "Stock User",
"submit": 0,
"write": 0
}

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

@@ -678,7 +678,7 @@
"is_submittable": 1,
"issingle": 0,
"max_attachments": 0,
"modified": "2015-05-20 07:58:59.025553",
"modified": "2015-07-13 05:28:26.085266",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry",
@@ -695,7 +695,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material User",
"role": "Stock User",
"share": 1,
"submit": 1,
"write": 1
@@ -741,7 +741,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material Manager",
"role": "Stock Manager",
"share": 1,
"submit": 1,
"write": 1

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

@@ -704,7 +704,7 @@ class TestStockEntry(unittest.TestCase):
def test_warehouse_company_validation(self):
set_perpetual_inventory(0)
frappe.get_doc("User", "test2@example.com")\
.add_roles("Sales User", "Sales Manager", "Material User", "Material Manager")
.add_roles("Sales User", "Sales Manager", "Stock User", "Stock Manager")
frappe.set_user("test2@example.com")
from erpnext.stock.utils import InvalidWarehouseCompany
@@ -720,11 +720,11 @@ class TestStockEntry(unittest.TestCase):
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", "User Permission")
test_user = frappe.get_doc("User", "test@example.com")
test_user.add_roles("Sales User", "Sales Manager", "Material User")
test_user.remove_roles("Material Manager")
test_user.add_roles("Sales User", "Sales Manager", "Stock User")
test_user.remove_roles("Stock Manager")
frappe.get_doc("User", "test2@example.com")\
.add_roles("Sales User", "Sales Manager", "Material User", "Material Manager")
.add_roles("Sales User", "Sales Manager", "Stock User", "Stock Manager")
frappe.set_user("test@example.com")
st1 = frappe.copy_doc(test_records[0])

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

@@ -266,7 +266,7 @@
"icon": "icon-list",
"idx": 1,
"in_create": 1,
"modified": "2014-06-23 08:07:56.370276",
"modified": "2015-07-13 05:28:27.826340",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Ledger Entry",
@@ -280,7 +280,7 @@
"permlevel": 0,
"read": 1,
"report": 1,
"role": "Material User",
"role": "Stock User",
"submit": 0,
"write": 0
},

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

@@ -149,7 +149,7 @@
"idx": 1,
"is_submittable": 1,
"max_attachments": 1,
"modified": "2015-07-06 03:13:52.054017",
"modified": "2015-07-13 05:28:29.255124",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Reconciliation",
@@ -163,7 +163,7 @@
"permlevel": 0,
"read": 1,
"report": 1,
"role": "Material Manager",
"role": "Stock Manager",
"share": 1,
"submit": 1,
"write": 1

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

@@ -103,7 +103,7 @@
"icon": "icon-cog",
"idx": 1,
"issingle": 1,
"modified": "2015-02-18 08:37:18.229705",
"modified": "2015-07-13 05:28:23.839277",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Settings",
@@ -115,7 +115,7 @@
"permlevel": 0,
"print": 1,
"read": 1,
"role": "Material Manager",
"role": "Stock Manager",
"share": 1,
"write": 1
}

6
erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json
View File

@@ -43,7 +43,7 @@
"idx": 1,
"in_create": 0,
"issingle": 1,
"modified": "2015-02-05 05:11:47.290476",
"modified": "2015-07-13 05:28:25.689187",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock UOM Replace Utility",
@@ -56,7 +56,7 @@
"print": 1,
"read": 1,
"report": 0,
"role": "Material Master Manager",
"role": "Item Manager",
"share": 1,
"submit": 0,
"write": 1
@@ -68,7 +68,7 @@
"print": 1,
"read": 1,
"report": 0,
"role": "Material Manager",
"role": "Stock Manager",
"share": 1,
"submit": 0,
"write": 1

6
erpnext/stock/doctype/warehouse/warehouse.json
View File

@@ -151,7 +151,7 @@
],
"icon": "icon-building",
"idx": 1,
"modified": "2015-02-05 05:11:48.803063",
"modified": "2015-07-13 05:28:25.214824",
"modified_by": "Administrator",
"module": "Stock",
"name": "Warehouse",
@@ -166,7 +166,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material Master Manager",
"role": "Item Manager",
"share": 1,
"submit": 0,
"write": 1
@@ -181,7 +181,7 @@
"print": 1,
"read": 1,
"report": 1,
"role": "Material User",
"role": "Stock User",
"submit": 0,
"write": 0
},

2
erpnext/stock/reorder_item.py
View File

@@ -147,7 +147,7 @@ def send_email_notification(mr_list):
email_list = frappe.db.sql_list("""select distinct r.parent
from tabUserRole r, tabUser p
where p.name = r.parent and p.enabled = 1 and p.docstatus < 2
and r.role in ('Purchase Manager','Material Manager')
and r.role in ('Purchase Manager','Stock Manager')
and p.name not in ('Administrator', 'All', 'Guest')""")
msg="""<h3>Following Material Requests has been raised automatically \