Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化

sf_sale/security/group_security.xml

@@ -11,7 +11,7 @@
         </record>
 
         <record model="ir.rule" id="crm_team_rule_director">
-            <field name="name">销售总监</field>
+            <field name="name">销售总监查看所有的订单</field>
             <field name="model_id" ref="sales_team.model_crm_team"/>
             <field name="domain_force">[(1,'=',1)]</field>
             <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>
@@ -20,20 +20,30 @@
             <field name="perm_create" eval="1"/>
         </record>
 
-<!--        <record model="ir.rule" id="sale_order_rule_director">-->
-<!--            <field name="name">销售总监查看所有的订单</field>-->
-<!--            <field name="model_id" ref="model_sale_order"/>-->
-<!--            <field name="domain_force">[(1,'=',1)]</field>-->
-<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>-->
-<!--            <field name="perm_read" eval="1"/>-->
-<!--            <field name="perm_write" eval="1"/>-->
-<!--        </record>-->
+        <record model="ir.rule" id="sale_customer_rule_director">
+            <field name="name">销售总监查看所有客户</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="domain_force">[(1,'=',1),('customer_rank','=',1)]</field>
+            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>
+            <field name="perm_read" eval="1"/>
+            <field name="perm_write" eval="1"/>
+        </record>
+
+        <record model="ir.rule" id="sale_customer_rule_my">
+            <field name="name">销售经理查看自己的客户</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <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="sale_order_rule_salemanager">
             <field name="name">销售经理查看自己的订单</field>
             <field name="model_id" ref="model_sale_order"/>
-            <field name="domain_force">['|',('partner_id','=',user.partner_id.id),('create_uid', '=',user.id)]</field>
+            <field name="domain_force">[('user_id', '=',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"/>
@@ -60,7 +70,7 @@
         </record>
 
 
-         <record model="ir.rule" id="purchase_supplier_rule_director">
+        <record model="ir.rule" id="purchase_supplier_rule_director">
             <field name="name">采购总监查看所有供应商</field>
             <field name="model_id" ref="base.model_res_partner"/>
             <field name="domain_force">[(1,'=',1)]</field>

sf_sale/security/ir.model.access.csv

@@ -8,6 +8,40 @@ access_sale_order_line_director,sale_order_line_director,model_sale_order_line,s
 access_crm_team_member_manager,crm_team_manager,sales_team.model_crm_team,sf_base.group_sale_director,1,1,1,0
 access_crm_team_member_director,crm_team_member_director,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
+access_product_template_group_sale_salemanager,product_template_group_sale_salemanager,product.model_product_template,sf_base.group_sale_salemanager,1,0,0,0
+access_product_template_group_sale_director,product_template_group_sale_director,product.model_product_template,sf_base.group_sale_director,1,0,0,0
+access_product_template_group_purchase,product_template_group_purchase,product.model_product_template,sf_base.group_purchase,1,0,0,0
+access_product_template_group_purchase_director,product_template_group_purchase_director,product.model_product_template,sf_base.group_purchase_director,1,0,0,0
+access_stock_picking_group_sale_salemanager,stock_picking_group_sale_salemanager,stock.model_stock_picking,sf_base.group_sale_salemanager,1,0,0,0
+access_stock_picking_group_sale_director,stock_picking_group_sale_director,stock.model_stock_picking,sf_base.group_sale_director,1,0,0,0
+access_stock_picking_group_purchase,stock_picking_group_purchase,stock.model_stock_picking,sf_base.group_purchase,1,0,0,0
+access_stock_picking_group_purchase_director,stock_picking_group_purchase_director,stock.model_stock_picking,sf_base.group_purchase_director,1,0,0,0
+access_account_move_group_sale_salemanager,account_move_group_sale_salemanager,account.model_account_move,sf_base.group_sale_salemanager,1,0,0,0
+access_account_move_group_sale_director,account_move_group_sale_director,account.model_account_move,sf_base.group_sale_director,1,0,0,0
+access_resource_resource_group_sale_director,resource_resource_group_sale_director,resource.model_resource_resource,sf_base.group_sale_director,1,1,1,0
+
+access_mrp_bom_group_purchase,mrp_bom_group_purchase,mrp.model_mrp_bom,sf_base.group_purchase,1,0,0,0
+access_mrp_bom_group_purchase_director,mrp_bom_group_purchase_director,mrp.model_mrp_bom,sf_base.group_purchase_director,1,0,0,0
+access_stock_move_group_purchase,stock_move_group_purchase,stock.model_stock_move,sf_base.group_purchase,1,0,0,0
+access_stock_move_group_purchase_director,stock_move_group_purchase_director,stock.model_stock_move,sf_base.group_purchase_director,1,0,0,0
+
+access_uom_uom_group_sale_salemanager,uom_uom_group_sale_salemanager,uom.model_uom_uom,sf_base.group_sale_salemanager,1,0,0,0
+access_uom_uom_group_sale_director,uom_uom_group_sale_director,uom.model_uom_uom,sf_base.group_sale_director,1,1,1,0
+access_uom_uom_group_purchase,uom_uom_group_purchase,uom.model_uom_uom,sf_base.group_purchase,1,0,0,0
+access_uom_uom_group_purchase_director,uom_uom_group_purchase_director,uom.model_uom_uom,sf_base.group_purchase_director,1,0,0,0
+
+access_uom_category_group_sale_salemanager,uom_category_group_sale_salemanager,uom.model_uom_category,sf_base.group_sale_salemanager,1,0,0,0
+access_uom_category_group_sale_director,uom_category_group_sale_director,uom.model_uom_category,sf_base.group_sale_director,1,1,1,0
+access_uom_category_group_purchase,uom_category_group_purchase,uom.model_uom_category,sf_base.group_purchase,1,0,0,0
+access_uom_category_group_purchase_director,uom_category_group_purchase_director,uom.model_uom_category,sf_base.group_purchase_director,1,0,0,0
+
+access_sale_order_check_wizard_group_sale_salemanager,sale_order_check_wizard_group_sale_salemanager,model_sale_order_check_wizard,sf_base.group_sale_salemanager,1,1,1,0
+access_sale_order_check_wizard_group_sale_director,sale_order_check_wizard_group_sale_director,model_sale_order_check_wizard,sf_base.group_sale_director,1,1,1,0
+
+
+
+
+
 
 
 access_sale_order,sale_order,model_sale_order,sf_base.group_plan_dispatch,1,0,0,0