Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/17.0-mig-001-jl' into 17.0-mig…
Browse files Browse the repository at this point in the history
…-001-jl
  • Loading branch information
festovalros committed Mar 4, 2024
2 parents c3a74e2 + 48d7623 commit 925ffa4
Show file tree
Hide file tree
Showing 25 changed files with 791 additions and 829 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ on:
pull_request:
branches:
- '[0-9]+.0'
types: [ labeled ]
types: [ opened, synchronize, reopened, labeled ]

env:
REQUIRED_MODULES: # list of addional addons to install separated by comma
REQUIRED_MODULES: 'l10n_do' # list of addional addons to install separated by comma
TEST_TAGS: '0'

jobs:
Expand All @@ -27,7 +27,7 @@ jobs:
get_modules: ${{ steps.get_modules.outputs.modules }}
services:
db:
image: postgres:13-alpine
image: postgres:13
env:
POSTGRES_DB: postgres
POSTGRES_USER: odoo
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/iterativo/dockerdoo:15.0
FROM gcr.io/iterativo/dockerdoo:17.0
ENV ODOO_EXTRA_ADDONS /mnt/extra-addons
USER root
RUN sudo mkdir -p ${ODOO_EXTRA_ADDONS}
Expand Down
7 changes: 4 additions & 3 deletions l10n_do_accounting/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
"category": "Localization",
"license": "LGPL-3",
"website": "https://github.com/odoo-dominicana",
"version": "15.0.0.14.2",
"version": "17.0.1.0.0",
"countries": ["do"],
# any module necessary for this one to work correctly
"depends": ["l10n_latam_invoice_document", "l10n_do"],
# always loaded
"data": [
"security/ir.model.access.csv",
"security/res_groups.xml",
"data/l10n_latam.document.type.csv",
# "data/l10n_latam.document.type.csv",
"wizard/account_move_reversal_views.xml",
"wizard/account_move_cancel_views.xml",
"wizard/account_debit_note_views.xml",
Expand All @@ -26,7 +27,7 @@
"views/account_dgii_menuitem.xml",
"views/account_journal_views.xml",
"views/l10n_latam_document_type_views.xml",
# "views/report_templates.xml",
"views/report_templates.xml",
"views/report_invoice.xml",
],
# only loaded in demonstration mode
Expand Down
46 changes: 23 additions & 23 deletions l10n_do_accounting/data/l10n_latam.document.type.csv
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
id,sequence,code,name,report_name,internal_type,l10n_do_ncf_type,doc_code_prefix,country_id/id,is_vat_required,active
ncf_fiscal_client,10,B,Crédito Fiscal,Factura de Crédito Fiscal,invoice,01,B01,base.do,True,TRUE
ncf_consumer_supplier,30,B,Consumo,Factura de Consumo,invoice,02,B02,base.do,False,TRUE
ncf_debit_note_client,40,B,Nota de Débito,Nota de Débito,debit_note,03,B03,base.do,True,TRUE
ncf_credit_note_client,60,B,Nota de Crédito,Nota de Crédito,credit_note,04,B04,base.do,False,TRUE
ncf_informal_supplier,80,B,Comprobante de Compra,Factura de Compra,invoice,11,B11,base.do,True,TRUE
ncf_unique_client,90,B,Único Ingreso,Factura de Único Ingreso,invoice,12,B12,base.do,False,TRUE
ncf_minor_supplier,100,B,Gasto Menor,Gasto Menor,invoice,13,B13,base.do,False,TRUE
ncf_special_client,110,B,Régimen Especial,Factura de Régimen Especial,invoice,14,B14,base.do,True,TRUE
ncf_gov_client,120,B,Factura Gubernamental,Factura Gubernamental,invoice,15,B15,base.do,True,TRUE
ncf_export_client,130,B,Exportación,Factura de Exportación,invoice,16,B16,base.do,True,TRUE
ncf_exterior_supplier,140,B,Pago al Exterior,Factura de Pago al Exterior,invoice,17,B17,base.do,False,TRUE
non_fiscal_import_supplier,150,N,Importación,Factura de Importación,invoice,,IMP,base.do,False,FALSE
ecf_fiscal_client,160,E,Crédito Fiscal Electrónica,Factura de Crédito Fiscal Electrónica,invoice,31,E31,base.do,True,TRUE
ecf_consumer_supplier,170,E,Consumo Electrónica,Factura de Consumo Electrónica,invoice,32,E32,base.do,False,TRUE
ecf_debit_note_client,180,E,Nota de Débito Electrónica,Nota de Débito Electrónica,debit_note,33,E33,base.do,True,TRUE
ecf_credit_note_client,190,E,Nota de Crédito Electrónica,Nota de Crédito Electrónica,credit_note,34,E34,base.do,True,TRUE
ecf_informal_supplier,200,E,Compras Electrónica,Factura de Compra Electrónica,invoice,41,E41,base.do,True,TRUE
ecf_minor_supplier,220,E,Gasto Menor Electrónica,Factura Gasto Menor Electrónica,invoice,43,E43,base.do,False,TRUE
ecf_special_client,230,E,Régimen Especial Electrónica,Factura de Régimen Especial Electrónica,invoice,44,E44,base.do,True,TRUE
ecf_gov_client,240,E,Factura Gubernamental Electrónica,Factura Gubernamental Electrónica,invoice,45,E45,base.do,True,TRUE
ecf_export_client,250,E,Exportación Electrónica,Factura de Exportación Electrónica,invoice,46,E46,base.do,True,TRUE
ecf_exterior_supplier,260,E,Pago al Exterior Electrónica,Factura de Pago al Exterior Electrónica,invoice,47,E47,base.do,False,TRUE
id,sequence,code,name@es,name,report_name,internal_type,l10n_do_ncf_type,doc_code_prefix,country_id/id,is_vat_required,active
ncf_fiscal_client,10,B,Crédito Fiscal,Fiscal Credit,Factura de Crédito Fiscal,invoice,1,B01,base.do,TRUE,TRUE
ncf_consumer_supplier,30,B,Consumo,Consumer,Factura de Consumo,invoice,2,B02,base.do,FALSE,TRUE
ncf_debit_note_client,40,B,Nota de Débito,Debit Note,Nota de Débito,debit_note,3,B03,base.do,TRUE,TRUE
ncf_credit_note_client,60,B,Nota de Crédito,Credit Note,Nota de Crédito,credit_note,4,B04,base.do,FALSE,TRUE
ncf_informal_supplier,80,B,Comprobante de Compra,Purchase receipt,Factura de Compra,invoice,11,B11,base.do,TRUE,TRUE
ncf_unique_client,90,B,Único Ingreso,Single Income,Factura de Único Ingreso,invoice,12,B12,base.do,FALSE,TRUE
ncf_minor_supplier,100,B,Gasto Menor,Minor Expense,Gasto Menor,invoice,13,B13,base.do,FALSE,TRUE
ncf_special_client,110,B,Régimen Especial,Special Regime,Factura de Régimen Especial,invoice,14,B14,base.do,TRUE,TRUE
ncf_gov_client,120,B,Factura Gubernamental,Government Invoice,Factura Gubernamental,invoice,15,B15,base.do,TRUE,TRUE
ncf_export_client,130,B,Exportación,Export,Factura de Exportación,invoice,16,B16,base.do,TRUE,TRUE
ncf_exterior_supplier,140,B,Pago al Exterior,Foreign Payment,Factura de Pago al Exterior,invoice,17,B17,base.do,FALSE,TRUE
non_fiscal_import_supplier,150,N,Importación,Import,Factura de Importación,invoice,,IMP,base.do,FALSE,FALSE
ecf_fiscal_client,160,E,Crédito Fiscal Electrónica,Electronic Fiscal Credit,Factura de Crédito Fiscal Electrónica,invoice,31,E31,base.do,TRUE,TRUE
ecf_consumer_supplier,170,E,Consumo Electrónica,Electronic Consumer,Factura de Consumo Electrónica,invoice,32,E32,base.do,FALSE,TRUE
ecf_debit_note_client,180,E,Nota de Débito Electrónica,Electronic Debit Note,Nota de Débito Electrónica,debit_note,33,E33,base.do,TRUE,TRUE
ecf_credit_note_client,190,E,Nota de Crédito Electrónica,Electronic Credit Note,Nota de Crédito Electrónica,credit_note,34,E34,base.do,TRUE,TRUE
ecf_informal_supplier,200,E,Compras Electrónica,Electronic Purchase,Factura de Compra Electrónica,invoice,41,E41,base.do,TRUE,TRUE
ecf_minor_supplier,220,E,Gasto Menor Electrónica,Electronic Minor Expense,Factura Gasto Menor Electrónica,invoice,43,E43,base.do,FALSE,TRUE
ecf_special_client,230,E,Régimen Especial Electrónica,Electronic Special Regime,Factura de Régimen Especial Electrónica,invoice,44,E44,base.do,TRUE,TRUE
ecf_gov_client,240,E,Factura Gubernamental Electrónica,Electronic Government Invoice,Factura Gubernamental Electrónica,invoice,45,E45,base.do,TRUE,TRUE
ecf_export_client,250,E,Exportación Electrónica,Electronic Export,Factura de Exportación Electrónica,invoice,46,E46,base.do,TRUE,TRUE
ecf_exterior_supplier,260,E,Pago al Exterior Electrónica,Electronic Foreign Payment,Factura de Pago al Exterior Electrónica,invoice,47,E47,base.do,FALSE,TRUE
Loading

0 comments on commit 925ffa4

Please sign in to comment.