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

解决冲突

Browse Source
This commit is contained in:
胡尧
2024-11-11 16:32:54 +08:00
parent eebb143778 a12eb12678
commit d68a9249c6
33 changed files with 392 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sf_sale/views/purchase_order_view.xml
View File

@@ -218,6 +218,7 @@
<field name="context">
{"search_default_categ_id":1,"search_default_filter_to_purchase":1, "purchase_product_template": 1}
</field>
<field name="view_mode">tree,kanban,form,activity</field>
</record>
</data>
</odoo>

2
sf_sale/views/quick_easy_order_view.xml
View File

@@ -74,7 +74,7 @@
<!-- <field name="process_id"/>-->
<field name="parameter_ids" widget="many2many_tags" string="表面工艺参数"
options="{'no_create': True}"/>
<field name="machining_precision" required="1"/>
<!-- <field name="machining_precision" required="1"/>-->
<field name="processing_time"/>
<field name="quantity" options="{'format': false}"/>
<field name="unit_price"/>

4
sf_sale/views/sale_order_view.xml
View File

@@ -95,7 +95,7 @@
<attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
</field>
<field name="payment_term_id" position="after">
<field name="deadline_of_delivery" readonly="0"/>
<field name="deadline_of_delivery" readonly="0"/>
<field name="payments_way" invisible="1"/>
<field name="pay_way" invisible="1"/>
<!-- <field name="schedule_status" readonly="1"/> -->
@@ -283,6 +283,8 @@
</field>
</record>
<record id="sale.product_template_action" model="ir.actions.act_window">
<field name="view_mode">tree,kanban,form,activity</field>
<field name="view_id" ref="product.product_template_tree_view"/>
<field name="context">{"search_default_categ_id":1,
"search_default_filter_to_sell":1,"sale_multi_pricelist_product_template": 1}
</field>