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': 'Pending, Your online payment has been successfully processed. But your order is not validated yet.', 'done_msg': 'Done, 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 @@
+
+ +
- 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 @@ + + + + + + + + + + + + + \ 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 @@ delivery.carrier + +
+ +
+