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

[[SISB] Yennifer Santiago Z]

[ADD] Modulo para generacion por medio de una
secuencia de los codigos de los trabajdores segun
la sede a la que pertenezcan.

Unmerged revisions

555. By [SISB] Yennifer Santiago Z on 2013-08-20

[ADD] Modulo para generacion por medio de una
secuencia de los codigos de los trabajdores segun
la sede a la que pertenezcan.

=== added directory 'sisb_codigo_trabajador'
=== added file 'sisb_codigo_trabajador/__init__.py'
--- sisb_codigo_trabajador/__init__.py	1970-01-01 00:00:00 +0000
+++ sisb_codigo_trabajador/__init__.py	2013-08-20 21:03:31 +0000
@@ -0,0 +1,24 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    SISB, Sistema Integral Simón Bolivar
+#    Copyright (C) 2012-2013 Industrias Diana, C.A. All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import codigo_trabajador
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'sisb_codigo_trabajador/__openerp__.py'
--- sisb_codigo_trabajador/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sisb_codigo_trabajador/__openerp__.py	2013-08-20 21:03:31 +0000
@@ -0,0 +1,45 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    SISB, Sistema Integral Simón Bolivar
+#    Copyright (C) 2012-2013 Industrias Diana, C.A. All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Codigo Trabajador',
+    'version': '1.0',
+    'category': 'Talento Humano',
+    "sequence": 38,
+    'complexity': "normal",
+    'description': """ """,
+    'author':'Industrias Diana C.A.',
+    'website':'http://www.industriasdiana.gob.ve',
+    'depends': [
+        'sisb_nomina',
+    ],
+    'init_xml': [
+    ],
+    'update_xml': [
+        'view/codigo_trabajador_view.xml',
+    ],
+    'test': [
+    ],
+    'active' : False,
+    'installable' : True,
+    'data' : [],
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'sisb_codigo_trabajador/codigo_trabajador.py'
--- sisb_codigo_trabajador/codigo_trabajador.py	1970-01-01 00:00:00 +0000
+++ sisb_codigo_trabajador/codigo_trabajador.py	2013-08-20 21:03:31 +0000
@@ -0,0 +1,53 @@
+#-*- coding:utf-8 -*-
+
+from time import strftime
+from datetime import date
+from datetime import datetime
+from datetime import timedelta
+import re
+from dateutil import relativedelta
+import netsvc
+from osv import fields, osv
+import tools
+from tools.translate import _
+import logging
+from itertools import groupby
+from operator import itemgetter
+
+class hr_sede(osv.osv):
+    '''
+    Sedes
+    '''
+    _inherit = 'hr.sede'
+    _description = 'Sedes'
+    
+    _columns = {
+        'secuencia_id': fields.many2one('ir.sequence', 'Secuencia codigo\
+            trabajadores'),
+    }
+    
+hr_sede()
+
+class hr_employee(osv.osv):
+    '''
+    Employee
+    '''
+    _inherit = 'hr.employee'
+    _description = 'Employee'
+    
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        
+        sede = self.pool.get('hr.sede').browse(cr, uid, vals['hr_sede_id'])
+        if not sede.secuencia_id:
+            raise osv.except_osv(_('ERROR!'),_('La Sede seleccionada\
+                no tiene una secuencia para la generación del código\
+                del trabajador'))
+                
+        seq = self.pool.get('ir.sequence').get(cr, uid, sede.secuencia_id.code)
+        vals.update({'cod_number':seq})
+        res = super(hr_employee, self).create(cr, uid, vals, context)
+        return res
+        
+hr_employee()
 
=== added directory 'sisb_codigo_trabajador/data'
=== added directory 'sisb_codigo_trabajador/i18n'
=== added directory 'sisb_codigo_trabajador/images'
=== added directory 'sisb_codigo_trabajador/report'
=== added directory 'sisb_codigo_trabajador/security'
=== added directory 'sisb_codigo_trabajador/static'
=== added directory 'sisb_codigo_trabajador/static/src'
=== added directory 'sisb_codigo_trabajador/static/src/img'
=== added file 'sisb_codigo_trabajador/static/src/img/icon.png'
 Binary files sisb_codigo_trabajador/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and sisb_codigo_trabajador/static/src/img/icon.png	2013-08-20 21:03:31 +0000 differ
=== added directory 'sisb_codigo_trabajador/test'
=== added directory 'sisb_codigo_trabajador/view'
=== added file 'sisb_codigo_trabajador/view/codigo_trabajador_view.xml'
--- sisb_codigo_trabajador/view/codigo_trabajador_view.xml	1970-01-01 00:00:00 +0000
+++ sisb_codigo_trabajador/view/codigo_trabajador_view.xml	2013-08-20 21:03:31 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="hr_sede_form_inherit" model="ir.ui.view">
+            <field name="name">hr.sede.form.inherit</field>
+            <field name="model">hr.sede</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sisb_nomina.hr_sede_form" />
+            <field name="arch" type="xml">
+                <xpath expr='/form/notebook/page/field[@name="amount_payment_2"]' position='after'>
+                    <separator string='Secuencia Código Trabajadores'/>
+                    <field name="secuencia_id"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record id="view_employee_form_codigo_inherit" model="ir.ui.view">
+            <field name="name">view.employee.form.codigo.inherit</field>
+            <field name="model">hr.employee</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sisb_nomina.view_employee_form_inherit" />
+            <field name="arch" type="xml">
+                <xpath expr='/form/group/group/field[@name="cod_number"]' position='replace'>
+                    <field name="cod_number" readonly='True'/>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
 
=== added directory 'sisb_codigo_trabajador/wizard'
=== modified file 'sisb_nomina/hr_shift_rotation.py'
--- sisb_nomina/hr_shift_rotation.py	2013-07-12 14:21:52 +0000
+++ sisb_nomina/hr_shift_rotation.py	2013-08-20 21:03:31 +0000
@@ -276,7 +276,7 @@
             }
             shift_week = self.pool.get('hr.shift.week').create(cr, uid, vals_shift_week)
 
-        return True
+        return employee
 
     def write(self, cr, uid, ids, vals, context=None):
         if context is None: