处理冲突

This commit is contained in:
qihao.gong@jikimo.com
2023-06-16 10:02:33 +08:00
parent e9ad452c43
commit 018fecfc59
25 changed files with 2855 additions and 905 deletions

View File

@@ -99,28 +99,6 @@
<field name="doall" eval="False"/>
</record>
<record model="ir.cron" id="sf_cron10">
<field name="name">同步资源库刀具类别</field>
<field name="model_id" ref="model_sf_cutting_tool_category"/>
<field name="state">code</field>
<field name="code">model.sync_cutting_tool_category()</field>
<field name="interval_number">1</field>
<field name="interval_type">days</field>
<field name="numbercall">-1</field>
<field name="doall" eval="False"/>
</record>
<record model="ir.cron" id="sf_cron11">
<field name="name">同步资源库刀具型号</field>
<field name="model_id" ref="model_sf_cutting_tool_type"/>
<field name="state">code</field>
<field name="code">model.sync_cutting_tool_type()</field>
<field name="interval_number">1</field>
<field name="interval_type">days</field>
<field name="numbercall">-1</field>
<field name="doall" eval="False"/>
</record>
<record model="ir.cron" id="sf_cron12">
<field name="name">同步资源库工序</field>
<field name="model_id" ref="model_sf_processing_order"/>
@@ -307,4 +285,48 @@
<field name="numbercall">-1</field>
<field name="doall" eval="False"/>
</record>
<record model="ir.cron" id="sf_cron29">
<field name="name">同步资源库夹紧元件型号</field>
<field name="model_id" ref="model_sf_fixture_clamping_element"/>
<field name="state">code</field>
<field name="code">model.sync_fixture_clamping_element()</field>
<field name="interval_number">1</field>
<field name="interval_type">days</field>
<field name="numbercall">-1</field>
<field name="doall" eval="False"/>
</record>
<record model="ir.cron" id="sf_cron30">
<field name="name">同步资源库夹紧元件类型</field>
<field name="model_id" ref="model_sf_clamping_element_type"/>
<field name="state">code</field>
<field name="code">model.sync_clamping_element_type()</field>
<field name="interval_number">1</field>
<field name="interval_type">days</field>
<field name="numbercall">-1</field>
<field name="doall" eval="False"/>
</record>
<record model="ir.cron" id="sf_cron31">
<field name="name">同步资源库导向元件类型</field>
<field name="model_id" ref="model_sf_guide_element_type"/>
<field name="state">code</field>
<field name="code">model.sync_guide_element_type()</field>
<field name="interval_number">1</field>
<field name="interval_type">days</field>
<field name="numbercall">-1</field>
<field name="doall" eval="False"/>
</record>
<record model="ir.cron" id="sf_cron31">
<field name="name">同步资源库导向元件导向方式</field>
<field name="model_id" ref="model_sf_guide_element_guide_mode"/>
<field name="state">code</field>
<field name="code">model.sync_guide_element_guide_mode()</field>
<field name="interval_number">1</field>
<field name="interval_type">days</field>
<field name="numbercall">-1</field>
<field name="doall" eval="False"/>
</record>
</odoo>