categulario
/
empresa-libre
forked from elmau/empresa-libre
1
0
Fork 0
Code Pull Requests Activity

Agregar ubicaciones a representación impresa de Carta Porte

This commit is contained in:
El Mau 2022-01-19 00:17:29 -06:00
parent 0498217b65
commit 88bb6d9411
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/app/controllers/util.py
View File

@ -969,14 +969,14 @@ class LIBO(object):
cell_5 = self._set_cell('{cp.Domicilio}', domicilio) cell_5 = self._set_cell('{cp.Domicilio}', domicilio)
row = cell_1.CellAddress.Row + 1 row = cell_1.CellAddress.Row + 1
try: self._sheet.getRows().insertByIndex(row, count)
self._sheet.Rows.insertByIndex(row, count) self._copy_paste_rows(cell_1, count)
except Exception as e: else:
print(e) cell_1 = self._set_cell(v=tipo, cell=cell_1)
# ~ self._copy_paste_rows(cell_1, count) cell_2 = self._set_cell(v=nombre, cell=cell_2)
# ~ row = cell_1.getCellAddress().Row cell_3 = self._set_cell(v=rfc, cell=cell_3)
# ~ else: cell_4 = self._set_cell(v=fecha, cell=cell_4)
# ~ cell_1 = self._set_cell(v=tipo, cell=cell_1) cell_5 = self._set_cell(v=domicilio, cell=cell_5)
return return
@ -1202,14 +1202,15 @@ class LIBO(object):
self._nomina(data['nomina']) self._nomina(data['nomina'])
else: else:
self._totales(data['totales']) self._totales(data['totales'])
self._timbre(data['timbre'])
self._donataria(data['donataria']) self._donataria(data['donataria'])
self._ine(data['ine']) self._ine(data['ine'])
self._divisas(data.get('divisas', {})) self._divisas(data.get('divisas', {}))
self._leyendas(data.get('leyendas', '')) self._leyendas(data.get('leyendas', ''))
self._carta_porte(data.get('carta_porte', {})) self._carta_porte(data.get('carta_porte', {}))
self._timbre(data['timbre'])
self._cancelado(data['cancelada']) self._cancelado(data['cancelada'])
self._others_values(data) self._others_values(data)
self._clean() self._clean()
@ -1224,7 +1225,6 @@ class LIBO(object):
def pdf(self, path, data, ods=False): def pdf(self, path, data, ods=False):
options = {'AsTemplate': True, 'Hidden': True} options = {'AsTemplate': True, 'Hidden': True}
log.debug('Abrir plantilla...') log.debug('Abrir plantilla...')
self._template = self._doc_open(path, options) self._template = self._doc_open(path, options)
if self._template is None: if self._template is None:
return b'' return b''

1
source/app/models/main.py
View File

@ -4785,6 +4785,7 @@ class Facturas(BaseModel):
values = cls._get_not_in_xml(cls, obj, emisor) values = cls._get_not_in_xml(cls, obj, emisor)
data = util.get_data_from_xml(obj, values) data = util.get_data_from_xml(obj, values)
data.update(utils.CfdiToDict(obj.xml).values)
doc = util.to_pdf(data, emisor.rfc, True) doc = util.to_pdf(data, emisor.rfc, True)
return doc, name return doc, name