Merge branch 'main' into coverage_receb1

Author: reingart

.coveragerc

@@ -5,14 +5,8 @@ omit =
         *iibb*
         *nsis*
         */padron.py
-        *pyemail*
-        *pyfepdf*
-        *pyi25*
-        *pyqr*
-        *rece1*
-        *recem*
         *recet*
-        *recex1*
+        *formatos*
         *rg3685*
         *setup_win*
         *sired*

.github/workflows/python-package.yml

@@ -41,11 +41,20 @@ jobs:
         python setup.py install
     - name: Download certificate and private key
       run: |
-        wget https://www.sistemasagiles.com.ar/soft/pyafipws/reingart2019.zip
+        wget  "https://www.sistemasagiles.com.ar/soft/pyafipws/reingart2021.zip" -O reingart2019.zip
         unzip reingart2019.zip
     - name: Fix OpenSSL "dh key too small"
       run: |
         sudo cp .github/openssl.cnf /etc/ssl/openssl.cnf
+    - name: Copy rece.ini file
+      run: |
+        sudo cp conf/rece.ini rece.ini
+    - name: Copy wsltv.ini file
+      run: |
+        sudo cp conf/wsltv.ini wsltv.ini
+    - name: Copy wslsp.ini file
+      run: |
+        sudo cp conf/wslsp.ini wslsp.ini
     - name: Test with pytest
       run: |
         pytest --html=report.html --self-contained-html

conf/rece.ini

@@ -42,6 +42,12 @@ ENTRADA=entrada.txt
 SALIDA=salida.txt
 ##URL=https://servicios1.afip.gov.ar/wsfe/service.asmx
 
+[WSFEXv1]
+CUIT=20267565393
+ENTRADA=entrada.txt
+SALIDA=salida.txt
+##URL=https://servicios1.afip.gov.ar/wsfe/service.asmx
+
 [WSCT]
 CUIT=20267565393
 ENTRADA=entrada.txt
@@ -78,7 +84,7 @@ LOCALE=Spanish_Argentina.1252
 FMT_CANTIDAD=0.4
 FMT_PRECIO=0.3
 CANT_POS=izq
-ENTRADA=factura.txt
+ENTRADA=facturas.txt
 SALIDA=factura.pdf
 
 [PDF]

conf/wslsp.ini

@@ -0,0 +1,12 @@
+[WSAA]
+CERT = reingart.crt
+PRIVATEKEY = reingart.key
+## URL = https: //wsaa.afip.gov.ar/ws/services/LoginCms
+
+[WSLSP]
+CUIT = 20267565393
+INPUT = invoices.csv
+OUTPUT = OUTPUT.txt
+ENTRADA=entrada.txt
+SALIDA=salida.txt
+## URL = https: //serviciosjava.afip.gob.ar/wslsp/LumService? Wsdl

conf/wsltv.ini

@@ -0,0 +1,12 @@
+[WSAA]
+CERT = reingart.crt
+PRIVATEKEY = reingart.key
+## URL = https: //wsaa.afip.gov.ar/ws/services/LoginCms
+
+[WSLTV]
+CUIT = 20267565393
+INPUT = invoices.csv
+OUTPUT = OUTPUT.txt
+ENTRADA=entrada.txt
+SALIDA=salida.txt
+## URL = https: //serviciosjava.afip.gob.ar/wsltv/LtvService? Wsdl

formatos/__init__.py

@@ -0,0 +1,17 @@
+#!/usr/bin/python
+# -*- coding: utf8 -*-
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation; either version 3, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTIBILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+
+"""Módulo para acceder a web services de la afip
+"""
+__author__ = "Mariano Reingart ([email protected])"
+__copyright__ = "Copyright (C) 2008-2021 Mariano Reingart"
+__license__ = "LGPL-3.0-or-later"

formatos/formato_dbf.py

@@ -40,7 +40,7 @@
 
 # definición del formato del archivo de intercambio:
 
-from formato_txt import (
+from .formato_txt import (
     A,
     N,
     I,

formatos/formato_json.py

@@ -36,7 +36,7 @@ def leer(fn="entrada.json"):
     return regs
 
 
-def escribir(filas, fn="salida.json"):
+def escribir(filas, fn="salida.json", **kwargs):
     "Dado una lista de comprobantes (diccionarios), escribe JSON"
     import codecs
 
@@ -46,6 +46,6 @@ def escribir(filas, fn="salida.json"):
         jsonfile,
         sort_keys=True,
         indent=4,
-        encoding="utf-8",
+        **kwargs
     )
     jsonfile.close()

formatos/formato_txt.py

@@ -21,6 +21,7 @@
 __license__ = "LGPL-3.0-or-later"
 
 from decimal import Decimal
+import sys
 
 CHARSET = "latin1"
 
@@ -117,7 +118,7 @@
     ("imp_iva", 15, I),
     ("despacho", 20, A),
     ("u_mtx", 10, N),
-    ("cod_mtx", 30, A),
+    ("cod_mtx", 30, N),
     ("dato_a", 15, A),
     ("dato_b", 15, A),
     ("dato_c", 15, A),
@@ -229,8 +230,9 @@ def escribir_linea_txt(dic, formato):
             valor = dic.get(clave, "")
             if not isinstance(valor, basestring):
                 valor = str(valor)
-            if isinstance(valor, str):
-                valor = valor.encode(CHARSET, "replace")
+            if sys.version_info[0] < 3 :
+                if isinstance(valor, str):
+                    valor = valor.encode(CHARSET, "replace")
             if valor == "None":
                 valor = ""
             if tipo == N and valor and valor != "NULL":
@@ -257,7 +259,7 @@ def escribir_linea_txt(dic, formato):
 
 def leer(fn="entrada.txt"):
     "Analiza un archivo TXT y devuelve un diccionario"
-    f_entrada = open(fn, "r")
+    f_entrada = open(fn, "rb")
     try:
         regs = []
         reg = None

pyemail.py

@@ -92,11 +92,12 @@ def Conectar(self, servidor, usuario=None, clave=None, puerto=25):
                 # inicio una sesión segura (TLS)
                 self.smtp.starttls()
             if usuario and clave:
-                # convertir a string (hmac necesita string "bytes")
-                if isinstance(usuario, str):
-                    usuario = usuario.encode("utf8")
-                if isinstance(clave, str):
-                    clave = clave.encode("utf8")
+                if sys.version_info[0] < 3:
+                    #convertir a string (hmac necesita string "bytes")
+                    if isinstance(usuario, str):
+                        usuario = usuario.encode("utf8")
+                    if isinstance(clave, str):
+                        clave = clave.encode("utf8")
                 self.smtp.login(usuario, clave)
             return True
         except Exception as e:
@@ -275,10 +276,14 @@ def main():
     elif "/prueba" in sys.argv:
         pyemail = PyEmail()
         import getpass
-
-        usuario = input("usuario:")
-        clave = getpass.getpass("clave:")
-        ok = pyemail.Conectar("smtp.gmail.com", "reingart", clave, 587)
+        i = sys.argv.index("/prueba")
+        if i + 2 < len(sys.argv):
+            usuario = sys.argv[sys.argv.index("/prueba") + 1]
+            clave = sys.argv[sys.argv.index("/prueba") + 2]
+        else:
+            usuario = input("usuario:")
+            clave = getpass.getpass("clave:")
+        ok = pyemail.Conectar("smtp.gmail.com", usuario=usuario, clave=clave, puerto=587)
         print("login ok?", ok, pyemail.Excepcion)
         print(pyemail.Traceback)
         ok = pyemail.Enviar(usuario, "prueba", usuario, "prueba!", None)