Merge lp:~inddiana/sisb/sisb_reporte_pasivo_max_vacaciones into lp:sisb

[[SISB] Marvi Diaz]

[IMP] se modifico sisb_nomina/wizard/reporte_pasivo_maximo_vacaciones.py, sisb_nomina/wizard/reporte_pasivo_maximo_vacaciones.xml reporte vacaciones por pagar

=== modified file 'sisb_nomina/wizard/reporte_pasivo_maximo_vacaciones.py'
--- sisb_nomina/wizard/reporte_pasivo_maximo_vacaciones.py	2016-11-23 11:59:11 +0000
+++ sisb_nomina/wizard/reporte_pasivo_maximo_vacaciones.py	2017-11-22 18:25:51 +0000
@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import time
 from osv import fields, osv
 from datetime import datetime
-import pooler
 import calendar
 import logging
 import netsvc
@@ -12,9 +10,10 @@
     _name = "wizard.maximum.passive.holiday"
     _logger = logging.getLogger('wizard.maximum.passive.holiday')
     _columns = {
-        'type_report': fields.selection([('resumido', 'Resumido'),('detallado', 'Detallado')], 'Reporte', select=True, required=True),
+        'type_report': fields.selection([(False, ''),('detallado', 'Detallado'),('resumido', 'Resumido')], 'Reporte', select=True, required=True),
         'sede_id': fields.many2one('hr.sede', 'Sede'),
         'for_sede': fields.boolean(''),
+        'basic': fields.boolean('Incluir sueldo basico'),
         'mes': fields.many2one('hr.month', 'Mes', required=True),
        }
     _defaults = {'for_sede': True}
@@ -23,7 +22,7 @@
         smtp_client = self.pool.get('email.smtpclient')
         smtp_server = smtp_client.search(cr, uid, [('active','=',True),('state','=','confirm')], context=False)
         if not smtp_server:
-            raise osv.except_osv(_('Acción Denegada!'), _('Debe configurar un servidor de correos para generar el reporte'))
+            raise osv.except_osv(('Acción Denegada!'), ('Debe configurar un servidor de correos para generar el reporte'))
         return True
       
     def _check_user_email_adress(self, cr, uid, ids, context=None):
@@ -35,8 +34,6 @@
     def _calcular_regla(self, cr, uid, rule, localdict, employee, context):
         obj_rule = self.pool.get('hr.salary.rule')
         amount, qty, rate = obj_rule.compute_rule(cr, uid, rule.id, localdict, context=context)
