From 5292826c72f0b01fbf2486f3aa35eaffc6ee86ef Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Wed, 22 Nov 2023 17:58:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=94=80=E5=94=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/security/group_security.xml | 4 +- sf_maintenance/__manifest__.py | 2 +- sf_mrs_connect/__init__.py | 1 - sf_sale/__manifest__.py | 3 +- sf_sale/models/sale_order.py | 6 ++ sf_sale/security/group_security.xml | 21 +++- sf_sale/security/ir.model.access.csv | 13 ++- sf_sale/views/sale_team.xml | 142 +++++++++++++++++++++++++++ 8 files changed, 184 insertions(+), 8 deletions(-) create mode 100644 sf_sale/views/sale_team.xml diff --git a/sf_base/security/group_security.xml b/sf_base/security/group_security.xml index 5423bfb8..0d435401 100644 --- a/sf_base/security/group_security.xml +++ b/sf_base/security/group_security.xml @@ -5,7 +5,7 @@ 20 - + 销售经理 @@ -13,7 +13,7 @@ 销售总监 - + diff --git a/sf_maintenance/__manifest__.py b/sf_maintenance/__manifest__.py index 7bfe057d..9c3c978a 100644 --- a/sf_maintenance/__manifest__.py +++ b/sf_maintenance/__manifest__.py @@ -6,7 +6,7 @@ 'category': '工厂设备', 'description': """ """, - 'depends': ['maintenance', 'sf_base'], + 'depends': ['hr_maintenance', 'sf_base'], 'data': [ 'security/group_security.xml', 'security/ir.model.access.csv', diff --git a/sf_mrs_connect/__init__.py b/sf_mrs_connect/__init__.py index 10245345..91c5580f 100644 --- a/sf_mrs_connect/__init__.py +++ b/sf_mrs_connect/__init__.py @@ -1,3 +1,2 @@ from . import controllers from . import models - diff --git a/sf_sale/__manifest__.py b/sf_sale/__manifest__.py index abd8d5a6..ea891245 100644 --- a/sf_sale/__manifest__.py +++ b/sf_sale/__manifest__.py @@ -10,10 +10,11 @@ """, 'category': 'sf', 'website': 'https://www.sf.jikimo.com', - 'depends': ['sale', 'sale_management', 'web_widget_model_viewer'], + 'depends': ['sale', 'sale_management', 'web_widget_model_viewer', 'sf_base','sales_team'], 'data': [ 'security/group_security.xml', 'security/ir.model.access.csv', + 'views/sale_team.xml', 'views/sale_order_view.xml', 'views/quick_easy_order_view.xml' ], diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index 93d67e37..e32b9360 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -68,3 +68,9 @@ class ResaleOrderLine(models.Model): _inherit = 'sale.order.line' model_glb_file = fields.Binary('模型的glb文件') + + +class ResCrmTeam(models.Model): + _inherit = 'crm.team' + + diff --git a/sf_sale/security/group_security.xml b/sf_sale/security/group_security.xml index b8668782..79fb2ef9 100644 --- a/sf_sale/security/group_security.xml +++ b/sf_sale/security/group_security.xml @@ -1,4 +1,23 @@ - + + + 销售经理只可以查看本人所在的团队 + + [(crm_team_member_ids.user_id,'=',user.id)] + + + + + + + + 销售总监 + + [(1,'=',1)] + + + + + \ No newline at end of file diff --git a/sf_sale/security/ir.model.access.csv b/sf_sale/security/ir.model.access.csv index 5a3a2ee8..b90db9d6 100644 --- a/sf_sale/security/ir.model.access.csv +++ b/sf_sale/security/ir.model.access.csv @@ -1,6 +1,15 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_quick_easy_order,quick_easy_order,model_quick_easy_order,base.group_user,1,1,1,1 -access_sf_auto_quatotion_common,sf_auto_quatotion_common,model_sf_auto_quatotion_common,base.group_user,1,1,1,1 +access_quick_easy_order,quick_easy_order,model_quick_easy_order,base.group_system,1,1,1,1 +access_sf_auto_quatotion_common,sf_auto_quatotion_common,model_sf_auto_quatotion_common,base.group_system,1,1,1,1 +access_sale_order,sale_order,model_sale_order,sf_base.group_sale_salemanager,1,1,1,0 +access_sale_order,sale_order,model_sale_order,sf_base.group_sale_director,1,1,1,0 +access_sale_order_line,sale_order_line,model_sale_order_line,sf_base.group_sale_salemanager,1,1,1,0 +access_sale_order_line,sale_order_line,model_sale_order_line,sf_base.group_sale_director,1,1,1,0 +access_crm_team,crm_team,sales_team.model_crm_team,sf_base.group_sale_director,1,1,1,0 +access_crm_team_member,crm_team_member,sales_team.model_crm_team_member,sf_base.group_sale_director,1,1,1,0 +access_res_users,res_users,base.model_res_users,sf_base.group_sale_director,1,1,1,0 + + diff --git a/sf_sale/views/sale_team.xml b/sf_sale/views/sale_team.xml new file mode 100644 index 00000000..8543888f --- /dev/null +++ b/sf_sale/views/sale_team.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +