Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组

# Conflicts:
#	sf_base/security/group_security.xml
#	sf_sale/security/group_security.xml
This commit is contained in:
jinling.yang
2023-12-06 14:56:31 +08:00
13 changed files with 220 additions and 56 deletions

View File

@@ -20,14 +20,15 @@
<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_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_order_rule_salemanager">
<field name="name">销售经理查看自己的订单</field>