From 6e2ffbe0373d021e3fc7c69150188bf04226a8bf Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Tue, 17 May 2016 12:27:17 +0200 Subject: [PATCH] [IMP] account_renumber: * Increase coverage to 100%. * Update data file tags, remove old-style "or" from wizard view. * Skip renumber when no date range is found. --- account_renumber/tests/test_account_renumber.py | 14 +++++++++++++- account_renumber/wizard/wizard_renumber.py | 2 +- account_renumber/wizard/wizard_renumber_view.xml | 5 ++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/account_renumber/tests/test_account_renumber.py b/account_renumber/tests/test_account_renumber.py index 54c0f03f8..3f7e60f63 100644 --- a/account_renumber/tests/test_account_renumber.py +++ b/account_renumber/tests/test_account_renumber.py @@ -3,7 +3,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from datetime import date -from openerp import fields +from openerp import exceptions, fields from openerp.tests.common import TransactionCase @@ -115,3 +115,15 @@ class AccountRenumberCase(TransactionCase): self.assertEqual( fields.Date.from_string(move.date).month, expected_month[n]) + + def test_renumber_all_no_date_ranges_in_sequence(self): + """Works fine using a sequence without date ranges.""" + self.sequence.use_date_range = False + self.test_renumber_all() + + def test_failure_when_no_results(self): + """Ensure an exception is raised when no results are found.""" + new_journal = self.journal.copy() + self.moves.write({"journal_id": new_journal.id}) + with self.assertRaises(exceptions.MissingError): + self.test_renumber_all() diff --git a/account_renumber/wizard/wizard_renumber.py b/account_renumber/wizard/wizard_renumber.py index ff971988a..cd5d8c0d0 100644 --- a/account_renumber/wizard/wizard_renumber.py +++ b/account_renumber/wizard/wizard_renumber.py @@ -83,7 +83,7 @@ class WizardRenumber(models.TransientModel): ("date_from", "<=", move.date), ("date_to", ">=", move.date)] ) - if date_range not in reset_ranges: + if date_range and date_range not in reset_ranges: date_range.number_next = self.number_next reset_ranges |= date_range else: diff --git a/account_renumber/wizard/wizard_renumber_view.xml b/account_renumber/wizard/wizard_renumber_view.xml index b7671e68f..6236b0fee 100644 --- a/account_renumber/wizard/wizard_renumber_view.xml +++ b/account_renumber/wizard/wizard_renumber_view.xml @@ -1,7 +1,7 @@ - + account_renumber.form @@ -27,7 +27,6 @@ string="Renumber" type="object" class="oe_highlight"/> - or