From c0513078525d1acbf5afad254d3eaf990b895c07 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 23 Jan 2014 10:41:15 +0100 Subject: [PATCH 01/11] [WIP] website: test_tour display report step by step (revert this commit after) bzr revid: chm@openerp.com-20140123094115-8wp1hc76gcdclk7o --- addons/website/static/src/js/website.tour.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js index f58bd048e80..b6ce5ad1621 100644 --- a/addons/website/static/src/js/website.tour.js +++ b/addons/website/static/src/js/website.tour.js @@ -348,6 +348,8 @@ } function executeStep (step) { // check if they are a cycle + console.log(window.localStorage.getItem("test-report")); + var lastStep = window.localStorage.getItem(testId); var tryStep = lastStep != step.stepId ? 0 : (+(window.localStorage.getItem("test-last-"+testId) || 0) + 1); window.localStorage.setItem("test-last-"+testId, tryStep); From f27237b8dde87ae9639b44271de53740aa85fe80 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Thu, 23 Jan 2014 11:26:32 +0100 Subject: [PATCH 02/11] [FIX] Set the auto_install flag to False bzr revid: stw@openerp.com-20140123102632-2zhttz8u3vh29tct --- addons/website_crm/__openerp__.py | 2 +- addons/website_mail/__openerp__.py | 2 +- addons/website_payment/__openerp__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/website_crm/__openerp__.py b/addons/website_crm/__openerp__.py index 08817314910..88b6ab1cc66 100644 --- a/addons/website_crm/__openerp__.py +++ b/addons/website_crm/__openerp__.py @@ -15,5 +15,5 @@ OpenERP Contact Form 'views/website_crm.xml', ], 'installable': True, - 'auto_install': True, + 'auto_install': False, } diff --git a/addons/website_mail/__openerp__.py b/addons/website_mail/__openerp__.py index 400411ed329..3e60135c833 100644 --- a/addons/website_mail/__openerp__.py +++ b/addons/website_mail/__openerp__.py @@ -44,5 +44,5 @@ 'static/src/xml/website_mail.xml' ], 'installable': True, - 'auto_install': True, + 'auto_install': False, } diff --git a/addons/website_payment/__openerp__.py b/addons/website_payment/__openerp__.py index e85803182de..ab214ae4cd7 100644 --- a/addons/website_payment/__openerp__.py +++ b/addons/website_payment/__openerp__.py @@ -14,5 +14,5 @@ 'data': [ 'views/website_payment_templates.xml', ], - 'auto_install': True, + 'auto_install': False, } From b37d6e72c168ec3446a6ced246c28325d46c2b9a Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Thu, 23 Jan 2014 11:34:25 +0100 Subject: [PATCH 03/11] [FIX] mail: adapt to improved behavior of ir_model_data.get_object() bzr revid: rco@openerp.com-20140123103425-gaud319o6t1f94qu --- addons/mail/mail_thread.py | 6 +++--- addons/mail/update.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 142d633c740..b8dbc580abf 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -165,7 +165,7 @@ class mail_thread(osv.AbstractModel): def read_followers_data(self, cr, uid, follower_ids, context=None): result = [] - technical_group = self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'group_no_one', context=context, check_existence_and_raise=True) + technical_group = self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'group_no_one', context=context) for follower in self.pool.get('res.partner').browse(cr, uid, follower_ids, context=context): is_editable = uid in map(lambda x: x.id, technical_group.users) is_uid = uid in map(lambda x: x.id, follower.user_ids) @@ -500,8 +500,8 @@ class mail_thread(osv.AbstractModel): posted = False for subtype in subtypes: - subtype_rec = self.pool.get('ir.model.data').get_object(cr, uid, subtype.split('.')[0], subtype.split('.')[1], context=context, check_existence_and_raise=False) - if not subtype_rec.exists(): + subtype_rec = self.pool.get('ir.model.data').get_object(cr, uid, subtype.split('.')[0], subtype.split('.')[1], context=context, check=False) + if not (subtype_rec and subtype_rec.exists()): _logger.debug('subtype %s not found' % subtype) continue message = format_message(subtype_rec.description if subtype_rec.description else subtype_rec.name, tracked_values) diff --git a/addons/mail/update.py b/addons/mail/update.py index 94286817648..f549f453b42 100644 --- a/addons/mail/update.py +++ b/addons/mail/update.py @@ -94,8 +94,8 @@ class publisher_warranty_contract(osv.osv): # old behavior based on res.log; now on mail.message, that is not necessarily installed IMD = self.pool['ir.model.data'] user = self.pool['res.users'].browse(cr, SUPERUSER_ID, SUPERUSER_ID) - poster = IMD.get_object(cr, SUPERUSER_ID, 'mail', 'group_all_employees', context=context, check_existence_and_raise=False) - if not poster.exists(): + poster = IMD.get_object(cr, SUPERUSER_ID, 'mail', 'group_all_employees', context=context, check=False) + if not (poster and poster.exists()): if not user.exists(): return True poster = user From 4e68fff52e9f427bfcb72d6887099f409d761f69 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 23 Jan 2014 11:47:05 +0100 Subject: [PATCH 04/11] [FIX] website_sale: demo data, test, delivery, context pricelist bzr revid: chm@openerp.com-20140123104705-679zt0odq0pseu7p --- addons/delivery/delivery_demo.xml | 2 +- addons/website/static/src/js/website.tour.js | 2 -- addons/website/tests/test_ui.py | 3 ++- addons/website/tests/ui_suite/ui_test_runner.js | 7 +------ addons/website_sale/controllers/main.py | 2 ++ addons/website_sale/models/website.py | 2 ++ .../static/src/js/website_sale_payment.js | 12 ++++++------ addons/website_sale/views/website_sale.xml | 10 ++++++---- .../views/website_sale_delivery.xml | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml index 1881c8b6608..0aed1a2aadd 100644 --- a/addons/delivery/delivery_demo.xml +++ b/addons/delivery/delivery_demo.xml @@ -39,7 +39,7 @@ Free delivery charges - 10 + 0 True 1000 diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js index b6ce5ad1621..f58bd048e80 100644 --- a/addons/website/static/src/js/website.tour.js +++ b/addons/website/static/src/js/website.tour.js @@ -348,8 +348,6 @@ } function executeStep (step) { // check if they are a cycle - console.log(window.localStorage.getItem("test-report")); - var lastStep = window.localStorage.getItem(testId); var tryStep = lastStep != step.stepId ? 0 : (+(window.localStorage.getItem("test-last-"+testId) || 0) + 1); window.localStorage.setItem("test-last-"+testId, tryStep); diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py index a4dcf8cf434..09cdf2b37e0 100644 --- a/addons/website/tests/test_ui.py +++ b/addons/website/tests/test_ui.py @@ -47,7 +47,8 @@ class WebsiteUiSuite(unittest.TestSuite): self._ignore_filters = [ # Ignore phantomjs warnings "*** WARNING:", - + # Disabled because of the 'web_hello' addon + "hello", # Fixes an issue with PhantomJS 1.9.2 on OS X 10.9 (Mavericks) # cf. https://github.com/ariya/phantomjs/issues/11418 "CoreText performance note", diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js index c64cebee7e1..507a8ca1e72 100644 --- a/addons/website/tests/ui_suite/ui_test_runner.js +++ b/addons/website/tests/ui_suite/ui_test_runner.js @@ -9,9 +9,6 @@ function waitFor (ready, callback, timeout, timeoutMessageCallback) { if(!condition) { var message = timeoutMessageCallback ? timeoutMessageCallback() : "Timeout after "+timeout+" ms"; console.log('{ "event": "error", "message": "'+message+'" }'); - if (window.localStorage.getItem("test-report")) { - console.log(JSON.parse(website.localStorage.getItem("test-report"))); - } console.log("Waiting for...\n"+ready); phantom.exit(1); } else { @@ -58,9 +55,7 @@ function run (test) { phantom.exit(1); }; page.onConsoleMessage = function(message) { - /* Disabled because of the 'web_hello' addon */ - //console.log(message); - //phantom.exit(1); + console.log(message); }; page.onCallback = function(data) { diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index b2a4d1eb57e..f429b68a5ad 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -336,6 +336,8 @@ class Ecommerce(http.Controller): index = random.randrange(0, len(suggested_ids)) suggested_products.append(suggested_ids.pop(index)) + context = dict(context or {}, pricelist=request.registry['website'].ecommerce_get_pricelist_id(cr, uid, None, context=context)) + values = { 'int': int, 'suggested_products': prod_obj.browse(cr, uid, suggested_products, context), diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py index 11ff6cf2efc..f52a409d244 100644 --- a/addons/website_sale/models/website.py +++ b/addons/website_sale/models/website.py @@ -158,10 +158,12 @@ class Website(orm.Model): order_id = self._ecommerce_create_quotation(cr, uid, context=context) request.httprequest.session['ecommerce_order_id'] = order_id + context = dict(context or {}, pricelist=self.ecommerce_get_pricelist_id(cr, uid, None, context=context)) return SaleOrder.browse(cr, SUPERUSER_ID, order_id, context=context) def ecommerce_get_current_order(self, cr, uid, context=None): SaleOrder = self.pool.get('sale.order') + context = dict(context or {}, pricelist=self.ecommerce_get_pricelist_id(cr, uid, None, context=context)) order_id = request.httprequest.session.get('ecommerce_order_id') if not order_id: request.httprequest.session['ecommerce_order_id'] = False diff --git a/addons/website_sale/static/src/js/website_sale_payment.js b/addons/website_sale/static/src/js/website_sale_payment.js index 3281ee009d2..20461a7c07e 100644 --- a/addons/website_sale/static/src/js/website_sale_payment.js +++ b/addons/website_sale/static/src/js/website_sale_payment.js @@ -2,11 +2,11 @@ $(document).ready(function () { // When choosing an acquirer, display its Pay Now button var $payment = $("#payment_method"); - $payment.find("input[name='acquirer']").click(function (ev) { - var payment_id = $(ev.currentTarget).val(); - $("div.oe_sale_acquirer_button[data-id]", $payment).addClass("hidden"); - $("div.oe_sale_acquirer_button[data-id='"+payment_id+"']", $payment).removeClass("hidden"); - }); - $payment.find("input[name='acquirer']:checked").click(); + $payment.on("click", "input[name='acquirer']", function (ev) { + var payment_id = $(ev.currentTarget).val(); + $("div.oe_sale_acquirer_button[data-id]", $payment).addClass("hidden"); + $("div.oe_sale_acquirer_button[data-id='"+payment_id+"']", $payment).removeClass("hidden"); + }) + .find("#payment_method input[name='acquirer']:checked").click(); }); diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index 096d554441b..e11647ce462 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -945,18 +945,20 @@ -
+

Payment Method:

- -
diff --git a/addons/website_sale_delivery/views/website_sale_delivery.xml b/addons/website_sale_delivery/views/website_sale_delivery.xml index 46f04e70a38..7f37a0647e3 100644 --- a/addons/website_sale_delivery/views/website_sale_delivery.xml +++ b/addons/website_sale_delivery/views/website_sale_delivery.xml @@ -23,8 +23,8 @@
-

Choose your Delivery Method

+

Choose your Delivery Method