From be8e7689054dae0fbfbcefb30e9c995de829bdc0 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 14 Jan 2019 14:52:28 +0100 Subject: [PATCH 1/2] [10.0] contract: allow to limit records on cron --- contract/__manifest__.py | 2 +- contract/models/account_analytic_account.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contract/__manifest__.py b/contract/__manifest__.py index 038d8838..54250c1c 100644 --- a/contract/__manifest__.py +++ b/contract/__manifest__.py @@ -9,7 +9,7 @@ { 'name': 'Contracts Management - Recurring', - 'version': '10.0.4.2.1', + 'version': '10.0.4.3.0', 'category': 'Contract Management', 'license': 'AGPL-3', 'author': "OpenERP SA, " diff --git a/contract/models/account_analytic_account.py b/contract/models/account_analytic_account.py index ee0f6ee9..3cc9e427 100644 --- a/contract/models/account_analytic_account.py +++ b/contract/models/account_analytic_account.py @@ -294,7 +294,7 @@ class AccountAnalyticAccount(models.Model): return invoices @api.model - def cron_recurring_create_invoice(self): + def cron_recurring_create_invoice(self, limit=None): today = fields.Date.today() contracts = self.with_context(cron=True).search([ ('recurring_invoices', '=', True), @@ -302,7 +302,7 @@ class AccountAnalyticAccount(models.Model): '|', ('date_end', '=', False), ('date_end', '>=', today), - ]) + ], limit=limit) return contracts.recurring_create_invoice() @api.multi From c23a752132df4a40fdcfec8956422394ea3dc47d Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Tue, 15 Jan 2019 08:30:10 +0000 Subject: [PATCH 2/2] [FIX] contract: Process invoices limit in a lower method To avoid blocking the queue when there are more than the specified limit of contracts, we process the limit while creating invoices instead of while searching for contracts, and break the process when the max of invoices has been created. See https://github.com/OCA/contract/pull/260#pullrequestreview-192187022 for more details. In case you need to use this new feature in the cron, it is also modified as `noupdate=1`. --- contract/data/contract_cron.xml | 2 +- contract/models/account_analytic_account.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/contract/data/contract_cron.xml b/contract/data/contract_cron.xml index 7c3a1fef..bf8e824e 100644 --- a/contract/data/contract_cron.xml +++ b/contract/data/contract_cron.xml @@ -1,5 +1,5 @@ - + Generate Recurring Invoices from Contracts diff --git a/contract/models/account_analytic_account.py b/contract/models/account_analytic_account.py index 3cc9e427..361be72a 100644 --- a/contract/models/account_analytic_account.py +++ b/contract/models/account_analytic_account.py @@ -260,13 +260,18 @@ class AccountAnalyticAccount(models.Model): return invoice @api.multi - def recurring_create_invoice(self): + def recurring_create_invoice(self, limit=None): """Create invoices from contracts + :param int limit: + Max of invoices to create. + :return: invoices created """ invoices = self.env['account.invoice'] for contract in self: + if limit and len(invoices) >= limit: + break ref_date = contract.recurring_next_date or fields.Date.today() if (contract.date_start > ref_date or contract.date_end and contract.date_end < ref_date): @@ -302,8 +307,8 @@ class AccountAnalyticAccount(models.Model): '|', ('date_end', '=', False), ('date_end', '>=', today), - ], limit=limit) - return contracts.recurring_create_invoice() + ]) + return contracts.recurring_create_invoice(limit) @api.multi def action_contract_send(self):