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

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

Browse Source 
# Conflicts:
#	sf_manufacturing/__manifest__.py
This commit is contained in:
liaodanlong
2024-11-15 10:37:13 +08:00
parent 811a79c7c1 153f599fe8
commit 4787cb451d
18 changed files with 441 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_manufacturing/views/mrp_production_addional_change.xml
View File

@@ -35,10 +35,10 @@
<field name="reservation_state" optional="hide" decoration-danger="reservation_state == 'confirmed'"
decoration-success="reservation_state == 'assigned'"/>
</xpath>
<xpath expr="//field[@name='state']" position="before">
<!-- <xpath expr="//field[@name='state']" position="before">
<field name="production_type" widget="badge" decoration-warning="production_type == '人工线下加工'"
decoration-success="production_type == '自动化产线加工'" optional="show"/>
</xpath>
</xpath> -->
<xpath expr="//field[@name='activity_ids']" position="replace">
<field name="activity_ids" string="下一个活动" widget="list_activity" optional="hide"/>
</xpath>
@@ -91,7 +91,7 @@
</xpath>
<xpath expr="//sheet//group//group//div[3]" position="after">
<field name="production_type" readonly="1"/>
<!-- <field name="production_type" readonly="1"/> -->
<field name="manual_quotation" readonly="1"/>
<field name="programming_no" readonly="1"/>
<field name="programming_state" readonly="1"