summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2015-08-25 13:13:18 +0200
committerqsm-odoo <qsm@odoo.com>2015-08-28 17:07:45 +0200
commit8aac33495a29bd2220f077f461e2385a17e02745 (patch)
tree5ce563ce712789d6cfb59bedad6ec5499eec575f
parent85fd8d1da5c73905299d9d1682d09b340d91bd46 (diff)
[FIX] (website_sale_)delivery : oe_button_box was placed after title
-rw-r--r--addons/delivery/delivery_view.xml2
-rw-r--r--addons/website_sale_delivery/views/website_sale_delivery_view.xml16
2 files changed, 7 insertions, 11 deletions
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 512b51bfa9c..ae20d85f7bf 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -23,7 +23,7 @@
<field name="arch" type="xml">
<form string="Carrier">
<sheet>
- <div class="oe_title">
+ <div class="oe_title" name="title">
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/>
diff --git a/addons/website_sale_delivery/views/website_sale_delivery_view.xml b/addons/website_sale_delivery/views/website_sale_delivery_view.xml
index 5bee930daca..58f26f7d39e 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery_view.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery_view.xml
@@ -1,27 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-
+<odoo>
<record model="ir.ui.view" id="view_delivery_carrier_form">
<field name="name">delivery.carrier.website.form</field>
<field name="model">delivery.carrier</field>
<field name="inherit_id" ref="delivery.view_delivery_carrier_form"/>
<field name="arch" type="xml">
- <xpath expr="//div[@class='oe_title']" position="after">
+ <div name="title" position="before">
<div class="oe_button_box" name="button_box">
<button class="oe_stat_button" name="website_publish_button"
type="object" icon="fa-globe">
<field name="website_published" widget="website_button"/>
</button>
</div>
- </xpath>
- <xpath expr="//group[@name='general']" position="after">
+ </div>
+ <group name="general" position="after">
<group name="website">
<field name="website_description" attrs="{'invisible':[('website_published', '=', False)]}"/>
</group>
- </xpath>
+ </group>
</field>
</record>
-
- </data>
-</openerp>
+ </odoo>