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

[[SISB] Yennifer Santiago Z]

[FIX] Corregido calculo de edad de los familiares de
trabajadores.
[FIX] Agregados campos relacionales cod_employee
y cod_concept en clase hr_variable_concept_line

=== modified file 'sisb_nomina/sisb_nomina.py'
--- sisb_nomina/sisb_nomina.py	2013-07-22 13:01:39 +0000
+++ sisb_nomina/sisb_nomina.py	2013-08-16 13:34:47 +0000
@@ -2512,8 +2512,11 @@
         employee_fam_obj = self.pool.get('hr.employee.family')
         current_date = datetime.now()
         for em in self.browse(cr, uid, ids, context=context):
-            edad = current_date.year - datetime.strptime(em.birthday,"%Y-%m-%d").year
-            res[em.id] = edad
+            birth = datetime.strptime(em.birthday,"%Y-%m-%d")
+            years = ((current_date.year - birth.year - 1) + 
+                (1 if (current_date.month, current_date.day) >= (birth.month, birth.day) else 0))
+            res[em.id] = years
+            
         return res
 
     def search_age(self, cr, uid, obj, name, args, context=None):
@@ -3289,6 +3292,10 @@
         'concept_id': fields.many2one('hr.concept', 'Concepto',required=True),
         'type': fields.selection([('qty', 'Cantidad'),('amount', 'Monto')], "Tipo Valor", required=True),
         'value': fields.float('Valor', digits=(16,2),required=True),
+        'code_employee': fields.related('employee_id', 'cod_number', type='char', 
+            size=64, string='Código Trabajdor', readonly=True),
+        'code_concept': fields.related('concept_id', 'code', type='char', 
+            size=64, string='Código Concepto', readonly=True),
     }
 
     def _check_employee(self, cr, uid, ids, context=None):
 
=== modified file 'sisb_nomina/view/sisb_nomina_view.xml'
--- sisb_nomina/view/sisb_nomina_view.xml	2013-07-18 15:36:16 +0000
+++ sisb_nomina/view/sisb_nomina_view.xml	2013-08-16 13:34:47 +0000
@@ -1107,15 +1107,19 @@
                             <field name="variable_concept_line_ids" nolabel='1' attrs="{'readonly':[('state','in',('execute','done','cancel'))]}">
                                 <tree string="" editable="bottom">
                                     <field name='employee_id'/>
+                                    <field name='code_employee'/>
                                     <field name='payroll_id'/>
                                     <field name='concept_id' domain="[('type','=','variable')]"/>
+                                    <field name='code_concept'/>
                                     <field name="type"/>
                                     <field name='value'/>
                                 </tree>
                                 <form string="Línea concepto variable">
                                     <field name='employee_id'/>
+                                    <field name='code_employee'/>
                                     <field name='payroll_id'/>
                                     <field name='concept_id'/>
+                                    <field name='code_concept'/>
                                     <field name="type"/>
                                     <field name='value'/>
                                 </form>