pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] delivery,website_sale_delivery: improve delivery methods publishing information

Browse Source 
- Remove duplicate search view from delivery module.
- Add website_published in tree and search view of delivery.so that
  we can check at a glance which carrier is available in frontend.
This commit is contained in:
dut-odoo
2016-08-12 13:47:47 +02:00
committed by David Monjoie
parent a78bc40c8f
commit 93f60ff0ef
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/delivery/views/delivery_view.xml
+2 -15
View File
@@ -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>
addons/website_sale_delivery/views/website_sale_delivery_views.xml
+22
View File
@@ -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"