From d226771383fa203907e15386cffe03e26177cbe8 Mon Sep 17 00:00:00 2001 From: czoellner Date: Wed, 10 Jun 2015 18:14:04 +0200 Subject: [PATCH 01/11] [FIX] purchase: ensures invoice lines are linked to PO line Fixes the impossibility to invoice purchase order lines, which were never invoiced but set to invoiced by validating a first invoice created by invoice control "manual". --- addons/purchase/purchase.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 3e80966e410..33062c3b858 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -1336,7 +1336,8 @@ class account_invoice(osv.Model): not all(picking.invoice_state in ['invoiced'] for picking in order.picking_ids)): shipped = False for po_line in order.order_line: - if all(line.invoice_id.state not in ['draft', 'cancel'] for line in po_line.invoice_lines): + if (po_line.invoice_lines and + all(line.invoice_id.state not in ['draft', 'cancel'] for line in po_line.invoice_lines)): invoiced.append(po_line.id) if invoiced and shipped: self.pool['purchase.order.line'].write(cr, user_id, invoiced, {'invoiced': True}) From 727f9056a35afd969cade0189908d2417cac5134 Mon Sep 17 00:00:00 2001 From: StefanRijnhart Date: Wed, 30 Jul 2014 14:22:35 +0200 Subject: [PATCH 02/11] [FIX] web: wrong company logo in multi-company env Don't preload company logo of the wrong company When a user other than the admin signed in and was in a company different than the admin and this company had a different logo, the company logo (in the upper left corner) displayed the logo of the admin company, instead of the logo of the company of this user. As soon as the user refreshed the page in his browser, the issue was resolved, but the logo should be the good one from the beginning. Closes #1453 --- addons/web/static/src/xml/base.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index e9949a589b1..0eb6ed1ee95 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -461,7 +461,7 @@
From 1511e788cf0b7d5d9744773f4b8036d784a2c8a7 Mon Sep 17 00:00:00 2001 From: Laetitia Gangloff Date: Tue, 15 Jul 2014 10:44:19 +0200 Subject: [PATCH 03/11] [FIX] fields: error if there is no value when convert a many2many relation Closes #1165 --- openerp/osv/fields.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index 23afb1663c3..65c6c10e42c 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -1278,6 +1278,8 @@ class sparse(function): """ if self._type == 'many2many': + if not value: + return [] assert value[0][0] == 6, 'Unsupported m2m value for sparse field: %s' % value return value[0][2] From da9d1a8c4594835217a7af78fe66f188e3260b63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Thu, 17 Jul 2014 17:29:32 +0200 Subject: [PATCH 04/11] [FIX] account_budget: support view and consolidation children in budget positions In account_budget module, when creating a budget position, the user can select view accounts and also accounts with consolidation children, in addition to normal accounts. However, when viewing budgets with positions containing only view accounts, the "practical amount" field was always zero. Since these type of accounts are accepted as budget positions, the system should take into account children and consolidation children when computing the practical amount. Fixes #372 Closes #1247 --- addons/account_budget/account_budget.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py index ac79ca1799d..c992dbca00a 100644 --- a/addons/account_budget/account_budget.py +++ b/addons/account_budget/account_budget.py @@ -114,10 +114,12 @@ class crossovered_budget_lines(osv.osv): result = 0.0 if context is None: context = {} + account_obj = self.pool.get('account.account') for line in self.browse(cr, uid, ids, context=context): acc_ids = [x.id for x in line.general_budget_id.account_ids] if not acc_ids: raise osv.except_osv(_('Error!'),_("The Budget '%s' has no accounts!") % ustr(line.general_budget_id.name)) + acc_ids = account_obj._get_children_and_consol(cr, uid, acc_ids, context=context) date_to = line.date_to date_from = line.date_from if line.analytic_account_id.id: From c3ca61da9e56edc86c3c3fac86842f3afee3eec7 Mon Sep 17 00:00:00 2001 From: Joao Alfredo Gama Batista Date: Mon, 22 Jun 2015 13:14:35 -0400 Subject: [PATCH 05/11] [IMP] sale_stock: add reference to product Avoids incompatibility with modules that make reference a serial field. --- addons/sale_stock/test/sale_order_onchange.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/sale_stock/test/sale_order_onchange.yml b/addons/sale_stock/test/sale_order_onchange.yml index 1026e5627c3..eda028d04a9 100644 --- a/addons/sale_stock/test/sale_order_onchange.yml +++ b/addons/sale_stock/test/sale_order_onchange.yml @@ -5,6 +5,7 @@ name: 'Devil Worship Book' list_price: 66.6 procure_method: 'make_to_order' + default_code: 'DWB00001' - Now i create a sale order that uses my new product - @@ -17,6 +18,6 @@ I verify that the onchange of product on sale order line was correctly triggered - !assert {model: sale.order, id: sale_order_onchange1, string: The onchange function of product was not correctly triggered}: - - order_line[0].name == u'Devil Worship Book' + - order_line[0].name == u'[DWB00001] Devil Worship Book' - order_line[0].price_unit == 66.6 - order_line[0].type == 'make_to_order' From ba46732744ca82d59bfba3349feb7a25ba2c0d92 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 25 Jun 2015 14:50:15 +0200 Subject: [PATCH 06/11] [FIX] delivery: allow carrier with 0.0 as normal price Before this rev., if you define a carrier - without advanced price rules - with a normal price set to 0.0 - Free if more than amount unchecked When you try to invoice a delivery order (coming from a sales order with as invoicing policy "on delivery order) No grid was found, while there was one, with as price 0.0 Closes #1364 --- addons/delivery/delivery.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py index c240ab19f6e..64b6597798d 100644 --- a/addons/delivery/delivery.py +++ b/addons/delivery/delivery.py @@ -112,10 +112,10 @@ class delivery_carrier(osv.osv): # not using advanced pricing per destination: override grid grid_id = grid_pool.search(cr, uid, [('carrier_id', '=', record.id)], context=context) - if grid_id and not (record.normal_price or record.free_if_more_than): + if grid_id and not (record.normal_price is not False or record.free_if_more_than): grid_pool.unlink(cr, uid, grid_id, context=context) - if not (record.normal_price or record.free_if_more_than): + if not (record.normal_price is not False or record.free_if_more_than): continue if not grid_id: @@ -142,7 +142,7 @@ class delivery_carrier(osv.osv): 'list_price': 0.0, } grid_line_pool.create(cr, uid, line_data, context=context) - if record.normal_price: + if record.normal_price is not False: line_data = { 'grid_id': grid_id and grid_id[0], 'name': _('Default price'), From a197c914583ca859214580472408e7ca9b3ecf63 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Thu, 25 Jun 2015 15:02:47 +0200 Subject: [PATCH 07/11] [FIX] account: remove lang from context before move creation If an error message pops up during the move creation, we have to take the user's language and not the partner's language. Fixes #6902 Closes #6903 --- addons/account/account_invoice.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 52babde17af..79294085488 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -1052,7 +1052,9 @@ class account_invoice(osv.osv): i[2]['period_id'] = period_id ctx.update(invoice=inv) - move_id = move_obj.create(cr, uid, move, context=ctx) + ctx_copy = ctx.copy() + ctx_copy.pop('lang', None) + move_id = move_obj.create(cr, uid, move, context=ctx_copy) new_move_name = move_obj.browse(cr, uid, move_id, context=ctx).name # make the invoice point to that move self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name}, context=ctx) From 831fbd01f7873a80732b6f0f8f3d949f72230296 Mon Sep 17 00:00:00 2001 From: andrius-preimantas Date: Thu, 10 Jul 2014 10:26:56 +0300 Subject: [PATCH 08/11] [FIX] stock: incoming shipments should be marked red when late Incoming shipments are marked red according to creation date which does not really make much sense. closes #1061 note: it was already like this in 8.0 with 201f1c323 --- addons/stock/stock_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 528926e699f..c2d87ae4101 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -727,7 +727,7 @@ stock.picking.tree stock.picking - + @@ -1003,7 +1003,7 @@ stock.picking.in.tree stock.picking.in - + From 7e0ed740f38d035174d4c1258a372af38ea4f677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Param=C3=A9s?= Date: Mon, 11 Aug 2014 11:32:45 +0100 Subject: [PATCH 09/11] [FIX] mail_thread: correctly handle single id argument in `unlink` fixes #1721 closes #1723 --- addons/mail/mail_thread.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 0dcfc6d5f68..eabd486d580 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -311,6 +311,9 @@ class mail_thread(osv.AbstractModel): cascaded, because link is done through (res_model, res_id). """ msg_obj = self.pool.get('mail.message') fol_obj = self.pool.get('mail.followers') + + if isinstance(ids, (int, long)): + ids = [ids] # delete messages and notifications msg_ids = msg_obj.search(cr, uid, [('model', '=', self._name), ('res_id', 'in', ids)], context=context) msg_obj.unlink(cr, uid, msg_ids, context=context) From 63aed836379107068a9afe8dd586e5962121bb9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Thu, 17 Jul 2014 17:52:22 +0200 Subject: [PATCH 10/11] [FIX] l10n_be: missing mappings of accounts to financial report Closes #1250 --- addons/l10n_be/account_pcmn_belgium.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml index 0d7c275e621..32da80bb1fe 100644 --- a/addons/l10n_be/account_pcmn_belgium.xml +++ b/addons/l10n_be/account_pcmn_belgium.xml @@ -3628,6 +3628,7 @@ other + Acomptes reçus @@ -3635,6 +3636,7 @@ other + Compensations fournisseurs @@ -3642,6 +3644,7 @@ other + DETTES FISCALES, SALARIALES ET SOCIALES @@ -6338,7 +6341,7 @@ view - + Reprises d'amortissements et de réductions de valeur From 1c0bc7cc1619ffde52e5bc92afb954052883d4a5 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 29 Jun 2015 15:10:06 +0200 Subject: [PATCH 11/11] [FIX] server: backport of 3940a096 on psutil psutil 3.0 removed get_momory_info method create wrapper method for backward compatibility --- openerp/netsvc.py | 10 ++++++++-- openerp/service/workers.py | 9 ++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/openerp/netsvc.py b/openerp/netsvc.py index 2763f79a6cf..b3481bd8db4 100644 --- a/openerp/netsvc.py +++ b/openerp/netsvc.py @@ -48,6 +48,12 @@ import openerp _logger = logging.getLogger(__name__) +def memory_info(process): + """ psutil < 2.0 does not have memory_info, >= 3.0 does not have + get_memory_info """ + return (getattr(process, 'memory_info', None) or process.get_memory_info)() + + def close_socket(sock): """ Closes a socket instance cleanly @@ -293,7 +299,7 @@ def dispatch_rpc(service_name, method, params): start_time = time.time() start_rss, start_vms = 0, 0 if psutil: - start_rss, start_vms = psutil.Process(os.getpid()).get_memory_info() + start_rss, start_vms = memory_info(psutil.Process(os.getpid())) if rpc_request and rpc_response_flag: log(rpc_request,logging.DEBUG,'%s.%s'%(service_name,method), replace_request_password(params)) @@ -303,7 +309,7 @@ def dispatch_rpc(service_name, method, params): end_time = time.time() end_rss, end_vms = 0, 0 if psutil: - end_rss, end_vms = psutil.Process(os.getpid()).get_memory_info() + end_rss, end_vms = memory_info(psutil.Process(os.getpid())) logline = '%s.%s time:%.3fs mem: %sk -> %sk (diff: %sk)' % (service_name, method, end_time - start_time, start_vms / 1024, end_vms / 1024, (end_vms - start_vms)/1024) if rpc_response_flag: log(rpc_response,logging.DEBUG, logline, result) diff --git a/openerp/service/workers.py b/openerp/service/workers.py index b275f5cd8cd..a6716d92631 100644 --- a/openerp/service/workers.py +++ b/openerp/service/workers.py @@ -23,9 +23,12 @@ except ImportError: import openerp import openerp.tools.config as config +from openerp.netsvc import memory_info _logger = logging.getLogger(__name__) + + class Multicorn(object): """ Multiprocessing inspired by (g)unicorn. Multicorn currently uses accept(2) as dispatching method between workers @@ -261,7 +264,7 @@ class Worker(object): _logger.info("Worker (%d) max request (%s) reached.", self.pid, self.request_count) self.alive = False # Reset the worker if it consumes too much memory (e.g. caused by a memory leak). - rss, vms = psutil.Process(os.getpid()).get_memory_info() + rss, vms = memory_info(psutil.Process(os.getpid())) if vms > config['limit_memory_soft']: _logger.info('Worker (%d) virtual memory limit (%s) reached.', self.pid, vms) self.alive = False # Commit suicide after the request. @@ -396,7 +399,7 @@ class WorkerCron(Worker): self.setproctitle(db_name) if rpc_request_flag: start_time = time.time() - start_rss, start_vms = psutil.Process(os.getpid()).get_memory_info() + start_rss, start_vms = memory_info(psutil.Process(os.getpid())) while True: # acquired = openerp.addons.base.ir.ir_cron.ir_cron._acquire_job(db_name) # TODO why isnt openerp.addons.base defined ? @@ -410,7 +413,7 @@ class WorkerCron(Worker): openerp.sql_db.close_db(db_name) if rpc_request_flag: end_time = time.time() - end_rss, end_vms = psutil.Process(os.getpid()).get_memory_info() + end_rss, end_vms = memory_info(psutil.Process(os.getpid())) logline = '%s time:%.3fs mem: %sk -> %sk (diff: %sk)' % (db_name, end_time - start_time, start_vms / 1024, end_vms / 1024, (end_vms - start_vms)/1024) _logger.debug("WorkerCron (%s) %s", self.pid, logline)