Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化消息模版

# Conflicts:
#	sf_tool_management/models/base.py
This commit is contained in:
jinling.yang
2024-09-18 15:40:54 +08:00
34 changed files with 1959 additions and 669 deletions

View File

@@ -43,7 +43,7 @@
<label for="default_capacity"/>
<div class="o_row">
<field name="default_capacity" string="产线日产能"/>
</div>
</xpath>
<xpath expr="//field[@name='default_capacity'][last()]" position="before">

View File

@@ -513,6 +513,11 @@
</xpath>
<xpath expr="//form//header" position="inside">
<button type="object" class="oe_highlight" name="get_three_check_datas" string="获取数据"
attrs='{"invisible": [("state","!=","progress")]}'/>
</xpath>
<xpath expr="//page[1]" position="before">
<field name="results" invisible="1"/>