[MIG] Request new version 16.0

CAPW-Servicios-Tecnicos · Nov 18, 2023 · 3cc7a75 · 3cc7a75
2 parents c078950 + c8a75ea
commit 3cc7a75
Show file tree

Hide file tree

Showing 7 changed files with 149 additions and 475 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -16,19 +16,7 @@ on:
     types: [ opened, synchronize, reopened, labeled ]
 
 env:
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-  REQUIRED_MODULES: 'l10n_generic_coa' # list of addional addons to install separated by comma
-=======
-  REQUIRED_MODULES: # list of addional addons to install separated by comma
->>>>>>> b4c16696959742a06c4b68e143226fca3a0d205f
-=======
-  REQUIRED_MODULES: # list of addional addons to install separated by comma
->>>>>>> 996e4b32a2c582a1b6cebc1348689df6b0bd0fb5
-=======
   REQUIRED_MODULES: 'l10n_do' # list of addional addons to install separated by comma
->>>>>>> 6a674d1fd1087914e2484a4992c1e7b63b55ddb4
   TEST_TAGS: '0'
 
 jobs:

diff --git a/l10n_do_accounting/__manifest__.py b/l10n_do_accounting/__manifest__.py
@@ -4,26 +4,21 @@
         Este módulo implementa la administración y gestión de los números de
          comprobantes fiscales para el cumplimento de la norma 06-18 de la
          Dirección de Impuestos Internos en la República Dominicana.""",
-    "author": "iterativo LLC, " "Indexa, " "CAPW Servicios Tecnicos",
+    "author": "iterativo LLC, " "Indexa",
     "category": "Localization",
+    "license": "LGPL-3",
     "website": "https://github.com/odoo-dominicana",
-<<<<<<< HEAD
-    "version": "15.0.0.12.0",
-=======
     "version": "16.0.1.3.0",
->>>>>>> 6a674d1fd1087914e2484a4992c1e7b63b55ddb4
     # any module necessary for this one to work correctly
     "depends": ["l10n_latam_invoice_document", "l10n_do"],
     # always loaded
     "data": [
-        "security/res_groups.xml",
         "security/ir.model.access.csv",
+        "security/res_groups.xml",
         "data/l10n_latam.document.type.csv",
-        "data/ir_config_parameter_data.xml",
         "wizard/account_move_reversal_views.xml",
         "wizard/account_move_cancel_views.xml",
         "wizard/account_debit_note_views.xml",
-        "views/account_fiscal_sequence.xml",
         "views/res_config_settings_view.xml",
         "views/account_move_views.xml",
         "views/res_partner_views.xml",
@@ -41,5 +36,4 @@
     "installable": True,
     "auto_install": False,
     "application": False,
-    "license": "LGPL-3",
-}
+}
diff --git a/l10n_do_accounting/i18n/es_DO.po b/l10n_do_accounting/i18n/es_DO.po
@@ -25,30 +25,7 @@ msgid "%s is not a stored field"
 msgstr "%s no es un campo almacenado"
 
 #. module: l10n_do_accounting
-<<<<<<< HEAD
-#: model_terms:ir.ui.view,arch_db:l10n_do_accounting.res_config_settings_view_form
-msgid "Ability to add manual signatures to the report"
-msgstr "Posibilidad de añadir firmas manuales al informe"
-
-#. module: l10n_do_accounting
-#: model:ir.model.fields,field_description:l10n_do_accounting.field_res_config_settings__view_delivered_received
-msgid "Delivered/Received"
-msgstr "Entregado/Recibido"
-
-#. module: l10n_do_accounting
-#: model_terms:ir.ui.view,arch_db:l10n_do_accounting.res_config_settings_view_form
-msgid "<span class=\"o_form_label\">Show name in report left</span>"
-msgstr "<span class=\"o_form_label\">Mostrar nombre en informe en la parte izquierda"
-
-#. module: l10n_do_accounting
-#: model_terms:ir.ui.view,arch_db:l10n_do_accounting.res_config_settings_view_form
-msgid "<span class=\"o_form_label\">Show name in report right</span>"
-msgstr "<span class=\"o_form_label\">Mostrar nombre en informe a la derecha</span>"
-
-#. module: l10n_do_accounting
-=======
 #. odoo-python
->>>>>>> 6a674d1fd1087914e2484a4992c1e7b63b55ddb4
 #: code:addons/l10n_do_accounting/models/account_move.py:0
 #, python-format
 msgid "01 - Operational Incomes"
@@ -1376,14 +1353,10 @@ msgstr ""
 #: code:addons/l10n_do_accounting/models/res_partner.py:0
 #, python-format
 msgid "special from Tax Paying"
-<<<<<<< HEAD
-msgstr "Exento"
-=======
 msgstr "Exento"
 
 #. module: l10n_do_accounting
 #: code:addons/l10n_do_accounting/models/account_move.py:0
 #, python-format
 msgid "You cannot cancel a fiscal document that has not been posted before."
-msgstr "No puede cancelar un documento fiscal que no haya sido posteado anteriormente."
->>>>>>> 996e4b32a2c582a1b6cebc1348689df6b0bd0fb5
+msgstr "No puede cancelar un documento fiscal que no haya sido posteado anteriormente."