From bcabe788ee7fa30be5330120a97be103c52b5d3b Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Tue, 7 Jul 2015 13:37:18 +0200
Subject: [PATCH] =?UTF-8?q?[IMP]=20:=20Several=20change=20concerning=20the?=
 =?UTF-8?q?=20publish=20button=20-=20website=5Fsale=5Fdelivery=20:=20set?=
 =?UTF-8?q?=20the=20field=20website=5Fpublished=20into=20a=20stat=20button?=
 =?UTF-8?q?=20and=20set=20the=20form=20into=20a=20sheet=20-=20payment=20:?=
 =?UTF-8?q?=20Payment=20acquirers=20unpublished=20by=20default,=20and=20we?=
 =?UTF-8?q?bsite=5Fpublished=20set=20into=20a=20stat=20button=20-=20websit?=
 =?UTF-8?q?e=5Fpartner=20:=20res=5Fpartner=20unpublished=20by=20default,?=
 =?UTF-8?q?=20to=20avoid=20partners=20as=20=E2=80=9CPlusbelle=20LaPoubelle?=
 =?UTF-8?q?=E2=80=9D=20to=20be=20published=20on=20the=20prod=20(True=20Sto?=
 =?UTF-8?q?ry)=20-=20website=5Fsale=5Fdelivery=20:=20Delivery=20method=20u?=
 =?UTF-8?q?npublished=20by=20default.=20Adapt=20the=20demo=20data=20to=20b?=
 =?UTF-8?q?e=20published=20(to=20avoid=20breaking=20a=20test),=20and=20set?=
 =?UTF-8?q?=20the=20field=20website=5Fpublished=20into=20a=20stat=20button?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/payment/models/payment_acquirer.py           |  2 +-
 addons/payment/views/payment_acquirer.xml           |  7 ++++++-
 addons/website_partner/models/res_partner.py        |  2 +-
 addons/website_sale_delivery/__openerp__.py         |  4 +++-
 .../demo/website_sale_delivery_demo.xml             | 13 +++++++++++++
 addons/website_sale_delivery/models/sale_order.py   |  2 +-
 .../views/website_sale_delivery_view.xml            |  8 ++++++++
 7 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 addons/website_sale_delivery/demo/website_sale_delivery_demo.xml

diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index b3f2c47fc57..7a822be624f 100644
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -101,7 +101,7 @@ class PaymentAcquirer(osv.Model):
         'company_id': lambda self, cr, uid, obj, ctx=None: self.pool['res.users'].browse(cr, uid, uid).company_id.id,
         'environment': 'test',
         'validation': 'automatic',
-        'website_published': True,
+        'website_published': False,
         'auto_confirm': 'at_pay_confirm',
         'pending_msg': '<i>Pending,</i> Your online payment has been successfully processed. But your order is not validated yet.',
         'done_msg': '<i>Done,</i> Your online payment has been successfully processed. Thank you for your order.',
diff --git a/addons/payment/views/payment_acquirer.xml b/addons/payment/views/payment_acquirer.xml
index 93857a356ab..3a01a8ad1d6 100644
--- a/addons/payment/views/payment_acquirer.xml
+++ b/addons/payment/views/payment_acquirer.xml
@@ -13,12 +13,17 @@
             <field name="arch" type="xml">
                 <form string="Payment Acquirer">
                     <sheet>
+                        <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>
                         <group name="acquirer_base">
                             <group>
                                 <field name="name"/>
                                 <field name="provider"/>
                                 <field name="company_id"/>
-                                <field name="website_published"/>
                                 <field name="environment"/>
                                 <field name="validation"/>
                                 <field name="auto_confirm"/>
diff --git a/addons/website_partner/models/res_partner.py b/addons/website_partner/models/res_partner.py
index cad7000a79a..686826b024c 100644
--- a/addons/website_partner/models/res_partner.py
+++ b/addons/website_partner/models/res_partner.py
@@ -42,5 +42,5 @@ class WebsiteResPartner(osv.Model):
         return res
 
     _defaults = {
-        'website_published': True
+        'website_private': True,
     }
diff --git a/addons/website_sale_delivery/__openerp__.py b/addons/website_sale_delivery/__openerp__.py
index 0389f501467..099f6e6e264 100644
--- a/addons/website_sale_delivery/__openerp__.py
+++ b/addons/website_sale_delivery/__openerp__.py
@@ -15,7 +15,9 @@ Delivery Costs
         'views/website_sale_delivery_view.xml',
         'security/ir.model.access.csv',
     ],
-    'demo': [],
+    'demo': [
+        'demo/website_sale_delivery_demo.xml',
+    ],
     'qweb': [],
     'installable': True,
 }
diff --git a/addons/website_sale_delivery/demo/website_sale_delivery_demo.xml b/addons/website_sale_delivery/demo/website_sale_delivery_demo.xml
new file mode 100644
index 00000000000..2d3731f9d6e
--- /dev/null
+++ b/addons/website_sale_delivery/demo/website_sale_delivery_demo.xml
@@ -0,0 +1,13 @@
+<openerp>
+    <data>
+
+        <record id="delivery.delivery_carrier" model="delivery.carrier">
+            <field name="website_published" eval="True"/>
+        </record>
+
+        <record id="delivery.normal_delivery_carrier" model="delivery.carrier">
+            <field name="website_published" eval="True"/>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/website_sale_delivery/models/sale_order.py b/addons/website_sale_delivery/models/sale_order.py
index f3690f54fc5..f63dd38d3f1 100644
--- a/addons/website_sale_delivery/models/sale_order.py
+++ b/addons/website_sale_delivery/models/sale_order.py
@@ -13,7 +13,7 @@ class delivery_carrier(orm.Model):
         'website_description': fields.text('Description for Online Quotations'),
     }
     _defaults = {
-        'website_published': True
+        'website_published': False
     }
 
 
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 66689449d1a..a8f266615c9 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery_view.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery_view.xml
@@ -7,6 +7,14 @@
         <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 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">
                 <group name="website">
                     <field name="website_published"/>