diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..b66a3c0 --- /dev/null +++ b/TODO.md @@ -0,0 +1,2 @@ +[ ] Permitir más de un remolque en la Carta Porte +[ ] Representación impresa de Comercio Exterior diff --git a/source/app/controllers/util.py b/source/app/controllers/util.py index ee5238e..2cbda51 100644 --- a/source/app/controllers/util.py +++ b/source/app/controllers/util.py @@ -881,8 +881,6 @@ class LIBO(object): image = self._template.createInstance('com.sun.star.drawing.GraphicObjectShape') gp = self._create_instance('com.sun.star.graphic.GraphicProvider') pd.add(image) - # ~ image.GraphicURL = data['path_cbb'] - # ~ properties = self._set_properties({'URL': self._path_url(data['path_cbb'])}) instance = 'com.sun.star.io.SequenceInputStream' stream = self._create_instance(instance) @@ -891,11 +889,11 @@ class LIBO(object): image.Graphic = gp.queryGraphic(properties) s = Size() - s.Width = 4150 - s.Height = 4500 + s.Width = 4000 + s.Height = 4000 image.setSize(s) image.Anchor = self._set_cell('{timbre.cbb}') - # ~ _kill(data['path_cbb']) + return def _donataria(self, data): diff --git a/source/app/models/main.py b/source/app/models/main.py index 576e180..85a73d7 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -5737,13 +5737,12 @@ class Facturas(BaseModel): 'NoIdentificacion': key, 'Cantidad': FORMAT.format(row.cantidad), 'ClaveUnidad': row.unidad, - # ~ 'Unidad': SATUnidades.get(SATUnidades.key==row.unidad).name[:20], 'Descripcion': row.descripcion, 'ValorUnitario': frm_vu.format(row.valor_unitario), 'Importe': FORMAT.format(row.importe), } if not is_global: - concepto['Unidad'] = SATUnidades.get(SATUnidades.key==row.unidad).name[:20], + concepto['Unidad'] = SATUnidades.get(SATUnidades.key==row.unidad).name[:20] if row.descuento: concepto['Descuento'] = FORMAT.format(row.descuento) diff --git a/source/templates/plantilla_factura_4.0.ods b/source/templates/plantilla_factura_4.0.ods index f1b8d7a..982474a 100644 Binary files a/source/templates/plantilla_factura_4.0.ods and b/source/templates/plantilla_factura_4.0.ods differ