-        previous_amount = rule.code in localdict and localdict[rule.code] or 0.0
-        tot_rule = amount * qty * rate / 100.0
         return {
             'salary_rule_id': rule.id,
             'name': rule.name,
@@ -128,7 +125,24 @@
                 return float(salario[-1][-1])
         return ''
     
-    def get_payslip_lines(self, cr, uid, structure_brw, employee, list_concept_codes, fecha_creada):
+    
+    def remuneracion(self, cr, uid, employee_id, date_from):
+        
+        monto = 0.0
+        payslip = self.pool.get('hr.payslip')
+        payslip_line = self.pool.get('hr.payslip.line')
+        payslip_id = payslip.search(cr, uid, [('employee_id', '=', employee_id), ('type_process', '=', 'nomina'), ('state', '=', 'done'),('date_from','<=',date_from)], limit=1)
+        if payslip_id:
+            payslip_line_id = payslip_line.search(cr, uid, [('slip_id', '=', payslip_id), ('code', '=', 'SD')] )
+            if not payslip_line_id:
+                payslip_id = payslip.search(cr, uid, [('employee_id', '=', employee_id), ('type_process', '=', 'nomina'), ('state', '=', 'done'), ('line_ids.code','=','SD')], limit=1)
+                payslip_line_id = payslip_line.search(cr, uid, [('slip_id', '=', payslip_id), ('code', '=', 'SD')] )
+            payslip_line_brw = payslip_line.browse(cr, uid, payslip_line_id[0])
+            monto = payslip_line_brw.amount
+        return monto
+    
+    
+    def get_payslip_lines(self, cr, uid, structure_brw, employee, list_concept_codes, fecha_creada, context):
         
         obj_rule = self.pool.get('hr.salary.rule')
         obj_line_liq = self.pool.get('hr.linea.liquidacion')
@@ -137,14 +151,14 @@
         fecha_liquidacion = datetime.strptime(fecha_creada,"%Y-%m-%d")
         
         period = self.pool.get('hr.period').search(cr, uid, [
-          ('date_start','<=', fecha_liquidacion), 
-          ('date_end','>=', fecha_liquidacion), 
+          ('date_start','<=', fecha_liquidacion),('date_end','>=', fecha_liquidacion), 
           ('type','=',employee.hr_payroll_id.hr_payment_calendar_id.type)])
         
         period = self.pool.get('hr.period').browse(cr, uid, period[0])
         
         #se obtienen los conceptos de la estructura salarial
         rule_ids = self.pool.get('hr.payroll.structure').get_all_rules(cr, uid, [structure_brw.id], employee, period.id, context=None)
+        
         sorted_rule_ids = [id for id, sequence in sorted(rule_ids, key=lambda x:x[1])]
         
         #  vac_vencidas: Lista de tuplas. Cada tupla tiene la forma (vac_vencida, num_dias_adicionales)
@@ -154,34 +168,28 @@
         employee_hol_brw = False
         
         if employee_hol_ids:
+            
             employee_hol_brw = self.pool.get('hr.employee.holidays').browse(cr, uid, employee_hol_ids[0], context=None)
             employee_hol_date = datetime.strptime(employee_hol_brw.corresp_to_end,"%Y-%m-%d")
+            
             #Se cancelan 1 dia adicional por año a partir del 2º año
-            dias_adicionales = employee_hol_date.year-start_rel_lab.year-1 if \
-              employee_hol_date.year-start_rel_lab.year > 1 else 0
-            dias_adicionales = dias_adicionales if dias_adicionales < 15 \
-              else 15
-            num_vac_vencidas = (fecha_liquidacion.year - employee_hol_date.year) if \
-              fecha_liquidacion.month >= employee_hol_date.month else \
-              (fecha_liquidacion.year - employee_hol_date.year - 1)
+            dias_adicionales = employee_hol_date.year-start_rel_lab.year-1 if employee_hol_date.year-start_rel_lab.year > 1 else 0
+            dias_adicionales = dias_adicionales if dias_adicionales < 15 else 15
+            num_vac_vencidas = (fecha_liquidacion.year - employee_hol_date.year) if fecha_liquidacion.month >= employee_hol_date.month else (fecha_liquidacion.year - employee_hol_date.year - 1)
+            
             for x in range(num_vac_vencidas):
-                vac_vencidas.append((employee_hol_date.year+x, dias_adicionales + \
-                  1 if dias_adicionales < 15 else 15))
+                dias_adicionales = dias_adicionales + 1 if dias_adicionales < 15 else 15
+                vac_vencidas.append((employee_hol_date.year + x, dias_adicionales))
         else:
             new_date = datetime(start_rel_lab.year, start_rel_lab.month, start_rel_lab.day)
-            num_vac_vencidas = (fecha_liquidacion.year - new_date.year) if \
-              fecha_liquidacion.month > new_date.month else \
-              (fecha_liquidacion.year - new_date.year - 1)
+            num_vac_vencidas = (fecha_liquidacion.year - new_date.year) if fecha_liquidacion.month > new_date.month else (fecha_liquidacion.year - new_date.year - 1)
             
             for x in range(num_vac_vencidas):
                 dias_adicionales = x
-                vac_vencidas.append((new_date.year + x, dias_adicionales \
-                  if dias_adicionales < 15 else 15))
+                vac_vencidas.append((new_date.year + x, dias_adicionales if dias_adicionales < 15 else 15))
     
         new_date = datetime(start_rel_lab.year, start_rel_lab.month, start_rel_lab.day)
-        
-        ultimo_anio_pagado = datetime.strptime(employee_hol_brw.corresp_to_end,"%Y-%m-%d") \
-          if employee_hol_brw else new_date
+        ultimo_anio_pagado = datetime.strptime(employee_hol_brw.corresp_to_end,"%Y-%m-%d") if employee_hol_brw else new_date
         
         reg_vac_no_disf = obj_line_liq.vacaciones_no_disfrutadas(cr, uid, employee)
         
@@ -216,7 +224,6 @@
             }
     
         localdict.update({'empleado': employee,})
-        param_fp_id = parameter_obj.search(cr, uid, [('type', '=', 'fecha_prest')])
 
         parameters_dict = {}
         for parameter in employee.hr_payroll_id.parameters_ids:
@@ -224,39 +231,41 @@
         
         localdict.update({'parametros': parameters_dict,})
         localdict['periodo'] = period
-        rules_dict = {}
-        rules_dict['SUELDO'] = self._sueldo(employee.id, fecha_creada, cr, uid)
-        localdict['concepto'] = rules_dict
-
+        
         categories_concept_dict={}
         blacklist = {}
         result_dict = {}
         
         for rule in obj_rule.browse(cr, uid, sorted_rule_ids, context=None):
