Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能

This commit is contained in:
jinling.yang
2023-08-24 17:32:25 +08:00
22 changed files with 810 additions and 394 deletions

View File

@@ -33,21 +33,26 @@
<field name="arch" type="xml">
<form string="快速订单">
<sheet>
<label for="name"/>
<h1>
<field name="name" readonly="True"/>
</h1>
<group>
<group>
<field name="customer_id"/>
<field name="material_id"/>
<field name="customer_id" readonly="1" force_save="1"/>
<field name="material_id" />
<field name="material_model_id"/>
<field name="process_id"/>
<field name="parameter_ids"/>
<field name="parameter_ids" widget="many2many_tags"/>
<field name="machining_precision"/>
<field name="quantity"/>
<field name="unit_price"/>
<field name="price"/>
</group>
<group>
<field name="upload_model_file" widget="many2many_binary" />
<field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
attrs="{'invisible': [('model_file', '=', False)]}"/>
</group>
</group>
</sheet>
</form>
@@ -82,7 +87,13 @@
</field>
</record>
<menuitem parent="sale.sale_order_menu" sequence="99" name="上传模型" id="menu_quick_easy_order"
action="action_quick_easy_order"/>
<!-- <menuitem id="res_partner_menu"-->
<!-- action="account.res_partner_action_customer"-->
<!-- groups="sales_team.group_sale_salesman"-->
<!-- sequence="40"/>-->
<menuitem sequence="50" name="上传模型" id="menu_quick_easy_order"
action="action_quick_easy_order"
parent="sale.menu_sale_order"
groups="sales_team.group_sale_salesman"/>
</data>
</odoo>