diff options
| author | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
|---|---|---|
| committer | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
| commit | d979aad3de95ae24aa1db52cf17c4eecf3d3ce6b (patch) | |
| tree | 592698c8e0dab53fcd157dd456a800bd4a80b5bf /addons/hr_contract | |
| parent | eea80125f7d1c739260929fb1f38866ef21439e1 (diff) | |
| parent | d101d3fbaaffe2d0219ac6cfeef50338a2501664 (diff) | |
[MERGE] branch merged with lp:openobject-addons
bzr revid: mtr@tinyerp.com-20110916054138-93b3caomaij5dyp4
Diffstat (limited to 'addons/hr_contract')
49 files changed, 333 insertions, 729 deletions
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py index 380a4f1c696..091204fcf74 100644 --- a/addons/hr_contract/__openerp__.py +++ b/addons/hr_contract/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Human Resources Contracts', 'version': '1.0', 'category': 'Human Resources', + 'complexity': "easy", 'description': """ Add all information on the employee form to manage contracts. ============================================================= @@ -44,7 +45,9 @@ You can assign several contracts per employee. 'hr_contract_view.xml' ], 'demo_xml': [], - 'test': ['test/test_hr_contract.yml'], + 'test': [ + 'test/test_hr_contract.yml' + ], 'installable': True, 'active': False, 'certificate': '0046298028637', diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py index 7ed2d16d6b7..3a6ea844012 100644 --- a/addons/hr_contract/hr_contract.py +++ b/addons/hr_contract/hr_contract.py @@ -46,41 +46,11 @@ class hr_employee(osv.osv): 'vehicle': fields.char('Company Vehicle', size=64), 'vehicle_distance': fields.integer('Home-Work Distance', help="In kilometers"), 'contract_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'), - 'contract_id':fields.function(_get_latest_contract, method=True, string='Contract', type='many2one', relation="hr.contract", help='Latest contract of the employee'), + 'contract_id':fields.function(_get_latest_contract, string='Contract', type='many2one', relation="hr.contract", help='Latest contract of the employee'), } hr_employee() -#Contract wage type period name -class hr_contract_wage_type_period(osv.osv): - _name='hr.contract.wage.type.period' - _description='Wage Period' - _columns = { - 'name': fields.char('Period Name', size=50, required=True, select=True), - 'factor_days': fields.float('Hours in the period', digits=(12,4), required=True, help='This field is used by the timesheet system to compute the price of an hour of work wased on the contract of the employee') - } - _defaults = { - 'factor_days': 168.0 - } -hr_contract_wage_type_period() - -#Contract wage type (hourly, daily, monthly, ...) -class hr_contract_wage_type(osv.osv): - _name = 'hr.contract.wage.type' - _description = 'Wage Type' - _columns = { - 'name': fields.char('Wage Type Name', size=50, required=True, select=True), - 'period_id': fields.many2one('hr.contract.wage.type.period', 'Wage Period', required=True), - 'type': fields.selection([('gross','Gross'), ('net','Net')], 'Type', required=True), - 'factor_type': fields.float('Factor for hour cost', digits=(12,4), required=True, help='This field is used by the timesheet system to compute the price of an hour of work wased on the contract of the employee') - } - _defaults = { - 'type': 'gross', - 'factor_type': 1.8 - } -hr_contract_wage_type() - - class hr_contract_type(osv.osv): _name = 'hr.contract.type' _description = 'Contract Type' @@ -103,15 +73,21 @@ class hr_contract(osv.osv): 'trial_date_start': fields.date('Trial Start Date'), 'trial_date_end': fields.date('Trial End Date'), 'working_hours': fields.many2one('resource.calendar','Working Schedule'), - 'wage_type_id': fields.many2one('hr.contract.wage.type', 'Wage Type', required=True), - 'wage': fields.float('Wage', digits=(16,2), required=True), + 'wage': fields.float('Wage', digits=(16,2), required=True, help="Basic Salary of the employee"), 'advantages': fields.text('Advantages'), - 'advantages_net': fields.float('Net Advantages Value', digits=(16,2)), - 'advantages_gross': fields.float('Gross Advantages Value', digits=(16,2)), 'notes': fields.text('Notes'), + 'permit_no': fields.char('Work Permit No', size=256, required=False, readonly=False), + 'visa_no': fields.char('Visa No', size=64, required=False, readonly=False), + 'visa_expire': fields.date('Visa Expire Date'), } + + def _get_type(self, cr, uid, context=None): + type_ids = self.pool.get('hr.contract.type').search(cr, uid, [('name', '=', 'Employee')]) + return type_ids and type_ids[0] or False + _defaults = { 'date_start': lambda *a: time.strftime("%Y-%m-%d"), + 'type_id': _get_type } def _check_dates(self, cr, uid, ids, context=None): @@ -123,9 +99,6 @@ class hr_contract(osv.osv): _constraints = [ (_check_dates, 'Error! contract start-date must be lower then contract end-date.', ['date_start', 'date_end']) ] - - - hr_contract() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_contract/hr_contract_data.xml b/addons/hr_contract/hr_contract_data.xml index 6e7aca57d67..97200910188 100644 --- a/addons/hr_contract/hr_contract_data.xml +++ b/addons/hr_contract/hr_contract_data.xml @@ -1,43 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data noupdate="1"> - - <!-- Contract Period Names --> - <record id="hr_contract_wage_type_period_daily" model="hr.contract.wage.type.period"> - <field name="name">daily</field> - </record> - <record id="hr_contract_wage_type_period_weekly" model="hr.contract.wage.type.period"> - <field name="name">weekly</field> - </record> - <record id="hr_contract_wage_type_period_monthly" model="hr.contract.wage.type.period"> - <field name="name">monthly</field> - </record> - - <!-- Contract Wage Types --> - <record id="hr_contract_monthly_gross" model="hr.contract.wage.type"> - <field name="name">Monthly Gross Wage</field> - <field name="type">gross</field> - <field name="period_id" ref="hr_contract_wage_type_period_monthly"/> - </record> - <record id="hr_contract_monthly_net" model="hr.contract.wage.type"> - <field name="name">Monthly Net Wage</field> - <field name="type">net</field> - <field name="period_id" ref="hr_contract_wage_type_period_monthly"/> - </record> - - <!-- Contract Types --> + <!-- Contract Types --> <record id="hr_contract_type_emp" model="hr.contract.type"> <field name="name">Employee</field> - </record> - + </record> + <record id="hr_contract_type_wrkr" model="hr.contract.type"> <field name="name">Worker</field> - </record> - + </record> + <record id="hr_contract_type_sub" model="hr.contract.type"> <field name="name">Subcontractor</field> - </record> - + </record> + </data> </openerp> diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index 36b9be1ac30..cfccd8912dc 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -2,100 +2,7 @@ <openerp> <data> - <record id="hr_contract_wage_type_view_form" model="ir.ui.view"> - <field name="name">hr.contract.wage.type.view.form</field> - <field name="model">hr.contract.wage.type</field> - <field name="type">form</field> - <field name="arch" type="xml"> - <form string="Wage Type"> - <field colspan="4" name="name"/> - <field name="period_id" widget="selection"/> - <field name="type"/> - <separator colspan="4" string="Hourly cost computation"/> - <field name="factor_type"/> - </form> - </field> - </record> - - <record id="hr_contract_wage_type_view_tree" model="ir.ui.view"> - <field name="name">hr.contract.wage.type.view.tree</field> - <field name="model">hr.contract.wage.type</field> - <field name="type">tree</field> - <field name="arch" type="xml"> - <tree string="Wage Types"> - <field name="name"/> - <field name="type"/> - <field name="period_id" invisible="1"/> - </tree> - </field> - </record> - - <record id="hr_contract_wage_type_view_search" model="ir.ui.view"> - <field name="name">hr.contract.wage.type.view.search</field> - <field name="model">hr.contract.wage.type</field> - <field name="type">search</field> - <field name="arch" type="xml"> - <search string="Search Wage Type"> - <group col='15' colspan='4'> - <field name="name"/> - <field name="type"/> - </group> - <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> - <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/> - </group> - </search> - </field> - </record> - - <record id="action_hr_contract_wage_type" model="ir.actions.act_window"> - <field name="name">Wage Type</field> - <field name="res_model">hr.contract.wage.type</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="domain">[]</field> - <field name="search_view_id" ref="hr_contract_wage_type_view_search"/> - </record> - <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/> - <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56" sequence="7"/> - - <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view"> - <field name="name">hr.contract.wage.type.period.view.form</field> - <field name="model">hr.contract.wage.type.period</field> - <field name="type">form</field> - <field name="arch" type="xml"> - <form string="Wage Period"> - <field colspan="4" name="name"/> - <field name="factor_days"/> - </form> - </field> - </record> - - <record id="hr_contract_wage_type_period_view_search" model="ir.ui.view"> - <field name="name">hr.contract.wage.type.period.view.search</field> - <field name="model">hr.contract.wage.type.period</field> - <field name="type">search</field> - <field name="arch" type="xml"> - <search string="Search Wage Period"> - <group col='15' colspan='4'> - <field name="name"/> - </group> - </search> - </field> - </record> - - <record id="action_hr_contract_wage_type_period" model="ir.actions.act_window"> - <field name="name">Wage period</field> - <field name="res_model">hr.contract.wage.type.period</field> - <field name="view_type">form</field> - <field name="domain">[]</field> - <field name="search_view_id" ref="hr_contract_wage_type_period_view_search"/> - </record> - - <menuitem action="action_hr_contract_wage_type_period" id="hr_menu_contract_wage_type_period" - parent="hr_contract.next_id_56" sequence="8"/> - <menuitem action="resource.action_resource_calendar_form" name="Working Schedules" id="hr_menu_working_time_type" parent="hr_contract.next_id_56" sequence="9"/> <record id="hr_hr_employee_view_form2" model="ir.ui.view"> <field name="name">hr.hr.employee.view.form2</field> <field name="model">hr.employee</field> @@ -132,9 +39,9 @@ <field name="arch" type="xml"> <search string="Search Contract"> <group col='15' colspan='4'> - <filter string="Current" icon="terp-check" name="current" domain="['|',('date_end','>=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/> - <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','<', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/> - <separator orientation="vertical"/> + <filter string="Current" icon="terp-check" name="current" domain="['|',('date_end','>=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/> + <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','<', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/> + <separator orientation="vertical"/> <field name="name"/> <field name="employee_id"/> <field name="working_hours"/> @@ -143,11 +50,11 @@ </group> <newline/> <group expand="0" string="Group By..." colspan="4" col="20"> - <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> - <separator orientation="vertical"/> + <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> + <separator orientation="vertical"/> <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/> <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/> - <separator orientation="vertical"/> + <separator orientation="vertical"/> <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/> </group> </search> @@ -161,34 +68,38 @@ <field name="arch" type="xml"> <form string="Contract"> <group colspan="3" col="6"> - <field name="name" /> - <field name="employee_id" /> - <field name="job_id"/> - <field name="wage"/> - <field name="wage_type_id" widget="selection"/> - <field name="type_id" widget="selection"/> + <field name="name" /> + <field name="employee_id" /> + <field name="job_id"/> + <field name="wage"/> + <field name="type_id" widget="selection"/> </group> <notebook> - <page string="Information"> - <group col="2" colspan="2"> - <separator colspan="2" string="Duration"/> - <field name="date_start" /> - <field name="date_end" /> - <field name="working_hours"/> - <separator colspan="2" string="Trial Period"/> - <field name="trial_date_start" /> - <field name="trial_date_end" /> - </group> - <group col="2" colspan="2"> - <separator colspan="2" string="Advantages"/> - <field name="advantages_net"/> - <field name="advantages_gross"/> - <separator colspan="2" string="Advantages Notes"/> - <field name="advantages" nolabel="1" colspan="2"/> + <page string="Information" name="information"> + <group col="2" colspan="2" name="left_column"> + <separator colspan="2" string="Duration"/> + <field name="date_start" /> + <field name="date_end" /> + <field name="working_hours"/> + <separator colspan="2" string="Trial Period"/> + <field name="trial_date_start" /> + <field name="trial_date_end" /> + </group> + <group col="2" colspan="2" name="right_column"> + <separator name="advantages" colspan="2" string="Advantages"/> + <field name="advantages" nolabel="1" colspan="2"/> </group> <separator colspan="4" string="Notes"/> <field colspan="4" name="notes" nolabel="1"/> </page> + <page string="Work Permit"> + <group col="2" colspan="2"> + <separator colspan="2" string="Valid for"/> + <field name="visa_no"/> + <field name="permit_no"/> + <field name="visa_expire"/> + </group> + </page> </notebook> </form> </field> @@ -204,11 +115,9 @@ <field name="employee_id"/> <field name="type_id"/> <field name="job_id"/> - <!--field name="department_id"/--> - <field name="working_hours"/> + <field name="working_hours"/> <field name="date_start"/> <field name="date_end"/> - <field name="wage_type_id" invisible="1"/> <field name="wage" invisible="1"/> </tree> </field> @@ -271,11 +180,12 @@ <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager"/> <!-- Contracts Button on Employee Form --> - <act_window + + <act_window context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}" - id="act_hr_employee_2_hr_contract" - name="Contracts" - res_model="hr.contract" + id="act_hr_employee_2_hr_contract" + name="Contracts" + res_model="hr.contract" src_model="hr.employee" groups="base.group_hr_manager"/> diff --git a/addons/hr_contract/i18n/ar.po b/addons/hr_contract/i18n/ar.po index eeac51a03e0..49d9ff1f25e 100644 --- a/addons/hr_contract/i18n/ar.po +++ b/addons/hr_contract/i18n/ar.po @@ -7,24 +7,24 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-08-03 05:39+0000\n" -"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n" +"PO-Revision-Date: 2011-06-18 11:23+0000\n" +"Last-Translator: kifcaliph <kifcaliph@hotmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:26+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 msgid "Hourly cost computation" -msgstr "" +msgstr "حساب تكلفة الساعة" #. module: hr_contract #: selection:hr.contract.wage.type,type:0 msgid "Gross" -msgstr "" +msgstr "الإجمالي" #. module: hr_contract #: view:hr.contract:0 diff --git a/addons/hr_contract/i18n/bg.po b/addons/hr_contract/i18n/bg.po index be94b139522..8bb44c985d6 100644 --- a/addons/hr_contract/i18n/bg.po +++ b/addons/hr_contract/i18n/bg.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:26+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/bs.po b/addons/hr_contract/i18n/bs.po index 957a60a9f95..d227d4f54bb 100644 --- a/addons/hr_contract/i18n/bs.po +++ b/addons/hr_contract/i18n/bs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:26+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/ca.po b/addons/hr_contract/i18n/ca.po index 0844390295c..75e492805e0 100644 --- a/addons/hr_contract/i18n/ca.po +++ b/addons/hr_contract/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:26+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/cs.po b/addons/hr_contract/i18n/cs.po index 69359d59783..ff63ed93a37 100644 --- a/addons/hr_contract/i18n/cs.po +++ b/addons/hr_contract/i18n/cs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:26+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/de.po b/addons/hr_contract/i18n/de.po index c530a10d2fa..aa61e8af21d 100644 --- a/addons/hr_contract/i18n/de.po +++ b/addons/hr_contract/i18n/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:26+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -445,44 +445,5 @@ msgstr "Suche Vertragstyp" #~ msgid "Contract Duration" #~ msgstr "Vertragslaufzeit" -#~ msgid "Calculations" -#~ msgstr "Kalkulation" - -#~ msgid "Function Arguments" -#~ msgstr "Funktion Argumente" - -#~ msgid "Error ! You can not create recursive Menu." -#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen." - #~ msgid "Invalid model name in the action definition." #~ msgstr "Ungültiger Modulname in der Aktionsdefinition." - -#~ msgid "Description" -#~ msgstr "Beschreibung" - -#~ msgid "Payslip Line" -#~ msgstr "Abrechnungsposition" - -#~ msgid "Salary Computation" -#~ msgstr "Berechnung Vergütung" - -#~ msgid "Employee specific allowances and deductions" -#~ msgstr "Mitarbeiter Zulagen und Abzüge" - -#~ msgid "Contract Details" -#~ msgstr "Vertragsdetails" - -#~ msgid "Salary Structure" -#~ msgstr "Vergütungsstruktur" - -#~ msgid "Size of the field can never be less than 1 !" -#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !" - -#~ msgid "The name of the module must be unique !" -#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !" - -#~ msgid "The certificate ID of the module must be unique !" -#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !" - -#~ msgid "Company contribution" -#~ msgstr "Arbeitgeberanteile" diff --git a/addons/hr_contract/i18n/el.po b/addons/hr_contract/i18n/el.po index 7768182ea5b..13144cbdacc 100644 --- a/addons/hr_contract/i18n/el.po +++ b/addons/hr_contract/i18n/el.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:26+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" "X-Poedit-SourceCharset: utf-8\n" @@ -388,9 +388,6 @@ msgstr "" #~ msgid "Number of children" #~ msgstr "Αριθμός τέκνων" -#~ msgid "Social security number" -#~ msgstr "Αρ. Κοινωνικής Ασφάλισης" - #~ msgid "Function" #~ msgstr "Λειτουργία" @@ -415,9 +412,6 @@ msgstr "" #~ msgid "Invalid XML for View Architecture!" #~ msgstr "Invalid XML for View Architecture!" -#~ msgid "Nationality" -#~ msgstr "Εθνικότητα" - #~ msgid "AUDIENS Number" #~ msgstr "AUDIENS Number" @@ -439,8 +433,5 @@ msgstr "" #~ msgid "Status Description" #~ msgstr "Περιγραφή Κατάστασης" -#~ msgid "Birth Date" -#~ msgstr "Ημερ/νία Γέννησης" - #~ msgid "Invalid model name in the action definition." #~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας" diff --git a/addons/hr_contract/i18n/es.po b/addons/hr_contract/i18n/es.po index 02044a1b28e..dd8fd78a462 100644 --- a/addons/hr_contract/i18n/es.po +++ b/addons/hr_contract/i18n/es.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -440,47 +440,8 @@ msgstr "Buscar tipo contrato" #~ msgid "Invalid model name in the action definition." #~ msgstr "Nombre de modelo no válido en la definición de acción." -#~ msgid "Salary Structure" -#~ msgstr "Estructura salarial" - -#~ msgid "Contract Details" -#~ msgstr "Detalles del contrato" - -#~ msgid "Calculations" -#~ msgstr "Cálculos" - -#~ msgid "Error ! You can not create recursive Menu." -#~ msgstr "¡Error! No puede crear menús recursivos." - -#~ msgid "Description" -#~ msgstr "Descripción" - #~ msgid "Function" #~ msgstr "Cargo" #~ msgid "Invalid XML for View Architecture!" #~ msgstr "¡XML no válido para la estructura de la vista!" - -#~ msgid "Payslip Line" -#~ msgstr "Línea de nómina" - -#~ msgid "Company contribution" -#~ msgstr "Contribución compañía" - -#~ msgid "Salary Computation" -#~ msgstr "Cálculo del salario" - -#~ msgid "Employee specific allowances and deductions" -#~ msgstr "Subsidios y deducciones específicos del empleado" - -#~ msgid "Size of the field can never be less than 1 !" -#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!" - -#~ msgid "The certificate ID of the module must be unique !" -#~ msgstr "¡El ID del certificado del módulo debe ser único!" - -#~ msgid "The name of the module must be unique !" -#~ msgstr "¡El nombre del módulo debe ser único!" - -#~ msgid "Function Arguments" -#~ msgstr "Argumentos de la función" diff --git a/addons/hr_contract/i18n/es_AR.po b/addons/hr_contract/i18n/es_AR.po index 6ca6072a8c5..492b27a28f1 100644 --- a/addons/hr_contract/i18n/es_AR.po +++ b/addons/hr_contract/i18n/es_AR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/es_EC.po b/addons/hr_contract/i18n/es_EC.po index b2a4d6b082c..d6138d2115f 100644 --- a/addons/hr_contract/i18n/es_EC.po +++ b/addons/hr_contract/i18n/es_EC.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/es_PY.po b/addons/hr_contract/i18n/es_PY.po index 784d41e2b1c..f0b4ffc7d28 100644 --- a/addons/hr_contract/i18n/es_PY.po +++ b/addons/hr_contract/i18n/es_PY.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/et.po b/addons/hr_contract/i18n/et.po index 2b29dccf23b..64b1b508273 100644 --- a/addons/hr_contract/i18n/et.po +++ b/addons/hr_contract/i18n/et.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:26+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/fi.po b/addons/hr_contract/i18n/fi.po index b7a4e15f276..1b0572b54a9 100644 --- a/addons/hr_contract/i18n/fi.po +++ b/addons/hr_contract/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:26+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -30,27 +30,27 @@ msgstr "Brutto" #. module: hr_contract #: view:hr.contract:0 msgid "Trial Period" -msgstr "" +msgstr "Koeaika" #. module: hr_contract #: field:hr.contract,trial_date_start:0 msgid "Trial Start Date" -msgstr "" +msgstr "Koeajan alkupäivä" #. module: hr_contract #: view:hr.contract:0 msgid "Passport" -msgstr "" +msgstr "Passi" #. module: hr_contract #: view:hr.employee:0 msgid "Medical Examination" -msgstr "" +msgstr "Lääkärintarkastus" #. module: hr_contract #: field:hr.employee,vehicle:0 msgid "Company Vehicle" -msgstr "" +msgstr "Yrityksen ajoneuvo" #. module: hr_contract #: field:hr.contract.wage.type,name:0 @@ -60,12 +60,12 @@ msgstr "Palkkatyypin nimi" #. module: hr_contract #: view:hr.employee:0 msgid "Miscellaneous" -msgstr "" +msgstr "Sekalaiset" #. module: hr_contract #: view:hr.contract:0 msgid "Current" -msgstr "" +msgstr "Nykyinen" #. module: hr_contract #: field:hr.contract.wage.type,factor_type:0 @@ -75,7 +75,7 @@ msgstr "Tuntimaksun kerroin" #. module: hr_contract #: view:hr.contract:0 msgid "Overpassed" -msgstr "" +msgstr "Ylitetty" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -85,24 +85,24 @@ msgstr "Palkkatyypit" #. module: hr_contract #: field:hr.contract,department_id:0 msgid "Department" -msgstr "" +msgstr "Osasto" #. module: hr_contract #: selection:hr.contract.wage.type,type:0 msgid "Basic" -msgstr "" +msgstr "Perus" #. module: hr_contract #: view:hr.contract:0 #: field:hr.contract,employee_id:0 #: model:ir.model,name:hr_contract.model_hr_employee msgid "Employee" -msgstr "" +msgstr "Työntekijä" #. module: hr_contract #: selection:hr.contract.wage.type,type:0 msgid "Net" -msgstr "" +msgstr "Netto" #. module: hr_contract #: model:ir.module.module,shortdesc:hr_contract.module_meta_information @@ -117,7 +117,7 @@ msgstr "Tunnit ajanjaksolla" #. module: hr_contract #: field:hr.employee,vehicle_distance:0 msgid "Home-Work Distance" -msgstr "" +msgstr "Työmatkan pituus" #. module: hr_contract #: view:hr.contract:0 @@ -131,27 +131,27 @@ msgstr "Sopimukset" #. module: hr_contract #: view:hr.employee:0 msgid "Personal Info" -msgstr "" +msgstr "Henkilötiedot" #. module: hr_contract #: view:hr.contract:0 msgid "Job" -msgstr "" +msgstr "Tehtävä" #. module: hr_contract #: view:hr.contract:0 msgid "Search Contract" -msgstr "" +msgstr "Hae sopimusta" #. module: hr_contract #: help:hr.employee,contract_id:0 msgid "Latest contract of the employee" -msgstr "" +msgstr "Työntekijän viimeisin sopimus" #. module: hr_contract #: field:hr.contract,advantages_net:0 msgid "Deductions" -msgstr "" +msgstr "Vähennykset" #. module: hr_contract #: model:ir.module.module,description:hr_contract.module_meta_information @@ -169,28 +169,28 @@ msgstr "" #: view:hr.contract:0 #: field:hr.contract,advantages:0 msgid "Advantages" -msgstr "" +msgstr "Edut" #. module: hr_contract #: view:hr.contract:0 msgid "Valid for" -msgstr "" +msgstr "Voimassa" #. module: hr_contract #: view:hr.contract:0 msgid "Work Permit" -msgstr "" +msgstr "Työlupa" #. module: hr_contract #: field:hr.employee,children:0 msgid "Number of Children" -msgstr "" +msgstr "Lasten lukumäärä" #. module: hr_contract #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type msgid "Contract Types" -msgstr "" +msgstr "Sopimustyypit" #. module: hr_contract #: field:hr.contract,wage_type_id:0 @@ -204,12 +204,12 @@ msgstr "Palkkatyyppi" #. module: hr_contract #: constraint:hr.employee:0 msgid "Error ! You cannot create recursive Hierarchy of Employees." -msgstr "" +msgstr "Virhe! Et voi luoda itseään toistavaa työntekijähierarkiaa." #. module: hr_contract #: field:hr.contract,date_end:0 msgid "End Date" -msgstr "" +msgstr "Loppupvm" #. module: hr_contract #: field:hr.contract,wage:0 @@ -219,24 +219,24 @@ msgstr "Palkka" #. module: hr_contract #: field:hr.contract,name:0 msgid "Contract Reference" -msgstr "" +msgstr "Sopimuksen viite" #. module: hr_contract #: help:hr.employee,vehicle_distance:0 msgid "In kilometers" -msgstr "" +msgstr "kilometreinä" #. module: hr_contract #: view:hr.contract:0 #: field:hr.contract,notes:0 msgid "Notes" -msgstr "" +msgstr "Huomautukset" #. module: hr_contract #: constraint:hr.employee:0 msgid "" "Error ! You cannot select a department for which the employee is the manager." -msgstr "" +msgstr "Virhe! Osastoa, jolla työntekijä on esimiehenä, ei voi valita." #. module: hr_contract #: view:hr.contract:0 @@ -244,7 +244,7 @@ msgstr "" #: model:ir.model,name:hr_contract.model_hr_contract #: model:ir.ui.menu,name:hr_contract.next_id_56 msgid "Contract" -msgstr "" +msgstr "Sopimus" #. module: hr_contract #: view:hr.contract:0 @@ -258,18 +258,18 @@ msgstr "Sopimustyyppi" #. module: hr_contract #: view:hr.contract.wage.type.period:0 msgid "Search Wage Period" -msgstr "" +msgstr "Hae palkkajaksoa" #. module: hr_contract #: view:hr.contract:0 #: field:hr.contract,working_hours:0 msgid "Working Schedule" -msgstr "" +msgstr "Työaikataulu" #. module: hr_contract #: view:hr.employee:0 msgid "Job Info" -msgstr "" +msgstr "Tehtävän tiedot" #. module: hr_contract #: field:hr.contract.wage.type,period_id:0 @@ -281,43 +281,44 @@ msgstr "Palkkajakso" #. module: hr_contract #: field:hr.contract,job_id:0 msgid "Job Title" -msgstr "" +msgstr "Tehtävänimike" #. module: hr_contract #: field:hr.employee,manager:0 msgid "Is a Manager" -msgstr "" +msgstr "On päällikkö" #. module: hr_contract #: field:hr.contract,date_start:0 msgid "Start Date" -msgstr "" +msgstr "Aloituspvm" #. module: hr_contract #: constraint:hr.contract:0 msgid "Error! contract start-date must be lower then contract end-date." msgstr "" +"Virhe! Sopimuksen alkupäivän täytyy olla aikaisempi kuin loppupäivän." #. module: hr_contract #: view:hr.contract.wage.type:0 msgid "Search Wage Type" -msgstr "" +msgstr "Hae palkan tyyppiä" #. module: hr_contract #: field:hr.contract.wage.type,type:0 msgid "Type" -msgstr "" +msgstr "Tyyppi" #. module: hr_contract #: field:hr.contract,trial_date_end:0 msgid "Trial End Date" -msgstr "" +msgstr "Koeajan loppupäivä" #. module: hr_contract #: view:hr.contract:0 #: view:hr.contract.wage.type:0 msgid "Group By..." -msgstr "" +msgstr "Ryhmittely.." #. module: hr_contract #: field:hr.contract.wage.type.period,name:0 @@ -327,7 +328,7 @@ msgstr "Ajanjakson nimi" #. module: hr_contract #: view:hr.contract.wage.type:0 msgid "Period" -msgstr "" +msgstr "Jakso" #. module: hr_contract #: field:hr.employee,place_of_birth:0 @@ -353,27 +354,27 @@ msgstr "" #. module: hr_contract #: view:hr.contract:0 msgid "Duration" -msgstr "" +msgstr "Kesto" #. module: hr_contract #: field:hr.employee,medic_exam:0 msgid "Medical Examination Date" -msgstr "" +msgstr "Lääkärintarkastuksen päivämäärä" #. module: hr_contract #: field:hr.contract,advantages_gross:0 msgid "Allowances" -msgstr "" +msgstr "Päiväraha" #. module: hr_contract #: view:hr.contract:0 msgid "Main Data" -msgstr "" +msgstr "Päätiedot" #. module: hr_contract #: view:hr.contract.type:0 msgid "Search Contract Type" -msgstr "" +msgstr "Hae sopimustyyppiä" #~ msgid "Number of children" #~ msgstr "Lasten lukumäärä" diff --git a/addons/hr_contract/i18n/fr.po b/addons/hr_contract/i18n/fr.po index 8c516413b2b..d2b754c5d5a 100644 --- a/addons/hr_contract/i18n/fr.po +++ b/addons/hr_contract/i18n/fr.po @@ -8,13 +8,13 @@ msgstr "" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" "PO-Revision-Date: 2011-01-13 08:56+0000\n" -"Last-Translator: Quentin THEURET <quentin@theuret.net>\n" +"Last-Translator: Quentin THEURET <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:26+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -445,30 +445,3 @@ msgstr "Rechercher dans les types de contrat" #~ msgid "AUDIENS Number" #~ msgstr "Numéro AUDIENS" - -#~ msgid "Calculations" -#~ msgstr "Calculs" - -#~ msgid "Function Arguments" -#~ msgstr "Arguments de la fonction" - -#~ msgid "Description" -#~ msgstr "Description" - -#~ msgid "Payslip Line" -#~ msgstr "Ligne de feuille de paye" - -#~ msgid "Salary Computation" -#~ msgstr "Calcul du salaire" - -#~ msgid "Contract Details" -#~ msgstr "Détails du contrat" - -#~ msgid "Salary Structure" -#~ msgstr "Structure salariale" - -#~ msgid "Employee specific allowances and deductions" -#~ msgstr "Allocations et déductions spécifiques de l'employé" - -#~ msgid "Company contribution" -#~ msgstr "Contribution de la société" diff --git a/addons/hr_contract/i18n/gl.po b/addons/hr_contract/i18n/gl.po index 20d719abf64..33e538e35bb 100644 --- a/addons/hr_contract/i18n/gl.po +++ b/addons/hr_contract/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:26+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/hi.po b/addons/hr_contract/i18n/hi.po index c9b73e19c44..e157b123603 100644 --- a/addons/hr_contract/i18n/hi.po +++ b/addons/hr_contract/i18n/hi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:26+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/hr.po b/addons/hr_contract/i18n/hr.po index 09148550d28..3110b93249d 100644 --- a/addons/hr_contract/i18n/hr.po +++ b/addons/hr_contract/i18n/hr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/hu.po b/addons/hr_contract/i18n/hu.po index 595e23b3586..fc0db576b10 100644 --- a/addons/hr_contract/i18n/hu.po +++ b/addons/hr_contract/i18n/hu.po @@ -8,13 +8,14 @@ msgstr "" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" "PO-Revision-Date: 2011-02-03 17:24+0000\n" -"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n" +"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) " +"<openerp@novotrade.hu>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/id.po b/addons/hr_contract/i18n/id.po index c4e37cc5833..4c5636280a5 100644 --- a/addons/hr_contract/i18n/id.po +++ b/addons/hr_contract/i18n/id.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/it.po b/addons/hr_contract/i18n/it.po index a7463a66e27..fbb16ec90aa 100644 --- a/addons/hr_contract/i18n/it.po +++ b/addons/hr_contract/i18n/it.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -443,21 +443,3 @@ msgstr "Cerca tipo contratto" #~ msgid "Invalid model name in the action definition." #~ msgstr "Nome modello non valido nella definizione dell'azione." - -#~ msgid "Function Arguments" -#~ msgstr "Argomenti funzione" - -#~ msgid "Description" -#~ msgstr "Descrizione" - -#~ msgid "Salary Computation" -#~ msgstr "Calcolo stipendio" - -#~ msgid "Contract Details" -#~ msgstr "Dettagli contratto" - -#~ msgid "Salary Structure" -#~ msgstr "Struttura stipendio" - -#~ msgid "Calculations" -#~ msgstr "Calcoli" diff --git a/addons/hr_contract/i18n/ko.po b/addons/hr_contract/i18n/ko.po index b265c0d350a..c5f14e3271d 100644 --- a/addons/hr_contract/i18n/ko.po +++ b/addons/hr_contract/i18n/ko.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/lo.po b/addons/hr_contract/i18n/lo.po index d6b9e240fa9..ca1c0736c04 100644 --- a/addons/hr_contract/i18n/lo.po +++ b/addons/hr_contract/i18n/lo.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/lt.po b/addons/hr_contract/i18n/lt.po index 0bb6cae32e8..ff63ed93a37 100644 --- a/addons/hr_contract/i18n/lt.po +++ b/addons/hr_contract/i18n/lt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/lv.po b/addons/hr_contract/i18n/lv.po index 27c299951b3..27ce6dffd09 100644 --- a/addons/hr_contract/i18n/lv.po +++ b/addons/hr_contract/i18n/lv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/mn.po b/addons/hr_contract/i18n/mn.po index 6406eb8df61..d5eacadd81e 100644 --- a/addons/hr_contract/i18n/mn.po +++ b/addons/hr_contract/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -434,33 +434,3 @@ msgstr "Гэрээний төрлийг хайх" #~ msgid "Invalid XML for View Architecture!" #~ msgstr "Дэлгэцийн XML алдаатай!" - -#~ msgid "Calculations" -#~ msgstr "Тооцоолол" - -#~ msgid "Error ! You can not create recursive Menu." -#~ msgstr "Алдаа! Рекурс цэсийг үүсгэж болохгүй" - -#~ msgid "Function Arguments" -#~ msgstr "Функцийн хувьсагчууд" - -#~ msgid "Description" -#~ msgstr "Тайлбар" - -#~ msgid "Payslip Line" -#~ msgstr "Цалингийн хуудасны мөр" - -#~ msgid "Company contribution" -#~ msgstr "Ажил олгогчийн төлөх шимтгэл" - -#~ msgid "Salary Computation" -#~ msgstr "Цалингийн тооцоолол" - -#~ msgid "Employee specific allowances and deductions" -#~ msgstr "Ажилтанд бүрт онцлог олголт, суутгалууд" - -#~ msgid "Contract Details" -#~ msgstr "Гэрээний дэлгэрэнгүй" - -#~ msgid "Salary Structure" -#~ msgstr "Цалингийн шатлал" diff --git a/addons/hr_contract/i18n/nl.po b/addons/hr_contract/i18n/nl.po index 2f121dea10b..3dc097ff6a1 100644 --- a/addons/hr_contract/i18n/nl.po +++ b/addons/hr_contract/i18n/nl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:26+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -441,42 +441,3 @@ msgstr "Contractsoort zoeken" #~ msgid "Contract Duration" #~ msgstr "Contractduur" - -#~ msgid "Calculations" -#~ msgstr "Berekeningen" - -#~ msgid "Error ! You can not create recursive Menu." -#~ msgstr "Fout ! U kunt geen recursief menu maken." - -#~ msgid "Function Arguments" -#~ msgstr "Functie argumenten" - -#~ msgid "Description" -#~ msgstr "Omschrijving" - -#~ msgid "Payslip Line" -#~ msgstr "Loonstrookregel" - -#~ msgid "Company contribution" -#~ msgstr "Bedrijfsbijdrage" - -#~ msgid "Salary Computation" -#~ msgstr "Loonberekening" - -#~ msgid "Employee specific allowances and deductions" -#~ msgstr "Medewerkersgebonden toelages en inhoudingen" - -#~ msgid "Contract Details" -#~ msgstr "Details contract" - -#~ msgid "Salary Structure" -#~ msgstr "Beloningsstructuur" - -#~ msgid "The name of the module must be unique !" -#~ msgstr "De modulenaam moet uniek zijn !" - -#~ msgid "Size of the field can never be less than 1 !" -#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !" - -#~ msgid "The certificate ID of the module must be unique !" -#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !" diff --git a/addons/hr_contract/i18n/nl_BE.po b/addons/hr_contract/i18n/nl_BE.po index 26f8819b364..7b2f539855f 100644 --- a/addons/hr_contract/i18n/nl_BE.po +++ b/addons/hr_contract/i18n/nl_BE.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/pl.po b/addons/hr_contract/i18n/pl.po index d444d23bad2..881c4faeee7 100644 --- a/addons/hr_contract/i18n/pl.po +++ b/addons/hr_contract/i18n/pl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/pt.po b/addons/hr_contract/i18n/pt.po index ccce1d2ec52..8a42aa22733 100644 --- a/addons/hr_contract/i18n/pt.po +++ b/addons/hr_contract/i18n/pt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -29,12 +29,12 @@ msgstr "Bruto" #. module: hr_contract #: view:hr.contract:0 msgid "Trial Period" -msgstr "Período de teste" +msgstr "Período experimental" #. module: hr_contract #: field:hr.contract,trial_date_start:0 msgid "Trial Start Date" -msgstr "" +msgstr "Início período experimental" #. module: hr_contract #: view:hr.contract:0 @@ -64,7 +64,7 @@ msgstr "Diversos" #. module: hr_contract #: view:hr.contract:0 msgid "Current" -msgstr "Actual" +msgstr "Atual" #. module: hr_contract #: field:hr.contract.wage.type,factor_type:0 @@ -74,7 +74,7 @@ msgstr "Factor de custo por hora" #. module: hr_contract #: view:hr.contract:0 msgid "Overpassed" -msgstr "" +msgstr "Caducado" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -89,7 +89,7 @@ msgstr "Departamento" #. module: hr_contract #: selection:hr.contract.wage.type,type:0 msgid "Basic" -msgstr "" +msgstr "Base" #. module: hr_contract #: view:hr.contract:0 @@ -145,7 +145,7 @@ msgstr "Procurar contrato" #. module: hr_contract #: help:hr.employee,contract_id:0 msgid "Latest contract of the employee" -msgstr "Último contrato do empregado" +msgstr "Último contrato do funcionário" #. module: hr_contract #: field:hr.contract,advantages_net:0 @@ -163,6 +163,14 @@ msgid "" " You can assign several contracts per employee.\n" " " msgstr "" +"\n" +" Agregar todos os dados para a gestão de contratos:\n" +" * Estado civil\n" +" * Número de segurança social\n" +" * Local e data de nascimento\n" +" * etc.\n" +" É possível associar vários contratos ao mesmo funcionário.\n" +" " #. module: hr_contract #: view:hr.contract:0 @@ -173,7 +181,7 @@ msgstr "Vantagens" #. module: hr_contract #: view:hr.contract:0 msgid "Valid for" -msgstr "" +msgstr "Válido por" #. module: hr_contract #: view:hr.contract:0 @@ -208,7 +216,7 @@ msgstr "Erro! Não pode criar hierarquias de funcionários recursivamente." #. module: hr_contract #: field:hr.contract,date_end:0 msgid "End Date" -msgstr "Data de Final" +msgstr "Data de fim" #. module: hr_contract #: field:hr.contract,wage:0 @@ -218,7 +226,7 @@ msgstr "Salário" #. module: hr_contract #: field:hr.contract,name:0 msgid "Contract Reference" -msgstr "" +msgstr "Ref.ª Contrato" #. module: hr_contract #: help:hr.employee,vehicle_distance:0 @@ -236,7 +244,7 @@ msgstr "Notas" msgid "" "Error ! You cannot select a department for which the employee is the manager." msgstr "" -"Erro! Não pode seleccionar um departamento cujo gestor é o empregado." +"Erro ! Não pode seleccionar um departamento cujo gestor é o funcionário." #. module: hr_contract #: view:hr.contract:0 @@ -258,7 +266,7 @@ msgstr "Tipo de Contrato" #. module: hr_contract #: view:hr.contract.wage.type.period:0 msgid "Search Wage Period" -msgstr "" +msgstr "Procurar período de pagamento de salários" #. module: hr_contract #: view:hr.contract:0 @@ -269,7 +277,7 @@ msgstr "Horário de trabalho" #. module: hr_contract #: view:hr.employee:0 msgid "Job Info" -msgstr "" +msgstr "Informações sobre o cargo" #. module: hr_contract #: field:hr.contract.wage.type,period_id:0 @@ -291,12 +299,12 @@ msgstr "É gerente" #. module: hr_contract #: field:hr.contract,date_start:0 msgid "Start Date" -msgstr "Data de Início" +msgstr "Data de início" #. module: hr_contract #: constraint:hr.contract:0 msgid "Error! contract start-date must be lower then contract end-date." -msgstr "" +msgstr "Erro! Data de início do contrato deve ser anterior à data de fim." #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -311,7 +319,7 @@ msgstr "Tipo" #. module: hr_contract #: field:hr.contract,trial_date_end:0 msgid "Trial End Date" -msgstr "" +msgstr "Fim do período experimental" #. module: hr_contract #: view:hr.contract:0 @@ -322,7 +330,7 @@ msgstr "Agrupar por..." #. module: hr_contract #: field:hr.contract.wage.type.period,name:0 msgid "Period Name" -msgstr "Nome do Período" +msgstr "Nome do período" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -332,13 +340,13 @@ msgstr "Período" #. module: hr_contract #: field:hr.employee,place_of_birth:0 msgid "Place of Birth" -msgstr "Local de Nascimento" +msgstr "Local de nascimento" #. module: hr_contract #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period msgid "Wage period" -msgstr "Período Salarial" +msgstr "Período salarial" #. module: hr_contract #: help:hr.contract.wage.type,factor_type:0 @@ -347,8 +355,8 @@ msgid "" "This field is used by the timesheet system to compute the price of an hour " "of work wased on the contract of the employee" msgstr "" -"Este campo é utilizado pelo sistema de horário para calcular o preço de uma " -"hora de trabalho baseado no contrato do funcionário" +"Este campo é utilizado pelas folhas de trabalho para calcular o preço de uma " +"hora de trabalho cok base no contrato do funcionário" #. module: hr_contract #: view:hr.contract:0 @@ -363,12 +371,12 @@ msgstr "Data do exame médico" #. module: hr_contract #: field:hr.contract,advantages_gross:0 msgid "Allowances" -msgstr "" +msgstr "Abonos" #. module: hr_contract #: view:hr.contract:0 msgid "Main Data" -msgstr "" +msgstr "Dados principais" #. module: hr_contract #: view:hr.contract.type:0 @@ -434,33 +442,3 @@ msgstr "Procurar o tipo de contrato" #~ msgid "Contract Duration" #~ msgstr "Duração do Contrato" - -#~ msgid "The certificate ID of the module must be unique !" -#~ msgstr "O ID do certificado do módulo tem de ser único!" - -#~ msgid "Calculations" -#~ msgstr "Cálculos" - -#~ msgid "Error ! You can not create recursive Menu." -#~ msgstr "Erro ! Não pode criar menus recursivos" - -#~ msgid "Description" -#~ msgstr "Descrição" - -#~ msgid "The name of the module must be unique !" -#~ msgstr "O nome do módulo deve ser único!" - -#~ msgid "Size of the field can never be less than 1 !" -#~ msgstr "O tamanho do campo não pode ser inferior a 1 !" - -#~ msgid "Salary Structure" -#~ msgstr "Estrutura do salário" - -#~ msgid "Salary Computation" -#~ msgstr "Cálculo de salário" - -#~ msgid "Company contribution" -#~ msgstr "Contribuição da empresa" - -#~ msgid "Contract Details" -#~ msgstr "Detalhes do contrato" diff --git a/addons/hr_contract/i18n/pt_BR.po b/addons/hr_contract/i18n/pt_BR.po index 30b083dbedb..2e067b1e353 100644 --- a/addons/hr_contract/i18n/pt_BR.po +++ b/addons/hr_contract/i18n/pt_BR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/ro.po b/addons/hr_contract/i18n/ro.po index 3adccdaa5c7..08de01c45e7 100644 --- a/addons/hr_contract/i18n/ro.po +++ b/addons/hr_contract/i18n/ro.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/ru.po b/addons/hr_contract/i18n/ru.po index 4d125f3631f..23adb63cd90 100644 --- a/addons/hr_contract/i18n/ru.po +++ b/addons/hr_contract/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-01-14 08:42+0000\n" -"Last-Translator: Alexey Y. Fedotov <Unknown>\n" +"PO-Revision-Date: 2011-06-27 05:15+0000\n" +"Last-Translator: Stanislav Hanzhin <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -74,7 +74,7 @@ msgstr "Множитель стоимости часа" #. module: hr_contract #: view:hr.contract:0 msgid "Overpassed" -msgstr "" +msgstr "Переведён" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -145,7 +145,7 @@ msgstr "Поиск договора" #. module: hr_contract #: help:hr.employee,contract_id:0 msgid "Latest contract of the employee" -msgstr "" +msgstr "Последний договор с сотрудником" #. module: hr_contract #: field:hr.contract,advantages_net:0 @@ -163,6 +163,13 @@ msgid "" " You can assign several contracts per employee.\n" " " msgstr "" +"\n" +" Добавляйте информацию в форму сотрудника для управления договорами:\n" +" * Семейное положение,\n" +" * Номер свидетельства социального страхования,\n" +" * Место рождения, дата рождения, ...\n" +" Можно назначить несколько договоров одному сотруднику.\n" +" " #. module: hr_contract #: view:hr.contract:0 @@ -218,7 +225,7 @@ msgstr "Зарплата" #. module: hr_contract #: field:hr.contract,name:0 msgid "Contract Reference" -msgstr "" +msgstr "Ссылка на договор" #. module: hr_contract #: help:hr.employee,vehicle_distance:0 @@ -259,7 +266,7 @@ msgstr "Тип договора" #. module: hr_contract #: view:hr.contract.wage.type.period:0 msgid "Search Wage Period" -msgstr "" +msgstr "Поиск по периоду выплаты" #. module: hr_contract #: view:hr.contract:0 @@ -303,7 +310,7 @@ msgstr "" #. module: hr_contract #: view:hr.contract.wage.type:0 msgid "Search Wage Type" -msgstr "" +msgstr "Поиск по типу выплаты" #. module: hr_contract #: field:hr.contract.wage.type,type:0 @@ -375,7 +382,7 @@ msgstr "Основные данные" #. module: hr_contract #: view:hr.contract.type:0 msgid "Search Contract Type" -msgstr "" +msgstr "Поиск по типу договора" #~ msgid "" #~ "The Object name must start with x_ and not contain any special character !" diff --git a/addons/hr_contract/i18n/sl.po b/addons/hr_contract/i18n/sl.po index f215195fb03..e4c07e27768 100644 --- a/addons/hr_contract/i18n/sl.po +++ b/addons/hr_contract/i18n/sl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/sq.po b/addons/hr_contract/i18n/sq.po index 30ce07b41c2..6f0f87540c0 100644 --- a/addons/hr_contract/i18n/sq.po +++ b/addons/hr_contract/i18n/sq.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:26+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/sr.po b/addons/hr_contract/i18n/sr.po index 37a7731ac6a..37b949ff100 100644 --- a/addons/hr_contract/i18n/sr.po +++ b/addons/hr_contract/i18n/sr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/sr@latin.po b/addons/hr_contract/i18n/sr@latin.po index bea5f2018bf..c1f699d551c 100644 --- a/addons/hr_contract/i18n/sr@latin.po +++ b/addons/hr_contract/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/sv.po b/addons/hr_contract/i18n/sv.po index 81daf21edca..3507998198b 100644 --- a/addons/hr_contract/i18n/sv.po +++ b/addons/hr_contract/i18n/sv.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/tlh.po b/addons/hr_contract/i18n/tlh.po index 0128e580b31..b52a8b73555 100644 --- a/addons/hr_contract/i18n/tlh.po +++ b/addons/hr_contract/i18n/tlh.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po index f74dc88ade2..b86593a76d7 100644 --- a/addons/hr_contract/i18n/tr.po +++ b/addons/hr_contract/i18n/tr.po @@ -13,43 +13,43 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 msgid "Hourly cost computation" -msgstr "" +msgstr "Saatlik Maliyet Hesaplama" #. module: hr_contract #: selection:hr.contract.wage.type,type:0 msgid "Gross" -msgstr "" +msgstr "Brüt" #. module: hr_contract #: view:hr.contract:0 msgid "Trial Period" -msgstr "" +msgstr "Deneme Süresi" #. module: hr_contract #: field:hr.contract,trial_date_start:0 msgid "Trial Start Date" -msgstr "" +msgstr "Deneme Başlangıç Tarihi" #. module: hr_contract #: view:hr.contract:0 msgid "Passport" -msgstr "" +msgstr "Pasaport" #. module: hr_contract #: view:hr.employee:0 msgid "Medical Examination" -msgstr "" +msgstr "Sağlık Kontrolü" #. module: hr_contract #: field:hr.employee,vehicle:0 msgid "Company Vehicle" -msgstr "" +msgstr "Firma Araçı" #. module: hr_contract #: field:hr.contract.wage.type,name:0 @@ -59,22 +59,22 @@ msgstr "Ücret Tipi Adı" #. module: hr_contract #: view:hr.employee:0 msgid "Miscellaneous" -msgstr "" +msgstr "Çeşitli" #. module: hr_contract #: view:hr.contract:0 msgid "Current" -msgstr "" +msgstr "Güncel" #. module: hr_contract #: field:hr.contract.wage.type,factor_type:0 msgid "Factor for hour cost" -msgstr "" +msgstr "Saat maliyet etmeni" #. module: hr_contract #: view:hr.contract:0 msgid "Overpassed" -msgstr "" +msgstr "Geçilen" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -84,12 +84,12 @@ msgstr "Ücret Tipleri" #. module: hr_contract #: field:hr.contract,department_id:0 msgid "Department" -msgstr "" +msgstr "Bölüm" #. module: hr_contract #: selection:hr.contract.wage.type,type:0 msgid "Basic" -msgstr "" +msgstr "Temel" #. module: hr_contract #: view:hr.contract:0 @@ -101,7 +101,7 @@ msgstr "Personel" #. module: hr_contract #: selection:hr.contract.wage.type,type:0 msgid "Net" -msgstr "" +msgstr "Net" #. module: hr_contract #: model:ir.module.module,shortdesc:hr_contract.module_meta_information @@ -111,12 +111,12 @@ msgstr "İnsan Kaynakları Sözleşmeleri" #. module: hr_contract #: field:hr.contract.wage.type.period,factor_days:0 msgid "Hours in the period" -msgstr "" +msgstr "Dönemdeki Saat Miktarı" #. module: hr_contract #: field:hr.employee,vehicle_distance:0 msgid "Home-Work Distance" -msgstr "" +msgstr "Ev_İş Mesafesi" #. module: hr_contract #: view:hr.contract:0 @@ -130,27 +130,27 @@ msgstr "Sözleşmeler" #. module: hr_contract #: view:hr.employee:0 msgid "Personal Info" -msgstr "" +msgstr "Personel Bilgisi" #. module: hr_contract #: view:hr.contract:0 msgid "Job" -msgstr "" +msgstr "İş" #. module: hr_contract #: view:hr.contract:0 msgid "Search Contract" -msgstr "" +msgstr "Sözleşme Ara" #. module: hr_contract #: help:hr.employee,contract_id:0 msgid "Latest contract of the employee" -msgstr "" +msgstr "Çalışanın son sözleşmesi" #. module: hr_contract #: field:hr.contract,advantages_net:0 msgid "Deductions" -msgstr "" +msgstr "Kesintiler" #. module: hr_contract #: model:ir.module.module,description:hr_contract.module_meta_information @@ -163,33 +163,40 @@ msgid "" " You can assign several contracts per employee.\n" " " msgstr "" +"\n" +" Sözleşmeyi yapmak için bütün bilgileri çalışanın formuna girin:\n" +" * Medeni durumu,\n" +" * Güvenlik no,\n" +" * Doğum yeri, tarihi, ...\n" +" Bir çalışana birçok sözleşme uygulayabilirsiniz.\n" +" " #. module: hr_contract #: view:hr.contract:0 #: field:hr.contract,advantages:0 msgid "Advantages" -msgstr "" +msgstr "Avantajlar" #. module: hr_contract #: view:hr.contract:0 msgid "Valid for" -msgstr "" +msgstr "Geçerliliği" #. module: hr_contract #: view:hr.contract:0 msgid "Work Permit" -msgstr "" +msgstr "Çalışma İzni" #. module: hr_contract #: field:hr.employee,children:0 msgid "Number of Children" -msgstr "" +msgstr "Çocuk Sayısı" #. module: hr_contract #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type msgid "Contract Types" -msgstr "" +msgstr "Sözleşme Türleri" #. module: hr_contract #: field:hr.contract,wage_type_id:0 @@ -203,7 +210,7 @@ msgstr "Ücret Tipi" #. module: hr_contract #: constraint:hr.employee:0 msgid "Error ! You cannot create recursive Hierarchy of Employees." -msgstr "" +msgstr "Hata ! Yinelemeli Personel Sıradizini yaratamazsınız." #. module: hr_contract #: field:hr.contract,date_end:0 @@ -218,12 +225,12 @@ msgstr "Ücret" #. module: hr_contract #: field:hr.contract,name:0 msgid "Contract Reference" -msgstr "" +msgstr "Sözleşme Referansı" #. module: hr_contract #: help:hr.employee,vehicle_distance:0 msgid "In kilometers" -msgstr "" +msgstr "Kilometre olarak" #. module: hr_contract #: view:hr.contract:0 @@ -235,7 +242,7 @@ msgstr "Notlar" #: constraint:hr.employee:0 msgid "" "Error ! You cannot select a department for which the employee is the manager." -msgstr "" +msgstr "Hata ! Personelin yönetici olduğu bir bölümü seçemezsiniz." #. module: hr_contract #: view:hr.contract:0 @@ -257,18 +264,18 @@ msgstr "Sözleşme Türü" #. module: hr_contract #: view:hr.contract.wage.type.period:0 msgid "Search Wage Period" -msgstr "" +msgstr "Ücret Dönemi Ara" #. module: hr_contract #: view:hr.contract:0 #: field:hr.contract,working_hours:0 msgid "Working Schedule" -msgstr "" +msgstr "Çalışma Planı" #. module: hr_contract #: view:hr.employee:0 msgid "Job Info" -msgstr "" +msgstr "İş Bilgisi" #. module: hr_contract #: field:hr.contract.wage.type,period_id:0 @@ -280,12 +287,12 @@ msgstr "Ücret Dönemi" #. module: hr_contract #: field:hr.contract,job_id:0 msgid "Job Title" -msgstr "" +msgstr "İş Ünvanı" #. module: hr_contract #: field:hr.employee,manager:0 msgid "Is a Manager" -msgstr "" +msgstr "Yöneticidir" #. module: hr_contract #: field:hr.contract,date_start:0 @@ -296,11 +303,12 @@ msgstr "Baş. Tarihi" #: constraint:hr.contract:0 msgid "Error! contract start-date must be lower then contract end-date." msgstr "" +"Hata! sözleşme başlangıç tarihi sözleşme bitiş tarihinden önce olmalı." #. module: hr_contract #: view:hr.contract.wage.type:0 msgid "Search Wage Type" -msgstr "" +msgstr "Ücret Türü Ara" #. module: hr_contract #: field:hr.contract.wage.type,type:0 @@ -310,13 +318,13 @@ msgstr "Tipi" #. module: hr_contract #: field:hr.contract,trial_date_end:0 msgid "Trial End Date" -msgstr "" +msgstr "Denem Bitiş Tarihi" #. module: hr_contract #: view:hr.contract:0 #: view:hr.contract.wage.type:0 msgid "Group By..." -msgstr "" +msgstr "Gruplandır..." #. module: hr_contract #: field:hr.contract.wage.type.period,name:0 @@ -326,12 +334,12 @@ msgstr "Dönem Adı" #. module: hr_contract #: view:hr.contract.wage.type:0 msgid "Period" -msgstr "" +msgstr "Dönem" #. module: hr_contract #: field:hr.employee,place_of_birth:0 msgid "Place of Birth" -msgstr "" +msgstr "Doğum Yeri" #. module: hr_contract #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period @@ -346,31 +354,33 @@ msgid "" "This field is used by the timesheet system to compute the price of an hour " "of work wased on the contract of the employee" msgstr "" +"Bu alan, çalışanaın sözleşmesine göre zaman çizelgesinde bir saatlik iş " +"ücretinin hesaplanmasında kullanılır." #. module: hr_contract #: view:hr.contract:0 msgid "Duration" -msgstr "" +msgstr "Süre" #. module: hr_contract #: field:hr.employee,medic_exam:0 msgid "Medical Examination Date" -msgstr "" +msgstr "Sağlık Kontrolü Tarihi" #. module: hr_contract #: field:hr.contract,advantages_gross:0 msgid "Allowances" -msgstr "" +msgstr "İndirimler" #. module: hr_contract #: view:hr.contract:0 msgid "Main Data" -msgstr "" +msgstr "Ana Veri" #. module: hr_contract #: view:hr.contract.type:0 msgid "Search Contract Type" -msgstr "" +msgstr "Sözleşme Türü Ara" #~ msgid "Invalid XML for View Architecture!" #~ msgstr "Görüntüleme mimarisi için Geçersiz XML" diff --git a/addons/hr_contract/i18n/uk.po b/addons/hr_contract/i18n/uk.po index 23cdc19bf02..e7192e9cb87 100644 --- a/addons/hr_contract/i18n/uk.po +++ b/addons/hr_contract/i18n/uk.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/i18n/vi.po b/addons/hr_contract/i18n/vi.po index f1f429b359c..6fe7bdd5af1 100644 --- a/addons/hr_contract/i18n/vi.po +++ b/addons/hr_contract/i18n/vi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-05-26 04:36+0000\n" -"X-Generator: Launchpad (build 12959)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -375,6 +375,3 @@ msgstr "" #~ msgid "Function" #~ msgstr "Chức năng" - -#~ msgid "Description" -#~ msgstr "Mô tả" diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po index 1d615d3ce50..b8f84858bdf 100644 --- a/addons/hr_contract/i18n/zh_CN.po +++ b/addons/hr_contract/i18n/zh_CN.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -34,7 +34,7 @@ msgstr "试用期" #. module: hr_contract #: field:hr.contract,trial_date_start:0 msgid "Trial Start Date" -msgstr "使用期开始日期" +msgstr "试用期开始日期" #. module: hr_contract #: view:hr.contract:0 @@ -74,7 +74,7 @@ msgstr "每小时成本系数" #. module: hr_contract #: view:hr.contract:0 msgid "Overpassed" -msgstr "Overpassed" +msgstr "已终止" #. module: hr_contract #: view:hr.contract.wage.type:0 @@ -89,7 +89,7 @@ msgstr "部门" #. module: hr_contract #: selection:hr.contract.wage.type,type:0 msgid "Basic" -msgstr "基本信息" +msgstr "基本" #. module: hr_contract #: view:hr.contract:0 @@ -101,7 +101,7 @@ msgstr "员工" #. module: hr_contract #: selection:hr.contract.wage.type,type:0 msgid "Net" -msgstr "净值" +msgstr "净额" #. module: hr_contract #: model:ir.module.module,shortdesc:hr_contract.module_meta_information @@ -111,12 +111,12 @@ msgstr "人力资源合同" #. module: hr_contract #: field:hr.contract.wage.type.period,factor_days:0 msgid "Hours in the period" -msgstr "周期的小时数" +msgstr "这周期的小时数" #. module: hr_contract #: field:hr.employee,vehicle_distance:0 msgid "Home-Work Distance" -msgstr "通勤距离" +msgstr "家与工作地点的距离" #. module: hr_contract #: view:hr.contract:0 @@ -135,7 +135,7 @@ msgstr "个人信息" #. module: hr_contract #: view:hr.contract:0 msgid "Job" -msgstr "工作" +msgstr "职务" #. module: hr_contract #: view:hr.contract:0 @@ -145,12 +145,12 @@ msgstr "搜索合同" #. module: hr_contract #: help:hr.employee,contract_id:0 msgid "Latest contract of the employee" -msgstr "该雇员最近的合同" +msgstr "该员工最近的合同" #. module: hr_contract #: field:hr.contract,advantages_net:0 msgid "Deductions" -msgstr "扣除" +msgstr "扣减" #. module: hr_contract #: model:ir.module.module,description:hr_contract.module_meta_information @@ -163,17 +163,24 @@ msgid "" " You can assign several contracts per employee.\n" " " msgstr "" +"\n" +" 在管理合同里添加这员工的所有信息：\n" +" * 婚姻状况\n" +" * 社保号\n" +" * 籍贯，出生日期。。。\n" +" 您可以为员工签订几份合同。\n" +" " #. module: hr_contract #: view:hr.contract:0 #: field:hr.contract,advantages:0 msgid "Advantages" -msgstr "优点" +msgstr "薪酬" #. module: hr_contract #: view:hr.contract:0 msgid "Valid for" -msgstr "生效于" +msgstr "有效期" #. module: hr_contract #: view:hr.contract:0 @@ -218,12 +225,12 @@ msgstr "工资" #. module: hr_contract #: field:hr.contract,name:0 msgid "Contract Reference" -msgstr "合同引用" +msgstr "合同编码" #. module: hr_contract #: help:hr.employee,vehicle_distance:0 msgid "In kilometers" -msgstr "单位：千米" +msgstr "公里" #. module: hr_contract #: view:hr.contract:0 @@ -235,7 +242,7 @@ msgstr "备注" #: constraint:hr.employee:0 msgid "" "Error ! You cannot select a department for which the employee is the manager." -msgstr "错误！您不能选择该雇员担任经理的部门。" +msgstr "错误！您不用为他选择一部门因为他是总经理(CEO)。" #. module: hr_contract #: view:hr.contract:0 @@ -257,7 +264,7 @@ msgstr "合同类型" #. module: hr_contract #: view:hr.contract.wage.type.period:0 msgid "Search Wage Period" -msgstr "搜索工资期" +msgstr "搜索工资周期" #. module: hr_contract #: view:hr.contract:0 @@ -268,7 +275,7 @@ msgstr "工作安排" #. module: hr_contract #: view:hr.employee:0 msgid "Job Info" -msgstr "招聘信息" +msgstr "职务信息" #. module: hr_contract #: field:hr.contract.wage.type,period_id:0 @@ -280,12 +287,12 @@ msgstr "工资周期" #. module: hr_contract #: field:hr.contract,job_id:0 msgid "Job Title" -msgstr "职位" +msgstr "职务名称" #. module: hr_contract #: field:hr.employee,manager:0 msgid "Is a Manager" -msgstr "是否是经理" +msgstr "是经理" #. module: hr_contract #: field:hr.contract,date_start:0 @@ -300,7 +307,7 @@ msgstr "错误！合同开始日期必须小于结束日期。" #. module: hr_contract #: view:hr.contract.wage.type:0 msgid "Search Wage Type" -msgstr "搜索薪酬类型" +msgstr "搜索工资类型" #. module: hr_contract #: field:hr.contract.wage.type,type:0 @@ -310,13 +317,13 @@ msgstr "类型" #. module: hr_contract #: field:hr.contract,trial_date_end:0 msgid "Trial End Date" -msgstr "试用期截至日期" +msgstr "试用期结束日期" #. module: hr_contract #: view:hr.contract:0 #: view:hr.contract.wage.type:0 msgid "Group By..." -msgstr "分组于" +msgstr "分组..." #. module: hr_contract #: field:hr.contract.wage.type.period,name:0 @@ -345,12 +352,12 @@ msgstr "工资周期" msgid "" "This field is used by the timesheet system to compute the price of an hour " "of work wased on the contract of the employee" -msgstr "这字段使用时间表系统来计算合同员工的每小时工价" +msgstr "这字段用于计工单，系统用来计算合同员工的每小时工价" #. module: hr_contract #: view:hr.contract:0 msgid "Duration" -msgstr "期间" +msgstr "有效期" #. module: hr_contract #: field:hr.employee,medic_exam:0 @@ -360,12 +367,12 @@ msgstr "体检日期" #. module: hr_contract #: field:hr.contract,advantages_gross:0 msgid "Allowances" -msgstr "津贴" +msgstr "补贴" #. module: hr_contract #: view:hr.contract:0 msgid "Main Data" -msgstr "主数据" +msgstr "主要数据" #. module: hr_contract #: view:hr.contract.type:0 @@ -397,25 +404,6 @@ msgstr "搜索合同类型" #~ msgid "Number of children" #~ msgstr "下级数" -#~ msgid "" -#~ "\n" -#~ " Add all information on the employee form to manage contracts:\n" -#~ " * Martial status,\n" -#~ " * Security number,\n" -#~ " * Place of birth, birth date, ...\n" -#~ "\n" -#~ " You can assign several contracts per employee.\n" -#~ " " -#~ msgstr "" -#~ "\n" -#~ " 增加员工管理合同的所有信息:\n" -#~ " * 婚姻状况\n" -#~ " * 社保号\n" -#~ " * 出生地点和出生日期\n" -#~ " \n" -#~ " 你可以为每个员工签几个合同\n" -#~ " " - #~ msgid "Medical examination date" #~ msgstr "体检日期" @@ -448,21 +436,3 @@ msgstr "搜索合同类型" #~ msgid "Invalid XML for View Architecture!" #~ msgstr "无效的视图结构xml文件!" - -#~ msgid "Calculations" -#~ msgstr "计算" - -#~ msgid "Description" -#~ msgstr "描述" - -#~ msgid "Contract Details" -#~ msgstr "合同明细" - -#~ msgid "Salary Structure" -#~ msgstr "薪酬结构" - -#~ msgid "Company contribution" -#~ msgstr "公司贡献" - -#~ msgid "Salary Computation" -#~ msgstr "薪酬计算" diff --git a/addons/hr_contract/i18n/zh_TW.po b/addons/hr_contract/i18n/zh_TW.po index 57a4248f232..9c0ca893132 100644 --- a/addons/hr_contract/i18n/zh_TW.po +++ b/addons/hr_contract/i18n/zh_TW.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" +"X-Generator: Launchpad (build 13830)\n" #. module: hr_contract #: view:hr.contract.wage.type:0 diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv index 7c87e3c36b3..41ffa72f937 100644 --- a/addons/hr_contract/security/ir.model.access.csv +++ b/addons/hr_contract/security/ir.model.access.csv @@ -1,6 +1,4 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_hr_contract_wage_type_period_user","hr.contract.wage.type.period.user","model_hr_contract_wage_type_period","base.group_hr_user",1,1,1,1 -"access_hr_contract_wage_type_user","hr.contract.wage.type.user","model_hr_contract_wage_type","base.group_hr_user",1,1,1,1 "access_hr_resource_manager","hr.employee.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1 "access_hr_resource_calendar_user","hr.employee.resource.calendar.user","resource.model_resource_calendar","base.group_hr_user",1,1,1,1 "access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1 diff --git a/addons/hr_contract/test/test_hr_contract.yml b/addons/hr_contract/test/test_hr_contract.yml index 5659eb912ee..bd39e091d8b 100644 --- a/addons/hr_contract/test/test_hr_contract.yml +++ b/addons/hr_contract/test/test_hr_contract.yml @@ -11,40 +11,21 @@ name: Mark Johnson user_id: base.user_root children: 2 - marital: hr.hr_employee_marital_status_married + marital: 'married' place_of_birth: Belgium vehicle: 'No' vehicle_distance: 12 - -- - I create a new Contract wage period. -- - !record {model: hr.contract.wage.type.period, id: hr_contract_wage_type_period_monthly0}: - factor_days: 176.0 - name: monthly -- - I create a new Contract Wage Type. -- - !record {model: hr.contract.wage.type, id: hr_contract_wage_type_monthlygrosswage0}: - factor_type: 1.9 - name: Monthly Gross Wage - period_id: 'hr_contract_wage_type_period_monthly0' - type: gross - - I create a new contract for "Mark Johnson". - !record {model: hr.contract, id: hr_contract_contract0}: - advantages_gross: 0.0 employee_id: 'hr_employee_employee0' - advantages_net: 0.0 date_end: !eval "'%s-05-18' %(datetime.now().year+1)" date_start: !eval "'%s-05-18' %(datetime.now().year)" trial_date_end: !eval "'%s-03-01' %(datetime.now().year)" trial_date_start: !eval "'%s-04-30' %(datetime.now().year)" name: contract1 wage: 1.0 - wage_type_id: hr_contract_wage_type_monthlygrosswage0 type_id: hr_contract_type_emp working_hours: resource.timesheet_group1 |