+            
             key = rule.code
             if key in list_concept_codes:
+                rules_dict = {}
+                
+                if key == 'VND':
+                    rules_dict['SUELDO'] = self._sueldo(employee.id, fecha_creada, cr, uid)
+                elif key == 'DAV190' or key == 'V190':
+                    rules_dict['SD'] = self.remuneracion(cr, uid, employee.id, fecha_liquidacion)
+                
+                localdict['concepto'] = rules_dict
                 localdict['result'] = None
                 localdict['result_qty'] = localdict['cantidad'] = 1.0
-    
+                inicial_dict = self._calcular_regla(cr, uid, rule, localdict, employee, context=None)
+                amount = inicial_dict['amount']
+                qty = localdict['cantidad'] = inicial_dict['quantity']
+                
                 if obj_rule.satisfy_condition(cr, uid, rule.id, localdict, context=None) and rule.id not in blacklist:
-                    inicial_dict = self._calcular_regla(cr, uid, rule, localdict, employee, context=None)
-                    amount = inicial_dict['amount']
-                    qty = localdict['cantidad'] = inicial_dict['quantity']
                     
-                    if rule.code == concept_vac_ven_brw.code or rule.code == \
-                      concept_dias_vac_ven_brw.code:
-
-                        qty_concept = parameters_dict['vacaciones'] \
-                          if rule.code == concept_vac_ven_brw.code else 15
-    
+                    if rule.code == concept_vac_ven_brw.code or rule.code == concept_dias_vac_ven_brw.code:
+                        
+                        qty_concept = parameters_dict['vacaciones'] if rule.code == concept_vac_ven_brw.code else 15
                         desde = datetime.strptime(employee.start_rel_lab,"%Y-%m-%d")
-                        
-                        num_vac = len(vac_vencidas) if (desde.month == fecha_liquidacion.month and 
-                            desde.day == fecha_liquidacion.day) else len(vac_vencidas) + 1
+                        num_vac = len(vac_vencidas) if (desde.month == fecha_liquidacion.month and desde.day == fecha_liquidacion.day) else len(vac_vencidas) + 1
                         
                         for c in range(num_vac):
-
+                            
                             if fecha_liquidacion.year > desde.year:
+                            
                                 if fecha_liquidacion.month == desde.month:
                                     if fecha_liquidacion.day < desde.day:
                                         meses = 12 - desde.month + fecha_liquidacion.month - 1
@@ -267,50 +276,44 @@
                                             meses = 12
                                 
                                 elif fecha_liquidacion.month < desde.month:
+                                    
                                     if fecha_liquidacion.day < desde.day:
                                         meses = 12 - desde.month + fecha_liquidacion.month - 1
                                     else:
                                         meses = 12 - desde.month + fecha_liquidacion.month
                                 else:
+                                    
                                     meses = fecha_liquidacion.month - desde.month
                                     if fecha_liquidacion.day < desde.day:
                                         meses = fecha_liquidacion.month - desde.month - 1
                                     else:
                                         meses = fecha_liquidacion.month - desde.month
                             else:
+                                
                                 meses = fecha_liquidacion.month - desde.month
+                                
                                 if fecha_liquidacion.day < desde.day:
                                     meses = fecha_liquidacion.month - desde.month - 1
                                 else:
                                     meses = fecha_liquidacion.month - desde.month
                             
-                            qty = qty_concept if ((ultimo_anio_pagado.year+c < fecha_liquidacion.year-1) or \
-                              (ultimo_anio_pagado.year+c == fecha_liquidacion.year-1 and \
-                              fecha_liquidacion.month > ultimo_anio_pagado.month)) \
-                              else float(qty_concept)/12*meses
+                            qty = qty_concept if ((ultimo_anio_pagado.year+c < fecha_liquidacion.year-1) or (ultimo_anio_pagado.year+c == fecha_liquidacion.year-1 and fecha_liquidacion.month > ultimo_anio_pagado.month)) else float(qty_concept)/12*meses
                             
                             key_ = key + '-' + str(ultimo_anio_pagado.year+c)
+                            
                             result_dict[key_] = inicial_dict.copy()
