diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index a26c1461..8cbcbb31 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -141,6 +141,8 @@ class ResPartnerToSale(models.Model): if customer: ids = [t.id for t in customer] domain = [('id', 'in', ids)] + else: + domain = [('id', '=', False)] return self._search(domain, limit=limit, access_rights_uid=name_get_uid) return super()._name_search(name, args, operator, limit, name_get_uid) @@ -175,5 +177,7 @@ class ResUserToSale(models.Model): if supplier: ids = [t.id for t in supplier] domain = [('id', 'in', ids)] + else: + domain = [('id', '=', False)] return self._search(domain, limit=limit, access_rights_uid=name_get_uid) return super()._name_search(name, args, operator, limit, name_get_uid) diff --git a/sf_sale/security/group_security.xml b/sf_sale/security/group_security.xml index ee08cd4c..431b872b 100644 --- a/sf_sale/security/group_security.xml +++ b/sf_sale/security/group_security.xml @@ -51,6 +51,16 @@ + + 销售经理查看自己的订单 + + ['|',('user_id','=',user.id),('create_uid', '=',user.id)] + + + + + + 采购总监查看所有的订单 diff --git a/sf_sale/security/ir.model.access.csv b/sf_sale/security/ir.model.access.csv index 3cd3ccd7..3962afc1 100644 --- a/sf_sale/security/ir.model.access.csv +++ b/sf_sale/security/ir.model.access.csv @@ -64,6 +64,10 @@ access_purchase_order_line_group_sale_director,purchase_order_line_group_sale_di access_purchase_order_wizard_group_purchase,purchase_order_wizard_group_purchase,model_purchase_order_wizard,sf_base.group_purchase,1,1,1,0 access_purchase_order_wizard_group_purchase_director,purchase_order_wizard_group_purchase_director,model_purchase_order_wizard,sf_base.group_purchase_director,1,1,1,0 +access_crm_tag_group_sale_salemanager,crm_tag_group_sale_salemanager,sales_team.model_crm_tag,sf_base.group_sale_salemanager,1,0,0,0 +access_crm_tag_group_sale_director,crm_tag_group_sale_director,sales_team.model_crm_tag,sf_base.group_sale_director,1,1,1,0 + + diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py index c3bb2e19..e334c32a 100644 --- a/sf_tool_management/__manifest__.py +++ b/sf_tool_management/__manifest__.py @@ -27,7 +27,6 @@ 'web.assets_qweb': [ ], 'web.assets_backend': [ - 'sf_tool_management/static/src/change.scss' ] },