Accept Merge Request #737: (feature/修复刀具管理模块 -> develop)

Merge Request: 修复刀具管理

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/737?initial=true

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)

sf_sale/security/group_security.xml

@@ -51,6 +51,16 @@
             <field name="perm_create" eval="1"/>
         </record>
 
+        <record model="ir.rule" id="sale_order_rule_my">
+            <field name="name">销售经理查看自己的订单</field>
+            <field name="model_id" ref="model_sale_order"/>
+            <field name="domain_force">['|',('user_id','=',user.id),('create_uid', '=',user.id)]</field>
+            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>
+            <field name="perm_read" eval="1"/>
+            <field name="perm_write" eval="1"/>
+            <field name="perm_create" eval="1"/>
+        </record>
+
         <record model="ir.rule" id="inventory_purchase_order_rule_director">
             <field name="name">采购总监查看所有的订单</field>
             <field name="model_id" ref="purchase.model_purchase_order"/>

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
+
+
 
 
 

sf_tool_management/__manifest__.py

@@ -27,7 +27,6 @@
         'web.assets_qweb': [
         ],
         'web.assets_backend': [
-            'sf_tool_management/static/src/change.scss'
         ]
 
     },