+                            
                             result_dict[key_].update({
                                 'name': rule.name,
-                                'periodo': 'Periodo ' + str(ultimo_anio_pagado.year+c) \
-                                  + '-' + str(ultimo_anio_pagado.year+1+c)\
-                                  if qty ==  qty_concept \
-                                  else 'Fraccion periodo ' + \
-                                  str(fecha_liquidacion.year) \
-                                  + '-' + str(fecha_liquidacion.year+1) if \
-                                  fecha_liquidacion.month > ultimo_anio_pagado.month else
-                                  'Fraccion periodo ' + \
-                                  str(fecha_liquidacion.year-1) \
-                                  + '-' + str(fecha_liquidacion.year),
-                                'quantity': qty,
+                                'periodo': 'Periodo ' + str(ultimo_anio_pagado.year+c) + '-' + str(ultimo_anio_pagado.year+1+c) if qty ==  qty_concept else 'Fraccion periodo ' + str(fecha_liquidacion.year) + '-' + str(fecha_liquidacion.year+1) if fecha_liquidacion.month > ultimo_anio_pagado.month else 'Fraccion periodo ' + str(fecha_liquidacion.year-1) + '-' + str(fecha_liquidacion.year), 'quantity': qty,
                             })
                             rules_dict[key_] = amount * qty or 0.0
                             localdict['concepto'] = rules_dict
                             
                     elif rule.code == concept_dias_adic_vac_ven_brw.code:
-
+                        
                         for c in range(len(vac_vencidas)):
+                            
                             qty = vac_vencidas[c][1]
                             key_ = key + '-' + str(ultimo_anio_pagado.year+c)
                             result_dict[key_] = inicial_dict.copy()
@@ -334,79 +337,56 @@
                             localdict['concepto'] = rules_dict
                             
                     elif rule.code == concept_vac_no_disf_brw.code:
+                        
                         for _vac in reg_vac_no_disf:
+                        
                             anio = datetime.strptime(_vac.employee_holidays_add_id.corresp_to_end,"%Y-%m-%d").year
-                            tipo = _vac.name[_vac.name.find('/')+13:]
                             qty = reg_vac_no_disf[_vac]
-                            key_ = key + '-' + str(_vac.name[_vac.name.find('/')+2:])
+                            key_ = key + '-' + str(_vac.name[_vac.name.find('/') + 2:])
                             result_dict[key_] = inicial_dict.copy()
+                            
                             result_dict[key_].update({
+                            
                                 'name': rule.name,
                                 'periodo': 'Periodo ' + str(anio-1) + ' - ' + str(anio),
                                 'quantity': qty,
                             })
-                            rules_dict[key_] = amount*qty or 0.0
+                            
+                            rules_dict[key_] = amount * qty or 0.0
                             localdict['concepto'] = rules_dict
-                        
-                    else:
-                        result_dict[key] = inicial_dict.copy()
-                        
-                        if rule.code == concept_util_liq_brw.code:
-                            qty = parameters_dict['utilidades']
-                            result_dict[key]['quantity'] = qty
-                            
-                        elif rule.code == concept_prest_liq_brw.code:
-                            qty = 5
-                            result_dict[key]['quantity'] = qty
-                            
-                        elif rule.code == concept_util_frac_liq_brw.code:
-                            contract_date_start = datetime.strptime(employee.start_rel_lab,"%Y-%m-%d")
-                            fraccion_mes = fecha_liquidacion.day / \
-                              calendar.monthrange(fecha_liquidacion.year,fecha_liquidacion.month)[1]
-                            if contract_date_start.year < fecha_liquidacion.year:
-                                qty = parameters_dict['utilidades']/12*(fecha_liquidacion.month \
-                                  - 1 + fraccion_mes)
-                                result_dict[key]['quantity'] = qty
-                            elif contract_date_start.year == fecha_liquidacion.year:
-                                qty = parameters_dict['utilidades']/12*(fecha_liquidacion.month - \
-                                  contract_date_start.month+fraccion_mes)
-                                result_dict[key]['quantity'] = qty
-                            
-                        rules_dict[key] = amount*qty or 0.0
-                        localdict['concepto'] = rules_dict
                     
                     if rule.concept_id.category_id.code not in categories_concept_dict:
-                        categories_concept_dict[rule.concept_id.category_id.code] = \
-                          amount or 0.0
+                        
+                        categories_concept_dict[rule.concept_id.category_id.code] = amount or 0.0
                     else:
-                        categories_concept_dict[rule.concept_id.category_id.code] = \
-                          categories_concept_dict[rule.concept_id.category_id.code] \
-                          + amount
+                        categories_concept_dict[rule.concept_id.category_id.code] = categories_concept_dict[rule.concept_id.category_id.code] + amount
+                    
                     localdict['categoria_concepto'] = categories_concept_dict
+                
                 else:
-                    blacklist += [id for id, seq in 
-                      self.pool.get('hr.salary.rule')._recursive_search_of_rules(cr, 
-                      uid, [rule], context=context)]
+                    
+                    blacklist += [id for id, seq in self.pool.get('hr.salary.rule')._recursive_search_of_rules(cr, uid, [rule], context=context)]
         
         result = [value for code, value in result_dict.items()]
         
         return result
         
