From 5cd089dda9a663d3d50c1ff23407d838e7c8325c Mon Sep 17 00:00:00 2001 From: Michael Telahun Makonnen Date: Mon, 12 Aug 2013 12:07:07 +0300 Subject: [PATCH 01/48] Employee and Contract Management, Attendance and Scheduling, Payroll Management modules --- hr_employee_id/__init__.py | 22 ++++++ hr_employee_id/__openerp__.py | 47 +++++++++++++ hr_employee_id/hr_contract.py | 40 +++++++++++ hr_employee_id/hr_contract_sequence.xml | 15 ++++ hr_employee_id/hr_contract_view.xml | 17 +++++ hr_employee_id/hr_employee_id.py | 93 +++++++++++++++++++++++++ hr_employee_id/hr_payroll_view.xml | 43 ++++++++++++ hr_employee_id/hr_view.xml | 64 +++++++++++++++++ 8 files changed, 341 insertions(+) create mode 100644 hr_employee_id/__init__.py create mode 100644 hr_employee_id/__openerp__.py create mode 100644 hr_employee_id/hr_contract.py create mode 100644 hr_employee_id/hr_contract_sequence.xml create mode 100644 hr_employee_id/hr_contract_view.xml create mode 100644 hr_employee_id/hr_employee_id.py create mode 100644 hr_employee_id/hr_payroll_view.xml create mode 100644 hr_employee_id/hr_view.xml diff --git a/hr_employee_id/__init__.py b/hr_employee_id/__init__.py new file mode 100644 index 00000000000..7ed0b67d970 --- /dev/null +++ b/hr_employee_id/__init__.py @@ -0,0 +1,22 @@ +#-*- coding:utf-8 -*- +# +# +# Copyright (C) 2011,2013 Michael Telahun Makonnen . +# 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 . +# +# + +from . import hr_employee_id diff --git a/hr_employee_id/__openerp__.py b/hr_employee_id/__openerp__.py new file mode 100644 index 00000000000..97e2f052308 --- /dev/null +++ b/hr_employee_id/__openerp__.py @@ -0,0 +1,47 @@ +#-*- coding:utf-8 -*- +# +# +# Copyright (C) 2011,2013 Michael Telahun Makonnen . +# 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 . +# +# + +{ + 'name': 'Employee ID', + 'version': '1.0', + 'category': 'Generic Modules/Human Resources', + 'description': """ +Employee Identification Numbers +=============================== +Company wide unique employee ID + """, + 'author': 'Michael Telahun Makonnen ', + 'website': 'http://miketelahun.wordpress.com', + 'depends': [ + 'hr', + ], + 'init_xml': [ + ], + 'update_xml': [ + 'hr_view.xml', + ], + 'test': [ + ], + 'demo_xml': [ + ], + 'installable': True, + 'active': False, +} diff --git a/hr_employee_id/hr_contract.py b/hr_employee_id/hr_contract.py new file mode 100644 index 00000000000..e6a210c5936 --- /dev/null +++ b/hr_employee_id/hr_contract.py @@ -0,0 +1,40 @@ +#-*- coding:utf-8 -*- +# +# +# Copyright (C) 2011,2013 Michael Telahun Makonnen . +# 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 . +# +# + +from osv import fields, osv + + +class hr_contract(osv.osv): + + _inherit = 'hr.contract' + + _columns = { + 'name': fields.char('Contract Reference', size=32, required=False, readonly=True), + } + + def create(self, cr, uid, vals, context=None): + + cid = super(hr_contract, self).create(cr, uid, vals, context) + if cid: + ref = self.pool.get('ir.sequence').get(cr, uid, 'contract.ref') + self.pool.get('hr.contract').write( + cr, uid, cid, {'name': ref}, context=context) + return cid diff --git a/hr_employee_id/hr_contract_sequence.xml b/hr_employee_id/hr_contract_sequence.xml new file mode 100644 index 00000000000..09612749ab4 --- /dev/null +++ b/hr_employee_id/hr_contract_sequence.xml @@ -0,0 +1,15 @@ + + + + + Contract Reference + contract.ref + + + Contract Reference + contract.ref + HR/EC/%(year)s/ + 5 + + + \ No newline at end of file diff --git a/hr_employee_id/hr_contract_view.xml b/hr_employee_id/hr_contract_view.xml new file mode 100644 index 00000000000..bf24da7648a --- /dev/null +++ b/hr_employee_id/hr_contract_view.xml @@ -0,0 +1,17 @@ + + + + + + hr.contract.form.view.inherit.ref + hr.contract + form + + + + + + + + + \ No newline at end of file diff --git a/hr_employee_id/hr_employee_id.py b/hr_employee_id/hr_employee_id.py new file mode 100644 index 00000000000..a48aa5e17f5 --- /dev/null +++ b/hr_employee_id/hr_employee_id.py @@ -0,0 +1,93 @@ +#-*- coding:utf-8 -*- +# +# +# Copyright (C) 2011,2013 Michael Telahun Makonnen . +# 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 . +# +# + +import random +import string +from osv import fields, osv +from tools.translate import _ + + +class hr_employee(osv.osv): + + """Implement company wide unique identification number.""" + + IDLEN = 8 + + _name = 'hr.employee' + _inherit = 'hr.employee' + + _columns = { + 'employee_no': fields.char('Employee ID', + size=IDLEN, + readonly=True), + # Formatted version of employee ID + 'f_employee_no': fields.char('Employee ID', + size=IDLEN + 2, + readonly=True), + 'tin_no': fields.char('TIN No', size=10), + } + + _sql_constraints = [ + ('employeeno_uniq', 'unique(employee_no)', + 'The Employee Number must be unique accross the company(s).'), + ('tinno_uniq', 'unique(tin_no)', + 'There is already another employee with this TIN number.'), + ] + + def _check_identification(self, cr, uid, ids, context=None): + obj = self.browse(cr, uid, ids[0], context=context) + if obj.identification_id or obj.tin_no: + return True + return False + +# _constraints = [ +# (_check_identification, 'At least one of the identification fields must be filled in.', ['identification_id', 'tin_no']), +# ] + + def _generate_employeeno(self, cr, uid, arg): + """Generate a random employee identifacation number""" + + tries = 0 + max_tries = 50 + while tries < max_tries: + rnd = random.SystemRandom() + eid = ''.join(rnd.choice(string.digits) + for _ in xrange(self.IDLEN)) + cr.execute( + '''SELECT employee_no FROM hr_employee WHERE employee_no=%s''', tuple((eid,))) + res = cr.fetchall() + if len(res) == 0: + break + + tries += 1 + + if tries == max_tries: + raise osv.except_osv( + _('Error'), _('Unable to generate an Employee ID number that is unique.')) + + return eid + + def create(self, cr, uid, vals, context={}): + + eid = self._generate_employeeno(cr, uid, context) + vals['employee_no'] = eid + vals['f_employee_no'] = '%s-%s-%s' % (eid[:2], eid[2:4], eid[4:]) + return super(hr_employee, self).create(cr, uid, vals, context) diff --git a/hr_employee_id/hr_payroll_view.xml b/hr_employee_id/hr_payroll_view.xml new file mode 100644 index 00000000000..aa45cf3f135 --- /dev/null +++ b/hr_employee_id/hr_payroll_view.xml @@ -0,0 +1,43 @@ + + + + + + + hr.employee.form.inherit + hr.employee + + + + + + + + + diff --git a/hr_employee_id/hr_view.xml b/hr_employee_id/hr_view.xml new file mode 100644 index 00000000000..f6ed4c52d09 --- /dev/null +++ b/hr_employee_id/hr_view.xml @@ -0,0 +1,64 @@ + + + + + + hr.employee.form.inherit + hr.employee + + + +
+
+
+
+ + + + + + + + + hr.employee.tree.inherit + hr.employee + + + + + + + + + + + + + + Employees + hr.employee + + + + + + + + + + HR - Employess Kanban + hr.employee + + + +
    • +     +     +     + +     +     From c2d924f9340bd1299b085076588c6817b23368a3 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Tue, 16 Sep 2014 16:51:50 +0100 Subject: [PATCH 02/48] Initialize 8.0 branch --- hr_employee_id/__init__.py | 22 ------ hr_employee_id/__openerp__.py | 47 ------------- hr_employee_id/hr_contract.py | 40 ----------- hr_employee_id/hr_contract_sequence.xml | 15 ---- hr_employee_id/hr_contract_view.xml | 17 ----- hr_employee_id/hr_employee_id.py | 93 ------------------------- hr_employee_id/hr_payroll_view.xml | 43 ------------ hr_employee_id/hr_view.xml | 64 ----------------- 8 files changed, 341 deletions(-) delete mode 100644 hr_employee_id/__init__.py delete mode 100644 hr_employee_id/__openerp__.py delete mode 100644 hr_employee_id/hr_contract.py delete mode 100644 hr_employee_id/hr_contract_sequence.xml delete mode 100644 hr_employee_id/hr_contract_view.xml delete mode 100644 hr_employee_id/hr_employee_id.py delete mode 100644 hr_employee_id/hr_payroll_view.xml delete mode 100644 hr_employee_id/hr_view.xml diff --git a/hr_employee_id/__init__.py b/hr_employee_id/__init__.py deleted file mode 100644 index 7ed0b67d970..00000000000 --- a/hr_employee_id/__init__.py +++ /dev/null @@ -1,22 +0,0 @@ -#-*- coding:utf-8 -*- -# -# -# Copyright (C) 2011,2013 Michael Telahun Makonnen . -# 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 . -# -# - -from . import hr_employee_id diff --git a/hr_employee_id/__openerp__.py b/hr_employee_id/__openerp__.py deleted file mode 100644 index 97e2f052308..00000000000 --- a/hr_employee_id/__openerp__.py +++ /dev/null @@ -1,47 +0,0 @@ -#-*- coding:utf-8 -*- -# -# -# Copyright (C) 2011,2013 Michael Telahun Makonnen . -# 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 . -# -# - -{ - 'name': 'Employee ID', - 'version': '1.0', - 'category': 'Generic Modules/Human Resources', - 'description': """ -Employee Identification Numbers -=============================== -Company wide unique employee ID - """, - 'author': 'Michael Telahun Makonnen ', - 'website': 'http://miketelahun.wordpress.com', - 'depends': [ - 'hr', - ], - 'init_xml': [ - ], - 'update_xml': [ - 'hr_view.xml', - ], - 'test': [ - ], - 'demo_xml': [ - ], - 'installable': True, - 'active': False, -} diff --git a/hr_employee_id/hr_contract.py b/hr_employee_id/hr_contract.py deleted file mode 100644 index e6a210c5936..00000000000 --- a/hr_employee_id/hr_contract.py +++ /dev/null @@ -1,40 +0,0 @@ -#-*- coding:utf-8 -*- -# -# -# Copyright (C) 2011,2013 Michael Telahun Makonnen . -# 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 . -# -# - -from osv import fields, osv - - -class hr_contract(osv.osv): - - _inherit = 'hr.contract' - - _columns = { - 'name': fields.char('Contract Reference', size=32, required=False, readonly=True), - } - - def create(self, cr, uid, vals, context=None): - - cid = super(hr_contract, self).create(cr, uid, vals, context) - if cid: - ref = self.pool.get('ir.sequence').get(cr, uid, 'contract.ref') - self.pool.get('hr.contract').write( - cr, uid, cid, {'name': ref}, context=context) - return cid diff --git a/hr_employee_id/hr_contract_sequence.xml b/hr_employee_id/hr_contract_sequence.xml deleted file mode 100644 index 09612749ab4..00000000000 --- a/hr_employee_id/hr_contract_sequence.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Contract Reference - contract.ref - - - Contract Reference - contract.ref - HR/EC/%(year)s/ - 5 - - - \ No newline at end of file diff --git a/hr_employee_id/hr_contract_view.xml b/hr_employee_id/hr_contract_view.xml deleted file mode 100644 index bf24da7648a..00000000000 --- a/hr_employee_id/hr_contract_view.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - hr.contract.form.view.inherit.ref - hr.contract - form - - - - - - - - - \ No newline at end of file diff --git a/hr_employee_id/hr_employee_id.py b/hr_employee_id/hr_employee_id.py deleted file mode 100644 index a48aa5e17f5..00000000000 --- a/hr_employee_id/hr_employee_id.py +++ /dev/null @@ -1,93 +0,0 @@ -#-*- coding:utf-8 -*- -# -# -# Copyright (C) 2011,2013 Michael Telahun Makonnen . -# 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 . -# -# - -import random -import string -from osv import fields, osv -from tools.translate import _ - - -class hr_employee(osv.osv): - - """Implement company wide unique identification number.""" - - IDLEN = 8 - - _name = 'hr.employee' - _inherit = 'hr.employee' - - _columns = { - 'employee_no': fields.char('Employee ID', - size=IDLEN, - readonly=True), - # Formatted version of employee ID - 'f_employee_no': fields.char('Employee ID', - size=IDLEN + 2, - readonly=True), - 'tin_no': fields.char('TIN No', size=10), - } - - _sql_constraints = [ - ('employeeno_uniq', 'unique(employee_no)', - 'The Employee Number must be unique accross the company(s).'), - ('tinno_uniq', 'unique(tin_no)', - 'There is already another employee with this TIN number.'), - ] - - def _check_identification(self, cr, uid, ids, context=None): - obj = self.browse(cr, uid, ids[0], context=context) - if obj.identification_id or obj.tin_no: - return True - return False - -# _constraints = [ -# (_check_identification, 'At least one of the identification fields must be filled in.', ['identification_id', 'tin_no']), -# ] - - def _generate_employeeno(self, cr, uid, arg): - """Generate a random employee identifacation number""" - - tries = 0 - max_tries = 50 - while tries < max_tries: - rnd = random.SystemRandom() - eid = ''.join(rnd.choice(string.digits) - for _ in xrange(self.IDLEN)) - cr.execute( - '''SELECT employee_no FROM hr_employee WHERE employee_no=%s''', tuple((eid,))) - res = cr.fetchall() - if len(res) == 0: - break - - tries += 1 - - if tries == max_tries: - raise osv.except_osv( - _('Error'), _('Unable to generate an Employee ID number that is unique.')) - - return eid - - def create(self, cr, uid, vals, context={}): - - eid = self._generate_employeeno(cr, uid, context) - vals['employee_no'] = eid - vals['f_employee_no'] = '%s-%s-%s' % (eid[:2], eid[2:4], eid[4:]) - return super(hr_employee, self).create(cr, uid, vals, context) diff --git a/hr_employee_id/hr_payroll_view.xml b/hr_employee_id/hr_payroll_view.xml deleted file mode 100644 index aa45cf3f135..00000000000 --- a/hr_employee_id/hr_payroll_view.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - hr.employee.form.inherit - hr.employee - - - - - - - - - diff --git a/hr_employee_id/hr_view.xml b/hr_employee_id/hr_view.xml deleted file mode 100644 index f6ed4c52d09..00000000000 --- a/hr_employee_id/hr_view.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - hr.employee.form.inherit - hr.employee - - - -
    -
    -
    -
    - - - -     -     -     - - - hr.employee.tree.inherit - hr.employee - - - - - - - - - - - - - - Employees - hr.employee - - - - - - - - - - HR - Employess Kanban - hr.employee - - - -
    • -     -     -     - -     -     From 68fe068857454bb662f4cd8ad2a5c08066cf6ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Tue, 13 Oct 2015 16:53:11 +0200 Subject: [PATCH 03/48] move addons out of __unported__ (they remain not installable) --- hr_employee_id/__init__.py | 22 ++++++ hr_employee_id/__openerp__.py | 43 ++++++++++ hr_employee_id/hr_contract.py | 43 ++++++++++ hr_employee_id/hr_contract_sequence.xml | 15 ++++ hr_employee_id/hr_contract_view.xml | 17 ++++ hr_employee_id/hr_employee_id.py | 100 ++++++++++++++++++++++++ hr_employee_id/hr_payroll_view.xml | 43 ++++++++++ hr_employee_id/hr_view.xml | 64 +++++++++++++++ 8 files changed, 347 insertions(+) create mode 100644 hr_employee_id/__init__.py create mode 100644 hr_employee_id/__openerp__.py create mode 100644 hr_employee_id/hr_contract.py create mode 100644 hr_employee_id/hr_contract_sequence.xml create mode 100644 hr_employee_id/hr_contract_view.xml create mode 100644 hr_employee_id/hr_employee_id.py create mode 100644 hr_employee_id/hr_payroll_view.xml create mode 100644 hr_employee_id/hr_view.xml diff --git a/hr_employee_id/__init__.py b/hr_employee_id/__init__.py new file mode 100644 index 00000000000..e16b5041f3c --- /dev/null +++ b/hr_employee_id/__init__.py @@ -0,0 +1,22 @@ +# -*- coding:utf-8 -*- +# +# +# Copyright (C) 2011,2013 Michael Telahun Makonnen . +# 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 . +# +# + +from . import hr_employee_id diff --git a/hr_employee_id/__openerp__.py b/hr_employee_id/__openerp__.py new file mode 100644 index 00000000000..2438234075a --- /dev/null +++ b/hr_employee_id/__openerp__.py @@ -0,0 +1,43 @@ +# -*- coding:utf-8 -*- +# +# +# Copyright (C) 2011,2013 Michael Telahun Makonnen . +# 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 . +# +# + +{ + 'name': 'Employee ID', + 'version': '1.0', + 'category': 'Generic Modules/Human Resources', + 'description': """ +Employee Identification Numbers +=============================== +Company wide unique employee ID + """, + 'author': "Michael Telahun Makonnen ,Odoo Community Association (OCA)", + 'website': 'http://miketelahun.wordpress.com', + 'license': 'AGPL-3', + 'depends': [ + 'hr', + ], + 'data': [ + 'hr_view.xml', + ], + 'test': [ + ], + 'installable': False, +} diff --git a/hr_employee_id/hr_contract.py b/hr_employee_id/hr_contract.py new file mode 100644 index 00000000000..55d622e2b34 --- /dev/null +++ b/hr_employee_id/hr_contract.py @@ -0,0 +1,43 @@ +# -*- coding:utf-8 -*- +# +# +# Copyright (C) 2011,2013 Michael Telahun Makonnen . +# 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 . +# +# + +from openerp.osv import fields, orm + + +class hr_contract(orm.Model): + + _inherit = 'hr.contract' + _columns = { + 'name': fields.char( + 'Contract Reference', + size=32, + required=False, + readonly=True, + ), + } + + def create(self, cr, uid, vals, context=None): + cid = super(hr_contract, self).create(cr, uid, vals, context) + if cid: + ref = self.pool.get('ir.sequence').get(cr, uid, 'contract.ref') + self.pool.get('hr.contract').write( + cr, uid, cid, {'name': ref}, context=context) + return cid diff --git a/hr_employee_id/hr_contract_sequence.xml b/hr_employee_id/hr_contract_sequence.xml new file mode 100644 index 00000000000..09612749ab4 --- /dev/null +++ b/hr_employee_id/hr_contract_sequence.xml @@ -0,0 +1,15 @@ + + + + + Contract Reference + contract.ref + + + Contract Reference + contract.ref + HR/EC/%(year)s/ + 5 + + + \ No newline at end of file diff --git a/hr_employee_id/hr_contract_view.xml b/hr_employee_id/hr_contract_view.xml new file mode 100644 index 00000000000..bf24da7648a --- /dev/null +++ b/hr_employee_id/hr_contract_view.xml @@ -0,0 +1,17 @@ + + + + + + hr.contract.form.view.inherit.ref + hr.contract + form + + + + + + + + + \ No newline at end of file diff --git a/hr_employee_id/hr_employee_id.py b/hr_employee_id/hr_employee_id.py new file mode 100644 index 00000000000..0983d8a1e78 --- /dev/null +++ b/hr_employee_id/hr_employee_id.py @@ -0,0 +1,100 @@ +# -*- coding:utf-8 -*- +# +# +# Copyright (C) 2011,2013 Michael Telahun Makonnen . +# 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 . +# +# + +import random +import string +from openerp.osv import fields, orm +from openerp.tools.translate import _ + + +class hr_employee(orm.Model): + + """Implement company wide unique identification number.""" + + IDLEN = 8 + + _name = 'hr.employee' + _inherit = 'hr.employee' + _columns = { + 'employee_no': fields.char( + 'Employee ID', + size=IDLEN, + readonly=True, + ), + # Formatted version of employee ID + 'f_employee_no': fields.char( + 'Employee ID', + size=IDLEN + 2, + readonly=True, + ), + 'tin_no': fields.char( + 'TIN No', + size=10, + ), + } + + def _rec_message_employee(self, cr, uid, ids, context=None): + return _('The Employee Number must be unique accross the company(s).') + + def _rec_message_tin(self, cr, uid, ids, context=None): + return _('There is already another employee with this TIN number.') + + _sql_constraints = [ + ('employeeno_uniq', 'unique(employee_no)', _rec_message_employee), + ('tinno_uniq', 'unique(tin_no)', _rec_message_tin), + ] + + def _check_identification(self, cr, uid, ids, context=None): + obj = self.browse(cr, uid, ids[0], context=context) + if obj.identification_id or obj.tin_no: + return True + return False + + def _generate_employeeno(self, cr, uid, arg): + """Generate a random employee identification number""" + tries = 0 + max_tries = 50 + eid = False + while tries < max_tries: + rnd = random.SystemRandom() + eid = ''.join( + rnd.choice(string.digits) for _ in xrange(self.IDLEN) + ) + cr.execute( + '''SELECT employee_no FROM hr_employee WHERE employee_no=%s''', + tuple((eid,)) + ) + res = cr.fetchall() + if len(res) == 0: + break + tries += 1 + if tries == max_tries: + raise orm.except_orm( + _('Error'), + _('Unable to generate an Employee ID number that is unique.') + ) + return eid + + def create(self, cr, uid, vals, context=None): + eid = self._generate_employeeno(cr, uid, context) + vals['employee_no'] = eid + vals['f_employee_no'] = '%s-%s-%s' % (eid[:2], eid[2:4], eid[4:]) + return super(hr_employee, self).create(cr, uid, vals, context) diff --git a/hr_employee_id/hr_payroll_view.xml b/hr_employee_id/hr_payroll_view.xml new file mode 100644 index 00000000000..aa45cf3f135 --- /dev/null +++ b/hr_employee_id/hr_payroll_view.xml @@ -0,0 +1,43 @@ + + + + + + + hr.employee.form.inherit + hr.employee + + + + + + + + + diff --git a/hr_employee_id/hr_view.xml b/hr_employee_id/hr_view.xml new file mode 100644 index 00000000000..3c47504dc3e --- /dev/null +++ b/hr_employee_id/hr_view.xml @@ -0,0 +1,64 @@ + + + + + + hr.employee.form.inherit + hr.employee + + + +
    +
    +
    +
    + + + +     +     +     + + + hr.employee.tree.inherit + hr.employee + + + + + + + + + + + + + + Employees + hr.employee + + + + + + + + + + HR - Employees Kanban + hr.employee + + + +
    • +     +     +     + +     +     From 9331d67384a7df4193bb334e0bbf99158952b420 Mon Sep 17 00:00:00 2001 From: Salton Massally Date: Tue, 25 Aug 2015 09:36:38 +0000 Subject: [PATCH 04/48] hr_employee_id: Port to V8 Initial Attempt of a port to V8 Some improvements made are as follows: * Ability so choose ID generation method * Sequence vs Random hr_employee_id: code linting and copyright removals apply suggeste changes * Use identification_id provided by hr addon rather than employee_no * use new api in configuration * pep8 changes Update res_company.py make fields assignable from res_company add tests Remove duplicate license key import openerp.exception.Warning as UserWarning [FIX] import Warning as UserWarning --- hr_employee_id/README.rst | 70 +++++++++++++ hr_employee_id/__init__.py | 16 ++- hr_employee_id/__openerp__.py | 32 +++--- hr_employee_id/data/hr_employee_sequence.xml | 15 +++ hr_employee_id/hr_contract.py | 43 -------- hr_employee_id/hr_contract_sequence.xml | 15 --- hr_employee_id/hr_contract_view.xml | 17 ---- hr_employee_id/hr_employee_id.py | 100 ------------------- hr_employee_id/hr_payroll_view.xml | 43 -------- hr_employee_id/hr_view.xml | 64 ------------ hr_employee_id/models/__init__.py | 22 ++++ hr_employee_id/models/hr_employee.py | 73 ++++++++++++++ hr_employee_id/models/res_company.py | 42 ++++++++ hr_employee_id/models/res_config.py | 68 +++++++++++++ hr_employee_id/tests/__init__.py | 21 ++++ hr_employee_id/tests/test_employee_id.py | 50 ++++++++++ hr_employee_id/views/hr_employee_views.xml | 58 +++++++++++ hr_employee_id/views/res_company.xml | 19 ++++ hr_employee_id/views/res_config_views.xml | 38 +++++++ 19 files changed, 497 insertions(+), 309 deletions(-) create mode 100644 hr_employee_id/README.rst create mode 100644 hr_employee_id/data/hr_employee_sequence.xml delete mode 100644 hr_employee_id/hr_contract.py delete mode 100644 hr_employee_id/hr_contract_sequence.xml delete mode 100644 hr_employee_id/hr_contract_view.xml delete mode 100644 hr_employee_id/hr_employee_id.py delete mode 100644 hr_employee_id/hr_payroll_view.xml delete mode 100644 hr_employee_id/hr_view.xml create mode 100644 hr_employee_id/models/__init__.py create mode 100644 hr_employee_id/models/hr_employee.py create mode 100644 hr_employee_id/models/res_company.py create mode 100644 hr_employee_id/models/res_config.py create mode 100644 hr_employee_id/tests/__init__.py create mode 100644 hr_employee_id/tests/test_employee_id.py create mode 100644 hr_employee_id/views/hr_employee_views.xml create mode 100644 hr_employee_id/views/res_company.xml create mode 100644 hr_employee_id/views/res_config_views.xml diff --git a/hr_employee_id/README.rst b/hr_employee_id/README.rst new file mode 100644 index 00000000000..54a828f14cf --- /dev/null +++ b/hr_employee_id/README.rst @@ -0,0 +1,70 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :alt: License: AGPL-3 + +=============================== +Employee Identification Numbers +=============================== + +Company wide unique employee ID. Supports +* Random ID Generation +* Sequence + +This module supports sequence of employee ID which will be generated +automatically from the sequence predefined. + +Installation +============ + +To install this module, you need to: + +* clone the branch 8.0 of the repository https://github.com/OCA/hr +* add the path to this repository in your configuration (addons-path) +* update the module list +* search for "Employee Identification Numbers" in your addons +* install the module + +Configuration +============= + +If you want to modify the format of the sequence, go to +Settings -> Technical -> Sequences & Identifiers -> Sequences +and search for the "Employee ID" sequence, where you modify +its prefix and numbering formats. + +Usage +===== + +When you will create a new employee, the field reference will be +assigned automatically with the next number of the predefined sequence. + + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback +`here `_. + +Credits +======= + +Contributors +------------ + +* Michael Telahun Makonnen +* Adrien Peiffer (ACSONE) +* Salton Massally (iDT Labs) + +Maintainer +---------- + +.. image:: http://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: http://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. + +To contribute to this module, please visit http://odoo-community.org. diff --git a/hr_employee_id/__init__.py b/hr_employee_id/__init__.py index e16b5041f3c..9fcbd0231f6 100644 --- a/hr_employee_id/__init__.py +++ b/hr_employee_id/__init__.py @@ -1,13 +1,12 @@ -# -*- coding:utf-8 -*- -# +# -*- coding: utf-8 -*- +############################################################################## # # Copyright (C) 2011,2013 Michael Telahun Makonnen . -# 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. +# 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 @@ -17,6 +16,5 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # -# - -from . import hr_employee_id +############################################################################## +from . import models diff --git a/hr_employee_id/__openerp__.py b/hr_employee_id/__openerp__.py index 2438234075a..0d39a9fe304 100644 --- a/hr_employee_id/__openerp__.py +++ b/hr_employee_id/__openerp__.py @@ -1,13 +1,12 @@ -# -*- coding:utf-8 -*- -# +# -*- coding: utf-8 -*- +############################################################################## # # Copyright (C) 2011,2013 Michael Telahun Makonnen . -# 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. +# 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 @@ -17,27 +16,24 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # -# - +############################################################################## { 'name': 'Employee ID', - 'version': '1.0', + 'version': '8.0.1.0.0', + 'license': 'AGPL-3', 'category': 'Generic Modules/Human Resources', - 'description': """ -Employee Identification Numbers -=============================== -Company wide unique employee ID - """, - 'author': "Michael Telahun Makonnen ,Odoo Community Association (OCA)", + 'author': 'Michael Telahun Makonnen, ' + 'Odoo Community Association (OCA)', 'website': 'http://miketelahun.wordpress.com', 'license': 'AGPL-3', 'depends': [ 'hr', ], 'data': [ - 'hr_view.xml', - ], - 'test': [ + 'views/res_config_views.xml', + 'views/res_company.xml', + 'views/hr_employee_views.xml', + 'data/hr_employee_sequence.xml', ], 'installable': False, } diff --git a/hr_employee_id/data/hr_employee_sequence.xml b/hr_employee_id/data/hr_employee_sequence.xml new file mode 100644 index 00000000000..ff44be4da69 --- /dev/null +++ b/hr_employee_id/data/hr_employee_sequence.xml @@ -0,0 +1,15 @@ + + + + + Default Employee ID Seq + employeeid.default.seq + + + Default Employee ID Seq + employeeid.default.seq + %(y)s + 5 + + + \ No newline at end of file diff --git a/hr_employee_id/hr_contract.py b/hr_employee_id/hr_contract.py deleted file mode 100644 index 55d622e2b34..00000000000 --- a/hr_employee_id/hr_contract.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding:utf-8 -*- -# -# -# Copyright (C) 2011,2013 Michael Telahun Makonnen . -# 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 . -# -# - -from openerp.osv import fields, orm - - -class hr_contract(orm.Model): - - _inherit = 'hr.contract' - _columns = { - 'name': fields.char( - 'Contract Reference', - size=32, - required=False, - readonly=True, - ), - } - - def create(self, cr, uid, vals, context=None): - cid = super(hr_contract, self).create(cr, uid, vals, context) - if cid: - ref = self.pool.get('ir.sequence').get(cr, uid, 'contract.ref') - self.pool.get('hr.contract').write( - cr, uid, cid, {'name': ref}, context=context) - return cid diff --git a/hr_employee_id/hr_contract_sequence.xml b/hr_employee_id/hr_contract_sequence.xml deleted file mode 100644 index 09612749ab4..00000000000 --- a/hr_employee_id/hr_contract_sequence.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Contract Reference - contract.ref - - - Contract Reference - contract.ref - HR/EC/%(year)s/ - 5 - - - \ No newline at end of file diff --git a/hr_employee_id/hr_contract_view.xml b/hr_employee_id/hr_contract_view.xml deleted file mode 100644 index bf24da7648a..00000000000 --- a/hr_employee_id/hr_contract_view.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - hr.contract.form.view.inherit.ref - hr.contract - form - - - - - - - - - \ No newline at end of file diff --git a/hr_employee_id/hr_employee_id.py b/hr_employee_id/hr_employee_id.py deleted file mode 100644 index 0983d8a1e78..00000000000 --- a/hr_employee_id/hr_employee_id.py +++ /dev/null @@ -1,100 +0,0 @@ -# -*- coding:utf-8 -*- -# -# -# Copyright (C) 2011,2013 Michael Telahun Makonnen . -# 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 . -# -# - -import random -import string -from openerp.osv import fields, orm -from openerp.tools.translate import _ - - -class hr_employee(orm.Model): - - """Implement company wide unique identification number.""" - - IDLEN = 8 - - _name = 'hr.employee' - _inherit = 'hr.employee' - _columns = { - 'employee_no': fields.char( - 'Employee ID', - size=IDLEN, - readonly=True, - ), - # Formatted version of employee ID - 'f_employee_no': fields.char( - 'Employee ID', - size=IDLEN + 2, - readonly=True, - ), - 'tin_no': fields.char( - 'TIN No', - size=10, - ), - } - - def _rec_message_employee(self, cr, uid, ids, context=None): - return _('The Employee Number must be unique accross the company(s).') - - def _rec_message_tin(self, cr, uid, ids, context=None): - return _('There is already another employee with this TIN number.') - - _sql_constraints = [ - ('employeeno_uniq', 'unique(employee_no)', _rec_message_employee), - ('tinno_uniq', 'unique(tin_no)', _rec_message_tin), - ] - - def _check_identification(self, cr, uid, ids, context=None): - obj = self.browse(cr, uid, ids[0], context=context) - if obj.identification_id or obj.tin_no: - return True - return False - - def _generate_employeeno(self, cr, uid, arg): - """Generate a random employee identification number""" - tries = 0 - max_tries = 50 - eid = False - while tries < max_tries: - rnd = random.SystemRandom() - eid = ''.join( - rnd.choice(string.digits) for _ in xrange(self.IDLEN) - ) - cr.execute( - '''SELECT employee_no FROM hr_employee WHERE employee_no=%s''', - tuple((eid,)) - ) - res = cr.fetchall() - if len(res) == 0: - break - tries += 1 - if tries == max_tries: - raise orm.except_orm( - _('Error'), - _('Unable to generate an Employee ID number that is unique.') - ) - return eid - - def create(self, cr, uid, vals, context=None): - eid = self._generate_employeeno(cr, uid, context) - vals['employee_no'] = eid - vals['f_employee_no'] = '%s-%s-%s' % (eid[:2], eid[2:4], eid[4:]) - return super(hr_employee, self).create(cr, uid, vals, context) diff --git a/hr_employee_id/hr_payroll_view.xml b/hr_employee_id/hr_payroll_view.xml deleted file mode 100644 index aa45cf3f135..00000000000 --- a/hr_employee_id/hr_payroll_view.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - hr.employee.form.inherit - hr.employee - - - - - - - - - diff --git a/hr_employee_id/hr_view.xml b/hr_employee_id/hr_view.xml deleted file mode 100644 index 3c47504dc3e..00000000000 --- a/hr_employee_id/hr_view.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - hr.employee.form.inherit - hr.employee - - - -
    -
    -
    -
    - - - -     -     -     - - - hr.employee.tree.inherit - hr.employee - - - - - - - - - - - - - - Employees - hr.employee - - - - - - - - - - HR - Employees Kanban - hr.employee - - - -
    • -     -     -     - -     -     diff --git a/hr_employee_id/models/__init__.py b/hr_employee_id/models/__init__.py new file mode 100644 index 00000000000..108d4ac8ec8 --- /dev/null +++ b/hr_employee_id/models/__init__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Copyright (C) 2011,2013 Michael Telahun Makonnen . +# +# 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 . +# +############################################################################## +from . import hr_employee +from . import res_company +from . import res_config diff --git a/hr_employee_id/models/hr_employee.py b/hr_employee_id/models/hr_employee.py new file mode 100644 index 00000000000..d0cd9da79a9 --- /dev/null +++ b/hr_employee_id/models/hr_employee.py @@ -0,0 +1,73 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Copyright (C) 2011,2013 Michael Telahun Makonnen . +# +# 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 . +# +############################################################################## +import random +import string +from openerp import models, fields, api, _ +from openerp.exceptions import Warning as UserWarning + + +class HrEmployee(models.Model): + """Implement company wide unique identification number.""" + + _inherit = 'hr.employee' + + identification_id = fields.Char( + 'Identification No', + copy=False + ) + + _sql_constraints = [ + ('identification_id_uniq', 'unique(identification_id)', + 'The Employee Number must be unique across the company(s).'), + ] + + @api.model + def _generate_identification_id(self): + """Generate a random employee identification number""" + company = self.env.user.company_id + employee_id = False + if company.employee_id_gen_method == 'sequence': + employee_id = self.env['ir.sequence'].get_id( + company.employee_id_sequence.id) + elif company.employee_id_gen_method == 'random': + employee_id_random_digits = company.employee_id_random_digits + tries = 0 + max_tries = 50 + while tries < max_tries: + rnd = random.SystemRandom() + employee_id = ''.join(rnd.choice(string.digits) + for _ in + xrange(employee_id_random_digits)) + if not self.search_count([('identification_id', + '=', + employee_id)]): + break + tries += 1 + if tries == max_tries: + raise UserWarning(_('Unable to generate an Employee ID number that \ + is unique.')) + return employee_id + + @api.model + @api.returns('self', lambda value: value.id) + def create(self, vals): + eid = self._generate_identification_id() + vals['identification_id'] = eid + return super(HrEmployee, self).create(vals) diff --git a/hr_employee_id/models/res_company.py b/hr_employee_id/models/res_company.py new file mode 100644 index 00000000000..4f880b94b7e --- /dev/null +++ b/hr_employee_id/models/res_company.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Copyright (C) 2015 Salton Massally (). +# +# 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 . +# +############################################################################### + +from openerp import models, fields + + +class ResCompany(models.Model): + _inherit = 'res.company' + + employee_id_gen_method = fields.Selection( + [ + ('random', 'Random'), + ('sequence', 'Sequence'), + ], + string="ID Generation Method", + default='random' + ) + employee_id_random_digits = fields.Integer( + '# of Digits', default=5, + help="Number of digits making up the ID" + ) + employee_id_sequence = fields.Many2one( + 'ir.sequence', 'Sequence', + help="Pattern to be used for used for ID Generation", + ) diff --git a/hr_employee_id/models/res_config.py b/hr_employee_id/models/res_config.py new file mode 100644 index 00000000000..1c8b2bc2c29 --- /dev/null +++ b/hr_employee_id/models/res_config.py @@ -0,0 +1,68 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Copyright (C) 2015 Salton Massally (). +# +# 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 . +# +############################################################################### + +from openerp import models, fields, api + + +class HumanResourcesConfiguration(models.TransientModel): + _inherit = 'hr.config.settings' + + def _default_id_sequence(self): + sequence = self.env.ref('hr_employee_id.seq_employeeid_ref') + return sequence and sequence.id or False + + employee_id_gen_method = fields.Selection( + [ + ('random', 'Random'), + ('sequence', 'Sequence'), + ], + string="ID Generation Method", + default='random' + ) + employee_id_random_digits = fields.Integer( + '# of Digits', default=5, + help="Number of digits making up the ID" + ) + employee_id_sequence = fields.Many2one( + 'ir.sequence', 'Sequence', + help="Pattern to be used for used for ID Generation", + default=_default_id_sequence + ) + + @api.model + def get_default_employee_id_values(self, fields): + company = self.env.user.company_id + return { + 'employee_id_gen_method': company.employee_id_gen_method, + 'employee_id_random_digits': company.employee_id_random_digits, + 'employee_id_sequence': company.employee_id_sequence.id, + } + + @api.one + def set_employee_id_values(self): + company = self.env.user.company_id + company.employee_id_gen_method = self.employee_id_gen_method + company.employee_id_random_digits = self.employee_id_random_digits + company.employee_id_sequence = self.employee_id_sequence + + @api.onchange('employee_id_gen_method') + def onchange_employee_id_gen_method(self): + if self.employee_id_gen_method == 'sequence': + self.employee_id_sequence = self._default_id_sequence() diff --git a/hr_employee_id/tests/__init__.py b/hr_employee_id/tests/__init__.py new file mode 100644 index 00000000000..1cfd7cf7e40 --- /dev/null +++ b/hr_employee_id/tests/__init__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Copyright (C) 2015 Salton Massally (). +# +# 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 . +# +############################################################################### + +from . import test_employee_id diff --git a/hr_employee_id/tests/test_employee_id.py b/hr_employee_id/tests/test_employee_id.py new file mode 100644 index 00000000000..0aac9f40c25 --- /dev/null +++ b/hr_employee_id/tests/test_employee_id.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Copyright (C) 2015 Salton Massally (). +# +# 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 . +# +############################################################################### +from openerp.tests import common + + +class TestEmployeeID(common.TransactionCase): + + def setUp(self): + super(TestEmployeeID, self).setUp() + self.employee_model = self.env['hr.employee'] + self.company = self.env.ref('base.main_company') + self.sequence = self.env.ref('hr_employee_id.seq_employeeid_ref') + + def test_random_id_generation(self): + # test ID generation for random + employee = self.employee_model.create({'name': 'Employee'}) + + self.assertAlmostEqual(len(employee.identification_id), 5) + + def test_random_id_generation_changed_digits(self): + # test ID generation for random but with defaults changed + self.company.write({'employee_id_random_digits': 10}) + employee = self.employee_model.create({'name': 'Employee'}) + + self.assertAlmostEqual(len(employee.identification_id), 10) + + def test_sequences_id_generation(self): + # test ID generation for a provided sequence + self.company.write({'employee_id_gen_method': 'sequence', + 'employee_id_sequence': self.sequence.id}) + employee = self.employee_model.create({'name': 'Employee'}) + + self.assertTrue(len(employee.identification_id)) diff --git a/hr_employee_id/views/hr_employee_views.xml b/hr_employee_id/views/hr_employee_views.xml new file mode 100644 index 00000000000..42acb92764a --- /dev/null +++ b/hr_employee_id/views/hr_employee_views.xml @@ -0,0 +1,58 @@ + + + + + + hr.employee.form.inherit + hr.employee + + + + +

    +

    +     +     +     + + + hr.employee.tree.inherit + hr.employee + + + + + + + + + + + + Employees + hr.employee + + + + + + + + + HR - Employees Kanban + hr.employee + + +
  • +
  • + +
    • + +     +     +     +     diff --git a/hr_employee_id/views/res_company.xml b/hr_employee_id/views/res_company.xml new file mode 100644 index 00000000000..b3c4c1aea85 --- /dev/null +++ b/hr_employee_id/views/res_company.xml @@ -0,0 +1,19 @@ + + + + + res.company.sheet + res.company + + + + + + + + + + + + + \ No newline at end of file diff --git a/hr_employee_id/views/res_config_views.xml b/hr_employee_id/views/res_config_views.xml new file mode 100644 index 00000000000..ebb869cef4a --- /dev/null +++ b/hr_employee_id/views/res_config_views.xml @@ -0,0 +1,38 @@ + + + + + hr.config.settings.inherit + hr.config.settings + + + + + + + + + + + From 6cd60914ec166b32159463982440d840fc56eef8 Mon Sep 17 00:00:00 2001 From: Andhitia Rama Date: Sat, 27 Feb 2016 18:26:12 +0700 Subject: [PATCH 05/48] hr_employee_id: Migration to 8.0 * Change .py header according OCA simple header * Add parameter name on field declaration * Greenify travis * Modify README.rst. Removing tabs from xml * Remove space from xml files * Make module installable --- hr_employee_id/README.rst | 10 +- hr_employee_id/__init__.py | 22 +---- hr_employee_id/__openerp__.py | 25 +---- hr_employee_id/i18n/ar.po | 84 ++++++++++++++++ hr_employee_id/i18n/de.po | 84 ++++++++++++++++ hr_employee_id/i18n/es.po | 84 ++++++++++++++++ hr_employee_id/i18n/fi.po | 84 ++++++++++++++++ hr_employee_id/i18n/fr.po | 84 ++++++++++++++++ hr_employee_id/i18n/it.po | 85 ++++++++++++++++ hr_employee_id/i18n/nl_NL.po | 84 ++++++++++++++++ hr_employee_id/i18n/pt_BR.po | 84 ++++++++++++++++ hr_employee_id/i18n/ro.po | 84 ++++++++++++++++ hr_employee_id/i18n/sl.po | 85 ++++++++++++++++ hr_employee_id/models/__init__.py | 22 +---- hr_employee_id/models/hr_employee.py | 25 +---- hr_employee_id/models/res_company.py | 29 ++---- hr_employee_id/models/res_config.py | 29 ++---- hr_employee_id/tests/__init__.py | 21 +--- hr_employee_id/tests/test_employee_id.py | 22 +---- hr_employee_id/views/hr_employee_views.xml | 107 ++++++++++----------- hr_employee_id/views/res_company.xml | 8 +- hr_employee_id/views/res_config_views.xml | 66 ++++++------- 22 files changed, 978 insertions(+), 250 deletions(-) create mode 100644 hr_employee_id/i18n/ar.po create mode 100644 hr_employee_id/i18n/de.po create mode 100644 hr_employee_id/i18n/es.po create mode 100644 hr_employee_id/i18n/fi.po create mode 100644 hr_employee_id/i18n/fr.po create mode 100644 hr_employee_id/i18n/it.po create mode 100644 hr_employee_id/i18n/nl_NL.po create mode 100644 hr_employee_id/i18n/pt_BR.po create mode 100644 hr_employee_id/i18n/ro.po create mode 100644 hr_employee_id/i18n/sl.po diff --git a/hr_employee_id/README.rst b/hr_employee_id/README.rst index 54a828f14cf..358262bec7b 100644 --- a/hr_employee_id/README.rst +++ b/hr_employee_id/README.rst @@ -1,11 +1,13 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :alt: License: AGPL-3 + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 =============================== Employee Identification Numbers =============================== -Company wide unique employee ID. Supports +Company wide unique employee ID. Supports: + * Random ID Generation * Sequence @@ -37,6 +39,9 @@ Usage When you will create a new employee, the field reference will be assigned automatically with the next number of the predefined sequence. +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/116/8.0 Bug Tracker =========== @@ -55,6 +60,7 @@ Contributors * Michael Telahun Makonnen * Adrien Peiffer (ACSONE) * Salton Massally (iDT Labs) +* Andhitia Rama (OpenSynergy Indonesia) Maintainer ---------- diff --git a/hr_employee_id/__init__.py b/hr_employee_id/__init__.py index 9fcbd0231f6..a0c6e3f999b 100644 --- a/hr_employee_id/__init__.py +++ b/hr_employee_id/__init__.py @@ -1,20 +1,6 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# Copyright (C) 2011,2013 Michael Telahun Makonnen . -# -# 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 . -# -############################################################################## +# © 2011, 2013 Michael Telahun Makonnen +# © 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + from . import models diff --git a/hr_employee_id/__openerp__.py b/hr_employee_id/__openerp__.py index 0d39a9fe304..1d33e1cbf8f 100644 --- a/hr_employee_id/__openerp__.py +++ b/hr_employee_id/__openerp__.py @@ -1,31 +1,16 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# Copyright (C) 2011,2013 Michael Telahun Makonnen . -# -# 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 . -# -############################################################################## +# © 2011, 2013 Michael Telahun Makonnen +# © 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Employee ID', 'version': '8.0.1.0.0', 'license': 'AGPL-3', 'category': 'Generic Modules/Human Resources', 'author': 'Michael Telahun Makonnen, ' + 'OpenSynergy Indonesia,' 'Odoo Community Association (OCA)', 'website': 'http://miketelahun.wordpress.com', - 'license': 'AGPL-3', 'depends': [ 'hr', ], @@ -35,5 +20,5 @@ 'views/hr_employee_views.xml', 'data/hr_employee_sequence.xml', ], - 'installable': False, + 'installable': True, } diff --git a/hr_employee_id/i18n/ar.po b/hr_employee_id/i18n/ar.po new file mode 100644 index 00000000000..318203497af --- /dev/null +++ b/hr_employee_id/i18n/ar.po @@ -0,0 +1,84 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_id +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: hr (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-11 01:48+0000\n" +"PO-Revision-Date: 2016-03-09 14:56+0000\n" +"Last-Translator: <>\n" +"Language-Team: Arabic (http://www.transifex.com/oca/OCA-hr-8-0/language/ar/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ar\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_random_digits:0 +#: field:res.company,employee_id_random_digits:0 +msgid "# of Digits" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_res_company +msgid "Companies" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employee +msgid "Employee" +msgstr "الموظف" + +#. module: hr_employee_id +#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration +#: view:res.company:hr_employee_id.view_company_form +msgid "Employee ID" +msgstr "" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_gen_method:0 +#: field:res.company,employee_id_gen_method:0 +msgid "ID Generation Method" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_random_digits:0 +#: help:res.company,employee_id_random_digits:0 +msgid "Number of digits making up the ID" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_sequence:0 +#: help:res.company,employee_id_sequence:0 +msgid "Pattern to be used for used for ID Generation" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: selection:res.company,employee_id_gen_method:0 +msgid "Random" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: field:hr.config.settings,employee_id_sequence:0 +#: selection:res.company,employee_id_gen_method:0 +#: field:res.company,employee_id_sequence:0 +msgid "Sequence" +msgstr "" + +#. module: hr_employee_id +#: sql_constraint:hr.employee:0 +msgid "The Employee Number must be unique across the company(s)." +msgstr "" + +#. module: hr_employee_id +#: code:addons/hr_employee_id/models/hr_employee.py:50 +#, python-format +msgid "" +"Unable to generate an Employee ID number that is unique." +msgstr "" diff --git a/hr_employee_id/i18n/de.po b/hr_employee_id/i18n/de.po new file mode 100644 index 00000000000..688d5a71243 --- /dev/null +++ b/hr_employee_id/i18n/de.po @@ -0,0 +1,84 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_id +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: hr (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-11 01:48+0000\n" +"PO-Revision-Date: 2016-03-09 14:56+0000\n" +"Last-Translator: <>\n" +"Language-Team: German (http://www.transifex.com/oca/OCA-hr-8-0/language/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_random_digits:0 +#: field:res.company,employee_id_random_digits:0 +msgid "# of Digits" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_res_company +msgid "Companies" +msgstr "Unternehmen" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employee +msgid "Employee" +msgstr "Angestellte" + +#. module: hr_employee_id +#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration +#: view:res.company:hr_employee_id.view_company_form +msgid "Employee ID" +msgstr "" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_gen_method:0 +#: field:res.company,employee_id_gen_method:0 +msgid "ID Generation Method" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_random_digits:0 +#: help:res.company,employee_id_random_digits:0 +msgid "Number of digits making up the ID" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_sequence:0 +#: help:res.company,employee_id_sequence:0 +msgid "Pattern to be used for used for ID Generation" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: selection:res.company,employee_id_gen_method:0 +msgid "Random" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: field:hr.config.settings,employee_id_sequence:0 +#: selection:res.company,employee_id_gen_method:0 +#: field:res.company,employee_id_sequence:0 +msgid "Sequence" +msgstr "Folge" + +#. module: hr_employee_id +#: sql_constraint:hr.employee:0 +msgid "The Employee Number must be unique across the company(s)." +msgstr "" + +#. module: hr_employee_id +#: code:addons/hr_employee_id/models/hr_employee.py:50 +#, python-format +msgid "" +"Unable to generate an Employee ID number that is unique." +msgstr "" diff --git a/hr_employee_id/i18n/es.po b/hr_employee_id/i18n/es.po new file mode 100644 index 00000000000..a1960347641 --- /dev/null +++ b/hr_employee_id/i18n/es.po @@ -0,0 +1,84 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_id +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: hr (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-11 01:48+0000\n" +"PO-Revision-Date: 2016-03-09 14:56+0000\n" +"Last-Translator: <>\n" +"Language-Team: Spanish (http://www.transifex.com/oca/OCA-hr-8-0/language/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_random_digits:0 +#: field:res.company,employee_id_random_digits:0 +msgid "# of Digits" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_res_company +msgid "Companies" +msgstr "Compañías" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employee +msgid "Employee" +msgstr "Empleado" + +#. module: hr_employee_id +#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration +#: view:res.company:hr_employee_id.view_company_form +msgid "Employee ID" +msgstr "" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_gen_method:0 +#: field:res.company,employee_id_gen_method:0 +msgid "ID Generation Method" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_random_digits:0 +#: help:res.company,employee_id_random_digits:0 +msgid "Number of digits making up the ID" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_sequence:0 +#: help:res.company,employee_id_sequence:0 +msgid "Pattern to be used for used for ID Generation" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: selection:res.company,employee_id_gen_method:0 +msgid "Random" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: field:hr.config.settings,employee_id_sequence:0 +#: selection:res.company,employee_id_gen_method:0 +#: field:res.company,employee_id_sequence:0 +msgid "Sequence" +msgstr "Secuencia" + +#. module: hr_employee_id +#: sql_constraint:hr.employee:0 +msgid "The Employee Number must be unique across the company(s)." +msgstr "" + +#. module: hr_employee_id +#: code:addons/hr_employee_id/models/hr_employee.py:50 +#, python-format +msgid "" +"Unable to generate an Employee ID number that is unique." +msgstr "" diff --git a/hr_employee_id/i18n/fi.po b/hr_employee_id/i18n/fi.po new file mode 100644 index 00000000000..05a56a1702d --- /dev/null +++ b/hr_employee_id/i18n/fi.po @@ -0,0 +1,84 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_id +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: hr (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-04-14 04:15+0000\n" +"PO-Revision-Date: 2016-04-04 11:09+0000\n" +"Last-Translator: Jarmo Kortetjärvi \n" +"Language-Team: Finnish (http://www.transifex.com/oca/OCA-hr-8-0/language/fi/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_random_digits:0 +#: field:res.company,employee_id_random_digits:0 +msgid "# of Digits" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_res_company +msgid "Companies" +msgstr "Yritykset" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employee +msgid "Employee" +msgstr "Työntekijä" + +#. module: hr_employee_id +#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration +#: view:res.company:hr_employee_id.view_company_form +msgid "Employee ID" +msgstr "" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_gen_method:0 +#: field:res.company,employee_id_gen_method:0 +msgid "ID Generation Method" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_random_digits:0 +#: help:res.company,employee_id_random_digits:0 +msgid "Number of digits making up the ID" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_sequence:0 +#: help:res.company,employee_id_sequence:0 +msgid "Pattern to be used for used for ID Generation" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: selection:res.company,employee_id_gen_method:0 +msgid "Random" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: field:hr.config.settings,employee_id_sequence:0 +#: selection:res.company,employee_id_gen_method:0 +#: field:res.company,employee_id_sequence:0 +msgid "Sequence" +msgstr "" + +#. module: hr_employee_id +#: sql_constraint:hr.employee:0 +msgid "The Employee Number must be unique across the company(s)." +msgstr "" + +#. module: hr_employee_id +#: code:addons/hr_employee_id/models/hr_employee.py:50 +#, python-format +msgid "" +"Unable to generate an Employee ID number that is unique." +msgstr "" diff --git a/hr_employee_id/i18n/fr.po b/hr_employee_id/i18n/fr.po new file mode 100644 index 00000000000..5cc0dcb8da1 --- /dev/null +++ b/hr_employee_id/i18n/fr.po @@ -0,0 +1,84 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_id +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: hr (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-11 01:48+0000\n" +"PO-Revision-Date: 2016-03-09 14:56+0000\n" +"Last-Translator: <>\n" +"Language-Team: French (http://www.transifex.com/oca/OCA-hr-8-0/language/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_random_digits:0 +#: field:res.company,employee_id_random_digits:0 +msgid "# of Digits" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_res_company +msgid "Companies" +msgstr "Entreprises" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employee +msgid "Employee" +msgstr "Employé" + +#. module: hr_employee_id +#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration +#: view:res.company:hr_employee_id.view_company_form +msgid "Employee ID" +msgstr "" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_gen_method:0 +#: field:res.company,employee_id_gen_method:0 +msgid "ID Generation Method" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_random_digits:0 +#: help:res.company,employee_id_random_digits:0 +msgid "Number of digits making up the ID" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_sequence:0 +#: help:res.company,employee_id_sequence:0 +msgid "Pattern to be used for used for ID Generation" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: selection:res.company,employee_id_gen_method:0 +msgid "Random" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: field:hr.config.settings,employee_id_sequence:0 +#: selection:res.company,employee_id_gen_method:0 +#: field:res.company,employee_id_sequence:0 +msgid "Sequence" +msgstr "Séquence" + +#. module: hr_employee_id +#: sql_constraint:hr.employee:0 +msgid "The Employee Number must be unique across the company(s)." +msgstr "" + +#. module: hr_employee_id +#: code:addons/hr_employee_id/models/hr_employee.py:50 +#, python-format +msgid "" +"Unable to generate an Employee ID number that is unique." +msgstr "" diff --git a/hr_employee_id/i18n/it.po b/hr_employee_id/i18n/it.po new file mode 100644 index 00000000000..f971c690ea4 --- /dev/null +++ b/hr_employee_id/i18n/it.po @@ -0,0 +1,85 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_id +# +# Translators: +# Paolo Valier, 2016 +msgid "" +msgstr "" +"Project-Id-Version: hr (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-12 12:02+0000\n" +"PO-Revision-Date: 2016-03-19 10:40+0000\n" +"Last-Translator: Paolo Valier\n" +"Language-Team: Italian (http://www.transifex.com/oca/OCA-hr-8-0/language/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_random_digits:0 +#: field:res.company,employee_id_random_digits:0 +msgid "# of Digits" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_res_company +msgid "Companies" +msgstr "Aziende" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employee +msgid "Employee" +msgstr "Dipendente" + +#. module: hr_employee_id +#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration +#: view:res.company:hr_employee_id.view_company_form +msgid "Employee ID" +msgstr "" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_gen_method:0 +#: field:res.company,employee_id_gen_method:0 +msgid "ID Generation Method" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_random_digits:0 +#: help:res.company,employee_id_random_digits:0 +msgid "Number of digits making up the ID" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_sequence:0 +#: help:res.company,employee_id_sequence:0 +msgid "Pattern to be used for used for ID Generation" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: selection:res.company,employee_id_gen_method:0 +msgid "Random" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: field:hr.config.settings,employee_id_sequence:0 +#: selection:res.company,employee_id_gen_method:0 +#: field:res.company,employee_id_sequence:0 +msgid "Sequence" +msgstr "" + +#. module: hr_employee_id +#: sql_constraint:hr.employee:0 +msgid "The Employee Number must be unique across the company(s)." +msgstr "" + +#. module: hr_employee_id +#: code:addons/hr_employee_id/models/hr_employee.py:50 +#, python-format +msgid "" +"Unable to generate an Employee ID number that is unique." +msgstr "" diff --git a/hr_employee_id/i18n/nl_NL.po b/hr_employee_id/i18n/nl_NL.po new file mode 100644 index 00000000000..ff3dfe1cc9f --- /dev/null +++ b/hr_employee_id/i18n/nl_NL.po @@ -0,0 +1,84 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_id +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: hr (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-11 01:48+0000\n" +"PO-Revision-Date: 2016-03-09 14:56+0000\n" +"Last-Translator: <>\n" +"Language-Team: Dutch (Netherlands) (http://www.transifex.com/oca/OCA-hr-8-0/language/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_random_digits:0 +#: field:res.company,employee_id_random_digits:0 +msgid "# of Digits" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_res_company +msgid "Companies" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employee +msgid "Employee" +msgstr "Werknemer" + +#. module: hr_employee_id +#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration +#: view:res.company:hr_employee_id.view_company_form +msgid "Employee ID" +msgstr "" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_gen_method:0 +#: field:res.company,employee_id_gen_method:0 +msgid "ID Generation Method" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_random_digits:0 +#: help:res.company,employee_id_random_digits:0 +msgid "Number of digits making up the ID" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_sequence:0 +#: help:res.company,employee_id_sequence:0 +msgid "Pattern to be used for used for ID Generation" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: selection:res.company,employee_id_gen_method:0 +msgid "Random" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: field:hr.config.settings,employee_id_sequence:0 +#: selection:res.company,employee_id_gen_method:0 +#: field:res.company,employee_id_sequence:0 +msgid "Sequence" +msgstr "" + +#. module: hr_employee_id +#: sql_constraint:hr.employee:0 +msgid "The Employee Number must be unique across the company(s)." +msgstr "" + +#. module: hr_employee_id +#: code:addons/hr_employee_id/models/hr_employee.py:50 +#, python-format +msgid "" +"Unable to generate an Employee ID number that is unique." +msgstr "" diff --git a/hr_employee_id/i18n/pt_BR.po b/hr_employee_id/i18n/pt_BR.po new file mode 100644 index 00000000000..f8dabb2d5b0 --- /dev/null +++ b/hr_employee_id/i18n/pt_BR.po @@ -0,0 +1,84 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_id +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: hr (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-11 01:48+0000\n" +"PO-Revision-Date: 2016-03-09 14:56+0000\n" +"Last-Translator: <>\n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-hr-8-0/language/pt_BR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_random_digits:0 +#: field:res.company,employee_id_random_digits:0 +msgid "# of Digits" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_res_company +msgid "Companies" +msgstr "Empresas" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employee +msgid "Employee" +msgstr "Empregado" + +#. module: hr_employee_id +#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration +#: view:res.company:hr_employee_id.view_company_form +msgid "Employee ID" +msgstr "" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_gen_method:0 +#: field:res.company,employee_id_gen_method:0 +msgid "ID Generation Method" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_random_digits:0 +#: help:res.company,employee_id_random_digits:0 +msgid "Number of digits making up the ID" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_sequence:0 +#: help:res.company,employee_id_sequence:0 +msgid "Pattern to be used for used for ID Generation" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: selection:res.company,employee_id_gen_method:0 +msgid "Random" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: field:hr.config.settings,employee_id_sequence:0 +#: selection:res.company,employee_id_gen_method:0 +#: field:res.company,employee_id_sequence:0 +msgid "Sequence" +msgstr "" + +#. module: hr_employee_id +#: sql_constraint:hr.employee:0 +msgid "The Employee Number must be unique across the company(s)." +msgstr "" + +#. module: hr_employee_id +#: code:addons/hr_employee_id/models/hr_employee.py:50 +#, python-format +msgid "" +"Unable to generate an Employee ID number that is unique." +msgstr "" diff --git a/hr_employee_id/i18n/ro.po b/hr_employee_id/i18n/ro.po new file mode 100644 index 00000000000..3158e7e67bc --- /dev/null +++ b/hr_employee_id/i18n/ro.po @@ -0,0 +1,84 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_id +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: hr (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-11 01:48+0000\n" +"PO-Revision-Date: 2016-03-09 14:56+0000\n" +"Last-Translator: <>\n" +"Language-Team: Romanian (http://www.transifex.com/oca/OCA-hr-8-0/language/ro/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_random_digits:0 +#: field:res.company,employee_id_random_digits:0 +msgid "# of Digits" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_res_company +msgid "Companies" +msgstr "Companii" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employee +msgid "Employee" +msgstr "Angajat" + +#. module: hr_employee_id +#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration +#: view:res.company:hr_employee_id.view_company_form +msgid "Employee ID" +msgstr "" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_gen_method:0 +#: field:res.company,employee_id_gen_method:0 +msgid "ID Generation Method" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_random_digits:0 +#: help:res.company,employee_id_random_digits:0 +msgid "Number of digits making up the ID" +msgstr "" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_sequence:0 +#: help:res.company,employee_id_sequence:0 +msgid "Pattern to be used for used for ID Generation" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: selection:res.company,employee_id_gen_method:0 +msgid "Random" +msgstr "" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: field:hr.config.settings,employee_id_sequence:0 +#: selection:res.company,employee_id_gen_method:0 +#: field:res.company,employee_id_sequence:0 +msgid "Sequence" +msgstr "" + +#. module: hr_employee_id +#: sql_constraint:hr.employee:0 +msgid "The Employee Number must be unique across the company(s)." +msgstr "" + +#. module: hr_employee_id +#: code:addons/hr_employee_id/models/hr_employee.py:50 +#, python-format +msgid "" +"Unable to generate an Employee ID number that is unique." +msgstr "" diff --git a/hr_employee_id/i18n/sl.po b/hr_employee_id/i18n/sl.po new file mode 100644 index 00000000000..3b6a03510ec --- /dev/null +++ b/hr_employee_id/i18n/sl.po @@ -0,0 +1,85 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_id +# +# Translators: +# Matjaž Mozetič , 2016 +msgid "" +msgstr "" +"Project-Id-Version: hr (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-11 01:48+0000\n" +"PO-Revision-Date: 2016-03-10 05:41+0000\n" +"Last-Translator: Matjaž Mozetič \n" +"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-hr-8-0/language/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_random_digits:0 +#: field:res.company,employee_id_random_digits:0 +msgid "# of Digits" +msgstr "Št. znakov" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_res_company +msgid "Companies" +msgstr "Družbe" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employee +msgid "Employee" +msgstr "Kader" + +#. module: hr_employee_id +#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration +#: view:res.company:hr_employee_id.view_company_form +msgid "Employee ID" +msgstr "ID kadra" + +#. module: hr_employee_id +#: field:hr.config.settings,employee_id_gen_method:0 +#: field:res.company,employee_id_gen_method:0 +msgid "ID Generation Method" +msgstr "Metoda ustvarjanja ID" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_random_digits:0 +#: help:res.company,employee_id_random_digits:0 +msgid "Number of digits making up the ID" +msgstr "Število znakov, ki sestavlja ID" + +#. module: hr_employee_id +#: help:hr.config.settings,employee_id_sequence:0 +#: help:res.company,employee_id_sequence:0 +msgid "Pattern to be used for used for ID Generation" +msgstr "Vzorec uporabljen za ustvarjanje ID" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: selection:res.company,employee_id_gen_method:0 +msgid "Random" +msgstr "Naključno" + +#. module: hr_employee_id +#: selection:hr.config.settings,employee_id_gen_method:0 +#: field:hr.config.settings,employee_id_sequence:0 +#: selection:res.company,employee_id_gen_method:0 +#: field:res.company,employee_id_sequence:0 +msgid "Sequence" +msgstr "Zaporedje" + +#. module: hr_employee_id +#: sql_constraint:hr.employee:0 +msgid "The Employee Number must be unique across the company(s)." +msgstr "Številka kadra mora biti unikatna v sklopu družbe (družb)." + +#. module: hr_employee_id +#: code:addons/hr_employee_id/models/hr_employee.py:50 +#, python-format +msgid "" +"Unable to generate an Employee ID number that is unique." +msgstr "Ni možno ustvariti ID številke kadra, ki bi bila unikatna." diff --git a/hr_employee_id/models/__init__.py b/hr_employee_id/models/__init__.py index 108d4ac8ec8..9e373a31dd8 100644 --- a/hr_employee_id/models/__init__.py +++ b/hr_employee_id/models/__init__.py @@ -1,22 +1,8 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# Copyright (C) 2011,2013 Michael Telahun Makonnen . -# -# 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 . -# -############################################################################## +# © 2011, 2013 Michael Telahun Makonnen +# © 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + from . import hr_employee from . import res_company from . import res_config diff --git a/hr_employee_id/models/hr_employee.py b/hr_employee_id/models/hr_employee.py index d0cd9da79a9..cdd04d4ddd9 100644 --- a/hr_employee_id/models/hr_employee.py +++ b/hr_employee_id/models/hr_employee.py @@ -1,22 +1,8 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# Copyright (C) 2011,2013 Michael Telahun Makonnen . -# -# 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 . -# -############################################################################## +# © 2011, 2013 Michael Telahun Makonnen +# © 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + import random import string from openerp import models, fields, api, _ @@ -29,7 +15,7 @@ class HrEmployee(models.Model): _inherit = 'hr.employee' identification_id = fields.Char( - 'Identification No', + string='Identification No', copy=False ) @@ -66,7 +52,6 @@ def _generate_identification_id(self): return employee_id @api.model - @api.returns('self', lambda value: value.id) def create(self, vals): eid = self._generate_identification_id() vals['identification_id'] = eid diff --git a/hr_employee_id/models/res_company.py b/hr_employee_id/models/res_company.py index 4f880b94b7e..1a0aaf81d74 100644 --- a/hr_employee_id/models/res_company.py +++ b/hr_employee_id/models/res_company.py @@ -1,22 +1,7 @@ # -*- coding: utf-8 -*- -############################################################################### -# -# Copyright (C) 2015 Salton Massally (). -# -# 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 . -# -############################################################################### +# © 2015 Salton Massally +# © 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from openerp import models, fields @@ -25,7 +10,7 @@ class ResCompany(models.Model): _inherit = 'res.company' employee_id_gen_method = fields.Selection( - [ + selection=[ ('random', 'Random'), ('sequence', 'Sequence'), ], @@ -33,10 +18,12 @@ class ResCompany(models.Model): default='random' ) employee_id_random_digits = fields.Integer( - '# of Digits', default=5, + string='# of Digits', + default=5, help="Number of digits making up the ID" ) employee_id_sequence = fields.Many2one( - 'ir.sequence', 'Sequence', + comodel_name='ir.sequence', + string='Sequence', help="Pattern to be used for used for ID Generation", ) diff --git a/hr_employee_id/models/res_config.py b/hr_employee_id/models/res_config.py index 1c8b2bc2c29..cbe87739e8c 100644 --- a/hr_employee_id/models/res_config.py +++ b/hr_employee_id/models/res_config.py @@ -1,22 +1,7 @@ # -*- coding: utf-8 -*- -############################################################################### -# -# Copyright (C) 2015 Salton Massally (). -# -# 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 . -# -############################################################################### +# © 2015 Salton Massally +# © 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from openerp import models, fields, api @@ -29,7 +14,7 @@ def _default_id_sequence(self): return sequence and sequence.id or False employee_id_gen_method = fields.Selection( - [ + selection=[ ('random', 'Random'), ('sequence', 'Sequence'), ], @@ -37,11 +22,13 @@ def _default_id_sequence(self): default='random' ) employee_id_random_digits = fields.Integer( - '# of Digits', default=5, + string='# of Digits', + default=5, help="Number of digits making up the ID" ) employee_id_sequence = fields.Many2one( - 'ir.sequence', 'Sequence', + comodel_name='ir.sequence', + string='Sequence', help="Pattern to be used for used for ID Generation", default=_default_id_sequence ) diff --git a/hr_employee_id/tests/__init__.py b/hr_employee_id/tests/__init__.py index 1cfd7cf7e40..c12ceee9516 100644 --- a/hr_employee_id/tests/__init__.py +++ b/hr_employee_id/tests/__init__.py @@ -1,21 +1,6 @@ # -*- coding: utf-8 -*- -############################################################################### -# -# Copyright (C) 2015 Salton Massally (). -# -# 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 . -# -############################################################################### +# © 2015 Salton Massally +# © 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import test_employee_id diff --git a/hr_employee_id/tests/test_employee_id.py b/hr_employee_id/tests/test_employee_id.py index 0aac9f40c25..0c59c9b738c 100644 --- a/hr_employee_id/tests/test_employee_id.py +++ b/hr_employee_id/tests/test_employee_id.py @@ -1,22 +1,8 @@ # -*- coding: utf-8 -*- -############################################################################### -# -# Copyright (C) 2015 Salton Massally (). -# -# 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 . -# -############################################################################### +# © 2015 Salton Massally +# © 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + from openerp.tests import common diff --git a/hr_employee_id/views/hr_employee_views.xml b/hr_employee_id/views/hr_employee_views.xml index 42acb92764a..fc58c2edf5d 100644 --- a/hr_employee_id/views/hr_employee_views.xml +++ b/hr_employee_id/views/hr_employee_views.xml @@ -1,58 +1,55 @@ - - - - hr.employee.form.inherit - hr.employee - - - - -

    -

    -     -     -     - - - hr.employee.tree.inherit - hr.employee - - - - - - - - - - - - Employees - hr.employee - - - - - - - - - HR - Employees Kanban - hr.employee - - -
  • -
  • - -
    • - -     -     -     + + + hr.employee.form.inherit + hr.employee + + + + +

    +

    +     +     +     + + hr.employee.tree.inherit + hr.employee + + + + + + + + + + + Employees + hr.employee + + + + + + + + + HR - Employees Kanban + hr.employee + + +
  • +
  • + +
    • + +     +     +     diff --git a/hr_employee_id/views/res_company.xml b/hr_employee_id/views/res_company.xml index b3c4c1aea85..6bb89209d79 100644 --- a/hr_employee_id/views/res_company.xml +++ b/hr_employee_id/views/res_company.xml @@ -8,12 +8,12 @@ - - - + + + - \ No newline at end of file + diff --git a/hr_employee_id/views/res_config_views.xml b/hr_employee_id/views/res_config_views.xml index ebb869cef4a..07399419ea3 100644 --- a/hr_employee_id/views/res_config_views.xml +++ b/hr_employee_id/views/res_config_views.xml @@ -1,38 +1,34 @@ - - - hr.config.settings.inherit - hr.config.settings - - - - - - - - - - + + + hr.config.settings.inherit + hr.config.settings + + + + + + + + + From 583740300edaf4fffffe626fb6911dec385bbbff Mon Sep 17 00:00:00 2001 From: Andrea Stirpe Date: Sun, 13 Nov 2016 19:32:16 +0100 Subject: [PATCH 06/48] 10.0 Porting hr_employee_id (#272) --- hr_employee_id/README.rst | 17 +- .../{__openerp__.py => __manifest__.py} | 3 +- hr_employee_id/data/hr_employee_sequence.xml | 24 ++- hr_employee_id/i18n/ar.po | 124 +++++++++++--- hr_employee_id/i18n/de.po | 115 ++++++++++--- hr_employee_id/i18n/es.po | 132 +++++++++++--- hr_employee_id/i18n/fi.po | 115 ++++++++++--- hr_employee_id/i18n/fr.po | 132 +++++++++++--- hr_employee_id/i18n/hr.po | 159 +++++++++++++++++ hr_employee_id/i18n/hr_HR.po | 161 ++++++++++++++++++ hr_employee_id/i18n/it.po | 2 +- hr_employee_id/i18n/nl_NL.po | 136 +++++++++++---- hr_employee_id/i18n/pt_BR.po | 115 ++++++++++--- hr_employee_id/i18n/ro.po | 115 ++++++++++--- hr_employee_id/i18n/sl.po | 116 ++++++++++--- hr_employee_id/models/hr_employee.py | 4 +- hr_employee_id/models/res_company.py | 6 +- hr_employee_id/models/res_config.py | 70 ++++---- hr_employee_id/tests/test_employee_id.py | 14 +- hr_employee_id/views/hr_employee_views.xml | 98 +++++------ hr_employee_id/views/res_company.xml | 19 --- hr_employee_id/views/res_config_views.xml | 77 +++++---- 22 files changed, 1386 insertions(+), 368 deletions(-) rename hr_employee_id/{__openerp__.py => __manifest__.py} (91%) create mode 100644 hr_employee_id/i18n/hr.po create mode 100644 hr_employee_id/i18n/hr_HR.po delete mode 100644 hr_employee_id/views/res_company.xml diff --git a/hr_employee_id/README.rst b/hr_employee_id/README.rst index 358262bec7b..a275de1b5fe 100644 --- a/hr_employee_id/README.rst +++ b/hr_employee_id/README.rst @@ -19,7 +19,7 @@ Installation To install this module, you need to: -* clone the branch 8.0 of the repository https://github.com/OCA/hr +* clone the branch 10.0 of the repository https://github.com/OCA/hr * add the path to this repository in your configuration (addons-path) * update the module list * search for "Employee Identification Numbers" in your addons @@ -33,6 +33,11 @@ Settings -> Technical -> Sequences & Identifiers -> Sequences and search for the "Employee ID" sequence, where you modify its prefix and numbering formats. +To configure the 'ID Generation Method', the '# of Digits' and +the 'Sequence', activate the developer mode and go to +Employees -> Configuration -> Employee ID. + + Usage ===== @@ -41,15 +46,19 @@ assigned automatically with the next number of the predefined sequence. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/116/8.0 + :target: https://runbot.odoo-community.org/runbot/116/10.0 + +Known issues / Roadmap +====================== + +* When installing the module, the ID of existing employees is not generated automatically Bug Tracker =========== Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed feedback -`here `_. +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback. Credits ======= diff --git a/hr_employee_id/__openerp__.py b/hr_employee_id/__manifest__.py similarity index 91% rename from hr_employee_id/__openerp__.py rename to hr_employee_id/__manifest__.py index 1d33e1cbf8f..e4d46c3943c 100644 --- a/hr_employee_id/__openerp__.py +++ b/hr_employee_id/__manifest__.py @@ -4,7 +4,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Employee ID', - 'version': '8.0.1.0.0', + 'version': '10.0.1.0.0', 'license': 'AGPL-3', 'category': 'Generic Modules/Human Resources', 'author': 'Michael Telahun Makonnen, ' @@ -16,7 +16,6 @@ ], 'data': [ 'views/res_config_views.xml', - 'views/res_company.xml', 'views/hr_employee_views.xml', 'data/hr_employee_sequence.xml', ], diff --git a/hr_employee_id/data/hr_employee_sequence.xml b/hr_employee_id/data/hr_employee_sequence.xml index ff44be4da69..bab4b7b4f45 100644 --- a/hr_employee_id/data/hr_employee_sequence.xml +++ b/hr_employee_id/data/hr_employee_sequence.xml @@ -1,15 +1,11 @@ - - - - Default Employee ID Seq - employeeid.default.seq - - - Default Employee ID Seq - employeeid.default.seq - %(y)s - 5 - - - \ No newline at end of file + + + + Default Employee ID Seq + employeeid.default.seq + %(y)s + 5 + + + diff --git a/hr_employee_id/i18n/ar.po b/hr_employee_id/i18n/ar.po index 318203497af..638988ebcd5 100644 --- a/hr_employee_id/i18n/ar.po +++ b/hr_employee_id/i18n/ar.po @@ -3,14 +3,16 @@ # * hr_employee_id # # Translators: +# OCA Transbot , 2016 +# abdullah alsabi , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 01:48+0000\n" -"PO-Revision-Date: 2016-03-09 14:56+0000\n" -"Last-Translator: <>\n" -"Language-Team: Arabic (http://www.transifex.com/oca/OCA-hr-8-0/language/ar/)\n" +"POT-Creation-Date: 2017-06-10 04:30+0000\n" +"PO-Revision-Date: 2017-06-10 04:30+0000\n" +"Last-Translator: abdullah alsabi , 2017\n" +"Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -18,15 +20,60 @@ msgstr "" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_random_digits:0 -#: field:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_random_digits msgid "# of Digits" +msgstr "عدد الأرقام" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "" +"(*) This configuration is related to the company you're logged " +"into." msgstr "" +"(*) This configuration is related to the company you're logged " +"into." + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Apply" +msgstr "تطبيق" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Cancel" +msgstr "إلغاء" #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_res_company msgid "Companies" -msgstr "" +msgstr "الشركات" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_company_id +msgid "Company" +msgstr "الشركة" + +#. module: hr_employee_id +#: model:ir.actions.act_window,name:hr_employee_id.action_human_resources_employeeid_config +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Configure Employee ID" +msgstr "إعداد رقم المستخدم" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_uid +msgid "Created by" +msgstr "انشئ من قبل" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_date +msgid "Created on" +msgstr "وقت الانشاء" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_display_name +msgid "Display Name" +msgstr "إسم العرض" #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_hr_employee @@ -34,42 +81,68 @@ msgid "Employee" msgstr "الموظف" #. module: hr_employee_id -#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration -#: view:res.company:hr_employee_id.view_company_form +#: model:ir.ui.menu,name:hr_employee_id.menu_account_config msgid "Employee ID" +msgstr "رقم الموظف" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Employee ID *" +msgstr "رقم الموظف *" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_sequence +msgid "Employee ID Sequence" msgstr "" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_gen_method:0 -#: field:res.company,employee_id_gen_method:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_id +msgid "ID" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_gen_method +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_gen_method msgid "ID Generation Method" msgstr "" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_random_digits:0 -#: help:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_uid +msgid "Last Updated by" +msgstr "اخر تعديل من قبل" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_date +msgid "Last Updated on" +msgstr "اخر تعديل في" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_random_digits msgid "Number of digits making up the ID" msgstr "" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_sequence:0 -#: help:res.company,employee_id_sequence:0 -msgid "Pattern to be used for used for ID Generation" +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_sequence +msgid "Pattern to be used for employee ID Generation" msgstr "" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 #: selection:res.company,employee_id_gen_method:0 msgid "Random" -msgstr "" +msgstr "عشوائي" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 -#: field:hr.config.settings,employee_id_sequence:0 #: selection:res.company,employee_id_gen_method:0 -#: field:res.company,employee_id_sequence:0 msgid "Sequence" -msgstr "" +msgstr "متسلسل" #. module: hr_employee_id #: sql_constraint:hr.employee:0 @@ -82,3 +155,8 @@ msgstr "" msgid "" "Unable to generate an Employee ID number that is unique." msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employeeid_config_settings +msgid "hr.employeeid.config.settings" +msgstr "" diff --git a/hr_employee_id/i18n/de.po b/hr_employee_id/i18n/de.po index 688d5a71243..a7029d67ff1 100644 --- a/hr_employee_id/i18n/de.po +++ b/hr_employee_id/i18n/de.po @@ -3,14 +3,15 @@ # * hr_employee_id # # Translators: +# OCA Transbot , 2016 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 01:48+0000\n" -"PO-Revision-Date: 2016-03-09 14:56+0000\n" -"Last-Translator: <>\n" -"Language-Team: German (http://www.transifex.com/oca/OCA-hr-8-0/language/de/)\n" +"POT-Creation-Date: 2016-11-29 01:35+0000\n" +"PO-Revision-Date: 2016-11-29 01:35+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -18,56 +19,125 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_random_digits:0 -#: field:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_random_digits msgid "# of Digits" msgstr "" +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Apply" +msgstr "" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Cancel" +msgstr "" + #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_res_company msgid "Companies" msgstr "Unternehmen" +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_company_id +msgid "Company" +msgstr "" + +#. module: hr_employee_id +#: model:ir.actions.act_window,name:hr_employee_id.action_human_resources_employeeid_config +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Configure Employee ID" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_uid +msgid "Created by" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_date +msgid "Created on" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_display_name +msgid "Display Name" +msgstr "" + #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_hr_employee msgid "Employee" msgstr "Angestellte" #. module: hr_employee_id -#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration -#: view:res.company:hr_employee_id.view_company_form +#: model:ir.ui.menu,name:hr_employee_id.menu_account_config msgid "Employee ID" msgstr "" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_gen_method:0 -#: field:res.company,employee_id_gen_method:0 +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Employee ID *" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_sequence +msgid "Employee ID Sequence" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_id +msgid "ID" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_gen_method +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_gen_method msgid "ID Generation Method" msgstr "" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_random_digits:0 -#: help:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_uid +msgid "Last Updated by" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_date +msgid "Last Updated on" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_random_digits msgid "Number of digits making up the ID" msgstr "" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_sequence:0 -#: help:res.company,employee_id_sequence:0 -msgid "Pattern to be used for used for ID Generation" +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_sequence +msgid "Pattern to be used for employee ID Generation" msgstr "" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 #: selection:res.company,employee_id_gen_method:0 msgid "Random" msgstr "" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 -#: field:hr.config.settings,employee_id_sequence:0 #: selection:res.company,employee_id_gen_method:0 -#: field:res.company,employee_id_sequence:0 msgid "Sequence" msgstr "Folge" @@ -82,3 +152,8 @@ msgstr "" msgid "" "Unable to generate an Employee ID number that is unique." msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employeeid_config_settings +msgid "hr.employeeid.config.settings" +msgstr "" diff --git a/hr_employee_id/i18n/es.po b/hr_employee_id/i18n/es.po index a1960347641..55ce15a4ee0 100644 --- a/hr_employee_id/i18n/es.po +++ b/hr_employee_id/i18n/es.po @@ -3,14 +3,16 @@ # * hr_employee_id # # Translators: +# OCA Transbot , 2016 +# José Antonio Cuello , 2016 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 01:48+0000\n" -"PO-Revision-Date: 2016-03-09 14:56+0000\n" -"Last-Translator: <>\n" -"Language-Team: Spanish (http://www.transifex.com/oca/OCA-hr-8-0/language/es/)\n" +"POT-Creation-Date: 2016-11-29 01:35+0000\n" +"PO-Revision-Date: 2016-11-29 01:35+0000\n" +"Last-Translator: José Antonio Cuello , 2016\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -18,67 +20,143 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_random_digits:0 -#: field:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_random_digits msgid "# of Digits" +msgstr "# de Digitos" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "" +"(*) This configuration is related to the company you're logged " +"into." msgstr "" +"(*) Esta configuración es relativa a la compañía donde estas " +"conectado." + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Apply" +msgstr "Aplicar" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Cancel" +msgstr "Cancelar" #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_res_company msgid "Companies" msgstr "Compañías" +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_company_id +msgid "Company" +msgstr "Compañía" + +#. module: hr_employee_id +#: model:ir.actions.act_window,name:hr_employee_id.action_human_resources_employeeid_config +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Configure Employee ID" +msgstr "Configurar ID de empleado" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_uid +msgid "Created by" +msgstr "Creado por" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_date +msgid "Created on" +msgstr "Creado en" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_display_name +msgid "Display Name" +msgstr "Mostrar nombre" + #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_hr_employee msgid "Employee" msgstr "Empleado" #. module: hr_employee_id -#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration -#: view:res.company:hr_employee_id.view_company_form +#: model:ir.ui.menu,name:hr_employee_id.menu_account_config msgid "Employee ID" -msgstr "" +msgstr "ID de empleado" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Employee ID *" +msgstr "ID de empleado*" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_sequence +msgid "Employee ID Sequence" +msgstr "Secuencia del ID de empleado" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_id +msgid "ID" +msgstr "ID" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_gen_method:0 -#: field:res.company,employee_id_gen_method:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_gen_method +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_gen_method msgid "ID Generation Method" -msgstr "" +msgstr "Método de generación del ID" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings___last_update +msgid "Last Modified on" +msgstr "Última modificación el" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_uid +msgid "Last Updated by" +msgstr "Última actualización por" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_random_digits:0 -#: help:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_date +msgid "Last Updated on" +msgstr "Última actualización el" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_random_digits msgid "Number of digits making up the ID" -msgstr "" +msgstr "Número de dígitos que componen el ID" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_sequence:0 -#: help:res.company,employee_id_sequence:0 -msgid "Pattern to be used for used for ID Generation" -msgstr "" +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_sequence +msgid "Pattern to be used for employee ID Generation" +msgstr "Patrón a usar para la creación del ID de empleado" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 #: selection:res.company,employee_id_gen_method:0 msgid "Random" -msgstr "" +msgstr "Aleatorio" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 -#: field:hr.config.settings,employee_id_sequence:0 #: selection:res.company,employee_id_gen_method:0 -#: field:res.company,employee_id_sequence:0 msgid "Sequence" msgstr "Secuencia" #. module: hr_employee_id #: sql_constraint:hr.employee:0 msgid "The Employee Number must be unique across the company(s)." -msgstr "" +msgstr "El ID de empleado debe ser único en la(s) compañía(s)" #. module: hr_employee_id #: code:addons/hr_employee_id/models/hr_employee.py:50 #, python-format msgid "" "Unable to generate an Employee ID number that is unique." -msgstr "" +msgstr "No es posible crear un ID de empleado que sea único." + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employeeid_config_settings +msgid "hr.employeeid.config.settings" +msgstr "hr.employeeid.config.settings" diff --git a/hr_employee_id/i18n/fi.po b/hr_employee_id/i18n/fi.po index 05a56a1702d..a86692232d1 100644 --- a/hr_employee_id/i18n/fi.po +++ b/hr_employee_id/i18n/fi.po @@ -3,14 +3,15 @@ # * hr_employee_id # # Translators: +# OCA Transbot , 2016 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-14 04:15+0000\n" -"PO-Revision-Date: 2016-04-04 11:09+0000\n" -"Last-Translator: Jarmo Kortetjärvi \n" -"Language-Team: Finnish (http://www.transifex.com/oca/OCA-hr-8-0/language/fi/)\n" +"POT-Creation-Date: 2017-03-03 03:37+0000\n" +"PO-Revision-Date: 2017-03-03 03:37+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -18,56 +19,125 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_random_digits:0 -#: field:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_random_digits msgid "# of Digits" msgstr "" +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Apply" +msgstr "" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Cancel" +msgstr "" + #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_res_company msgid "Companies" msgstr "Yritykset" +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_company_id +msgid "Company" +msgstr "" + +#. module: hr_employee_id +#: model:ir.actions.act_window,name:hr_employee_id.action_human_resources_employeeid_config +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Configure Employee ID" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_uid +msgid "Created by" +msgstr "Luonut" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_date +msgid "Created on" +msgstr "Luotu" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_display_name +msgid "Display Name" +msgstr "" + #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_hr_employee msgid "Employee" msgstr "Työntekijä" #. module: hr_employee_id -#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration -#: view:res.company:hr_employee_id.view_company_form +#: model:ir.ui.menu,name:hr_employee_id.menu_account_config msgid "Employee ID" msgstr "" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_gen_method:0 -#: field:res.company,employee_id_gen_method:0 +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Employee ID *" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_sequence +msgid "Employee ID Sequence" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_gen_method +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_gen_method msgid "ID Generation Method" msgstr "" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_random_digits:0 -#: help:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_uid +msgid "Last Updated by" +msgstr "Viimeksi päivittänyt" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_date +msgid "Last Updated on" +msgstr "Viimeksi päivitetty" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_random_digits msgid "Number of digits making up the ID" msgstr "" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_sequence:0 -#: help:res.company,employee_id_sequence:0 -msgid "Pattern to be used for used for ID Generation" +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_sequence +msgid "Pattern to be used for employee ID Generation" msgstr "" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 #: selection:res.company,employee_id_gen_method:0 msgid "Random" msgstr "" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 -#: field:hr.config.settings,employee_id_sequence:0 #: selection:res.company,employee_id_gen_method:0 -#: field:res.company,employee_id_sequence:0 msgid "Sequence" msgstr "" @@ -82,3 +152,8 @@ msgstr "" msgid "" "Unable to generate an Employee ID number that is unique." msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employeeid_config_settings +msgid "hr.employeeid.config.settings" +msgstr "" diff --git a/hr_employee_id/i18n/fr.po b/hr_employee_id/i18n/fr.po index 5cc0dcb8da1..d040533ac01 100644 --- a/hr_employee_id/i18n/fr.po +++ b/hr_employee_id/i18n/fr.po @@ -3,14 +3,16 @@ # * hr_employee_id # # Translators: +# OCA Transbot , 2016 +# guillaume bauer , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 01:48+0000\n" -"PO-Revision-Date: 2016-03-09 14:56+0000\n" -"Last-Translator: <>\n" -"Language-Team: French (http://www.transifex.com/oca/OCA-hr-8-0/language/fr/)\n" +"POT-Creation-Date: 2017-07-17 12:55+0000\n" +"PO-Revision-Date: 2017-07-17 12:55+0000\n" +"Last-Translator: guillaume bauer , 2017\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -18,67 +20,143 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_random_digits:0 -#: field:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_random_digits msgid "# of Digits" +msgstr "# de chiffres" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "" +"(*) This configuration is related to the company you're logged " +"into." msgstr "" +"(*) Cette configuration est liée à la société dans laquelle vous vous " +"êtes connecté " + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Apply" +msgstr "Appliquer" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Cancel" +msgstr "Annuler" #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_res_company msgid "Companies" msgstr "Entreprises" +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_company_id +msgid "Company" +msgstr "Entreprise" + +#. module: hr_employee_id +#: model:ir.actions.act_window,name:hr_employee_id.action_human_resources_employeeid_config +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Configure Employee ID" +msgstr "Renseigner l' ID de l'employé" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_uid +msgid "Created by" +msgstr "Créé par" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_date +msgid "Created on" +msgstr "Créé le" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_display_name +msgid "Display Name" +msgstr "Nom affiché" + #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_hr_employee msgid "Employee" msgstr "Employé" #. module: hr_employee_id -#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration -#: view:res.company:hr_employee_id.view_company_form +#: model:ir.ui.menu,name:hr_employee_id.menu_account_config msgid "Employee ID" -msgstr "" +msgstr "ID de l'employé" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Employee ID *" +msgstr "ID de l'employé *" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_sequence +msgid "Employee ID Sequence" +msgstr "Séquence de l'ID de l'employé" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_id +msgid "ID" +msgstr "ID" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_gen_method:0 -#: field:res.company,employee_id_gen_method:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_gen_method +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_gen_method msgid "ID Generation Method" -msgstr "" +msgstr "Méthode de génération de l'ID" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings___last_update +msgid "Last Modified on" +msgstr "Dernière modification le" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_uid +msgid "Last Updated by" +msgstr "Mis-à-jour par" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_random_digits:0 -#: help:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_date +msgid "Last Updated on" +msgstr "Mis-à-jour le" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_random_digits msgid "Number of digits making up the ID" -msgstr "" +msgstr "Nombre de chiffres pour fabriquer l'ID" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_sequence:0 -#: help:res.company,employee_id_sequence:0 -msgid "Pattern to be used for used for ID Generation" -msgstr "" +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_sequence +msgid "Pattern to be used for employee ID Generation" +msgstr "Modèle à utiliser pour la génération de l'ID" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 #: selection:res.company,employee_id_gen_method:0 msgid "Random" -msgstr "" +msgstr "Aléatoire" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 -#: field:hr.config.settings,employee_id_sequence:0 #: selection:res.company,employee_id_gen_method:0 -#: field:res.company,employee_id_sequence:0 msgid "Sequence" msgstr "Séquence" #. module: hr_employee_id #: sql_constraint:hr.employee:0 msgid "The Employee Number must be unique across the company(s)." -msgstr "" +msgstr "Le numéro d'employé doit être unique par société(s)." #. module: hr_employee_id #: code:addons/hr_employee_id/models/hr_employee.py:50 #, python-format msgid "" "Unable to generate an Employee ID number that is unique." -msgstr "" +msgstr "Impossible de générer le numéro d'ID employé qui doit être unique." + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employeeid_config_settings +msgid "hr.employeeid.config.settings" +msgstr "hr.employeeid.config.settings" diff --git a/hr_employee_id/i18n/hr.po b/hr_employee_id/i18n/hr.po new file mode 100644 index 00000000000..93995c0fc5e --- /dev/null +++ b/hr_employee_id/i18n/hr.po @@ -0,0 +1,159 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_id +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-04 06:52+0000\n" +"PO-Revision-Date: 2017-07-04 06:52+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_random_digits +msgid "# of Digits" +msgstr "# znamenaka" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Apply" +msgstr "Primjeni" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Cancel" +msgstr "Odustani" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_res_company +msgid "Companies" +msgstr "Organizacije" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_company_id +msgid "Company" +msgstr "Organizacija" + +#. module: hr_employee_id +#: model:ir.actions.act_window,name:hr_employee_id.action_human_resources_employeeid_config +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Configure Employee ID" +msgstr "Postavi ID djelatnika" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_uid +msgid "Created by" +msgstr "Kreirao" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_date +msgid "Created on" +msgstr "Kreirano" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_display_name +msgid "Display Name" +msgstr "Naziv" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_employee_id +#: model:ir.ui.menu,name:hr_employee_id.menu_account_config +msgid "Employee ID" +msgstr "ID djelatnika" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Employee ID *" +msgstr "ID djelatnika *" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_sequence +msgid "Employee ID Sequence" +msgstr "Sekvenca ID djelatnika" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_gen_method +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_gen_method +msgid "ID Generation Method" +msgstr "Metoda generianja ID-a" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings___last_update +msgid "Last Modified on" +msgstr "Zadnje modificirano" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_uid +msgid "Last Updated by" +msgstr "Zadnji ažurirao" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_date +msgid "Last Updated on" +msgstr "Zadnje ažurirano" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_random_digits +msgid "Number of digits making up the ID" +msgstr "Broj znamekana za stvaranje ID-a" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_sequence +msgid "Pattern to be used for employee ID Generation" +msgstr "Uzorak za kreiranje ID-djelatnika" + +#. module: hr_employee_id +#: selection:res.company,employee_id_gen_method:0 +msgid "Random" +msgstr "Slučajno" + +#. module: hr_employee_id +#: selection:res.company,employee_id_gen_method:0 +msgid "Sequence" +msgstr "Sekvenca" + +#. module: hr_employee_id +#: sql_constraint:hr.employee:0 +msgid "The Employee Number must be unique across the company(s)." +msgstr "Šifra djelatnika mora biti jedinstvena unutar(između) poduzeća" + +#. module: hr_employee_id +#: code:addons/hr_employee_id/models/hr_employee.py:50 +#, python-format +msgid "" +"Unable to generate an Employee ID number that is unique." +msgstr "Nije moguće generirati jedinstvenu šifru djelatnika." + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employeeid_config_settings +msgid "hr.employeeid.config.settings" +msgstr "hr.employeeid.config.settings" diff --git a/hr_employee_id/i18n/hr_HR.po b/hr_employee_id/i18n/hr_HR.po new file mode 100644 index 00000000000..2ee053b2e14 --- /dev/null +++ b/hr_employee_id/i18n/hr_HR.po @@ -0,0 +1,161 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_id +# +# Translators: +# Bole , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-11-29 03:45+0000\n" +"PO-Revision-Date: 2016-11-29 03:45+0000\n" +"Last-Translator: Bole , 2016\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr_HR\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_random_digits +msgid "# of Digits" +msgstr "# znamenaka" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" +"(*) ove postavke su povezane sa poduzećem u koje ste trenutno " +"prijavljeni." + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Apply" +msgstr "Primjeni" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Cancel" +msgstr "Odustani" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_res_company +msgid "Companies" +msgstr "Poduzeća" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_company_id +msgid "Company" +msgstr "Poduzeće" + +#. module: hr_employee_id +#: model:ir.actions.act_window,name:hr_employee_id.action_human_resources_employeeid_config +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Configure Employee ID" +msgstr "Postavke ID-a djelatnika" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_uid +msgid "Created by" +msgstr "Kreirao" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_date +msgid "Created on" +msgstr "Kreirano" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_display_name +msgid "Display Name" +msgstr "Naziv" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employee +msgid "Employee" +msgstr "Djelatnik" + +#. module: hr_employee_id +#: model:ir.ui.menu,name:hr_employee_id.menu_account_config +msgid "Employee ID" +msgstr "ID djelatnika" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Employee ID *" +msgstr "ID djelatnika *" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_sequence +msgid "Employee ID Sequence" +msgstr "Sekvenca ID-a djelatnika" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_gen_method +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_gen_method +msgid "ID Generation Method" +msgstr "Metoda generianja ID-a" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings___last_update +msgid "Last Modified on" +msgstr "Zadnje ažurirano" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_uid +msgid "Last Updated by" +msgstr "Zadnji ažurirao" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_date +msgid "Last Updated on" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_random_digits +msgid "Number of digits making up the ID" +msgstr "Broj znamenaka za konstrukciju ID-a" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_sequence +msgid "Pattern to be used for employee ID Generation" +msgstr "Uzorak prema kojem se generira ID" + +#. module: hr_employee_id +#: selection:res.company,employee_id_gen_method:0 +msgid "Random" +msgstr "Slučajno" + +#. module: hr_employee_id +#: selection:res.company,employee_id_gen_method:0 +msgid "Sequence" +msgstr "Sljedno" + +#. module: hr_employee_id +#: sql_constraint:hr.employee:0 +msgid "The Employee Number must be unique across the company(s)." +msgstr "ID broj djelatnika mora biti jedinstven za poduzeće(a)." + +#. module: hr_employee_id +#: code:addons/hr_employee_id/models/hr_employee.py:50 +#, python-format +msgid "" +"Unable to generate an Employee ID number that is unique." +msgstr "Nije moguće generiranje jedinstvenog ID djelatnika." + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employeeid_config_settings +msgid "hr.employeeid.config.settings" +msgstr "hr.employeeid.config.settings" diff --git a/hr_employee_id/i18n/it.po b/hr_employee_id/i18n/it.po index f971c690ea4..6813358d735 100644 --- a/hr_employee_id/i18n/it.po +++ b/hr_employee_id/i18n/it.po @@ -55,7 +55,7 @@ msgstr "" #. module: hr_employee_id #: help:hr.config.settings,employee_id_sequence:0 #: help:res.company,employee_id_sequence:0 -msgid "Pattern to be used for used for ID Generation" +msgid "Pattern to be used for employee ID Generation" msgstr "" #. module: hr_employee_id diff --git a/hr_employee_id/i18n/nl_NL.po b/hr_employee_id/i18n/nl_NL.po index ff3dfe1cc9f..8d64101a824 100644 --- a/hr_employee_id/i18n/nl_NL.po +++ b/hr_employee_id/i18n/nl_NL.po @@ -3,14 +3,16 @@ # * hr_employee_id # # Translators: +# OCA Transbot , 2016 +# Peter Hageman , 2017 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 01:48+0000\n" -"PO-Revision-Date: 2016-03-09 14:56+0000\n" -"Last-Translator: <>\n" -"Language-Team: Dutch (Netherlands) (http://www.transifex.com/oca/OCA-hr-8-0/language/nl_NL/)\n" +"POT-Creation-Date: 2017-07-01 01:04+0000\n" +"PO-Revision-Date: 2017-07-01 01:04+0000\n" +"Last-Translator: Peter Hageman , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -18,15 +20,60 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_random_digits:0 -#: field:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_random_digits msgid "# of Digits" +msgstr "# Decimalen" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "" +"(*) This configuration is related to the company you're logged " +"into." msgstr "" +"(*) Deze configuratie is gerelateerd aan het bedrijf waarmee mee je " +"ingelogd bent." + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Apply" +msgstr "Toepassen" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Cancel" +msgstr "Annuleer" #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_res_company msgid "Companies" -msgstr "" +msgstr "Bedrijven" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_company_id +msgid "Company" +msgstr "Bedrijf" + +#. module: hr_employee_id +#: model:ir.actions.act_window,name:hr_employee_id.action_human_resources_employeeid_config +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Configure Employee ID" +msgstr "Configureer Personeelsnummer" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_uid +msgid "Created by" +msgstr "Aangemaakt door" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_date +msgid "Created on" +msgstr "Aangemaakt op" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_display_name +msgid "Display Name" +msgstr "Weergavenaam" #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_hr_employee @@ -34,51 +81,82 @@ msgid "Employee" msgstr "Werknemer" #. module: hr_employee_id -#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration -#: view:res.company:hr_employee_id.view_company_form +#: model:ir.ui.menu,name:hr_employee_id.menu_account_config msgid "Employee ID" -msgstr "" +msgstr "Personeelsnummer" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Employee ID *" +msgstr "Personeelsnummer *" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_sequence +msgid "Employee ID Sequence" +msgstr "Personeelsnummervolgorde" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_id +msgid "ID" +msgstr "ID" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_gen_method:0 -#: field:res.company,employee_id_gen_method:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_gen_method +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_gen_method msgid "ID Generation Method" -msgstr "" +msgstr "ID-Genereermethode" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings___last_update +msgid "Last Modified on" +msgstr "Laatst gewijzigd op" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_uid +msgid "Last Updated by" +msgstr "Laatst bijgewerkt door" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_random_digits:0 -#: help:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_date +msgid "Last Updated on" +msgstr "Laatst bijgewerkt op" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_random_digits msgid "Number of digits making up the ID" -msgstr "" +msgstr "Aantal cijfers voor de opmaak van de ID" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_sequence:0 -#: help:res.company,employee_id_sequence:0 -msgid "Pattern to be used for used for ID Generation" -msgstr "" +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_sequence +msgid "Pattern to be used for employee ID Generation" +msgstr "Te gebruiken patroon voor het genereren van de medewerker-ID" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 #: selection:res.company,employee_id_gen_method:0 msgid "Random" -msgstr "" +msgstr "Willekeurig" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 -#: field:hr.config.settings,employee_id_sequence:0 #: selection:res.company,employee_id_gen_method:0 -#: field:res.company,employee_id_sequence:0 msgid "Sequence" -msgstr "" +msgstr "Volgorde" #. module: hr_employee_id #: sql_constraint:hr.employee:0 msgid "The Employee Number must be unique across the company(s)." -msgstr "" +msgstr "Het Personeelsnummer moet uniek zijn binnen elk bedrijf en bedrijven." #. module: hr_employee_id #: code:addons/hr_employee_id/models/hr_employee.py:50 #, python-format msgid "" "Unable to generate an Employee ID number that is unique." -msgstr "" +msgstr "Niet in staat om een uniek personeelsnummer te genereren." + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employeeid_config_settings +msgid "hr.employeeid.config.settings" +msgstr "hr.employeeid.config.settings" diff --git a/hr_employee_id/i18n/pt_BR.po b/hr_employee_id/i18n/pt_BR.po index f8dabb2d5b0..c4701aaf1b5 100644 --- a/hr_employee_id/i18n/pt_BR.po +++ b/hr_employee_id/i18n/pt_BR.po @@ -3,14 +3,15 @@ # * hr_employee_id # # Translators: +# OCA Transbot , 2016 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 01:48+0000\n" -"PO-Revision-Date: 2016-03-09 14:56+0000\n" -"Last-Translator: <>\n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-hr-8-0/language/pt_BR/)\n" +"POT-Creation-Date: 2017-03-03 03:37+0000\n" +"PO-Revision-Date: 2017-03-03 03:37+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -18,56 +19,125 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_random_digits:0 -#: field:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_random_digits msgid "# of Digits" msgstr "" +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Apply" +msgstr "" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Cancel" +msgstr "" + #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_res_company msgid "Companies" msgstr "Empresas" +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_company_id +msgid "Company" +msgstr "" + +#. module: hr_employee_id +#: model:ir.actions.act_window,name:hr_employee_id.action_human_resources_employeeid_config +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Configure Employee ID" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_uid +msgid "Created by" +msgstr "Criado por" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_date +msgid "Created on" +msgstr "Criado em" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_display_name +msgid "Display Name" +msgstr "" + #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_hr_employee msgid "Employee" msgstr "Empregado" #. module: hr_employee_id -#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration -#: view:res.company:hr_employee_id.view_company_form +#: model:ir.ui.menu,name:hr_employee_id.menu_account_config msgid "Employee ID" msgstr "" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_gen_method:0 -#: field:res.company,employee_id_gen_method:0 +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Employee ID *" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_sequence +msgid "Employee ID Sequence" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_id +msgid "ID" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_gen_method +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_gen_method msgid "ID Generation Method" msgstr "" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_random_digits:0 -#: help:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_uid +msgid "Last Updated by" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_date +msgid "Last Updated on" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_random_digits msgid "Number of digits making up the ID" msgstr "" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_sequence:0 -#: help:res.company,employee_id_sequence:0 -msgid "Pattern to be used for used for ID Generation" +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_sequence +msgid "Pattern to be used for employee ID Generation" msgstr "" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 #: selection:res.company,employee_id_gen_method:0 msgid "Random" msgstr "" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 -#: field:hr.config.settings,employee_id_sequence:0 #: selection:res.company,employee_id_gen_method:0 -#: field:res.company,employee_id_sequence:0 msgid "Sequence" msgstr "" @@ -82,3 +152,8 @@ msgstr "" msgid "" "Unable to generate an Employee ID number that is unique." msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employeeid_config_settings +msgid "hr.employeeid.config.settings" +msgstr "" diff --git a/hr_employee_id/i18n/ro.po b/hr_employee_id/i18n/ro.po index 3158e7e67bc..4f55fe6bfd5 100644 --- a/hr_employee_id/i18n/ro.po +++ b/hr_employee_id/i18n/ro.po @@ -3,14 +3,15 @@ # * hr_employee_id # # Translators: +# OCA Transbot , 2016 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 01:48+0000\n" -"PO-Revision-Date: 2016-03-09 14:56+0000\n" -"Last-Translator: <>\n" -"Language-Team: Romanian (http://www.transifex.com/oca/OCA-hr-8-0/language/ro/)\n" +"POT-Creation-Date: 2017-03-03 03:37+0000\n" +"PO-Revision-Date: 2017-03-03 03:37+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -18,56 +19,125 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_random_digits:0 -#: field:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_random_digits msgid "# of Digits" msgstr "" +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Apply" +msgstr "" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Cancel" +msgstr "" + #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_res_company msgid "Companies" msgstr "Companii" +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_company_id +msgid "Company" +msgstr "" + +#. module: hr_employee_id +#: model:ir.actions.act_window,name:hr_employee_id.action_human_resources_employeeid_config +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Configure Employee ID" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_uid +msgid "Created by" +msgstr "Creeat de către" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_date +msgid "Created on" +msgstr "Creeat în" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_display_name +msgid "Display Name" +msgstr "" + #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_hr_employee msgid "Employee" msgstr "Angajat" #. module: hr_employee_id -#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration -#: view:res.company:hr_employee_id.view_company_form +#: model:ir.ui.menu,name:hr_employee_id.menu_account_config msgid "Employee ID" msgstr "" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_gen_method:0 -#: field:res.company,employee_id_gen_method:0 +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Employee ID *" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_sequence +msgid "Employee ID Sequence" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_gen_method +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_gen_method msgid "ID Generation Method" msgstr "" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_random_digits:0 -#: help:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_uid +msgid "Last Updated by" +msgstr "Ultima actualizare de către" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_date +msgid "Last Updated on" +msgstr "Ultima actualizare în" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_random_digits msgid "Number of digits making up the ID" msgstr "" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_sequence:0 -#: help:res.company,employee_id_sequence:0 -msgid "Pattern to be used for used for ID Generation" +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_sequence +msgid "Pattern to be used for employee ID Generation" msgstr "" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 #: selection:res.company,employee_id_gen_method:0 msgid "Random" msgstr "" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 -#: field:hr.config.settings,employee_id_sequence:0 #: selection:res.company,employee_id_gen_method:0 -#: field:res.company,employee_id_sequence:0 msgid "Sequence" msgstr "" @@ -82,3 +152,8 @@ msgstr "" msgid "" "Unable to generate an Employee ID number that is unique." msgstr "" + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employeeid_config_settings +msgid "hr.employeeid.config.settings" +msgstr "" diff --git a/hr_employee_id/i18n/sl.po b/hr_employee_id/i18n/sl.po index 3b6a03510ec..d29d69f9697 100644 --- a/hr_employee_id/i18n/sl.po +++ b/hr_employee_id/i18n/sl.po @@ -3,15 +3,15 @@ # * hr_employee_id # # Translators: -# Matjaž Mozetič , 2016 +# OCA Transbot , 2016 msgid "" msgstr "" -"Project-Id-Version: hr (8.0)\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 01:48+0000\n" -"PO-Revision-Date: 2016-03-10 05:41+0000\n" -"Last-Translator: Matjaž Mozetič \n" -"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-hr-8-0/language/sl/)\n" +"POT-Creation-Date: 2017-03-03 03:37+0000\n" +"PO-Revision-Date: 2017-03-03 03:37+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -19,56 +19,125 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_random_digits:0 -#: field:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_random_digits msgid "# of Digits" msgstr "Št. znakov" +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "" +"(*) This configuration is related to the company you're logged " +"into." +msgstr "" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Apply" +msgstr "" + +#. module: hr_employee_id +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Cancel" +msgstr "" + #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_res_company msgid "Companies" msgstr "Družbe" +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_company_id +msgid "Company" +msgstr "" + +#. module: hr_employee_id +#: model:ir.actions.act_window,name:hr_employee_id.action_human_resources_employeeid_config +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Configure Employee ID" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_uid +msgid "Created by" +msgstr "Ustvaril" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_create_date +msgid "Created on" +msgstr "Ustvarjeno" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_display_name +msgid "Display Name" +msgstr "Prikazni naziv" + #. module: hr_employee_id #: model:ir.model,name:hr_employee_id.model_hr_employee msgid "Employee" msgstr "Kader" #. module: hr_employee_id -#: view:hr.config.settings:hr_employee_id.view_human_resources_configuration -#: view:res.company:hr_employee_id.view_company_form +#: model:ir.ui.menu,name:hr_employee_id.menu_account_config msgid "Employee ID" msgstr "ID kadra" #. module: hr_employee_id -#: field:hr.config.settings,employee_id_gen_method:0 -#: field:res.company,employee_id_gen_method:0 +#: model:ir.ui.view,arch_db:hr_employee_id.view_human_resources_employeeid_configuration +msgid "Employee ID *" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_sequence +msgid "Employee ID Sequence" +msgstr "" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_employee_id_gen_method +#: model:ir.model.fields,field_description:hr_employee_id.field_res_company_employee_id_gen_method msgid "ID Generation Method" msgstr "Metoda ustvarjanja ID" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_random_digits:0 -#: help:res.company,employee_id_random_digits:0 +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings___last_update +msgid "Last Modified on" +msgstr "Zadnjič spremenjeno" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_uid +msgid "Last Updated by" +msgstr "Zadnjič posodobil" + +#. module: hr_employee_id +#: model:ir.model.fields,field_description:hr_employee_id.field_hr_employeeid_config_settings_write_date +msgid "Last Updated on" +msgstr "Zadnjič posodobljeno" + +#. module: hr_employee_id +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_random_digits +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_random_digits msgid "Number of digits making up the ID" msgstr "Število znakov, ki sestavlja ID" #. module: hr_employee_id -#: help:hr.config.settings,employee_id_sequence:0 -#: help:res.company,employee_id_sequence:0 -msgid "Pattern to be used for used for ID Generation" +#: model:ir.model.fields,help:hr_employee_id.field_hr_employeeid_config_settings_employee_id_sequence +#: model:ir.model.fields,help:hr_employee_id.field_res_company_employee_id_sequence +msgid "Pattern to be used for employee ID Generation" msgstr "Vzorec uporabljen za ustvarjanje ID" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 #: selection:res.company,employee_id_gen_method:0 msgid "Random" msgstr "Naključno" #. module: hr_employee_id -#: selection:hr.config.settings,employee_id_gen_method:0 -#: field:hr.config.settings,employee_id_sequence:0 #: selection:res.company,employee_id_gen_method:0 -#: field:res.company,employee_id_sequence:0 msgid "Sequence" msgstr "Zaporedje" @@ -83,3 +152,8 @@ msgstr "Številka kadra mora biti unikatna v sklopu družbe (družb)." msgid "" "Unable to generate an Employee ID number that is unique." msgstr "Ni možno ustvariti ID številke kadra, ki bi bila unikatna." + +#. module: hr_employee_id +#: model:ir.model,name:hr_employee_id.model_hr_employeeid_config_settings +msgid "hr.employeeid.config.settings" +msgstr "" diff --git a/hr_employee_id/models/hr_employee.py b/hr_employee_id/models/hr_employee.py index cdd04d4ddd9..5afe02c7937 100644 --- a/hr_employee_id/models/hr_employee.py +++ b/hr_employee_id/models/hr_employee.py @@ -5,8 +5,8 @@ import random import string -from openerp import models, fields, api, _ -from openerp.exceptions import Warning as UserWarning +from odoo import models, fields, api, _ +from odoo.exceptions import Warning as UserWarning class HrEmployee(models.Model): diff --git a/hr_employee_id/models/res_company.py b/hr_employee_id/models/res_company.py index 1a0aaf81d74..8110e5a61e2 100644 --- a/hr_employee_id/models/res_company.py +++ b/hr_employee_id/models/res_company.py @@ -3,7 +3,7 @@ # © 2016 OpenSynergy Indonesia # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import models, fields +from odoo import models, fields class ResCompany(models.Model): @@ -24,6 +24,6 @@ class ResCompany(models.Model): ) employee_id_sequence = fields.Many2one( comodel_name='ir.sequence', - string='Sequence', - help="Pattern to be used for used for ID Generation", + string='Employee ID Sequence', + help="Pattern to be used for employee ID Generation" ) diff --git a/hr_employee_id/models/res_config.py b/hr_employee_id/models/res_config.py index cbe87739e8c..9e31bf4e9ac 100644 --- a/hr_employee_id/models/res_config.py +++ b/hr_employee_id/models/res_config.py @@ -3,53 +3,51 @@ # © 2016 OpenSynergy Indonesia # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import models, fields, api +from odoo import models, fields class HumanResourcesConfiguration(models.TransientModel): - _inherit = 'hr.config.settings' + _inherit = 'res.config.settings' + _name = 'hr.employeeid.config.settings' + + def _default_id_gen_method(self): + gen_method = self.env.user.company_id.employee_id_gen_method + if not gen_method: + gen_method = self.env['res.company'].default_get( + ['employee_id_gen_method'] + )['employee_id_gen_method'] + return gen_method + + def _default_id_random_digits(self): + digits = self.env.user.company_id.employee_id_random_digits + if not digits: + digits = self.env['res.company'].default_get( + ['employee_id_random_digits'] + )['employee_id_random_digits'] + return digits def _default_id_sequence(self): - sequence = self.env.ref('hr_employee_id.seq_employeeid_ref') + sequence = self.env.user.company_id.employee_id_sequence + if not sequence: + sequence = self.env.ref('hr_employee_id.seq_employeeid_ref') return sequence and sequence.id or False + company_id = fields.Many2one( + 'res.company', + string='Company', + required=True, + default=lambda self: self.env.user.company_id) + employee_id_gen_method = fields.Selection( - selection=[ - ('random', 'Random'), - ('sequence', 'Sequence'), - ], - string="ID Generation Method", - default='random' + related='company_id.employee_id_gen_method', + default=_default_id_gen_method ) employee_id_random_digits = fields.Integer( - string='# of Digits', - default=5, - help="Number of digits making up the ID" + related='company_id.employee_id_random_digits', + default=_default_id_random_digits ) employee_id_sequence = fields.Many2one( - comodel_name='ir.sequence', - string='Sequence', - help="Pattern to be used for used for ID Generation", + 'ir.sequence', + related='company_id.employee_id_sequence', default=_default_id_sequence ) - - @api.model - def get_default_employee_id_values(self, fields): - company = self.env.user.company_id - return { - 'employee_id_gen_method': company.employee_id_gen_method, - 'employee_id_random_digits': company.employee_id_random_digits, - 'employee_id_sequence': company.employee_id_sequence.id, - } - - @api.one - def set_employee_id_values(self): - company = self.env.user.company_id - company.employee_id_gen_method = self.employee_id_gen_method - company.employee_id_random_digits = self.employee_id_random_digits - company.employee_id_sequence = self.employee_id_sequence - - @api.onchange('employee_id_gen_method') - def onchange_employee_id_gen_method(self): - if self.employee_id_gen_method == 'sequence': - self.employee_id_sequence = self._default_id_sequence() diff --git a/hr_employee_id/tests/test_employee_id.py b/hr_employee_id/tests/test_employee_id.py index 0c59c9b738c..af783ecb6df 100644 --- a/hr_employee_id/tests/test_employee_id.py +++ b/hr_employee_id/tests/test_employee_id.py @@ -3,7 +3,7 @@ # © 2016 OpenSynergy Indonesia # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp.tests import common +from odoo.tests import common class TestEmployeeID(common.TransactionCase): @@ -34,3 +34,15 @@ def test_sequences_id_generation(self): employee = self.employee_model.create({'name': 'Employee'}) self.assertTrue(len(employee.identification_id)) + + def test_configuration_default_values(self): + # test loading of default configuration values + self.company.write({'employee_id_gen_method': None, + 'employee_id_random_digits': None, + 'employee_id_sequence': None}) + config_model = self.env['hr.employeeid.config.settings'] + config = config_model.create({}) + self.assertTrue(config.company_id.id == self.company.id) + self.assertTrue(config.employee_id_gen_method == 'random') + self.assertTrue(config.employee_id_random_digits == 5) + self.assertFalse(config.employee_id_sequence is False) diff --git a/hr_employee_id/views/hr_employee_views.xml b/hr_employee_id/views/hr_employee_views.xml index fc58c2edf5d..ed7dc8da1ad 100644 --- a/hr_employee_id/views/hr_employee_views.xml +++ b/hr_employee_id/views/hr_employee_views.xml @@ -1,55 +1,55 @@ - - - - hr.employee.form.inherit - hr.employee - - - - -

    -

    -     -     -     - - hr.employee.tree.inherit - hr.employee - - - - - - - - - - - Employees - hr.employee - - + + + + hr.employee.form.inherit + hr.employee + + + + +

    +

    +     +     +     + + hr.employee.tree.inherit + hr.employee + + + + + + + + Employees + hr.employee + + + + - - - HR - Employees Kanban - hr.employee - - -
  • -
  • - -
    • +     +     + + HR - Employees Kanban + hr.employee + + +
  • +
  • +
    • -     -     -     -     + + + + + diff --git a/hr_employee_id/views/res_company.xml b/hr_employee_id/views/res_company.xml deleted file mode 100644 index 6bb89209d79..00000000000 --- a/hr_employee_id/views/res_company.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - res.company.sheet - res.company - - - - - - - - - - - - - diff --git a/hr_employee_id/views/res_config_views.xml b/hr_employee_id/views/res_config_views.xml index 07399419ea3..fef5138a985 100644 --- a/hr_employee_id/views/res_config_views.xml +++ b/hr_employee_id/views/res_config_views.xml @@ -1,34 +1,51 @@ - - - - hr.config.settings.inherit - hr.config.settings - - - - -
  • Date: Fri, 25 Jul 2025 14:30:28 -0600 Subject: [PATCH 44/48] [FIX] Update hr_job kanban view to not display 'no_of_recruitment' --- hr_recruitment_torecruit/views/hr_job.xml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/hr_recruitment_torecruit/views/hr_job.xml b/hr_recruitment_torecruit/views/hr_job.xml index 3db5077a24b..9e57b92b6a4 100644 --- a/hr_recruitment_torecruit/views/hr_job.xml +++ b/hr_recruitment_torecruit/views/hr_job.xml @@ -19,9 +19,10 @@ +
  • - To be recruited + To be recruited
    • + + + False +     + hr.job tree hr.job From ddb521bd6fee9acd330f5338c01687c8041cff90 Mon Sep 17 00:00:00 2001 From: "Samuel Macias Oropeza (smo)" Date: Thu, 7 Aug 2025 15:23:04 -0600 Subject: [PATCH 45/48] [FIX] hr_holidays_team_manager --- .../models/hr_employee_base.py | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/hr_holidays_team_manager/models/hr_employee_base.py b/hr_holidays_team_manager/models/hr_employee_base.py index 2a48dacb5a7..55c5e380c2f 100644 --- a/hr_holidays_team_manager/models/hr_employee_base.py +++ b/hr_holidays_team_manager/models/hr_employee_base.py @@ -6,48 +6,48 @@ class HrEmployeeBase(models.AbstractModel): _inherit = "hr.employee.base" - def search(self, args, offset=0, limit=None, order=None, count=False): - params = self.env.context.get("params") - if params: - model = params.get("model") - if not self.env.context.get("by_pass"): - if ( - model in ["hr.leave", "hr.leave.allocation"] - and self.env.user.has_group("hr_holidays.group_hr_holidays_user") - and not self.env.user.has_group( - "hr_holidays_team_manager.group_hr_holidays_officer" - ) - ): - if args is None: - args = [] - employee_id = self.env.user.with_context(by_pass=True).employee_ids - if employee_id: - args += [ - ("department_id", "=", employee_id[0].department_id.id) - ] - - return super().search( - args, offset=offset, limit=limit, order=order, count=count - ) - - @api.model - def name_search(self, name="", args=None, operator="ilike", limit=100): - context = self.env.context - if context: - if not self.env.context.get("by_pass"): - if ( - [context.get("hr_leave_allocation") or context.get("hr_leave")] - and self.env.user.has_group("hr_holidays.group_hr_holidays_user") - and not self.env.user.has_group( - "hr_holidays_team_manager.group_hr_holidays_officer" - ) - ): - if args is None: - args = [] - employee_id = self.env.user.with_context(by_pass=True).employee_ids - if employee_id: - args += [ - ("department_id", "=", employee_id[0].department_id.id) - ] - - return super().name_search(name=name, args=args, operator=operator, limit=limit) + # def search(self, args, offset=0, limit=None, order=None, count=False): + # params = self.env.context.get("params") + # if params: + # model = params.get("model") + # if not self.env.context.get("by_pass"): + # if ( + # model in ["hr.leave", "hr.leave.allocation"] + # and self.env.user.has_group("hr_holidays.group_hr_holidays_user") + # and not self.env.user.has_group( + # "hr_holidays_team_manager.group_hr_holidays_officer" + # ) + # ): + # if args is None: + # args = [] + # employee_id = self.env.user.with_context(by_pass=True).employee_ids + # if employee_id: + # args += [ + # ("department_id", "=", employee_id[0].department_id.id) + # ] + # + # return super().search( + # args, offset=offset, limit=limit, order=order, count=count + # ) + # + # @api.model + # def name_search(self, name="", args=None, operator="ilike", limit=100): + # context = self.env.context + # if context: + # if not self.env.context.get("by_pass"): + # if ( + # [context.get("hr_leave_allocation") or context.get("hr_leave")] + # and self.env.user.has_group("hr_holidays.group_hr_holidays_user") + # and not self.env.user.has_group( + # "hr_holidays_team_manager.group_hr_holidays_officer" + # ) + # ): + # if args is None: + # args = [] + # employee_id = self.env.user.with_context(by_pass=True).employee_ids + # if employee_id: + # args += [ + # ("department_id", "=", employee_id[0].department_id.id) + # ] + # + # return super().name_search(name=name, args=args, operator=operator, limit=limit) From 92d0d837b3e76d5ea4dc171e42c95ff606006741 Mon Sep 17 00:00:00 2001 From: "Samuel Macias Oropeza (smo)" Date: Wed, 20 Aug 2025 10:58:45 -0600 Subject: [PATCH 46/48] [FIX] hr_holidays_team_manager --- .../data/hr_holidays_security.xml | 3 +- .../models/hr_employee_base.py | 90 +++++++++---------- 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/hr_holidays_team_manager/data/hr_holidays_security.xml b/hr_holidays_team_manager/data/hr_holidays_security.xml index 2a16e36144f..be5948f5ce1 100644 --- a/hr_holidays_team_manager/data/hr_holidays_security.xml +++ b/hr_holidays_team_manager/data/hr_holidays_security.xml @@ -32,8 +32,7 @@ Time off: Team manager time off same department ['|', - ('employee_id.department_id', 'in',[user.employee_ids.department_id.id]), - ('employee_ids.department_id', 'in', [user.employee_ids.department_id.id])] + [(1, '=', 1)] diff --git a/hr_holidays_team_manager/models/hr_employee_base.py b/hr_holidays_team_manager/models/hr_employee_base.py index 55c5e380c2f..2a48dacb5a7 100644 --- a/hr_holidays_team_manager/models/hr_employee_base.py +++ b/hr_holidays_team_manager/models/hr_employee_base.py @@ -6,48 +6,48 @@ class HrEmployeeBase(models.AbstractModel): _inherit = "hr.employee.base" - # def search(self, args, offset=0, limit=None, order=None, count=False): - # params = self.env.context.get("params") - # if params: - # model = params.get("model") - # if not self.env.context.get("by_pass"): - # if ( - # model in ["hr.leave", "hr.leave.allocation"] - # and self.env.user.has_group("hr_holidays.group_hr_holidays_user") - # and not self.env.user.has_group( - # "hr_holidays_team_manager.group_hr_holidays_officer" - # ) - # ): - # if args is None: - # args = [] - # employee_id = self.env.user.with_context(by_pass=True).employee_ids - # if employee_id: - # args += [ - # ("department_id", "=", employee_id[0].department_id.id) - # ] - # - # return super().search( - # args, offset=offset, limit=limit, order=order, count=count - # ) - # - # @api.model - # def name_search(self, name="", args=None, operator="ilike", limit=100): - # context = self.env.context - # if context: - # if not self.env.context.get("by_pass"): - # if ( - # [context.get("hr_leave_allocation") or context.get("hr_leave")] - # and self.env.user.has_group("hr_holidays.group_hr_holidays_user") - # and not self.env.user.has_group( - # "hr_holidays_team_manager.group_hr_holidays_officer" - # ) - # ): - # if args is None: - # args = [] - # employee_id = self.env.user.with_context(by_pass=True).employee_ids - # if employee_id: - # args += [ - # ("department_id", "=", employee_id[0].department_id.id) - # ] - # - # return super().name_search(name=name, args=args, operator=operator, limit=limit) + def search(self, args, offset=0, limit=None, order=None, count=False): + params = self.env.context.get("params") + if params: + model = params.get("model") + if not self.env.context.get("by_pass"): + if ( + model in ["hr.leave", "hr.leave.allocation"] + and self.env.user.has_group("hr_holidays.group_hr_holidays_user") + and not self.env.user.has_group( + "hr_holidays_team_manager.group_hr_holidays_officer" + ) + ): + if args is None: + args = [] + employee_id = self.env.user.with_context(by_pass=True).employee_ids + if employee_id: + args += [ + ("department_id", "=", employee_id[0].department_id.id) + ] + + return super().search( + args, offset=offset, limit=limit, order=order, count=count + ) + + @api.model + def name_search(self, name="", args=None, operator="ilike", limit=100): + context = self.env.context + if context: + if not self.env.context.get("by_pass"): + if ( + [context.get("hr_leave_allocation") or context.get("hr_leave")] + and self.env.user.has_group("hr_holidays.group_hr_holidays_user") + and not self.env.user.has_group( + "hr_holidays_team_manager.group_hr_holidays_officer" + ) + ): + if args is None: + args = [] + employee_id = self.env.user.with_context(by_pass=True).employee_ids + if employee_id: + args += [ + ("department_id", "=", employee_id[0].department_id.id) + ] + + return super().name_search(name=name, args=args, operator=operator, limit=limit) From cac21cd67bc87a99d1c1b299b0a4dbd2311b5bea Mon Sep 17 00:00:00 2001 From: jorgesanchez98 Date: Thu, 21 Aug 2025 11:21:21 -0600 Subject: [PATCH 47/48] [FIX] HR hollidays team manager --- hr_holidays_team_manager/data/hr_holidays_security.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_holidays_team_manager/data/hr_holidays_security.xml b/hr_holidays_team_manager/data/hr_holidays_security.xml index be5948f5ce1..1ac3449da04 100644 --- a/hr_holidays_team_manager/data/hr_holidays_security.xml +++ b/hr_holidays_team_manager/data/hr_holidays_security.xml @@ -31,7 +31,7 @@ Time off: Team manager time off same department - ['|', + [(1, '=', 1)] From 6732fa98712c502e0aea1884abdb2acf41562cc2 Mon Sep 17 00:00:00 2001 From: Hector del Reguero Date: Mon, 27 Apr 2026 11:47:47 -0600 Subject: [PATCH 48/48] [FIX]hr_holiday_team_manager: Fix search function that was missing passing arguments --- hr_holidays_team_manager/models/hr_employee_base.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hr_holidays_team_manager/models/hr_employee_base.py b/hr_holidays_team_manager/models/hr_employee_base.py index 2a48dacb5a7..7c194b3dde3 100644 --- a/hr_holidays_team_manager/models/hr_employee_base.py +++ b/hr_holidays_team_manager/models/hr_employee_base.py @@ -6,7 +6,12 @@ class HrEmployeeBase(models.AbstractModel): _inherit = "hr.employee.base" - def search(self, args, offset=0, limit=None, order=None, count=False): + @api.model + def search(self, domain=None, offset=0, limit=None, order=None, count=False): + # Ensure domain is always a list for the parent search method + if domain is None: + domain = [] + params = self.env.context.get("params") if params: model = params.get("model") @@ -18,16 +23,14 @@ def search(self, args, offset=0, limit=None, order=None, count=False): "hr_holidays_team_manager.group_hr_holidays_officer" ) ): - if args is None: - args = [] employee_id = self.env.user.with_context(by_pass=True).employee_ids if employee_id: - args += [ + domain = list(domain) + [ ("department_id", "=", employee_id[0].department_id.id) ] return super().search( - args, offset=offset, limit=limit, order=order, count=count + domain, offset=offset, limit=limit, order=order, count=count ) @api.model