diff --git a/satcfdi/accounting/contabilidad.py b/satcfdi/accounting/contabilidad.py index 526aebd..ee66ff2 100644 --- a/satcfdi/accounting/contabilidad.py +++ b/satcfdi/accounting/contabilidad.py @@ -172,7 +172,7 @@ def generar_contabilidad( imprimir_contablidad( catalogo_cuentas=cat, balanza_comprobacion=ban, - archivo_excel=filename(ban)[:-4] + ".xlsx" + archivo_excel=os.path.join(folder, filename(ban)[:-4] + ".xlsx") ) validate_saldos(cuentas) diff --git a/tests/test_contabilidad.py b/tests/test_contabilidad.py index 2731653..d363a95 100644 --- a/tests/test_contabilidad.py +++ b/tests/test_contabilidad.py @@ -56,7 +56,7 @@ def test_generate_contabilidad_empty(): generar_contabilidad( dp=DatePeriod(2024, 2), - rfc_emisor="MOLE870717DRA", + rfc_emisor="CACX7605101P8", cuentas={}, polizas=[], folder=os.path.join(current_dir, 'test_contabilidad_electronica/out/empty'), @@ -76,7 +76,7 @@ def test_generate_contabilidad_simple(): generar_contabilidad( dp=DatePeriod(2024, 2), - rfc_emisor="MOLE870717DRA", + rfc_emisor="CACX7605101P8", cuentas=cuentas, polizas=[], folder=os.path.join(current_dir, 'test_contabilidad_electronica/out/simple'), diff --git a/tests/MOLE870717DRA202402BN.xlsx b/tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402BN.xlsx similarity index 61% rename from tests/MOLE870717DRA202402BN.xlsx rename to tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402BN.xlsx index 62450dd..eba2f0a 100644 Binary files a/tests/MOLE870717DRA202402BN.xlsx and b/tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402BN.xlsx differ diff --git a/tests/test_contabilidad_electronica/ref/simple/MOLE870717DRA202402BN.xml b/tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402BN.xml similarity index 85% rename from tests/test_contabilidad_electronica/ref/simple/MOLE870717DRA202402BN.xml rename to tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402BN.xml index 4c7ee07..22e1fac 100644 --- a/tests/test_contabilidad_electronica/ref/simple/MOLE870717DRA202402BN.xml +++ b/tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402BN.xml @@ -1,2 +1,2 @@ - + diff --git a/tests/test_contabilidad_electronica/ref/empty/MOLE870717DRA202402CT.xml b/tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402CT.xml similarity index 70% rename from tests/test_contabilidad_electronica/ref/empty/MOLE870717DRA202402CT.xml rename to tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402CT.xml index b6389c5..9d4bd8f 100644 --- a/tests/test_contabilidad_electronica/ref/empty/MOLE870717DRA202402CT.xml +++ b/tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402CT.xml @@ -1,2 +1,2 @@ - + diff --git a/tests/test_contabilidad_electronica/ref/simple/MOLE870717DRA202402PL.xml b/tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402PL.xml similarity index 85% rename from tests/test_contabilidad_electronica/ref/simple/MOLE870717DRA202402PL.xml rename to tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402PL.xml index 7864ada..503cca6 100644 --- a/tests/test_contabilidad_electronica/ref/simple/MOLE870717DRA202402PL.xml +++ b/tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402PL.xml @@ -1,2 +1,2 @@ - + diff --git a/tests/test_contabilidad_electronica/ref/empty/MOLE870717DRA202402XC.xml b/tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402XC.xml similarity index 71% rename from tests/test_contabilidad_electronica/ref/empty/MOLE870717DRA202402XC.xml rename to tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402XC.xml index cdcacfd..62484a2 100644 --- a/tests/test_contabilidad_electronica/ref/empty/MOLE870717DRA202402XC.xml +++ b/tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402XC.xml @@ -1,2 +1,2 @@ - + diff --git a/tests/test_contabilidad_electronica/ref/empty/MOLE870717DRA202402XF.xml b/tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402XF.xml similarity index 85% rename from tests/test_contabilidad_electronica/ref/empty/MOLE870717DRA202402XF.xml rename to tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402XF.xml index e7f251d..0c674fb 100644 --- a/tests/test_contabilidad_electronica/ref/empty/MOLE870717DRA202402XF.xml +++ b/tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402XF.xml @@ -1,2 +1,2 @@ - + diff --git a/tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402BN.xlsx b/tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402BN.xlsx new file mode 100644 index 0000000..eba2f0a Binary files /dev/null and b/tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402BN.xlsx differ diff --git a/tests/test_contabilidad_electronica/ref/empty/MOLE870717DRA202402BN.xml b/tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402BN.xml similarity index 85% rename from tests/test_contabilidad_electronica/ref/empty/MOLE870717DRA202402BN.xml rename to tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402BN.xml index 4c7ee07..22e1fac 100644 --- a/tests/test_contabilidad_electronica/ref/empty/MOLE870717DRA202402BN.xml +++ b/tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402BN.xml @@ -1,2 +1,2 @@ - + diff --git a/tests/test_contabilidad_electronica/ref/simple/MOLE870717DRA202402CT.xml b/tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402CT.xml similarity index 89% rename from tests/test_contabilidad_electronica/ref/simple/MOLE870717DRA202402CT.xml rename to tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402CT.xml index 7f8b530..2bf38a3 100644 --- a/tests/test_contabilidad_electronica/ref/simple/MOLE870717DRA202402CT.xml +++ b/tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402CT.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test_contabilidad_electronica/ref/empty/MOLE870717DRA202402PL.xml b/tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402PL.xml similarity index 85% rename from tests/test_contabilidad_electronica/ref/empty/MOLE870717DRA202402PL.xml rename to tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402PL.xml index 7864ada..503cca6 100644 --- a/tests/test_contabilidad_electronica/ref/empty/MOLE870717DRA202402PL.xml +++ b/tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402PL.xml @@ -1,2 +1,2 @@ - + diff --git a/tests/test_contabilidad_electronica/ref/simple/MOLE870717DRA202402XC.xml b/tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402XC.xml similarity index 71% rename from tests/test_contabilidad_electronica/ref/simple/MOLE870717DRA202402XC.xml rename to tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402XC.xml index cdcacfd..62484a2 100644 --- a/tests/test_contabilidad_electronica/ref/simple/MOLE870717DRA202402XC.xml +++ b/tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402XC.xml @@ -1,2 +1,2 @@ - + diff --git a/tests/test_contabilidad_electronica/ref/simple/MOLE870717DRA202402XF.xml b/tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402XF.xml similarity index 85% rename from tests/test_contabilidad_electronica/ref/simple/MOLE870717DRA202402XF.xml rename to tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402XF.xml index e7f251d..0c674fb 100644 --- a/tests/test_contabilidad_electronica/ref/simple/MOLE870717DRA202402XF.xml +++ b/tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402XF.xml @@ -1,2 +1,2 @@ - + diff --git a/tests/utils.py b/tests/utils.py index bfd1c8b..00dfca0 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -108,8 +108,12 @@ def compare_directories(dir1, dir2): # Check for common files that are different if dcmp.diff_files: - print(f"Files that are different: {dcmp.diff_files} in {dir2}") - return False + for f in dcmp.diff_files: + if f.endswith(".xlsx"): + continue + else: + print(f"Files that are different: {dcmp.diff_files} in {dir2}") + return False # Check for files present in one directory but not in the other if dcmp.left_only or dcmp.right_only: