diff options
| -rw-r--r-- | addons/delivery/views/delivery_view.xml | 17 | ||||
| -rw-r--r-- | addons/website_sale_delivery/views/website_sale_delivery_views.xml | 22 |
2 files changed, 24 insertions, 15 deletions
diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml index cb525eadb73..ffb958eda3a 100644 --- a/addons/delivery/views/delivery_view.xml +++ b/addons/delivery/views/delivery_view.xml @@ -4,21 +4,6 @@ <menuitem id="menu_delivery" name="Delivery" parent="stock.menu_stock_config_settings" groups="stock.group_stock_manager" sequence="50"/> <menuitem id="sale_menu_delivery" name="Delivery" parent="sales_team.menu_sale_config" groups="sales_team.group_sale_manager" sequence="12"/> - <record id="view_delivery_carrier_search" model="ir.ui.view"> - <field name="name">delivery.carrier.search</field> - <field name="model">delivery.carrier</field> - <field name="arch" type="xml"> - <search string="Delivery Carrier Search"> - <field name="name" string="Carrier" /> - <separator/> - <filter string="Archived" name="inactive" domain="[('active','=',False)]"/> - <group expand="0" string="Group By" > - <filter string="Price Computation" name="delivery_type" context="{'group_by':'delivery_type'}" /> - </group> - </search> - </field> - </record> - <record id="view_delivery_carrier_tree" model="ir.ui.view"> <field name="name">delivery.carrier.tree</field> <field name="model">delivery.carrier</field> @@ -36,7 +21,9 @@ <field name="model">delivery.carrier</field> <field name="arch" type="xml"> <search string="Delivery Carrier"> + <field name="name" string="Carrier" /> <field name="delivery_type"/> + <filter string="Archived" name="inactive" domain="[('active','=',False)]"/> <group expand="1" string="Group By"> <filter string="Provider" name="provider" context="{'group_by':'delivery_type', 'residual_visible':True}"/> </group> diff --git a/addons/website_sale_delivery/views/website_sale_delivery_views.xml b/addons/website_sale_delivery/views/website_sale_delivery_views.xml index 7693da5ed42..73ec58e7a81 100644 --- a/addons/website_sale_delivery/views/website_sale_delivery_views.xml +++ b/addons/website_sale_delivery/views/website_sale_delivery_views.xml @@ -19,6 +19,28 @@ </field> </record> + <record id="view_delivery_carrier_tree_inherit_website_sale_delivery" model="ir.ui.view"> + <field name="name">delivery.carrier.tree.inherit</field> + <field name="model">delivery.carrier</field> + <field name="inherit_id" ref="delivery.view_delivery_carrier_tree"/> + <field name="arch" type="xml"> + <field name="delivery_type" position="after"> + <field name="website_published"/> + </field> + </field> + </record> + + <record id="view_delivery_carrier_search_inherit_website_sale_delivery" model="ir.ui.view"> + <field name="name">delivery.carrier.search.inherit</field> + <field name="model">delivery.carrier</field> + <field name="inherit_id" ref="delivery.view_delivery_carrier_search"/> + <field name="arch" type="xml"> + <filter name="inactive" position="after"> + <filter string="Published" name="website_published" domain="[('website_published','=',True)]"/> + </filter> + </field> + </record> + <menuitem id="menu_ecommerce_delivery" parent="website_sale.menu_ecommerce_settings" |