Merge pull request #57 from chazuttu/minor_bug_fixes

minor bug fixes for PDF generation
reingart · Jun 12, 2021 · 68cfe1c · 68cfe1c
2 parents 5db4da7 + ae1976f
commit 68cfe1c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/pyfepdf.py b/pyfepdf.py
@@ -767,7 +767,7 @@ def fmt_num(self, i, fmt="%0.2f", monetary=True):
                 import locale
 
                 locale.setlocale(locale.LC_ALL, loc)
-                return locale.format(
+                return locale.format_string(
                     fmt,
                     Decimal(str(i).replace(",", ".")),
                     grouping=True,
@@ -1541,7 +1541,7 @@ def ProcesarPlantilla(self, num_copias=3, lineas_max=36, qty_pos="izq"):
                     else:
                         barras = ""
 
-                    f.set("CodigoBarras", unicode(barras))
+                    f.set("CodigoBarras", str(barras))
                     f.set("CodigoBarrasLegible", barras)
 
                     if not HOMO and barras and fact.get("resultado") == "A":

diff --git a/setup.py b/setup.py
@@ -40,7 +40,7 @@
 kwargs["package_dir"] = {"pyafipws": "."}
 kwargs["packages"] = ["pyafipws"]
 opts = {}
-data_files = []
+data_files = [("pyafipws/plantillas", glob.glob("plantillas/*"))]
 
 
 long_desc = (

diff --git a/utils.py b/utils.py
@@ -1108,7 +1108,6 @@ def norm(x, encoding="latin1"):
 def date(fmt=None, timestamp=None):
     "Manejo de fechas (simil PHP)"
     if fmt == "U":  # return timestamp
-        # use universal standard time to avoid timezone differences
         t = datetime.datetime.utcnow()
         return int(time.mktime(t.timetuple()))
     if fmt == "c":  # return isoformat