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

Merge branch 'refs/heads/develop' into feature/tool_standard_library_process

Browse Source 
# Conflicts:
#	sf_manufacturing/models/product_template.py
This commit is contained in:
liaodanlong
2025-03-26 17:01:13 +08:00
parent 11a5217430 855e0eb1c2
commit d2155b17b4
20 changed files with 256 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sf_manufacturing/views/stock_picking_view.xml
View File

@@ -68,14 +68,8 @@
context="{'group_by': 'retrospect_ref'}"/>
</xpath>
<xpath expr="//field[@name='picking_type_id']" position="after">
<field name="product_id"
string="零件图号"
filter_domain="[('product_id.part_number', 'ilike', self)]"
/>
<field name="product_id"
string="零件名称"
filter_domain="[('product_id.part_name', 'ilike', self)]"
/>
<field name="part_numbers" string="零件图号" filter_domain="[('part_numbers', 'ilike', self)]"/>
<field name="part_names" string="零件名称" filter_domain="[('part_names', 'ilike', self)]"/>
</xpath>
</field>
</record>
@@ -97,7 +91,8 @@
<attribute name="invisible">True</attribute>
</xpath>
<xpath expr="//form//button[@name='action_assign_serial_show_details']" position="after">
<button name="button_update_the_sequence_number" type="object" class="btn-link" data-hotkey="k" title="Assign Serial Numbers">
<button name="button_update_the_sequence_number" type="object" class="btn-link" data-hotkey="k"
title="Assign Serial Numbers">
<span>更新序列号</span>
</button>
</xpath>