-  
+
     def _send_report_by_email(self, cr, uid, parameters, context=None):
         
         subject = parameters['subject']
         message = parameters['message']
         data = parameters['data']
+        title = parameters['data']['titulo']
         file_name = parameters['file_name']
         fecha_creada = parameters['data']['fecha_creada']
-
+        type_report = parameters['data']['type_report']
+        basic = parameters['data']['sueldo_basico']
+        
         smtp_client = self.pool.get('email.smtpclient')
         smtp_server = smtp_client.search(cr, uid, [('active','=',True),('state','=','confirm')], context=False)
         
         parameter_obj = self.pool.get('hr.parameters')
-        payroll_obj = self.pool.get('hr.payroll')
-        payroll_structure_obj = self.pool.get('hr.payroll.structure')
         obj_line_liq = self.pool.get('hr.linea.liquidacion')
         
         param_struct_id = parameter_obj.search(cr, uid, [('type', '=', 'estructuras_liq')])
@@ -416,71 +396,102 @@
         
         if data['for_sede']:
             employee_ids = self.pool.get('hr.employee').search(cr, uid, [('state','in',['vacaciones','activo','reposo']),('start_rel_lab','<=', fecha_creada)])
-            title = "Todas las sedes"
         else:
-            brw_sede = self.pool.get('hr.sede').browse(cr, uid, data['sede']) 
             employee_ids = self.pool.get('hr.employee').search(cr, uid, [('hr_sede_id','=',data['sede']),('state','in',['vacaciones','activo','reposo']),('start_rel_lab','<=', fecha_creada)])
-            title = brw_sede.name
-        
-        list_val = []
-        value = []
-        
+
+        list_concept_codes = self.query_concept(cr)
         dicc_department = {}
         
-        for i in employee_ids:
-            employee = self.pool.get('hr.employee').browse(cr, uid, [i])
-            if employee[0].start_rel_lab <= fecha_creada:
-                dicc_department[employee[0].department_id.id] = []
-        
-        
-        for i in employee_ids:
-            employee = self.pool.get('hr.employee').browse(cr, uid, [i])
-            if employee[0].start_rel_lab <= fecha_creada:
-                struct_brw = [x for x in struct_list if x.hr_payroll_id == employee[0].hr_payroll_id]
-                lines = self.get_payslip_lines(cr, uid, struct_brw[0], employee[0], list_concept_codes, fecha_creada)
-                val= []
-                l=[]
+        if employee_ids:
+          c = 0
+          for i in employee_ids:
+            c = c + 1
+            #~ print str(c) + " de " + str(len(employee_ids))
+            val= []
+            l=[]
+        
+            employee = self.pool.get('hr.employee').browse(cr, uid, [i])
+        
+            if employee[0].start_rel_lab <= fecha_creada:
+                   
+                struct_list = parameter_obj.browse(cr, uid, param_struct_id)[0].estruc_liq_ids
+                struct_brw = [x for x in struct_list if x.hr_payroll_id == employee[0].hr_payroll_id]
+                if struct_brw:
+                    obj_line_liq.vacaciones_no_disfrutadas(cr, uid, employee[0])
+                else:
+                    raise osv.except_osv(('ERROR!'), ('La %s no esta incluida en los parametros de la estructura para liquidacion'%(employee[0].hr_payroll_id.name)))
+
+                struct_brw = [x for x in struct_list if x.hr_payroll_id == employee[0].hr_payroll_id]
+                lines = self.get_payslip_lines(cr, uid, struct_brw[0], employee[0], list_concept_codes, fecha_creada, context)
+        
                 [l.append(key) for key in lines if key not in l]
+        
+                sd = self.remuneracion(cr, uid, employee[0].id, fecha_creada)
+                
                 for line in l:
                     if line['amount'] > 0.0 and line['quantity'] > 0.0:
                         amount = line['amount'] * line['quantity']
-                        val.append({'n':line['name'] + " " + line['periodo'], 'a':amount, 'q':line['quantity'], 'p':line['periodo']})
+                        basico = sd * line['quantity']
+                        val.append({'sd':basico,'n':line['name'] + " " + line['periodo'], 'a':amount, 'q':line['quantity'], 'p':line['periodo']})
+
                 if val:
+                    
+                    if not employee[0].department_id.id in dicc_department:
+                        dicc_department[employee[0].department_id.id]=[]
                     dicc_department[employee[0].department_id.id].append((employee[0].cod_number, employee[0].name, sorted(val)))
-        
+            
         total_departamento={}
