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

Accept Merge Request #281: (feature/修改缺陷 -> develop)

Browse Source 
Merge Request: 去掉自定义barcode，暂时取消功能刀具的同步

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/281?initial=true
This commit is contained in:
马广威
2023-07-26 15:27:09 +08:00
parent fd7875b24e 503361a847
commit b1ea52cbe3
3 changed files with 6332 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_mrs_connect/models/res_config_setting.py
View File

@@ -54,9 +54,9 @@ class ResConfigSettings(models.TransientModel):
_logger.info("同步所有刀具型号...") _logger.info("同步所有刀具型号...")
self.env['sf.cutting.tool.model'].sync_all_tool_model() self.env['sf.cutting.tool.model'].sync_all_tool_model()
_logger.info("同步所有刀具型号完成") _logger.info("同步所有刀具型号完成")
_logger.info("同步所有功能刀具列表...") # _logger.info("同步所有功能刀具列表...")
self.env['sf.functional.cutting.tool'].sync_all_functional_cutting_tool() # self.env['sf.functional.cutting.tool'].sync_all_functional_cutting_tool()
_logger.info("同步所有功能刀具列表完成") # _logger.info("同步所有功能刀具列表完成")
self.env['sf.fixture.material'].sync_all_fixture_material() self.env['sf.fixture.material'].sync_all_fixture_material()
_logger.info("同步夹具物料") _logger.info("同步夹具物料")
self.env['sf.multi_mounting.type'].sync_all_multi_mounting_type() self.env['sf.multi_mounting.type'].sync_all_multi_mounting_type()

6319
sf_plan_management/i18n/zh_CN.po Normal file
View File

File diff suppressed because it is too large Load Diff

20
sf_warehouse/views/view.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<odoo> <odoo>
<data> <data>
<record id="view_location_tree2_sf_inherit" model="ir.ui.view"> <!-- <record id="view_location_tree2_sf_inherit" model="ir.ui.view"> -->
<field name="name">stock.location.tree.sf.inherit</field> <!-- <field name="name">stock.location.tree.sf.inherit</field> -->
<field name="model">stock.location</field> <!-- <field name="model">stock.location</field> -->
<field name="inherit_id" ref="stock.view_location_tree2"/> <!-- <field name="inherit_id" ref="stock.view_location_tree2"/> -->
<field name="arch" type="xml"> <!-- <field name="arch" type="xml"> -->
<xpath expr="//tree/field[@name='complete_name']" position="before"> <!-- <xpath expr="//tree/field[@name='complete_name']" position="before"> -->
<field name="barcode"/> <!-- <field name="barcode"/> -->
</xpath> <!-- </xpath> -->
</field> <!-- </field> -->
</record> <!-- </record> -->
<record id="view_location_form_sf_inherit" model="ir.ui.view"> <record id="view_location_form_sf_inherit" model="ir.ui.view">
<field name="name">stock.location.form.sf.inherit</field> <field name="name">stock.location.form.sf.inherit</field>