From ad78f115c31cf8cbe5cff5dbcbc766b5a0c3a0f9 Mon Sep 17 00:00:00 2001 From: "Yenthe V.G" Date: Tue, 9 Jan 2018 16:17:14 +0100 Subject: [PATCH 1/4] [ADD] doc: warning about function names in tests Closes #22116 --- doc/reference/testing.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/reference/testing.rst b/doc/reference/testing.rst index bff45196390..0495e896d8b 100644 --- a/doc/reference/testing.rst +++ b/doc/reference/testing.rst @@ -75,6 +75,10 @@ in each method:: # other tests... +.. note:: + + Test methods must start with `test_` + Running tests ------------- From eeea6e8667cfafc18e4966170d5dd6a6312aa40c Mon Sep 17 00:00:00 2001 From: "Yenthe V.G" Date: Tue, 9 Jan 2018 10:38:15 +0100 Subject: [PATCH 2/4] [FIX] website_blog: don't copy visitor count of blogpost This commit closes #22107 and closes #22111 --- addons/website_blog/models/website_blog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_blog/models/website_blog.py b/addons/website_blog/models/website_blog.py index 657ea5d8ff7..bc5de780976 100644 --- a/addons/website_blog/models/website_blog.py +++ b/addons/website_blog/models/website_blog.py @@ -133,7 +133,7 @@ class BlogPost(osv.Model): 'author_avatar': fields.related( 'author_id', 'image_small', string="Avatar", type="binary"), - 'visits': fields.integer('No of Views'), + 'visits': fields.integer('No of Views', copy=False), 'ranking': fields.function(_compute_ranking, string='Ranking', type='float'), } From eded3cfda8254034edf4fa86ddc11dce65b02f6c Mon Sep 17 00:00:00 2001 From: Paul Catinean Date: Wed, 10 Jan 2018 13:06:59 +0100 Subject: [PATCH 3/4] [FIX] website: check that website.user_id is not falsy This field should be required. This commits closes #21997 @kangol: diff in addons/website/models/ir_http.py is for existing db It can be ignored in master because required will be apply --- addons/website/models/ir_http.py | 2 +- addons/website/models/website.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py index b8af335a17e..6b6f119fd88 100644 --- a/addons/website/models/ir_http.py +++ b/addons/website/models/ir_http.py @@ -40,7 +40,7 @@ class ir_http(orm.AbstractModel): def _auth_method_public(self): if not request.session.uid: website = self.pool['website'].get_current_website(request.cr, openerp.SUPERUSER_ID, context=request.context) - if website: + if website and website.user_id: request.uid = website.user_id.id else: request.uid = self.pool['ir.model.data'].xmlid_to_res_id(request.cr, openerp.SUPERUSER_ID, 'base', 'public_user') diff --git a/addons/website/models/website.py b/addons/website/models/website.py index aef827b86a8..b4b95f00ab5 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -166,7 +166,7 @@ class website(osv.osv): 'social_youtube': fields.char('Youtube Account'), 'social_googleplus': fields.char('Google+ Account'), 'google_analytics_key': fields.char('Google Analytics Key'), - 'user_id': fields.many2one('res.users', string='Public User'), + 'user_id': fields.many2one('res.users', string='Public User', required=True), 'compress_html': fields.boolean('Compress HTML'), 'cdn_activated': fields.boolean('Activate CDN for assets'), 'cdn_url': fields.char('CDN Base URL'), From 330f84f21138343782000d375b4ce8daeb8907c7 Mon Sep 17 00:00:00 2001 From: qdp-odoo Date: Thu, 11 Jan 2018 10:46:31 +0100 Subject: [PATCH 4/4] [FIX] l10n_fr_fec: fix format of Debit/Credit columns MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Numeric columns of fixed length should be left padded with '0' instead of ' ' (Article A47 A-1 Section III 2°) --- addons/l10n_fr_fec/wizard/fec.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/l10n_fr_fec/wizard/fec.py b/addons/l10n_fr_fec/wizard/fec.py index 00440affe2e..673b450b789 100644 --- a/addons/l10n_fr_fec/wizard/fec.py +++ b/addons/l10n_fr_fec/wizard/fec.py @@ -43,8 +43,8 @@ class AccountFrFec(models.TransientModel): '-' AS PieceRef, %s AS PieceDate, '/' AS EcritureLib, - replace(CASE WHEN COALESCE(sum(aml.balance), 0) <= 0 THEN '0,00' ELSE to_char(SUM(aml.balance), '999999999999999D99') END, '.', ',') AS Debit, - replace(CASE WHEN COALESCE(sum(aml.balance), 0) >= 0 THEN '0,00' ELSE to_char(-SUM(aml.balance), '999999999999999D99') END, '.', ',') AS Credit, + replace(CASE WHEN COALESCE(sum(aml.balance), 0) <= 0 THEN '0,00' ELSE to_char(SUM(aml.balance), '000000000000000D99') END, '.', ',') AS Debit, + replace(CASE WHEN COALESCE(sum(aml.balance), 0) >= 0 THEN '0,00' ELSE to_char(-SUM(aml.balance), '000000000000000D99') END, '.', ',') AS Credit, '' AS EcritureLet, '' AS DateLet, %s AS ValidDate, @@ -142,8 +142,8 @@ class AccountFrFec(models.TransientModel): '-' AS PieceRef, %s AS PieceDate, '/' AS EcritureLib, - replace(CASE WHEN sum(aml.balance) <= 0 THEN '0,00' ELSE to_char(SUM(aml.balance), '999999999999999D99') END, '.', ',') AS Debit, - replace(CASE WHEN sum(aml.balance) >= 0 THEN '0,00' ELSE to_char(-SUM(aml.balance), '999999999999999D99') END, '.', ',') AS Credit, + replace(CASE WHEN sum(aml.balance) <= 0 THEN '0,00' ELSE to_char(SUM(aml.balance), '000000000000000D99') END, '.', ',') AS Debit, + replace(CASE WHEN sum(aml.balance) >= 0 THEN '0,00' ELSE to_char(-SUM(aml.balance), '000000000000000D99') END, '.', ',') AS Credit, '' AS EcritureLet, '' AS DateLet, %s AS ValidDate, @@ -227,8 +227,8 @@ class AccountFrFec(models.TransientModel): '-' AS PieceRef, %s AS PieceDate, '/' AS EcritureLib, - replace(CASE WHEN sum(aml.balance) <= 0 THEN '0,00' ELSE to_char(SUM(aml.balance), '999999999999999D99') END, '.', ',') AS Debit, - replace(CASE WHEN sum(aml.balance) >= 0 THEN '0,00' ELSE to_char(-SUM(aml.balance), '999999999999999D99') END, '.', ',') AS Credit, + replace(CASE WHEN sum(aml.balance) <= 0 THEN '0,00' ELSE to_char(SUM(aml.balance), '000000000000000D99') END, '.', ',') AS Debit, + replace(CASE WHEN sum(aml.balance) >= 0 THEN '0,00' ELSE to_char(-SUM(aml.balance), '000000000000000D99') END, '.', ',') AS Credit, '' AS EcritureLet, '' AS DateLet, %s AS ValidDate, @@ -289,14 +289,14 @@ class AccountFrFec(models.TransientModel): AS PieceRef, TO_CHAR(am.date, 'YYYYMMDD') AS PieceDate, CASE WHEN aml.name IS NULL THEN '/' ELSE replace(aml.name, '|', '/') END AS EcritureLib, - replace(CASE WHEN aml.debit = 0 THEN '0,00' ELSE to_char(aml.debit, '999999999999999D99') END, '.', ',') AS Debit, - replace(CASE WHEN aml.credit = 0 THEN '0,00' ELSE to_char(aml.credit, '999999999999999D99') END, '.', ',') AS Credit, + replace(CASE WHEN aml.debit = 0 THEN '0,00' ELSE to_char(aml.debit, '000000000000000D99') END, '.', ',') AS Debit, + replace(CASE WHEN aml.credit = 0 THEN '0,00' ELSE to_char(aml.credit, '000000000000000D99') END, '.', ',') AS Credit, CASE WHEN rec.name IS NULL THEN '' ELSE rec.name END AS EcritureLet, CASE WHEN aml.full_reconcile_id IS NULL THEN '' ELSE TO_CHAR(rec.create_date, 'YYYYMMDD') END AS DateLet, TO_CHAR(am.date, 'YYYYMMDD') AS ValidDate, CASE WHEN aml.amount_currency IS NULL OR aml.amount_currency = 0 THEN '' - ELSE replace(to_char(aml.amount_currency, '999999999999999D99'), '.', ',') + ELSE replace(to_char(aml.amount_currency, '000000000000000D99'), '.', ',') END AS Montantdevise, CASE WHEN aml.currency_id IS NULL THEN '' ELSE rc.name END AS Idevise FROM