Skip to content

Commit

Permalink
Updated Contabilidad
Browse files Browse the repository at this point in the history
  • Loading branch information
@satcfdi
satcfdi committed Apr 22, 2024
1 parent 335b039 commit 71e764f
Show file tree
Hide file tree
Showing 15 changed files with 29 additions and 27 deletions.
5 changes: 2 additions & 3 deletions satcfdi/accounting/contabilidad.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,13 @@ def output_file(file, folder, fiel=None, generate_pdf=False, zip_xml=False):
zip_file(output_file[:-4] + '.zip', [
ZipData(
filename(file),
file.xml_bytes(xml_declaration=True)
file.xml_bytes()
)
])
else:
file.xml_write(
output_file,
pretty_print=True,
xml_declaration=True
pretty_print=True
)

if generate_pdf:
Expand Down
3 changes: 3 additions & 0 deletions satcfdi/cfdi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ class CFDI(XElement):
def to_xml(self, validate=False, include_schema_location=True) -> lxml.etree.Element:
return super().to_xml(validate, include_schema_location)

def xml_write(self, target, pretty_print=False, xml_declaration=True, validate=False, include_schema_location=True) -> bytes:
return super().xml_write(target, pretty_print=pretty_print, xml_declaration=xml_declaration, validate=validate, include_schema_location=include_schema_location)

def xml_bytes(self, pretty_print=False, xml_declaration=True, validate=False, include_schema_location=True) -> bytes:
return super().xml_bytes(pretty_print=pretty_print, xml_declaration=xml_declaration, validate=validate, include_schema_location=include_schema_location)

Expand Down
28 changes: 14 additions & 14 deletions satcfdi/xelement.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,20 @@ def to_xml(self, validate=False, include_schema_location=False) -> etree.Element

return xml

def xml_write(self, target, pretty_print=False, xml_declaration=True, validate=False, include_schema_location=False):
xml = self.to_xml(validate=validate, include_schema_location=include_schema_location)
et = etree.ElementTree(xml)
et.write(
target,
xml_declaration=xml_declaration,
encoding="UTF-8",
pretty_print=pretty_print
)

def xml_bytes(self, pretty_print=False, xml_declaration=True, validate=False, include_schema_location=False) -> bytes:
xml = self.to_xml(validate=validate, include_schema_location=include_schema_location)
return etree.tostring(xml, xml_declaration=xml_declaration, encoding="UTF-8", pretty_print=pretty_print)

def process(self, validate=False) -> 'XElement':
return XElement.from_xml(self.to_xml(validate=validate))

Expand All @@ -46,20 +60,6 @@ def from_file(cls, filename) -> 'XElement':
def from_string(cls, string) -> 'XElement':
return cls.from_xml(etree.fromstring(string, parser=parser))

def xml_write(self, target, pretty_print=False, xml_declaration=True, validate=False, include_schema_location=False):
xml = self.to_xml(validate=validate, include_schema_location=include_schema_location)
et = etree.ElementTree(xml)
et.write(
target,
xml_declaration=xml_declaration,
encoding="UTF-8",
pretty_print=pretty_print
)

def xml_bytes(self, pretty_print=False, xml_declaration=True, validate=False, include_schema_location=False) -> bytes:
xml = self.to_xml(validate=validate, include_schema_location=include_schema_location)
return etree.tostring(xml, xml_declaration=xml_declaration, encoding="UTF-8", pretty_print=pretty_print)