+        total_departamento_basico={}
+        
         for c in dicc_department:
             total_departamento[c] = 0.0
+            total_departamento_basico[c] = 0.0
         
         for c in dicc_department:
             amount = 0.0
+            basico = 0.0
             for i in dicc_department[c]:
+                
                 for x in i[2]:
                     amount += x['a']
+                    basico += x['sd']
+            
             total_departamento[c] = amount
+            total_departamento_basico[c] = basico
         
         total_resumen = []
+        total_resumen_basico = []
         for c in total_departamento:
             total_resumen.append(total_departamento[c])
+            total_resumen_basico.append(total_departamento_basico[c])
+        
         total_resumen = sum(total_resumen)
+        total_resumen_basico = sum(total_resumen_basico)
         
         total_empleado = {}
+        total_empleado_basico = {}
         for c in dicc_department:
             for i in dicc_department[c]:
                 total_empleado[i[0]] = 0.0
+                total_empleado_basico[i[0]] = 0.0
                 
         for c in dicc_department:
             for i in dicc_department[c]:
                 for x in i[2]:
                     total_empleado[i[0]] += x['a']
+                    total_empleado_basico[i[0]] += x['sd']
         
         new = datetime.strptime(fecha_creada, '%Y-%m-%d')
-         
+        
         data['form'] = dicc_department
         data['total_resumen'] = total_resumen
+        data['total_resumen_basico'] = total_resumen_basico
         data['total_empleado'] = total_empleado
+        data['total_empleado_basico'] = total_empleado_basico
         data['sede'] = title
-        data['al'] = str(new.strftime('%d-%m-%Y'))
+        data['sueldo_basico'] = basic
+        data['type_report'] = type_report
+        data['al'] = str(new.strftime('%d/%m/%Y'))
         
         report = self._create_report(cr, uid, data['ids'], data['model'], file_name, data)
         attachments = report[0] and [report[1]] or []
@@ -502,17 +513,13 @@
                             'from': uid,
                             'attachments': attachments
                             }
-                            
                     smtp_client.send_email(cr, uid, smtp_server_id, email['to'], email['name'], email['body'], email['attachments'])
         finally:
             cron = self.pool.get('ir.cron')
             accion_planificada = cron.search(cr, uid, [('name','=', subject)])
             cron.unlink(cr, uid, accion_planificada)
-    
+        
     def _send_request(self, cr, uid, ids, subject, message, context=None):
