[MERGE] Merge with trunk addons

bzr revid: mra@mra-laptop-20100803073220-sh726x753e9g4arj
This commit is contained in:
Mustufa Rangwala
2010-08-03 13:02:20 +05:30
15 changed files with 757 additions and 98 deletions
+661
View File
@@ -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)"
@@ -58,7 +58,7 @@
help = "Final Validation Evaluations"/>
<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
<separator orientation="vertical"/>
<field name="employee_id" widget="selection"/>
<field name="employee_id"/>
<field name="plan_id" widget="selection"/>
</group>
<newline/>
@@ -72,7 +72,7 @@
<field name="department_id"/>
</group>
<newline/>
<group expand="1" string="Group By...">
<group expand="0" string="Group By...">
<filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
<filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
<separator orientation="vertical"/>
@@ -58,9 +58,9 @@
<field name="employee_id"/>
</group>
<newline/>
<group expand="1" string="Group By..." colspan="10" col="12">
<group expand="0" string="Group By..." colspan="10" col="12">
<filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
<filter icon="terp-personal" string="Employee"
<filter icon="terp-personal" string="Employee"
name="user" context="{'group_by':'employee_id'}"
help="Leaves by employee"/>
<separator orientation="vertical"/>
@@ -62,7 +62,7 @@
<field name="employee_id"/>
</group>
<newline/>
<group expand="1" string="Group By..." colspan="10" col="12">
<group expand="0" string="Group By..." colspan="10" col="12">
<filter string="Department" name="department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
<separator orientation="vertical"/>
<filter icon="terp-personal" string="Employee" name="Employee" context="{'group_by':'employee_id'}"
+58 -59
View File
@@ -62,7 +62,6 @@
<field name="arch" type="xml">
<search string="Search Passport">
<group col="8" colspan="4">
<separator orientation="vertical"/>
<field name="name"/>
<field name="employee_id"/>
<field name="country_id"/>
@@ -77,7 +76,7 @@
</group>
</search>
</field>
</record>
</record>
<record id="action_hr_passport_tree" model="ir.actions.act_window">
<field name="name">All Passports</field>
<field name="res_model">hr.passport</field>
@@ -87,12 +86,12 @@
</record>
<menuitem id="passport_configure" parent="hr.menu_hr_configuration" name="Passport"/>
<menuitem
id="menu_action_hr_passport_tree"
action="action_hr_passport_tree"
parent="passport_configure"
id="menu_action_hr_passport_tree"
action="action_hr_passport_tree"
parent="passport_configure"
/>
<!-- End Passport Views -->
<!-- Employee View -->
<record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
<field name="name">hr.hr.employee.view.form2</field>
@@ -208,7 +207,7 @@
</notebook>
</field>
</record>
<record id="view_employee_passport_form" model="ir.ui.view">
<field name="name">hr.employee.passport.form</field>
<field name="model">hr.employee</field>
@@ -221,7 +220,7 @@
</field>
</record>
<!-- End Employee View -->
<!-- Contract View -->
<record id="hr_contract.hr_contract_view_form" model="ir.ui.view">
<field name="name">hr.contract.view.form</field>
@@ -274,7 +273,7 @@
</record>
<menuitem action="hr_contract.action_hr_contract" id="hr_menu_contract" parent="payroll_configure" name="Contracts" sequence="4"/>
<!-- End Contract View-->
<!-- Salary structure -->
<record id="view_hr_employee_grade_tree" model="ir.ui.view">
<field name="name">hr.payroll.structure.tree</field>
@@ -310,20 +309,20 @@
</form>
</field>
</record>
<record id="action_view_hr_employee_grade_form" model="ir.actions.act_window">
<field name="name">Salary Structure</field>
<field name="res_model">hr.payroll.structure</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_hr_employee_grade_tree"/>
</record>
<menuitem
id="menu_hr_employee_function"
action="action_view_hr_employee_grade_form"
parent="payroll_configure"
<menuitem
id="menu_hr_employee_function"
action="action_view_hr_employee_grade_form"
parent="payroll_configure"
/>
<!-- End Salary structure -->
<!-- Holiday Status -->
<record model="ir.ui.view" id="view_holiday_status_form1">
<field name="name">hr.holidays.status.inherit</field>
@@ -348,7 +347,7 @@
</field>
</record>
<!-- End Holiday Status -->
<!-- Payslip Line -->
<record id="view_hr_payslip_line_tree" model="ir.ui.view">
<field name="name">hr.payslip.line.tree</field>
@@ -434,7 +433,7 @@
</tree>
</field>
</record>
<record id="view_hr_payslip_form" model="ir.ui.view">
<field name="name">hr.payslip.form</field>
<field name="model">hr.payslip</field>
@@ -465,21 +464,21 @@
<field name="analytic_account_id"/>
</tree>
</field>
<group col="6" colspan="4">
<separator string="Computation Overview" colspan="6"/>
<field name="working_days"/>
<field name="holiday_days"/>
<field name="worked_days"/>
<field name="basic_before_leaves"/>
<field name="leaves"/>
<field name="basic"/>
<field name="allounce"/>
<field name="deduction"/>
<field name="other_pay"/>
<field name="grows"/>
<field name="net"/>
<field name="total_pay"/>
@@ -538,7 +537,7 @@
</group>
</search>
</field>
</record>
</record>
<record id="action_view_hr_payslip_form" model="ir.actions.act_window">
<field name="name">Employee Payslip</field>
<field name="res_model">hr.payslip</field>
@@ -547,9 +546,9 @@
<field name="search_view_id" ref="view_hr_payslip_filter"/>
</record>
<menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>
<!-- Payment Heads -->
<record id="hr_allounce_deduction_categoty_form" model="ir.ui.view">
<field name="name">hr.allounce.deduction.categoty.form</field>
@@ -618,7 +617,7 @@
</search>
</field>
</record>
<record id="hr_allounce_deduction_tree" model="ir.actions.act_window">
<field name="name">Salary Heads</field>
<field name="res_model">hr.allounce.deduction.categoty</field>
@@ -626,13 +625,13 @@
<field name="view_id" ref="hr_allounce_deduction_categoty_tree"/>
<field name="search_view_id" ref="view_allounce_deduction_categoty_filter"/>
</record>
<menuitem
id="menu_hr_allounce_deduction_tree"
action="hr_allounce_deduction_tree"
parent="payroll_configure"
<menuitem
id="menu_hr_allounce_deduction_tree"
action="hr_allounce_deduction_tree"
parent="payroll_configure"
/>
<!-- End Payment Heads -->
<!-- Company Contribution -->
<record id="hr_company_contribution_form" model="ir.ui.view">
<field name="name">company.contribution.form</field>
@@ -716,7 +715,7 @@
</group>
</search>
</field>
</record>
</record>
<record id="action_hr_company_contribution_tree" model="ir.actions.act_window">
<field name="name">Company Contributions</field>
<field name="res_model">company.contribution</field>
@@ -724,13 +723,13 @@
<field name="view_id" ref="hr_company_contribution_tree"/>
<field name="search_view_id" ref="view_hr_company_contribution_filter"/>
</record>
<menuitem
id="menu_hr_company_contribution_tree"
action="action_hr_company_contribution_tree"
parent="payroll_configure"
<menuitem
id="menu_hr_company_contribution_tree"
action="action_hr_company_contribution_tree"
parent="payroll_configure"
/>
<!-- End Company Contribution -->
<!-- Contract Form-->
<!-- <record id="hr_contract.hr_contract_view_form" model="ir.ui.view">-->
<!-- <field name="name">hr.contract.view.form</field>-->
@@ -776,7 +775,7 @@
<!-- id="hr_menu_contract" -->
<!-- parent="payroll_configure"-->
<!-- />-->
<record id="view_hr_bank_advice_tree" model="ir.ui.view">
<field name="name">hr.payroll.advice.tree</field>
<field name="model">hr.payroll.advice</field>
@@ -790,7 +789,7 @@
</tree>
</field>
</record>
<record id="view_hr_bank_advice_form" model="ir.ui.view">
<field name="name">hr.payroll.advice.form</field>
<field name="model">hr.payroll.advice</field>
@@ -840,12 +839,12 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_hr_bank_advice_tree"/>
</record>
<menuitem
action="action_view_hr_bank_advice_tree"
id="hr_menu_payment_advice"
<menuitem
action="action_view_hr_bank_advice_tree"
id="hr_menu_payment_advice"
parent="menu_hr_root_payroll"
/>
<record id="view_hr_payroll_register_tree" model="ir.ui.view">
<field name="name">hr.payroll.register.tree</field>
<field name="model">hr.payroll.register</field>
@@ -921,12 +920,12 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem
action="action_view_hr_payroll_register_form"
id="hr_menu_payroll_register"
<menuitem
action="action_view_hr_payroll_register_form"
id="hr_menu_payroll_register"
parent="menu_hr_root_payroll"
/>
<!--
Contribution Register
-->
@@ -961,10 +960,10 @@
<tree string="Register Lines" editable="top">
<field name="code"/>
<field name="employee_id"/>
<field name="period_id"/>
<field name="period_id"/>
<field name="emp_deduction"/>
<field name="comp_deduction"/>
<field name="total"/>
<field name="comp_deduction"/>
<field name="total"/>
</tree>
</field>
</page>
@@ -993,9 +992,9 @@
<field name="view_id" ref="hr_contibution_register_tree"/>
</record>
<menuitem
id="menu_action_hr_contibution_register_form"
action="action_contibution_register_form"
parent="payroll_configure"
id="menu_action_hr_contibution_register_form"
action="action_contibution_register_form"
parent="payroll_configure"
/>
<record id="hr_contibution_register_line_form" model="ir.ui.view">
<field name="name">hr.contibution.register.line.form</field>
@@ -1005,15 +1004,15 @@
<form string="Contribution">
<field name="name"/>
<field name="code"/>
<field name="employee_id"/>
<field name="period_id"/>
<field name="employee_id"/>
<field name="period_id"/>
<field name="emp_deduction"/>
<field name="comp_deduction"/>
<field name="total"/>
<field name="comp_deduction"/>
<field name="total"/>
</form>
</field>
</record>
<record id="hr_payslip_line_condition_tree" model="ir.ui.view">
<field name="name">hr.payslip.line.condition.tree</field>
<field name="model">hr.payslip.line.condition</field>
@@ -1022,7 +1021,7 @@
<form string="Condition">
<field name="name"/>
<field name="date_start"/>
<field name="date_end"/>
<field name="date_end"/>
<field name="state"/>
</form>
</field>
@@ -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)
@@ -185,14 +185,14 @@
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="Table Contents" fontName="Times-Roman"/>
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
<paraStyle name="Table Contents" fontName="Helvetica"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -202,8 +202,8 @@
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Footer" fontName="Times-Roman"/>
<paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Footer" fontName="Helvetica"/>
<paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -218,10 +218,10 @@
<paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Drawing" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Header" fontName="Times-Roman"/>
<paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
<paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
<paraStyle name="Signature" fontName="Times-Roman"/>
<paraStyle name="Header" fontName="Helvetica"/>
<paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
<paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
<paraStyle name="Signature" fontName="Helvetica"/>
<paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -230,16 +230,16 @@
<paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Salutation" fontName="Times-Roman"/>
<paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Salutation" fontName="Helvetica"/>
<paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
<images/>
</stylesheet>
<images/>
<story>
<para style="terp_default_8">[[repeatIn(objects,'employee')]]</para>
<blockTable colWidths="539.0" style="Table1">
@@ -308,7 +308,7 @@
<para style="terp_tblheader_Details">Designation</para>
</td>
<td>
<para style="terp_default_9">[[ cont.function.name or '' ]]</para>
<para style="terp_default_9">[[ cont.job_id.name or '' ]]</para>
</td>
<td>
<para style="terp_tblheader_Details">Phone No.</para>
@@ -427,7 +427,7 @@
<font color="white"> </font>
</para>
<section>
<para style="terp_default_9">[[repeatIn(cont.function.line_ids,'line')]]</para>
<para style="terp_default_9">[[repeatIn(cont.struct_id.line_ids,'line')]]</para>
<blockTable colWidths="34.0,117.0,39.0,67.0,44.0,110.0,69.0,59.0" style="Table8">
<tr>
<td>
@@ -550,3 +550,4 @@
</para>
</story>
</document>
+1 -1
View File
@@ -52,7 +52,7 @@
<group col='8' colspan='4'>
<filter icon="terp-go-today" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
<separator orientation="vertical"/>
<field name="user_id" select="1" widget="selection"/>
<field name="user_id"/>
<field name="account_id" select="1" widget="selection"/>
<field name="date" select="1"/>
</group>
@@ -58,7 +58,7 @@
<field name="user_id" />
</group>
<newline/>
<group expand="1" string="Group By...">
<group expand="0" string="Group By...">
<filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<separator orientation="vertical"/>
@@ -76,7 +76,7 @@
<field name="user_id" />
</group>
<newline/>
<group expand="1" string="Group By...">
<group expand="0" string="Group By...">
<filter string="User" name="User_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
<separator orientation="vertical"/>
+3 -4
View File
@@ -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'})
+1 -1
View File
@@ -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
@@ -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:
+5 -5
View File
@@ -241,11 +241,11 @@
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') or removeParentNode('section') ]]</para>
<para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') ]]</para>
<blockTable colWidths="257.0,58.0,61.0,46.0,26.0,74.0" style="Move_Line_Contect_Assign_State">
<tr>
<td>
<para style="terp_default_9">[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </para>
<para style="terp_default_9"><font> [ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ] </font> <font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </font> </para>
</td>
<td>
<para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
@@ -268,16 +268,16 @@
<font color="white"> </font>
</para>
<para style="terp_default_5cm_Above_Space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('s') ]]</para>
<para style="terp_default_5cm_Above_Space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('section') ]]</para>
<para style="terp_default_Bold_9">Non Assigned Products: [[ ( move_lines.state == 'assigned' or move_lines.state == 'done' or move_lines.state == 'confirmed' ) and removeParentNode('para') ]]</para>
<para style="terp_default_1cm_above_space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('para') ]]</para>
</section>
<section>
<para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]]</para>
<para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') and removeParentNode('section') ]]</para>
<blockTable colWidths="257.0,57.0,62.0,46.0,26.0,74.0" style="Move_Line_Content_Other_State">
<tr>
<td>
<para style="terp_default_9">[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]</para>
<para style="terp_default_9"><font> [ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ] </font> <font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </font> </para>
</td>
<td>
<para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>