diff --git a/locale/es.po b/locale/es.po index 4ae944f..d5c6c32 100644 --- a/locale/es.po +++ b/locale/es.po @@ -578,6 +578,22 @@ msgctxt "field:ncf.manager.sequence,effective_expiration_date:" msgid "Expiration Date" msgstr "Fecha de vencimiento" +msgctxt "field:ncf.manager.sequence,tree_from_number:" +msgid "Authorized From" +msgstr "Desde autorizado" + +msgctxt "field:ncf.manager.sequence,tree_until_number:" +msgid "Authorized Until" +msgstr "Hasta autorizado" + +msgctxt "field:ncf.manager.sequence,tree_number_next:" +msgid "Next Number to Issue" +msgstr "Siguiente número por emitir" + +msgctxt "field:ncf.manager.sequence,tree_expiration_date:" +msgid "Expiration Date" +msgstr "Fecha de vencimiento" + msgctxt "field:ncf.manager.sequence,availability:" msgid "Availability" msgstr "Disponibilidad" diff --git a/locale/es_419.po b/locale/es_419.po index 14451a2..9c07c0b 100644 --- a/locale/es_419.po +++ b/locale/es_419.po @@ -1093,6 +1093,22 @@ msgctxt "field:ncf.manager.sequence,effective_expiration_date:" msgid "Expiration Date" msgstr "Fecha de vencimiento" +msgctxt "field:ncf.manager.sequence,tree_from_number:" +msgid "Authorized From" +msgstr "Desde autorizado" + +msgctxt "field:ncf.manager.sequence,tree_until_number:" +msgid "Authorized Until" +msgstr "Hasta autorizado" + +msgctxt "field:ncf.manager.sequence,tree_number_next:" +msgid "Next Number to Issue" +msgstr "Siguiente número por emitir" + +msgctxt "field:ncf.manager.sequence,tree_expiration_date:" +msgid "Expiration Date" +msgstr "Fecha de vencimiento" + msgctxt "field:ncf.manager.sequence,availability:" msgid "Availability" msgstr "Disponibilidad" diff --git a/locale/es_DO.po b/locale/es_DO.po index 560a6ed..14c4f81 100644 --- a/locale/es_DO.po +++ b/locale/es_DO.po @@ -57,6 +57,22 @@ msgctxt "field:ncf.manager.sequence,effective_expiration_date:" msgid "Expiration Date" msgstr "Fecha de vencimiento" +msgctxt "field:ncf.manager.sequence,tree_from_number:" +msgid "Authorized From" +msgstr "Desde autorizado" + +msgctxt "field:ncf.manager.sequence,tree_until_number:" +msgid "Authorized Until" +msgstr "Hasta autorizado" + +msgctxt "field:ncf.manager.sequence,tree_number_next:" +msgid "Next Number to Issue" +msgstr "Siguiente número por emitir" + +msgctxt "field:ncf.manager.sequence,tree_expiration_date:" +msgid "Expiration Date" +msgstr "Fecha de vencimiento" + msgctxt "field:ncf.manager.sequence,availability:" msgid "Availability" msgstr "Disponibilidad" diff --git a/ncf_manager.py b/ncf_manager.py index c7a7fe6..43678a4 100644 --- a/ncf_manager.py +++ b/ncf_manager.py @@ -363,6 +363,19 @@ class NCFManagerSequences(Workflow, ModelSQL, ModelView): 'invisible': Eval('sequence_mode') == 'create', }), 'get_effective_sequence_values') + # Tree-specific values must remain visible for both assisted draft lines + # and lines backed by an activated strict sequence. The effective fields + # above retain their form-only visibility rules. + tree_from_number = fields.Function( + fields.Integer('Authorized From'), 'get_effective_sequence_values') + tree_until_number = fields.Function( + fields.Integer('Authorized Until'), 'get_effective_sequence_values') + tree_number_next = fields.Function( + fields.Integer('Next Number to Issue'), + 'get_effective_sequence_values') + tree_expiration_date = fields.Function( + fields.Date('Expiration Date'), 'get_effective_sequence_values') + invoice_type = fields.Selection([ ('invoice_customer', 'Customer Invoice'), ('invoice_supplier', 'Supplier Invoice') @@ -437,6 +450,10 @@ class NCFManagerSequences(Workflow, ModelSQL, ModelView): 'effective_until_number': 'until_number', 'effective_number_next': 'number_next', 'effective_expiration_date': 'expiration_date', + 'tree_from_number': 'from_number', + 'tree_until_number': 'until_number', + 'tree_number_next': 'number_next', + 'tree_expiration_date': 'expiration_date', } for record in records: sequence = record.ncf_sequences diff --git a/tests/test_module.py b/tests/test_module.py index 9f28c59..4b1b77b 100644 --- a/tests/test_module.py +++ b/tests/test_module.py @@ -278,6 +278,12 @@ class NcfManagerTestCase(ModuleTestCase): self.assertEqual( line.effective_expiration_date, datetime.date(today.year, 12, 31)) + self.assertEqual(line.tree_from_number, 100) + self.assertEqual(line.tree_until_number, 109) + self.assertEqual(line.tree_number_next, 100) + self.assertEqual( + line.tree_expiration_date, + datetime.date(today.year, 12, 31)) self.assertEqual(line.availability, 'low') Manager.finish([manager]) @@ -305,6 +311,11 @@ class NcfManagerTestCase(ModuleTestCase): self.assertEqual(line.from_number, 1) self.assertEqual(line.until_number, 100) self.assertEqual(line.expiration_date, datetime.date(2027, 12, 31)) + self.assertEqual(line.tree_from_number, 1) + self.assertEqual(line.tree_until_number, 100) + self.assertEqual(line.tree_number_next, 1) + self.assertEqual( + line.tree_expiration_date, datetime.date(2027, 12, 31)) managers, lines = import_dgii_authorizations( company, data, 'authorization-again.xml') diff --git a/view/ncf_manager_sequences_tree.xml b/view/ncf_manager_sequences_tree.xml index 8a29b96..52b8f8e 100644 --- a/view/ncf_manager_sequences_tree.xml +++ b/view/ncf_manager_sequences_tree.xml @@ -7,10 +7,10 @@ this repository contains the full copyright notices and license terms. --> - - - - + + + +