jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
mgw
2023-06-12 14:35:14 +08:00
parent e0983d0530
commit 3d04200ca7
167 changed files with 3468 additions and 7898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sf_mrs_connect/data/ir_cron_data.xml
View File

@@ -142,4 +142,15 @@
<field name="numbercall">-1</field>
<field name="doall" eval="False"/>
</record>
<record model="ir.cron" id="sf_cron14">
<field name="name">同步资源库机床型号</field>
<field name="model_id" ref="model_sf_machine_tool_category"/>
<field name="state">code</field>
<field name="code">model.sync_machine_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>
</odoo>

2
sf_mrs_connect/models/res_config_setting.py
View File

@@ -38,6 +38,8 @@ class ResConfigSettings(models.TransientModel):
_logger.info("同步资源库控制系统")
self.env['sf.machine_tool.type'].sync_all_machine_tool_type()
_logger.info("同步资源库机床型号")
self.env['sf.machine_tool.category'].sync_all_machine_tool_category()
_logger.info("同步资源库机床类型")
self.env['sf.cutting_tool.category'].sync_all_cutting_tool_category()
_logger.info("同步资源库刀具类别")
self.env['sf.cutting_tool.type'].sync_all_cutting_tool_type()

2
sf_mrs_connect/views/res_config_settings_views.xml
View File

@@ -26,7 +26,7 @@
<field name="sf_secret_key"/>
</div>
<div class="col-12 col-lg-6 o_setting_box">
<button type="object" class="oe_highlight" name="sf_all_sync"
<button type="object" class="oe_highlight" name="sf_all_sync" confirm="确认同步"
string="同步资源库基础数据"
/>
</div>