elmau
/
empresa-libre
6
5
Fork 1
Code Issues 1 Pull Requests Releases Wiki Activity

Merge branch 'develop' 

Fix - Varios productos
This commit is contained in:
Mauricio Baeza 2017-10-31 20:09:01 -06:00
parent ec44e5cf73 295f1c80c5
commit cd87914a28
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -673,6 +673,23 @@ class LIBO(object):
cell_4 = self._set_cell('{cantidad}', cantidad, value=True)
cell_5 = self._set_cell('{valorunitario}', valor_unitario, value=True)
cell_6 = self._set_cell('{importe}', importe, value=True)
else:
row = cell_2.getCellAddress().Row + 1
self._sheet.getRows().insertByIndex(row, 1)
if cell_1:
self._copy_cell(cell_1)
cell_1 = self._set_cell(v=key, cell=cell_1)
if cell_3:
self._copy_cell(cell_3)
cell_3 = self._set_cell(v=unidad, cell=cell_3)
self._copy_cell(cell_2)
self._copy_cell(cell_4)
self._copy_cell(cell_5)
self._copy_cell(cell_6)
cell_2 = self._set_cell(v=description, cell=cell_2)
cell_4 = self._set_cell(v=cantidad, cell=cell_4, value=True)
cell_5 = self._set_cell(v=valor_unitario, cell=cell_5, value=True)
cell_6 = self._set_cell(v=importe, cell=cell_6, value=True)
return
def _totales(self, data):

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

@ -1308,10 +1308,11 @@ class Facturas(BaseModel):
FacturasDetalle.create(**product)
for tax in p.impuestos:
if tax.id in totals_tax:
totals_tax[tax.id]['importe'] += product['importe']
totals_tax[tax.id].importe += product['importe']
else:
tax.importe = product['importe']
totals_tax[tax.id] = tax
#~ totals_tax[tax.id]['importe'] = product['importe']
for tax in totals_tax.values():
if tax.tipo == 'E' or tax.tipo == 'R':