From 8b7658489259fac1ffcd6f0b3d83390ef7e5700b Mon Sep 17 00:00:00 2001 From: Yenthe666 Date: Sun, 14 Apr 2019 08:26:38 +0000 Subject: [PATCH 1/3] [FIX] doc: fix typo in qweb documentation closes odoo/odoo#32670 Signed-off-by: Martin Trigaux (mat) --- doc/reference/qweb.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/reference/qweb.rst b/doc/reference/qweb.rst index a806c3fda8f..813866d9d0e 100644 --- a/doc/reference/qweb.rst +++ b/doc/reference/qweb.rst @@ -99,7 +99,7 @@ Extra conditional branching directives ``t-elif`` and ``t-else`` are also available::
-

Happy bithday!

+

Happy birthday!

Welcome master!

Welcome!

From 08425316d311d4569d5d5634248fc1fd18d6a7f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=A1zquez=20Acosta?= Date: Fri, 3 May 2019 15:30:13 +0000 Subject: [PATCH 2/3] [FIX] stock: rewrite search override style for RPC Putting *args and **kwargs confuses the function `odoo.api.split_context`. This causes that a call to `search` via XMLRPC gets the wrong argument: takes the first argument of ``args`` as the context. Example which ignores the `count=True`:: ``` api.call_kw(self.env['product.product'], 'search', ( [], False, False, None, True, {'lang': 'en_US'} ), {}) ``` would ignore the `count=True` and use the wrong argument for context. Issue introduced in commit 15ea753a. Since: `def search(self, model=None, *args, **kwargs)` is equivalent to: `def search(self, args, offset=0, limit=None, order=None, count=False):` because the call to the super will anyway call the parent method, we can change the method arguments. note: this is only for [10.0,saas-14] where 15ea753a is. closes #33147 Signed-off-by: Nicolas Lempereur (nle) Co-authored-by: Nicolas Lempereur --- addons/stock/models/product.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/stock/models/product.py b/addons/stock/models/product.py index 804b42d3bf6..2032550c472 100644 --- a/addons/stock/models/product.py +++ b/addons/stock/models/product.py @@ -372,13 +372,13 @@ class Product(models.Model): return self.mapped('product_tmpl_id').action_view_routes() @api.model - def search(self, domain=None, *args, **kwargs): + def search(self, args, offset=0, limit=None, order=None, count=False): # ONLY FOR 10.0 UP TO SAAS-15 # ignore dummy fields used for search context² - for index in range(len(domain or [])): - if domain[index][0] in ('location_id', 'warehouse_id'): - domain[index] = expression.TRUE_LEAF - return super(Product, self).search(domain, *args, **kwargs) + for index in range(len(args or [])): + if args[index][0] in ('location_id', 'warehouse_id'): + args[index] = expression.TRUE_LEAF + return super(Product, self).search(args, offset=offset, limit=limit, order=order, count=count) @api.multi def write(self, values): @@ -516,13 +516,13 @@ class ProductTemplate(models.Model): return self.mapped('product_variant_ids').onchange_tracking() @api.model - def search(self, domain=None, *args, **kwargs): + def search(self, args, offset=0, limit=None, order=None, count=False): # ONLY FOR 10.0 UP TO SAAS-15 # ignore dummy fields used for search context - for index in range(len(domain or [])): - if domain[index][0] in ('location_id', 'warehouse_id'): - domain[index] = expression.TRUE_LEAF - return super(ProductTemplate, self).search(domain, *args, **kwargs) + for index in range(len(args or [])): + if args[index][0] in ('location_id', 'warehouse_id'): + args[index] = expression.TRUE_LEAF + return super(ProductTemplate, self).search(args, offset=offset, limit=limit, order=order, count=count) @api.multi def write(self, vals): From a48318cb33e27e095a0629544e21e4d1ce6b2447 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Mon, 6 May 2019 17:16:07 +0000 Subject: [PATCH 3/3] [CLA] update Tecnativa signature Remove Tecnativa's old employees, add new ones closes odoo/odoo#33197 Signed-off-by: Martin Trigaux (mat) --- doc/cla/corporate/tecnativa.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/cla/corporate/tecnativa.md b/doc/cla/corporate/tecnativa.md index 9f3601d16a0..5249fe08571 100644 --- a/doc/cla/corporate/tecnativa.md +++ b/doc/cla/corporate/tecnativa.md @@ -17,7 +17,7 @@ Rafael Blasco rafael.blasco@tecnativa.com https://github.com/rafaelbn Sergio Teruel sergio.teruel@tecnativa.com https://github.com/sergio-teruel Carlos Dauden carlos.dauden@tecnativa.com https://github.com/carlosdauden Jairo Llopis jairo.llopis@tecnativa.com https://github.com/yajo -Vicent Cubells vicent.cubells@tecnativa.com https://github.com/cubells -Luis Montalba luis.montalba@tecnativa.com https://github.com/luismontalba David Vidal david.vidal@tecnativa.com https://github.com/chienandalu -Cristina Martín cristina.martin@tecnativa.com https://github.com/cristinamartinrod +Cristina Martín cristina.martin@tecnativa.com https://github.com/cristinamartinrod (up to 2019-04-30) +Ernesto Tejeda ernesto.tejeda@tecnativa.com https://github.com/ernestotejeda +Alexandre Díaz alexandre.diaz@tecnativa.com https://github.com/Tardo