def __repr__(self):
# return '%s.%s(%s)' % (self.__class__.__module__,
# self.__class__.__qualname__,
Expand Down
Binary file modified tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402BN.xlsx
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402BN.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<BCE:Balanza xmlns:BCE="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/BalanzaComprobacion" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoEnvio="N"/>
<BCE:Balanza xmlns:BCE="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/BalanzaComprobacion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoEnvio="N" xsi:schemaLocation="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/BalanzaComprobacion http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/BalanzaComprobacion/BalanzaComprobacion_1_3.xsd"/>
2 changes: 1 addition & 1 deletion tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402CT.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<catalogocuentas:Catalogo xmlns:catalogocuentas="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/CatalogoCuentas" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024"/>
<catalogocuentas:Catalogo xmlns:catalogocuentas="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/CatalogoCuentas" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" xsi:schemaLocation="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/CatalogoCuentas http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/CatalogoCuentas/CatalogoCuentas_1_3.xsd"/>
2 changes: 1 addition & 1 deletion tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402PL.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<PLZ:Polizas xmlns:PLZ="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/PolizasPeriodo" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoSolicitud=""/>
<PLZ:Polizas xmlns:PLZ="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/PolizasPeriodo" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoSolicitud="" xsi:schemaLocation="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/PolizasPeriodo http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/PolizasPeriodo/PolizasPeriodo_1_3.xsd"/>
2 changes: 1 addition & 1 deletion tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402XC.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<AuxiliarCtas:AuxiliarCtas xmlns:AuxiliarCtas="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarCtas" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoSolicitud=""/>
<AuxiliarCtas:AuxiliarCtas xmlns:AuxiliarCtas="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarCtas" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoSolicitud="" xsi:schemaLocation="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarCtas http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarCtas/AuxiliarCtas_1_3.xsd"/>
2 changes: 1 addition & 1 deletion tests/test_contabilidad_electronica/ref/empty/CACX7605101P8202402XF.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<RepAux:RepAuxFol xmlns:RepAux="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarFolios" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoSolicitud=""/>
<RepAux:RepAuxFol xmlns:RepAux="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarFolios" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoSolicitud="" xsi:schemaLocation="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarFolios http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarFolios/AuxiliarFolios_1_3.xsd"/>
Binary file modified tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402BN.xlsx
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402BN.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<BCE:Balanza xmlns:BCE="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/BalanzaComprobacion" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoEnvio="N">
<BCE:Balanza xmlns:BCE="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/BalanzaComprobacion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoEnvio="N" xsi:schemaLocation="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/BalanzaComprobacion http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/BalanzaComprobacion/BalanzaComprobacion_1_3.xsd">
<BCE:Ctas NumCta="1000" SaldoIni="0" Debe="10000" Haber="10000" SaldoFin="0"/>
<BCE:Ctas NumCta="1020" SaldoIni="0" Debe="10000" Haber="10000" SaldoFin="0"/>
<BCE:Ctas NumCta="1020.01" SaldoIni="0" Debe="10000" Haber="0" SaldoFin="10000"/>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402CT.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<catalogocuentas:Catalogo xmlns:catalogocuentas="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/CatalogoCuentas" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024">
<catalogocuentas:Catalogo xmlns:catalogocuentas="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/CatalogoCuentas" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" xsi:schemaLocation="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/CatalogoCuentas http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/CatalogoCuentas/CatalogoCuentas_1_3.xsd">
<catalogocuentas:Ctas CodAgrup="100" NumCta="1000" Desc="Activos" Nivel="1" Natur="D"/>
<catalogocuentas:Ctas CodAgrup="102" NumCta="1020" Desc="Bancos" SubCtaDe="1000" Nivel="2" Natur="D"/>
<catalogocuentas:Ctas CodAgrup="102.01" NumCta="1020.01" Desc="Bancos Nacionales" SubCtaDe="1020" Nivel="3" Natur="D"/>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402PL.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<PLZ:Polizas xmlns:PLZ="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/PolizasPeriodo" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoSolicitud="AF">
<PLZ:Polizas xmlns:PLZ="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/PolizasPeriodo" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoSolicitud="AF" xsi:schemaLocation="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/PolizasPeriodo http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/PolizasPeriodo/PolizasPeriodo_1_3.xsd">
<PLZ:Poliza NumUnIdenPol="1" Fecha="2024-02-01" Concepto="Compra de equipo de computo">
<PLZ:Transaccion NumCta="1020.01" DesCta="Bancos Nacionales" Concepto="Nal" Debe="10000" Haber="0">
<PLZ:CompNal UUID_CFDI="a4f4fea5-e798-4ab3-a2e5-75f741f4ecca" RFC="CACX7605101P8" MontoTotal="10000"/>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402XC.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<AuxiliarCtas:AuxiliarCtas xmlns:AuxiliarCtas="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarCtas" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoSolicitud="AF">
<AuxiliarCtas:AuxiliarCtas xmlns:AuxiliarCtas="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarCtas" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoSolicitud="AF" xsi:schemaLocation="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarCtas http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarCtas/AuxiliarCtas_1_3.xsd">
<AuxiliarCtas:Cuenta NumCta="1020.01" DesCta="Bancos Nacionales" SaldoIni="0" SaldoFin="10000">
<AuxiliarCtas:DetalleAux Fecha="2024-02-01" NumUnIdenPol="1" Concepto="Compra de equipo de computo Nal" Debe="10000" Haber="0"/>
</AuxiliarCtas:Cuenta>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_contabilidad_electronica/ref/simple/CACX7605101P8202402XF.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<RepAux:RepAuxFol xmlns:RepAux="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarFolios" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoSolicitud="AF">
<RepAux:RepAuxFol xmlns:RepAux="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarFolios" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Version="1.3" RFC="CACX7605101P8" Mes="02" Anio="2024" TipoSolicitud="AF" xsi:schemaLocation="http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarFolios http://www.sat.gob.mx/esquemas/ContabilidadE/1_3/AuxiliarFolios/AuxiliarFolios_1_3.xsd">
<RepAux:DetAuxFol NumUnIdenPol="1" Fecha="2024-02-01">
<RepAux:ComprNal UUID_CFDI="a4f4fea5-e798-4ab3-a2e5-75f741f4ecca" MontoTotal="10000" RFC="CACX7605101P8"/>
</RepAux:DetAuxFol>
Expand Down

0 comments on commit 71e764f

Please sign in to comment.