Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug

This commit is contained in:
龚启豪
2023-11-23 16:37:53 +08:00
47 changed files with 1633 additions and 1549 deletions

View File

@@ -38,5 +38,33 @@
</record>
<record model="ir.module.category" id="module_category_plan">
<field name="name">计划</field>
<field name="sequence">20</field>
</record>
<record id="sales_team.group_sale_manager" model="res.groups">
<field name="name">销售经理</field>
<field name="category_id" ref="base.module_category_sales_sales"/>
<!-- <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>-->
</record>
<!-- <record id="group_sale_director" model="res.groups">-->
<!-- <field name="name">销售总监</field>-->
<!-- <field name="category_id" ref="base.module_category_sales_sales"/>-->
<!-- <field name="implied_ids" eval="[(4, ref('sf_base.group_sale_manager'))]"/>-->
<!-- </record>-->
<record id="group_plan_dispatch" model="res.groups">
<field name="name">计划调度岗</field>
<field name="category_id" ref="module_category_plan"/>
<field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
</record>
<record id="group_plan_director" model="res.groups">
<field name="name">计划总监</field>
<field name="category_id" ref="module_category_plan"/>
<field name="implied_ids" eval="[(4, ref('sf_base.group_plan_dispatch'))]"/>
</record>
</data>
</odoo>