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

1.工单查询页面新增工序类型和状态搜索面板

Browse Source 
2.销售模块新增delivery依赖
This commit is contained in:
jinling.yang
2024-02-27 10:37:59 +08:00
parent bf7926acf4
commit 424754db1a
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sf_machine_connect/views/WorkCenterBarcodes.xml
View File

@@ -2,18 +2,23 @@
<odoo> <odoo>
<record id="workcenter_form_vieww_scan_barcode_search" model="ir.ui.view"> <record id="workcenter_form_vieww_scan_barcode_search" model="ir.ui.view">
<field name="name">work.order.search</field> <field name="name">work.order.search</field>
<!-- <field name="model">mrp.workcenter</field>--> <!-- <field name="model">mrp.workcenter</field>-->
<field name="model">mrp.workorder</field> <field name="model">mrp.workorder</field>
<field name="inherit_id" ref="mrp.view_mrp_production_work_order_search"/> <field name="inherit_id" ref="mrp.view_mrp_production_work_order_search"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='production_id']" position="before"> <xpath expr="//group" position="before">
<!-- <field name="name" filter_domain="['|', '|', ('明确的字段内容', 'ilike', self), ('shortdesc', 'ilike', self), ('name', 'ilike', self)]" string="Theme"/>--> <searchpanel>
<!-- <field name="tray_code" filter_domain="[('production_id.tray_ids.code','=',self)]"/>--> <field name="routing_type" select="multi" string="工序类型" icon="fa-building" enable_counters="1"/>
<!-- <field name="production_id"/>--> <field name="state" select="multi" string="状态" icon="fa-building" enable_counters="1"/>
</searchpanel>
<!-- <field name="name" filter_domain="['|', '|', ('明确的字段内容', 'ilike', self), ('shortdesc', 'ilike', self), ('name', 'ilike', self)]" string="Theme"/>-->
<!-- <field name="tray_code" filter_domain="[('production_id.tray_ids.code','=',self)]"/>-->
<!-- <field name="production_id"/>-->
</xpath> </xpath>
<!-- <xpath expr="//search//group//filter[@name='product']" position="before">--> <!-- <xpath expr="//search//group//filter[@name='product']" position="before">-->
<!-- <filter string="Tray code" name="traycode" domain="[]" context="{'group_by': 'tray_code'}"/>--> <!-- <filter string="Tray code" name="traycode" domain="[]" context="{'group_by': 'tray_code'}"/>-->
<!-- </xpath>--> <!-- </xpath>-->
</field> </field>
</record> </record>

2
sf_sale/__manifest__.py
View File

@@ -10,7 +10,7 @@
""", """,
'category': 'sf', 'category': 'sf',
'website': 'https://www.sf.jikimo.com', 'website': 'https://www.sf.jikimo.com',
'depends': ['sale', 'sale_management', 'web_widget_model_viewer', 'sf_base', 'account', 'purchase'], 'depends': ['sale', 'sale_management', 'web_widget_model_viewer', 'sf_base', 'account', 'purchase', 'delivery'],
'data': [ 'data': [
'security/group_security.xml', 'security/group_security.xml',
'security/ir.model.access.csv', 'security/ir.model.access.csv',