diana-addons

Merge lp:~inddiana/diana-addons/imp_he_biostar into lp:diana-addons/6.0

  1. imp_he_biostar
  2. Merge into trunk-2
Proposed by Mauricio Jose Sanchez Puerta
Status: Merged
Merged at revision: 16
Proposed branch: lp:~inddiana/diana-addons/imp_he_biostar
Merge into: lp:diana-addons/6.0
Diff against target: 61 lines (+4/-8)
3 files modified
diana_integracion_biostar/wizard/consultar_retardos_wizard.py (+1/-1)
diana_integracion_biostar/wizard/export_biostar.py (+2/-1)
diana_integracion_biostar/wizard/horas_retardo_wizard.py (+1/-6)
To merge this branch: bzr merge lp:~inddiana/diana-addons/imp_he_biostar
Reviewer Review Type Date Requested Status
Aristóbulo Meneses Pending
Review via email: mp+171349@code.launchpad.net

Description of the change

 [FIX]: Reparado error para exportar con fecha de expiracion mayor a la fecha de inicio

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'diana_integracion_biostar/wizard/consultar_retardos_wizard.py'
2--- diana_integracion_biostar/wizard/consultar_retardos_wizard.py 2013-06-07 12:41:42 +0000
3+++ diana_integracion_biostar/wizard/consultar_retardos_wizard.py 2013-06-25 16:08:15 +0000
4@@ -112,7 +112,7 @@
5
6 dia = dia.strptime(dia.strftime( '%H:%M:%S'), '%H:%M:%S')
7 date = self.discount_case(cod_obj[0].shift_id, dia.strftime("%Y-%m-%d"))
8- print date
9+ #~ print date
10 if dia < self.convert_hours(date[0]) + timedelta(minutes=15):
11
12 h1 = self.convert_hours(date[0])+ timedelta(minutes=5) #esta es la hora normal de entrada a la que se adiciona 15 minutos
13
14=== modified file 'diana_integracion_biostar/wizard/export_biostar.py'
15--- diana_integracion_biostar/wizard/export_biostar.py 2013-06-07 20:00:23 +0000
16+++ diana_integracion_biostar/wizard/export_biostar.py 2013-06-25 16:08:15 +0000
17@@ -10,10 +10,11 @@
18
19 def export(self, cr, uid, ids, context=None):
20 sql1 = "select TOP 1 sUserID from TB_USER ORDER BY nUserIdn DESC"
21- sql2 = "INSERT INTO TB_USER VALUES ('%s', 0, '', '', %s, '', 0, 0, 241, 0, 0, 0, CAST('' AS VARBINARY))"
22+ sql2 = "INSERT INTO TB_USER VALUES ('%s', 0, '', '', %s, '', 0, 1924988400, 241, 0, 0, 0, CAST('' AS VARBINARY))"
23 sql3 = "select MAX(nUserIdn) from TB_USER"
24 sql4 = "INSERT INTO TB_USER_CUSTOMINFO VALUES (%s, 'Asistant Manager', '', '', '', %s, %s, '', '', '', '', '', '', '', '', '', '', '', '', '', '' )"
25 sql5 = "INSERT INTO TB_USER_EX VALUES (%s, '', '', '', 0, '', 0, 0, 0, '')"
26+ #~ sql5 = "INSERT INTO TB_USER_EX VALUES (%s, '', '', '', 0, '', 0, CAST('1924988400' as int), 0, '')"
27 idsw = [context['active_id']]
28
29 try:
30
31=== modified file 'diana_integracion_biostar/wizard/horas_retardo_wizard.py'
32--- diana_integracion_biostar/wizard/horas_retardo_wizard.py 2013-06-07 12:41:42 +0000
33+++ diana_integracion_biostar/wizard/horas_retardo_wizard.py 2013-06-25 16:08:15 +0000
34@@ -81,9 +81,6 @@
35 fecha_fin = period2[-1]
36 periodo = period2
37
38- #~ for i in cod:
39- #~ periodo = self.generate_valid_period(cr, uid, ids, i, periodo, hr_holidays_calendar)
40-
41 j = []
42 n = []
43 retardos = []
44@@ -120,8 +117,6 @@
45
46 if asu['value'] != 0:
47 hrvc_linea_obj.create(cr, uid, asu , context=None)
48- #~
49- #~ print '=' * 50
50
51
52 return {
53@@ -188,7 +183,7 @@
54 empleado_brw = empleado_obj.browse(cr, uid, empleado_id)
55 period = empleado_brw[0].shift_id
56 dif_total = self.total_discount('mensual')
57- d = self. discount_case(period, row[-1])
58+ d = self.discount_case(period, row[-1])
59 des1 = [i for i in row if row[1] < 2 if row[-1] in periodo]
60 des2 = [i for i in row if row[1] >= 2 if self.cvr_hr(row[2]) >= self.cvr_hr(d[0]) + timedelta(minutes=15) if row[-1] in periodo]
61 des3 = [i for i in row if row[1] >= 2 if self.cvr_hr(row[2]) >= self.cvr_hr(d[0]) + timedelta(minutes=5) and self.cvr_hr(row[2]) < self.cvr_hr(d[0]) + timedelta(minutes=15) ]

Subscribers

People subscribed via source and target branches