From 7a876ae6abcf77173ea0914e767e37b3186a8a78 Mon Sep 17 00:00:00 2001 From: Patrick Thieuleux <> Date: Mon, 2 Aug 2010 16:40:45 +0200 Subject: [PATCH 1/6] [ADD] Added Belgian French localization to hr module. bzr revid: jth@openerp.com-20100802144045-xxptb3uwkl229lf1 --- addons/hr/i18n/fr_BE.po | 661 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 661 insertions(+) create mode 100644 addons/hr/i18n/fr_BE.po diff --git a/addons/hr/i18n/fr_BE.po b/addons/hr/i18n/fr_BE.po new file mode 100644 index 00000000000..d4eecc0128f --- /dev/null +++ b/addons/hr/i18n/fr_BE.po @@ -0,0 +1,661 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * hr +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.0dev\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2010-07-30 14:14:29+0000\n" +"PO-Revision-Date: 2010-07-30 14:14:29+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: hr +#: model:process.node,name:hr.process_node_openerpuser0 +msgid "Openerp user" +msgstr "Utilisateur OpenERP" + +#. module: hr +#: view:hr.job:0 +#: field:hr.job,requirements:0 +msgid "Requirements" +msgstr "" + +#. module: hr +#: model:process.transition,name:hr.process_transition_contactofemployee0 +msgid "Link the employee to information" +msgstr "" + +#. module: hr +#: field:hr.employee,sinid:0 +msgid "SIN No" +msgstr "Numéro de Sécurité Sociale" + +#. module: hr +#: model:ir.module.module,shortdesc:hr.module_meta_information +#: model:ir.ui.menu,name:hr.menu_hr_deshboard +#: model:ir.ui.menu,name:hr.menu_hr_root +msgid "Human Resources" +msgstr "Ressources humaines" + +#. module: hr +#: view:hr.employee:0 +msgid "Group By..." +msgstr "Grouper par" + +#. module: hr +#: field:hr.employee,work_email:0 +msgid "Work E-mail" +msgstr "Courriel professionnel" + +#. module: hr +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Nom de Modèle non valide pour la définition de l'action." + +#. module: hr +#: view:hr.employee:0 +#: field:hr.employee,department_id:0 +#: field:hr.job,department_id:0 +#: view:res.users:0 +msgid "Department" +msgstr "Département" + +#. module: hr +#: field:hr.employee,ssnid:0 +msgid "SSN No" +msgstr "Numéro de sécurité sociale" + +#. module: hr +#: view:hr.job:0 +msgid "Jobs" +msgstr "" + +#. module: hr +#: view:hr.installer:0 +msgid "title" +msgstr "" + +#. module: hr +#: field:hr.department,company_id:0 +#: field:hr.job,company_id:0 +msgid "Company" +msgstr "Société" + +#. module: hr +#: model:ir.model,name:hr.model_hr_employee_marital_status +msgid "Employee Marital Status" +msgstr "État civil du travailleur" + +#. module: hr +#: model:process.transition,name:hr.process_transition_employeeuser0 +msgid "Link a user to an employee" +msgstr "Associer un utilisateur à un travailleur" + +#. module: hr +#: field:hr.department,parent_id:0 +msgid "Parent Department" +msgstr "Département parent" + +#. module: hr +#: view:ir.actions.todo:0 +msgid "Launch" +msgstr "" + +#. module: hr +#: view:hr.department:0 +#: view:hr.employee:0 +#: field:hr.employee,notes:0 +msgid "Notes" +msgstr "Remarques" + +#. module: hr +#: model:ir.model,name:hr.model_hr_installer +msgid "hr.installer" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "Position" +msgstr "" + +#. module: hr +#: model:ir.actions.act_window,name:hr.action_hr_installer +msgid "Human Resources Modules Installation" +msgstr "Installation du module des ressources humaines" + +#. module: hr +#: model:ir.actions.act_window,name:hr.action2 +msgid "Employee Hierarchy" +msgstr "Hiérarchie des travailleurs" + +#. module: hr +#: selection:hr.job,state:0 +msgid "In Recruitement" +msgstr "" + +#. module: hr +#: selection:hr.job,state:0 +msgid "Old" +msgstr "" + +#. module: hr +#: help:hr.installer,hr_timesheet_sheet:0 +msgid "Tracks and helps employees encode and validate timesheets and attendance." +msgstr "" + +#. module: hr +#: field:hr.job,no_of_employee:0 +msgid "No of Employees" +msgstr "Nombre de travailleurs" + +#. module: hr +#: view:hr.job:0 +msgid "Recruitment" +msgstr "" + +#. module: hr +#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married +msgid "married" +msgstr "Marié(e)" + +#. module: hr +#: selection:hr.employee,gender:0 +msgid "Female" +msgstr "Féminin" + +#. module: hr +#: field:hr.installer,hr_evaluation:0 +msgid "Periodic Evaluations" +msgstr "" + +#. module: hr +#: field:hr.installer,hr_timesheet_sheet:0 +msgid "Timesheets" +msgstr "" + +#. module: hr +#: model:ir.actions.act_window,name:hr.open_view_employee_tree +msgid "Employees Structure" +msgstr "Structure des travailleurs" + +#. module: hr +#: view:hr.employee:0 +msgid "Social IDs" +msgstr "Numéros sociaux" + +#. module: hr +#: field:hr.employee,work_phone:0 +msgid "Work Phone" +msgstr "Téléphone professionnel" + +#. module: hr +#: field:hr.employee.category,child_ids:0 +msgid "Child Categories" +msgstr "Catégories filles" + +#. module: hr +#: view:hr.job:0 +#: field:hr.job,description:0 +#: model:ir.model,name:hr.model_hr_job +msgid "Job Description" +msgstr "" + +#. module: hr +#: field:hr.employee,work_location:0 +msgid "Office Location" +msgstr "Localisation du Bureau" + +#. module: hr +#: view:hr.employee:0 +#: view:hr.job:0 +#: model:ir.model,name:hr.model_hr_employee +#: model:process.node,name:hr.process_node_employee0 +msgid "Employee" +msgstr "Travailleur" + +#. module: hr +#: model:process.node,note:hr.process_node_employeecontact0 +msgid "Other information" +msgstr "Autre information" + +#. module: hr +#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower +msgid "widow(er)" +msgstr "Veuf/Veuve" + +#. module: hr +#: view:hr.employee:0 +msgid "Unactive" +msgstr "Inactif" + +#. module: hr +#: field:hr.employee,child_ids:0 +#: view:res.users:0 +#: field:res.users,child_ids:0 +msgid "Subordinates" +msgstr "Subordonnés" + +#. module: hr +#: model:ir.model,name:hr.model_ir_actions_act_window +msgid "ir.actions.act_window" +msgstr "ir.actions.act_window" + +#. module: hr +#: help:hr.installer,hr_attendance:0 +msgid "Simplifies the management of employee attendances." +msgstr "" + +#. module: hr +#: model:ir.actions.act_window,name:hr.open_board_hr +#: model:ir.ui.menu,name:hr.menu_hr_project +msgid "Human Resources Dashboard" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +#: field:hr.employee,job_id:0 +#: view:hr.job:0 +msgid "Job" +msgstr "" + +#. module: hr +#: view:hr.department:0 +#: field:hr.department,member_ids:0 +msgid "Members" +msgstr "Membres" + +#. module: hr +#: model:ir.ui.menu,name:hr.menu_hr_configuration +msgid "Configuration" +msgstr "Configuration" + +#. module: hr +#: field:hr.job,expected_employees:0 +msgid "Expected Employees" +msgstr "Travailleurs prévus" + +#. module: hr +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "XML non valide pour l'architecture de la vue" + +#. module: hr +#: field:hr.employee.category,parent_id:0 +msgid "Parent Category" +msgstr "Catégorie mère" + +#. module: hr +#: view:hr.department:0 +#: model:ir.actions.act_window,name:hr.open_module_tree_department +#: model:ir.actions.act_window,name:hr.open_module_tree_department_tree +#: model:ir.ui.menu,name:hr.menu_department_def +#: model:ir.ui.menu,name:hr.menu_department_tree +#: model:ir.ui.menu,name:hr.menu_hr_department_tree +#: field:res.users,context_department_id:0 +msgid "Departments" +msgstr "Départements" + +#. module: hr +#: model:process.node,name:hr.process_node_employeecontact0 +msgid "Employee Contact" +msgstr "Contrat de travail du travailleur" + +#. module: hr +#: view:board.board:0 +msgid "My Board" +msgstr "" + +#. module: hr +#: selection:hr.employee,gender:0 +msgid "Male" +msgstr "Masculin" + +#. module: hr +#: model:ir.actions.act_window,name:hr.open_view_categ_form +#: model:ir.ui.menu,name:hr.menu_view_employee_category_form +msgid "Categories of Employee" +msgstr "Catégories de travailleurs" + +#. module: hr +#: field:hr.installer,hr_attendance:0 +msgid "Attendances (Sign In/Out)" +msgstr "" + +#. module: hr +#: view:hr.employee.category:0 +#: model:ir.model,name:hr.model_hr_employee_category +msgid "Employee Category" +msgstr "Catégorie du travailleur" + +#. module: hr +#: field:hr.installer,config_logo:0 +msgid "Image" +msgstr "" + +#. module: hr +#: model:process.process,name:hr.process_process_employeecontractprocess0 +msgid "Employee Contract" +msgstr "Contrat de travail du travailleur" + +#. module: hr +#: help:hr.installer,hr_evaluation:0 +msgid "Lets you create and manage the periodic evaluation and performance review of employees." +msgstr "" + +#. module: hr +#: model:ir.model,name:hr.model_hr_department +msgid "hr.department" +msgstr "hr.department" + +#. module: hr +#: help:hr.installer,hr_holidays:0 +msgid "Tracks employee leaves allocations, requests and planning.\n" +"\n" +"Can also plug into OpenERP's agendas and calendars applications in order to display accepted leaves requests on OpenERP's calendars." +msgstr "" + +#. module: hr +#: field:hr.installer,hr_recruitment:0 +msgid "Recruitment Process" +msgstr "" + +#. module: hr +#: field:hr.employee,category_id:0 +#: field:hr.employee.category,name:0 +msgid "Category" +msgstr "Catégorie" + +#. module: hr +#: model:process.transition,note:hr.process_transition_employeeuser0 +msgid "The field Relate'd user in the Employee form allows to link the OpenERP user (and his rights and role) to the employee." +msgstr "" + +#. module: hr +#: field:hr.department,note:0 +msgid "Note" +msgstr "Note" + +#. module: hr +#: view:hr.employee:0 +msgid "Contact Information" +msgstr "Informations sur le contact" + +#. module: hr +#: field:hr.employee,address_id:0 +msgid "Working Address" +msgstr "Adresse professionnelle" + +#. module: hr +#: view:hr.employee:0 +msgid "Status" +msgstr "État" + +#. module: hr +#: field:hr.installer,progress:0 +msgid "Configuration Progress" +msgstr "État d'avancement de configuration" + +#. module: hr +#: model:ir.actions.act_window,name:hr.open_view_categ_tree +#: model:ir.ui.menu,name:hr.menu_view_employee_category_tree +msgid "Categories structure" +msgstr "Structure des catégories" + +#. module: hr +#: field:hr.employee,partner_id:0 +msgid "unknown" +msgstr "" + +#. module: hr +#: field:hr.installer,hr_holidays:0 +msgid "Holidays / Leaves Management" +msgstr "Gestion des congés / absences" + +#. module: hr +#: field:hr.employee,birthday:0 +msgid "Birthday" +msgstr "Date d'anniversaire" + +#. module: hr +#: model:ir.ui.menu,name:hr.menu_hr_main +#: model:ir.ui.menu,name:hr.menu_hr_management +msgid "Human Resources Management" +msgstr "Gestion des ressources humaines" + +#. module: hr +#: view:hr.department:0 +msgid "Companies" +msgstr "Sociétés" + +#. module: hr +#: model:ir.module.module,description:hr.module_meta_information +msgid "\n" +" Module for human resource management. You can manage:\n" +" * Employees and hierarchies : You can define your employee with User and display hierarchies\n" +" * HR Departments\n" +" * HR Jobs\n" +" " +msgstr "" + +#. module: hr +#: model:process.transition,note:hr.process_transition_contactofemployee0 +msgid "In the Employee form, there are different kind of information like Contact information." +msgstr "" + +#. module: hr +#: view:res.users:0 +#: field:res.users,parent_id:0 +msgid "Managers" +msgstr "Responsables" + +#. module: hr +#: field:hr.employee.marital.status,description:0 +msgid "Status Description" +msgstr "" + +#. module: hr +#: field:hr.job,state:0 +msgid "State" +msgstr "" + +#. module: hr +#: field:hr.employee,marital:0 +#: view:hr.employee.marital.status:0 +#: field:hr.employee.marital.status,name:0 +#: model:ir.actions.act_window,name:hr.action_hr_marital_status +#: model:ir.ui.menu,name:hr.hr_menu_marital_status +msgid "Marital Status" +msgstr "État civil" + +#. module: hr +#: help:hr.installer,hr_recruitment:0 +msgid "Helps you manage and streamline your recruitment process." +msgstr "" + +#. module: hr +#: model:process.node,note:hr.process_node_employee0 +msgid "Employee form and structure" +msgstr "" + +#. module: hr +#: field:hr.employee,photo:0 +msgid "Photo" +msgstr "" + +#. module: hr +#: model:ir.model,name:hr.model_res_users +msgid "res.users" +msgstr "res.users" + +#. module: hr +#: view:hr.job:0 +#: selection:hr.job,state:0 +msgid "Open" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "Personal Information" +msgstr "Informations personnelles" + +#. module: hr +#: constraint:ir.model:0 +msgid "The Object name must start with x_ and not contain any special character !" +msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !" + +#. module: hr +#: view:res.users:0 +msgid "Current Activity" +msgstr "Activité courante" + +#. module: hr +#: view:hr.job:0 +msgid "Current" +msgstr "Courant" + +#. module: hr +#: field:hr.installer,hr_contract:0 +msgid "Employee's Contracts" +msgstr "Contrats du travailleur" + +#. module: hr +#: view:hr.employee.category:0 +msgid "Employees Categories" +msgstr "Catégories des travailleurs" + +#. module: hr +#: field:hr.employee,address_home_id:0 +msgid "Home Address" +msgstr "Adresse personnelle" + +#. module: hr +#: view:hr.job:0 +msgid "Description" +msgstr "Description" + +#. module: hr +#: help:hr.installer,hr_contract:0 +msgid "Extends employee profiles to help manage their contracts." +msgstr "Etend les profils du travailleur pour aider dans la gestion de leurs contrats" + +#. module: hr +#: help:hr.installer,hr_expense:0 +msgid "Tracks and manages employee expenses, and can automatically re-invoice clients if the expenses are project-related." +msgstr "" + +#. module: hr +#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single +msgid "Single" +msgstr "Célibataire" + +#. module: hr +#: field:hr.job,name:0 +msgid "Job Name" +msgstr "" + +#. module: hr +#: view:hr.department:0 +msgid "department" +msgstr "département" + +#. module: hr +#: field:hr.employee,country_id:0 +msgid "Nationality" +msgstr "Nationalité" + +#. module: hr +#: field:hr.employee,otherid:0 +msgid "Other ID" +msgstr "Autre identifiant" + +#. module: hr +#: field:hr.employee,resource_id:0 +msgid "Resource" +msgstr "" + +#. module: hr +#: field:hr.department,complete_name:0 +msgid "Name" +msgstr "Nom" + +#. module: hr +#: field:hr.employee,gender:0 +msgid "Gender" +msgstr "Genre" + +#. module: hr +#: view:hr.employee:0 +#: field:hr.job,employee_ids:0 +#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree +#: model:ir.actions.act_window,name:hr.open_view_employee_list +#: model:ir.actions.act_window,name:hr.open_view_employee_list_my +#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my +#: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form +msgid "Employees" +msgstr "Travailleurs" + +#. module: hr +#: field:hr.employee,bank_account:0 +msgid "Bank Account" +msgstr "Compte bancaire" + +#. module: hr +#: field:hr.department,name:0 +msgid "Department Name" +msgstr "Nom du département" + +#. module: hr +#: help:hr.employee,ssnid:0 +msgid "Social Security Number" +msgstr "Numéro de sécurité sociale" + +#. module: hr +#: model:process.node,note:hr.process_node_openerpuser0 +msgid "Creation of a OpenERP user" +msgstr "Création d'un utilisateur OpenERP" + +#. module: hr +#: field:hr.department,child_ids:0 +msgid "Child Departments" +msgstr "Sous-départements" + +#. module: hr +#: model:ir.actions.act_window,name:hr.action_hr_job +#: model:ir.ui.menu,name:hr.menu_hr_job +msgid "Job Positions" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +#: field:hr.employee,coach_id:0 +msgid "Coach" +msgstr "" + +#. module: hr +#: view:res.users:0 +msgid "Departements Informations" +msgstr "" + +#. module: hr +#: field:hr.installer,hr_expense:0 +msgid "Expenses" +msgstr "" + +#. module: hr +#: field:hr.department,manager_id:0 +#: view:hr.employee:0 +#: field:hr.employee,parent_id:0 +msgid "Manager" +msgstr "Responsable" + +#. module: hr +#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced +msgid "Divorced / separated" +msgstr "Divorcé(e) / Séparé(e)" + From d507b014b3263a8e179139397310c1d4af3b9573 Mon Sep 17 00:00:00 2001 From: "MTR(OpenERP)" <> Date: Tue, 3 Aug 2010 10:25:12 +0530 Subject: [PATCH 2/6] [IMP] Sale: creation of invoice from sale order line, yaml bzr revid: mra@mra-laptop-20100803045512-b7sk118lqcinp0bu --- addons/sale/sale.py | 7 +++---- addons/sale/test/invoice_on_shipped_qty.yml | 2 +- addons/sale/test/so_make_line_invoice.yml | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 9b0f555fc80..21ca506bb83 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -920,7 +920,6 @@ class sale_order_line(osv.osv): }) cr.execute('insert into sale_order_line_invoice_rel (order_line_id,invoice_id) values (%s,%s)', (line.id, inv_id)) self.write(cr, uid, [line.id], {'invoiced': True}) - sales[line.order_id.id] = True create_ids.append(inv_id) # Trigger workflow events @@ -935,11 +934,11 @@ class sale_order_line(osv.osv): for line in self.browse(cr, uid, ids, context=context): if line.invoiced: raise osv.except_osv(_('Invalid action !'), _('You cannot cancel a sale order line that has already been invoiced !')) - for pick in line.order_id.picking_ids: - if pick.state != 'cancel': + for move_line in line.move_ids: + if move_line.state != 'cancel': raise osv.except_osv( _('Could not cancel sale order line!'), - _('You must first cancel all pickings attached with sale order.')) + _('You must first cancel stock moves attached to this sale order line.')) message = _('Sale order line') + " '" + line.name + "' "+_("is cancelled") self.log(cr, uid, id, message) return self.write(cr, uid, ids, {'state': 'cancel'}) diff --git a/addons/sale/test/invoice_on_shipped_qty.yml b/addons/sale/test/invoice_on_shipped_qty.yml index 5a608aff9b8..95191569886 100644 --- a/addons/sale/test/invoice_on_shipped_qty.yml +++ b/addons/sale/test/invoice_on_shipped_qty.yml @@ -106,7 +106,7 @@ Creating a account invoice pay entry. - !record {model: account.invoice.pay, id: account_invoice_pay_tst1}: - amount: 20000.0 + amount: 40000.0 date: '2010-07-17' journal_id: sale.account_journal_bankjournal0 name: tst diff --git a/addons/sale/test/so_make_line_invoice.yml b/addons/sale/test/so_make_line_invoice.yml index 9725a169b2c..6a5ea58f6da 100644 --- a/addons/sale/test/so_make_line_invoice.yml +++ b/addons/sale/test/so_make_line_invoice.yml @@ -134,7 +134,6 @@ I click on the "Create Invoice" button of sale order and verify that it gives a warning message - !python {model: sale.order}: | - sale_order_obj = self.pool.get('sale.order') import netsvc wf_service = netsvc.LocalService("workflow") try: From 2a35886498d68427fa64eb83af9578bb20da8b10 Mon Sep 17 00:00:00 2001 From: "UCO (OpenERP)" <> Date: Tue, 3 Aug 2010 10:49:58 +0530 Subject: [PATCH 3/6] [IMP] stock: Improve the picking report bzr revid: sbh@tinyerp.com-20100803051958-dweffkz4l3kmk7gx --- addons/stock/report/picking.rml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index ebd4e0af226..ef60a79bb66 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -241,7 +241,7 @@
- [[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') or removeParentNode('section') ]] + [[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') ]] @@ -268,12 +268,12 @@ - [[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('s') ]] + [[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('section') ]] Non Assigned Products: [[ ( move_lines.state == 'assigned' or move_lines.state == 'done' or move_lines.state == 'confirmed' ) and removeParentNode('para') ]] [[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('para') ]]
- [[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]] + [[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') and removeParentNode('section') ]] From f4a6bc875bcb3655fbce35d96d00142c6f65f002 Mon Sep 17 00:00:00 2001 From: "UCO (OpenERP)" <> Date: Tue, 3 Aug 2010 10:51:07 +0530 Subject: [PATCH 4/6] [IMP] stock: If the product has no code, it should not display [] product_name bzr revid: sbh@tinyerp.com-20100803052107-oaf5cbq02k4e890l --- addons/stock/report/picking.rml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index ef60a79bb66..c5b4237a1d8 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -245,7 +245,7 @@ - [ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] + [ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] [[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]] @@ -277,7 +277,7 @@ - [ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] + [ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] [[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]] From 2fdd2000e604584fa486696ea8fc4bf670f1e95f Mon Sep 17 00:00:00 2001 From: "PSI(OpenERP)" <> Date: Tue, 3 Aug 2010 12:11:46 +0530 Subject: [PATCH 6/6] [IMP] hr related modules bzr revid: mra@mra-laptop-20100803064146-1tlbgy3huwxfer4e --- .../report/hr_evaluation_report_view.xml | 2 +- .../report/hr_expense_report_view.xml | 2 +- .../report/available_holidays_view.xml | 4 +- .../report/hr_holidays_report_view.xml | 2 +- addons/hr_payroll/hr_payroll_view.xml | 117 +++++++++--------- .../report/report_emp_salary_structure.py | 2 +- .../report/report_emp_salary_structure.rml | 39 +++--- addons/hr_timesheet/hr_timesheet_view.xml | 2 +- .../report/hr_timesheet_report_view.xml | 2 +- .../report/timesheet_report_view.xml | 2 +- 10 files changed, 87 insertions(+), 87 deletions(-) diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index b4ab2743c0b..bb50e30c9be 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -58,7 +58,7 @@ help = "Final Validation Evaluations"/> - + diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 71187ef0726..942c7f13316 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -72,7 +72,7 @@ - + diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml index 205e8ce31ed..0b9f91e37dc 100644 --- a/addons/hr_holidays/report/available_holidays_view.xml +++ b/addons/hr_holidays/report/available_holidays_view.xml @@ -58,9 +58,9 @@ - + - diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml index e25a7487e51..d38aceeeeb9 100644 --- a/addons/hr_holidays/report/hr_holidays_report_view.xml +++ b/addons/hr_holidays/report/hr_holidays_report_view.xml @@ -62,7 +62,7 @@ - + - @@ -77,7 +76,7 @@ - + All Passports hr.passport @@ -87,12 +86,12 @@ - + hr.hr.employee.view.form2 @@ -208,7 +207,7 @@ - + hr.employee.passport.form hr.employee @@ -221,7 +220,7 @@ - + hr.contract.view.form @@ -274,7 +273,7 @@ - + hr.payroll.structure.tree @@ -310,20 +309,20 @@ - + Salary Structure hr.payroll.structure form - - + hr.holidays.status.inherit @@ -348,7 +347,7 @@ - + hr.payslip.line.tree @@ -434,7 +433,7 @@ - + hr.payslip.form hr.payslip @@ -465,21 +464,21 @@ - + - + - + - + @@ -538,7 +537,7 @@ - + Employee Payslip hr.payslip @@ -547,9 +546,9 @@ - - - + + + hr.allounce.deduction.categoty.form @@ -618,7 +617,7 @@ - + Salary Heads hr.allounce.deduction.categoty @@ -626,13 +625,13 @@ - - + company.contribution.form @@ -716,7 +715,7 @@ - + Company Contributions company.contribution @@ -724,13 +723,13 @@ - - + @@ -776,7 +775,7 @@ - + hr.payroll.advice.tree hr.payroll.advice @@ -790,7 +789,7 @@ - + hr.payroll.advice.form hr.payroll.advice @@ -840,12 +839,12 @@ tree,form - - + hr.payroll.register.tree hr.payroll.register @@ -921,12 +920,12 @@ form tree,form - - + @@ -961,10 +960,10 @@ - + - - + + @@ -993,9 +992,9 @@ hr.contibution.register.line.form @@ -1005,15 +1004,15 @@
- - + + - - + +
- + hr.payslip.line.condition.tree hr.payslip.line.condition @@ -1022,7 +1021,7 @@
- + diff --git a/addons/hr_payroll/report/report_emp_salary_structure.py b/addons/hr_payroll/report/report_emp_salary_structure.py index 8d0b1333dfe..0c63f446c38 100644 --- a/addons/hr_payroll/report/report_emp_salary_structure.py +++ b/addons/hr_payroll/report/report_emp_salary_structure.py @@ -42,7 +42,7 @@ class salary_structure_report(report_sxw.rml_parse): def get_contract(self,emp): curr_date = "'"+time.strftime("%Y-%m-%d")+"'" sql_req= ''' - SELECT c.id as id, c.wage as wage, function as function + SELECT c.id as id, c.wage as wage, struct_id as struct FROM hr_contract c LEFT JOIN hr_employee emp on (c.employee_id=emp.id) LEFT JOIN hr_contract_wage_type cwt on (cwt.id = c.wage_type_id) diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml index 18211b254f3..d5864beb675 100644 --- a/addons/hr_payroll/report/report_emp_salary_structure.rml +++ b/addons/hr_payroll/report/report_emp_salary_structure.rml @@ -185,14 +185,14 @@ - + - + - - + + @@ -202,8 +202,8 @@ - - + + @@ -218,10 +218,10 @@ - - - - + + + + @@ -230,16 +230,16 @@ - - - - + + + + - - + + + - [[repeatIn(objects,'employee')]] @@ -308,7 +308,7 @@ Designation - [[ cont.function.name or '' ]] + [[ cont.job_id.name or '' ]] Phone No. @@ -427,7 +427,7 @@
- [[repeatIn(cont.function.line_ids,'line')]] + [[repeatIn(cont.struct_id.line_ids,'line')]] @@ -550,3 +550,4 @@ + diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index d612706257f..9f8100cd184 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -52,7 +52,7 @@ - + diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml index 8ab227a1870..4515215e4a1 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -58,7 +58,7 @@ - + diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index 0a4aaf1dbf3..cff67ddca5e 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -76,7 +76,7 @@ - +