-        """
-        Metodo que envia una notificacion interna de OpenERP
-        """
         notificaciones = {
                 'name': (subject),
                 'act_to': uid,
@@ -535,40 +542,36 @@
             fp.write(result);
             fp.close();
         except Exception,e:
-            print 'Exception in create report:',e
+            #~ print 'Exception in create report:',e
             return (False, str(e))
         return (True, ret_file_name)
     
-    def getObtenerDia(self, mes, dia="primer"):
-        meses = {'ENERO':'01', 'FEBRERO':'02', 'MARZO':'03', 'ABRIL':'04', 'MAYO':'05', 'JUNIO':'06', 
-        'JULIO':'07', 'AGOSTO':'08', 'SEPTIEMBRE':'09', 'OCTUBRE':'10', 'NOVIEMBRE':'11', 'DICIEMBRE':'12'}
-        mes = mes.split(" ")
-        anio = mes[1]
-        mes =  meses[mes[0].upper()]
-        calendario = calendar.monthrange(int(anio),int(mes))
-        if dia == "ultimo":
-            fecha_creada = str(anio)+"-"+ str(mes)+ "-" + str(calendario[1])
-            return fecha_creada
-        return str(anio)+"-"+ str(mes)+ "-" + "-01"
+    def getObtenerDia(self, mes, anio):
+        calendario = calendar.monthrange(anio, mes)
+        return '%s-%s-%s'%(anio, '0'+ str(mes) if len(str(mes)) < 2 else mes, calendario[1])
     
     def print_report_buton(self, cr, uid, ids, context=None):
         
-        brw = self.browse(cr, uid, ids)[0]
-        mes = brw.mes.name
-        month_id = brw.mes.id
-        fecha_creada = self.getObtenerDia(mes, 'ultimo')
-        for_sede = brw.for_sede
-        type_report = brw.type_report
-         
+        if context is None:context = {}
+        context['procesar'] = True 
+        
         self._check_email_server(cr, uid, ids, context)
         email = self._check_user_email_adress(cr, uid, ids, context)
         
+        if not email:
+            raise osv.except_osv(('ERROR!'), ('No hay un correo electronico asociado al usuario.'))
+        
         parameter_obj = self.pool.get('hr.parameters')
         payroll_obj = self.pool.get('hr.payroll')
         payroll_structure_obj = self.pool.get('hr.payroll.structure')
-        obj_line_liq = self.pool.get('hr.linea.liquidacion')
         obj_process = self.pool.get('hr.process')
         obj_period = self.pool.get('hr.period')
+        obj_line_liq = self.pool.get('hr.linea.liquidacion')
+        
+        brw = self.browse(cr, uid, ids)[0]
+        mes_brw = brw.mes
+        sede_id = brw.sede_id
+        fecha_creada = self.getObtenerDia(mes_brw.month_year, mes_brw.hr_year_id.year)
         
         param_struct_id = parameter_obj.search(cr, uid, [('type', '=', 'estructuras_liq')])
         if not param_struct_id:
@@ -611,7 +614,8 @@
               la pestaña Configuracion -> Configuraciones de nomina -> \
               Parametros de nomina y registrar un parametro de tipo \
               Conceptos Vacaciones no disfrutadas'))
-
+        
+        
         nomina_ids = payroll_obj.search(cr, uid, [])
         nomina_browse = payroll_obj.browse(cr, uid, nomina_ids)
         
@@ -621,6 +625,7 @@
                 raise osv.except_osv(('ERROR!'), ('No hay una Estructuras de Liquidaciones para la nomina %s')%(i.name))
         
         for i in nomina_browse:
+            
             param_concept_salary_id = parameter_obj.search(cr, uid, [('type', '=', 'concepto_sueldo'),
             ('payroll_id', '=', i.id)])
         
@@ -635,54 +640,58 @@
                   Parametros de nomina y registrar un parametro de tipo \
                   Concepto Salario')%(i.name))
             
-            fecha_liquidacion = datetime.strptime(fecha_creada,"%Y-%m-%d")
-            
-            period_id = obj_period.search(cr, uid, [('hr_month_id', '=', month_id), ('state', '=', 'close')])
+            period_id = obj_period.search(cr, uid, [('hr_month_id', '=', mes_brw.id), ('state', '=', 'close')])
             
             if not period_id:
-                raise osv.except_osv(('ERROR!'), ('No hay un periodo asociado a la fecha %s para la %s')%(today, i.name))  
-            
+                raise osv.except_osv(('ERROR!'), ('No hay un periodo asociado al mes seleccionado. para la %s')%(i.name))  
+        
             otros_procesos_id = obj_process.search(cr, uid, [('hr_payroll_ids', '=', i.id), 
-              ('type', 'not in', ('prestaciones','bono_alimentacion','guarderias')), 
-              ('hr_period_ids', 'in', period_id), ('state', '=', 'done')])
+                                                             ('type', 'not in', ('prestaciones','bono_alimentacion','guarderias')), 
+                                                             ('hr_period_ids', 'in', period_id), ('state', '=', 'done')])
             
             if otros_procesos_id:
-
-                proceso_id = obj_process.search(cr, uid, [('hr_payroll_ids', '=', i.id), ('type', '=', 'prestaciones'), 
-                      ('hr_period_ids', 'in', period_id), ('state', '=', 'done')])
+                
+                proceso_id = obj_process.search(cr, uid, [('hr_payroll_ids', '=', i.id), 
+                                                          ('type', '=', 'prestaciones'), 
+                                                          ('hr_period_ids', 'in', period_id), 
+                                                          ('state', '=', 'done')])
                 
                 if not proceso_id:
-                   raise osv.except_osv(('ERROR!'), ('La %s para el mes de %s no \
-                     posee proceso de Prestaciones Sociales aprobado'%(i.name, mes)))
+                   raise osv.except_osv(('ERROR!'), ('La %s para el mes de %s no posee proceso de Prestaciones Sociales aprobado'%(i.name, mes_brw.name)))
                 
-                proceso_nomina_id = obj_process.search(cr, uid, [('hr_payroll_ids', '=', i.id), ('type', '=', 'nomina'), 
-                  ('hr_period_ids', 'in', period_id), ('state', '=', 'done')])
+                proceso_nomina_id = obj_process.search(cr, uid, [('hr_payroll_ids', '=', i.id), 
+                                                                 ('type', '=', 'nomina'), 
+                                                                 ('hr_period_ids', 'in', period_id), 
+                                                                 ('state', '=', 'done')])
                 
                 if not proceso_nomina_id:
-                   raise osv.except_osv(('ERROR!'), ('La %s para el mes de %s no \
-                     posee proceso de Nomina aprobado'%(i.name, mes)))
+                   raise osv.except_osv(('ERROR!'), ('La %s para el mes de %s no posee proceso de Nomina aprobado'%(i.name, mes_brw.name)))
             
