diff options
| -rw-r--r-- | addons/product/views/product_views.xml | 1 | ||||
| -rw-r--r-- | addons/purchase/views/product_views.xml | 25 | ||||
| -rw-r--r-- | addons/purchase_requisition/views/product_views.xml | 4 | ||||
| -rw-r--r-- | odoo/addons/test_main_flows/static/tests/tours/main_flow.js | 16 |
4 files changed, 33 insertions, 13 deletions
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml index 6b48a701865..4b43b0eff36 100644 --- a/addons/product/views/product_views.xml +++ b/addons/product/views/product_views.xml @@ -671,6 +671,7 @@ <field name="min_qty"/> <field name="product_uom" groups="uom.group_uom"/> <field name="price" string="Price"/> + <field name="delay" optional="hide"/> </tree> </field> </record> diff --git a/addons/purchase/views/product_views.xml b/addons/purchase/views/product_views.xml index a4228b9be3e..3bb683cfa22 100644 --- a/addons/purchase/views/product_views.xml +++ b/addons/purchase/views/product_views.xml @@ -2,6 +2,27 @@ <odoo> <!-- Product Suppliers--> + <record id="product_supplierinfo_tree_view2" model="ir.ui.view"> + <field name="name">product.supplierinfo.tree.view2</field> + <field name="model">product.supplierinfo</field> + <field name="inherit_id" ref="product.product_supplierinfo_tree_view"/> + <field name="mode">primary</field> + <field name="priority" eval="1000"/> + <field name="arch" type="xml"> + <xpath expr="//tree" position="attributes"> + <attribute name="editable">bottom</attribute> + </xpath> + <xpath expr="//field[@name='company_id']" position="attributes"> + <attribute name="readonly">0</attribute> + </xpath> + <xpath expr="//field[@name='name']" position="attributes"> + <attribute name="readonly">0</attribute> + </xpath> + <xpath expr="//field[@name='product_id']" position="attributes"> + <attribute name="readonly">0</attribute> + </xpath> + </field> + </record> <record id="view_product_supplier_inherit" model="ir.ui.view"> <field name="name">product.template.supplier.form.inherit</field> @@ -12,8 +33,8 @@ <attribute name="invisible">0</attribute> </xpath> <group name="purchase" position="before"> - <field name="seller_ids" context="{'default_product_tmpl_id':context.get('product_tmpl_id',active_id), 'product_template_invisible_variant': True}" nolabel="1" attrs="{'invisible': [('product_variant_count','>',1)]}"/> - <field name="variant_seller_ids" context="{'default_product_tmpl_id': context.get('product_tmpl_id', active_id)}" nolabel="1" attrs="{'invisible': [('product_variant_count','<=',1)]}"/> + <field name="seller_ids" context="{'default_product_tmpl_id':context.get('product_tmpl_id',active_id), 'product_template_invisible_variant': True, 'tree_view_ref':'purchase.product_supplierinfo_tree_view2'}" nolabel="1" attrs="{'invisible': [('product_variant_count','>',1)]}"/> + <field name="variant_seller_ids" context="{'default_product_tmpl_id': context.get('product_tmpl_id', active_id), 'tree_view_ref':'purchase.product_supplierinfo_tree_view2'}" nolabel="1" attrs="{'invisible': [('product_variant_count','<=',1)]}"/> </group> <group name="bill" position="attributes"> <attribute name="groups">purchase.group_purchase_manager</attribute> diff --git a/addons/purchase_requisition/views/product_views.xml b/addons/purchase_requisition/views/product_views.xml index 82f34339745..51fb3d31e9c 100644 --- a/addons/purchase_requisition/views/product_views.xml +++ b/addons/purchase_requisition/views/product_views.xml @@ -6,8 +6,8 @@ <field name="model">product.supplierinfo</field> <field name="inherit_id" ref="product.product_supplierinfo_tree_view"/> <field name="arch" type="xml"> - <xpath expr="//field[@name='name']" position="after"> - <field name="purchase_requisition_id" readonly="1"/> + <xpath expr="//field[@name='product_id']" position="after"> + <field name="purchase_requisition_id" readonly="1" optional="hide"/> </xpath> </field> </record> diff --git a/odoo/addons/test_main_flows/static/tests/tours/main_flow.js b/odoo/addons/test_main_flows/static/tests/tours/main_flow.js index 334223e4901..4b49c9e7e08 100644 --- a/odoo/addons/test_main_flows/static/tests/tours/main_flow.js +++ b/odoo/addons/test_main_flows/static/tests/tours/main_flow.js @@ -140,11 +140,11 @@ tour.register('main_flow_tour', { position: 'right', run: "text 1", }, { - trigger: ".modal-footer .btn-primary:first", + trigger: 'label:contains("Vendor Taxes")', extra_trigger: ".o_field_widget[name=name] > .o_external_button", // Wait name_create - content: _t('Save & Close'), - position: 'bottom', -}, { + // click somewhere else to exit cell focus +}, +{ trigger: ".modal-footer .btn-primary", content: _t('Save'), position: 'bottom', @@ -195,12 +195,10 @@ tour.register('main_flow_tour', { position: 'right', run: "text 1", }, { - trigger: ".modal-footer .btn-primary:first", - content: _t('Save & Close'), - position: 'bottom', -}, { + trigger: 'label:contains("Vendor Taxes")', + // click somewhere else to exit cell focus +},{ trigger: ".modal-footer .btn-primary", - // Wait Save & Close and check value extra_trigger: ".o_field_widget[name=seller_ids] .o_data_row td:nth-child(2):contains('the_flow.vendor')", content: _t('Save'), position: 'bottom', |