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

Error al importar nómina y factura en lote

This commit is contained in:
Mauricio Baeza 2018-11-07 19:14:54 -06:00
parent 68ed8ee0db
commit 2d045af037
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,3 +1,9 @@
v 1.25.0 [07-nov-2018]
----------------------
- Fix: Al importar días de pago en nómina
- Fix: Al importar descripción en factura en lote
v 1.24.0 [06-nov-2018] v 1.24.0 [06-nov-2018]
---------------------- ----------------------
- Fix: Consulta estatus SAT - Fix: Consulta estatus SAT

2
VERSION
View File

@ -1 +1 @@
1.24.0 1.25.0

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

@ -1399,6 +1399,7 @@ class LIBO(object):
'fecha_inicial_pago', 'fecha_inicial_pago',
'fecha_final_pago', 'fecha_final_pago',
'relacionados', 'relacionados',
'dias_pagados',
) )
data = tuple([dict(zip(fields, r[1:])) for r in rows[2:]]) data = tuple([dict(zip(fields, r[1:])) for r in rows[2:]])
return data, '' return data, ''

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

@ -181,7 +181,7 @@ def import_invoice():
'id_product': obj.id, 'id_product': obj.id,
'delete': '-', 'delete': '-',
'clave': obj.clave, 'clave': obj.clave,
'descripcion': description, 'descripcion': description or obj.descripcion,
'pedimento': pedimento, 'pedimento': pedimento,
'unidad': obj.unidad.id, 'unidad': obj.unidad.id,
'cantidad': cant, 'cantidad': cant,
@ -7217,6 +7217,7 @@ class CfdiNomina(BaseModel):
sn = {'si': True, 'no': False} sn = {'si': True, 'no': False}
data = row.copy() data = row.copy()
rfc = data.pop('rfc') rfc = data.pop('rfc')
days_pay = data.pop('dias_pagados')
try: try:
data['empleado'] = Empleados.get(Empleados.rfc==rfc) data['empleado'] = Empleados.get(Empleados.rfc==rfc)
except Empleados.DoesNotExist: except Empleados.DoesNotExist:
@ -7241,7 +7242,8 @@ class CfdiNomina(BaseModel):
data['fecha_pago'] = util.calc_to_date(row['fecha_pago']) data['fecha_pago'] = util.calc_to_date(row['fecha_pago'])
data['fecha_inicial_pago'] = util.calc_to_date(row['fecha_inicial_pago']) data['fecha_inicial_pago'] = util.calc_to_date(row['fecha_inicial_pago'])
data['fecha_final_pago'] = util.calc_to_date(row['fecha_final_pago']) data['fecha_final_pago'] = util.calc_to_date(row['fecha_final_pago'])
data['dias_pagados'] = util.get_days(data['fecha_inicial_pago'], data['fecha_final_pago']) # ~ data['dias_pagados'] = util.get_days(data['fecha_inicial_pago'], data['fecha_final_pago'])
data['dias_pagados'] = days_pay
return data, '' return data, ''

2
source/app/settings.py
View File

@ -47,7 +47,7 @@ except ImportError:
DEBUG = DEBUG DEBUG = DEBUG
VERSION = '1.24.0' VERSION = '1.25.0'
EMAIL_SUPPORT = ('soporte@empresalibre.net',) EMAIL_SUPPORT = ('soporte@empresalibre.net',)
TITLE_APP = '{} v{}'.format(TITLE_APP, VERSION) TITLE_APP = '{} v{}'.format(TITLE_APP, VERSION)