-        if for_sede:
+        if brw.for_sede:
             employee_ids = self.pool.get('hr.employee').search(cr, uid, [('state','in',['vacaciones','activo','reposo'])])
-            title = "TODAS LAS SEDES"
         else:
-            employee_ids = self.pool.get('hr.employee').search(cr, uid, [('hr_sede_id','=',brw.sede_id.id),('state','in',['vacaciones','activo','reposo'])])
-            title = brw.sede_id.name
-        
+            employee_ids = self.pool.get('hr.employee').search(cr, uid, [('hr_sede_id','=',sede_id.id),('state','in',['vacaciones','activo','reposo'])])
+            
+        title = sede_id.name if not brw.for_sede else 'TODAS LAS SEDES'
         
         if employee_ids:
+            
             for i in employee_ids:
+            
                 employee = self.pool.get('hr.employee').browse(cr, uid, [i])
                 if employee[0].start_rel_lab <= fecha_creada:
                     struct_list = parameter_obj.browse(cr, uid, param_struct_id)[0].estruc_liq_ids
                     struct_brw = [x for x in struct_list if x.hr_payroll_id == employee[0].hr_payroll_id]
                     if struct_brw:
-                        reg_vac_no_disf = obj_line_liq.vacaciones_no_disfrutadas(cr, uid, employee[0])
+                        obj_line_liq.vacaciones_no_disfrutadas(cr, uid, employee[0])
                     else:
                         raise osv.except_osv(('ERROR!'), ('La %s no esta incluida en los parametros de la estructura para liquidacion'%(employee[0].hr_payroll_id.name)))
+            
             data = {}
             data['form'] = {}
             data['ids'] = [1]
+            data['titulo'] = title
+            data['sueldo_basico'] = brw.basic
             data['model'] = "wizard.maximum.passive.holiday"
             data['sede'] = brw.sede_id.id
             data['type_report'] = brw.type_report
@@ -715,11 +724,9 @@
                 self.pool.get('ir.cron').create(cr, uid, vals, context)
                 self._send_request(cr, uid, ids, subject, request_message, context)
                 return {'type':'ir.actions.act_window_close'}
-            else:
-                raise osv.except_osv(('Accion Denegada!'), ('No existen datos disponibles para generar el reporte'))
-        else:
-            raise osv.except_osv(('Accion Denegada!'), ('%s no cuenta con trabajadores para poder generar este reporte')%(title))
-    
-    
+        
+            raise osv.except_osv(('Accion Denegada!'), ('No existen datos disponibles para generar el reporte'))
+        
+        raise osv.except_osv(('Accion Denegada!'), ('%s no cuenta con trabajadores para poder generar este reporte')%(title))    
     
 wizard_maximum_passive_holiday()
 
=== modified file 'sisb_nomina/wizard/reporte_pasivo_maximo_vacaciones.xml'
--- sisb_nomina/wizard/reporte_pasivo_maximo_vacaciones.xml	2016-11-22 14:39:04 +0000
+++ sisb_nomina/wizard/reporte_pasivo_maximo_vacaciones.xml	2017-11-22 18:25:51 +0000
@@ -7,23 +7,25 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="maximum passive holiday">
-                    <group col="4" colspan="4" >
-                        
-                    </group>
-                    <group colspan="4" col="8">
-                        <field name="type_report" colspan="1"/>
-                        <field name="sede_id" colspan="2" attrs= "{'readonly':[('for_sede','=','True')], 'required':[('for_sede','!=','True')] }"/>
-                        <field name="for_sede" colspan="2" />
-                        
-                        <newline/>
-                        
-                        <field name="mes" colspan="2" />
-                    </group>
-                    <newline/>
-                    <newline/>
+                    
+                    <group colspan="2" col="6">
+                        <field name="type_report"/>
+                        <field name="sede_id" attrs= "{'readonly':[('for_sede','=','True')], 'required':[('for_sede','!=','True')] }"/>
+                        <field name="for_sede" />
+                        <field name="mes" />
+                        <field name="basic" />
+                    </group>
+                    
+                    
+                    <newline/>
+                    
                     <group>
-                    <button name="print_report_buton" string="Print Report" type="object" icon="mail- " confirm="Antes de iniciar la generacion del reporte se validaran ciertos datos. Al finalizar se enviara a su direccion de correo" />
+
+                        <button name="print_report_buton" string="Generar Reporte" type="object" icon="mail- " confirm="Antes de iniciar la generacion del reporte se validaran ciertos datos. Al finalizar se enviara a su direccion de correo" />
+
                     </group>
+
+                
                 </form>
             </field>
         </record>