Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20111223054503-il515335tdfkghbw
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223073609-mpe8e232ykba47y0

28 files changed, 26554 insertions, 28564 deletions

diff --git a/addons/hr_payroll/i18n/bg.po b/addons/hr_payroll/i18n/bg.po
index 37dc77046a6..37812c8be37 100644
--- a/addons/hr_payroll/i18n/bg.po
+++ b/addons/hr_payroll/i18n/bg.po
@@ -7,247 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-03-27 15:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:15+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Имейл адрес"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Запалта нето"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Отдел"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr ""
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Групиране по..."
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr ""
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Области"
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Заем"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Иплатена заплата"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Фирма"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
+#: view:hr.payslip:0
+msgid "Done Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Пращане в проект"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Изтича"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Други"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr ""
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Общо:"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Отхвърляне"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Напускащи"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Регистриране"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
-msgstr "Грешка! Не можете да изберете отдел, в който служителят е мениджър."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Стойност"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Име на служителя"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
 msgstr ""
 
 #. module: hr_payroll
@@ -256,259 +202,176 @@ msgid "Salary Computation"
 msgstr "Изчисляване на заплата"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Сума"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Процентно"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Друга информация"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Платен празник"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Групиране по..."
-
-#. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Паспорт валиден до"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Неплатен празник"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Валидност от"
-
-#. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Сума (словом):"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Плащане"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
+msgid "Draft Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Identification No"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Базиран на"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Identification No"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Общо:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Публикувано"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Дата :"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Междинна сума"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Плащаниея -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "Visa No"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "От"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "По заплата"
-
-#. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Крайна дата"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Бележки:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Състояние"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Аргументи на функция"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -516,453 +379,342 @@ msgid "Employee"
 msgstr "Служител"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Формула"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Тип"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "Имейл"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "#"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Грешка!"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Брутна заплата"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Друго плащане"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Удръжки"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Запалта на служител"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Общо за служител"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Fixed Amount"
 msgstr "Фиксирана количество"
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "До"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+msgid "Worked Days & Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Payslip"
+msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: constraint:hr.contract:0
-msgid "Error! contract start-date must be lower then contract end-date."
-msgstr "Грешка! Началната дата на договора трябва да бъде крайната дата."
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
+#: view:hr.payslip:0
+msgid "Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr ""
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr "Грешка! Началната дата на договора трябва да бъде крайната дата."
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Други:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Общо по фирми"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Код на служител"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Категория"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "Печат на извлечение"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Чернова"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr "Доходи"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Основен"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Всичи паспорти"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Име на служител"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
+#: view:hr.salary.rule:0
+msgid "Conditions"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "Процент (%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
+#: view:hr.payslip:0
+msgid "Worked Day"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "За"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Договори"
-
-#. module: hr_payroll
 #: view:hr.payroll.structure:0
 msgid "Employee Function"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Платен"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "Платен? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Валидиране"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Заглавие"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Потребител"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Редове от плащане"
-
-#. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Активен"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr ""
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
@@ -972,61 +724,38 @@ msgstr ""
 "Грешка! Не могат да бъдат създавани рекурсивни йерархии от служители."
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Условие"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Изчисление"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr "Предназначение"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr "Код на категория"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "Информация за заплата"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1035,340 +764,276 @@ msgid "Companies"
 msgstr "Фирми"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Договор"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Дата"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr "Участници"
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "Телефонен No."
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
-msgstr "Участници"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "Етикет"
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
-msgstr "Друг No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Код"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "Номер:"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Последователност"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Номер"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr "Структура на заплатата"
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Отмяна"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "Затваряне"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Обезщетения"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "Паспорт No"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Паспорт"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Обща заплата"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "за период"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "Имейл"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "Отпечатване на отчет"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr "Изчисления"
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Други информации"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Месец"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr "Издание"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr "Динамично изчисление"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Функция"
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr "Области"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Уважаеми г-н/г-жо,"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Описание"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Начална дата"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ")"
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1380,240 +1045,435 @@ msgid "Payroll"
 msgstr "Ведомост"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Тип възнаграждение"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "Нетна заплата"
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr "Номера на паспорта трябва да е уникален !"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "Име на категория"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Адрес"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Банка"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "Напред"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Име"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "Държава"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Служители"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Банкова сметка"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Общо плащане"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr ""
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Общо"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
-msgstr "Друг Id"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Детайли за банката"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Последователност"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Годишна заплата"
+#~ msgid "Department"
+#~ msgstr "Отдел"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr ""
+#~ msgid "Loan"
+#~ msgstr "Заем"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr ""
+#~ msgid "Others"
+#~ msgstr "Други"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr ""
+#~ msgid "Expire"
+#~ msgstr "Изтича"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Общо"
+#~ msgid "Register"
+#~ msgstr "Регистриране"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr ""
+#~ msgid "Leaves"
+#~ msgstr "Напускащи"
+
+#~ msgid "Reject"
+#~ msgstr "Отхвърляне"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr "Грешка! Не можете да изберете отдел, в който служителят е мениджър."
+
+#~ msgid "Value"
+#~ msgstr "Стойност"
+
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Неплатен празник"
+
+#~ msgid "Percentage"
+#~ msgstr "Процентно"
+
+#~ msgid "Valid From"
+#~ msgstr "Валидност от"
+
+#~ msgid "Payment"
+#~ msgstr "Плащане"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Сума (словом):"
+
+#~ msgid "Date :"
+#~ msgstr "Дата :"
+
+#~ msgid "Payments -"
+#~ msgstr "Плащаниея -"
+
+#~ msgid "Posted"
+#~ msgstr "Публикувано"
+
+#~ msgid "Sub Total"
+#~ msgstr "Междинна сума"
+
+#~ msgid "From"
+#~ msgstr "От"
+
+#~ msgid "End Date"
+#~ msgstr "Крайна дата"
+
+#~ msgid "Function Arguments"
+#~ msgstr "Аргументи на функция"
+
+#~ msgid "Notes:"
+#~ msgstr "Бележки:"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "Type"
+#~ msgstr "Тип"
+
+#~ msgid "Formula"
+#~ msgstr "Формула"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Грешка!"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Брутна заплата"
+
+#~ msgid "Deductions"
+#~ msgstr "Удръжки"
+
+#~ msgid "Other Payment"
+#~ msgstr "Друго плащане"
+
+#~ msgid "Employee Salary"
+#~ msgstr "Запалта на служител"
+
+#~ msgid "Total By Employee"
+#~ msgstr "Общо за служител"
+
+#~ msgid "To"
+#~ msgstr "До"
+
+#~ msgid "Others:"
+#~ msgstr "Други:"
+
+#~ msgid "Print Statement"
+#~ msgstr "Печат на извлечение"
+
+#~ msgid "Basic"
+#~ msgstr "Основен"
+
+#~ msgid "Earnings"
+#~ msgstr "Доходи"
+
+#~ msgid "Employee Name"
+#~ msgstr "Име на служител"
+
+#~ msgid "For"
+#~ msgstr "За"
+
+#~ msgid "Contracts"
+#~ msgstr "Договори"
+
+#~ msgid "Paid"
+#~ msgstr "Платен"
+
+#~ msgid "Validation"
+#~ msgstr "Валидиране"
+
+#~ msgid "User"
+#~ msgstr "Потребител"
+
+#~ msgid "Title"
+#~ msgstr "Заглавие"
+
+#~ msgid "Paid ? "
+#~ msgstr "Платен? "
+
+#~ msgid "Payment Lines"
+#~ msgstr "Редове от плащане"
+
+#~ msgid "Salary Information"
+#~ msgstr "Информация за заплата"
+
+#~ msgid "Condition"
+#~ msgstr "Условие"
+
+#~ msgid "Compute"
+#~ msgstr "Изчисление"
+
+#~ msgid "Category Code"
+#~ msgstr "Код на категория"
+
+#~ msgid "Date"
+#~ msgstr "Дата"
+
+#~ msgid "Phone No."
+#~ msgstr "Телефонен No."
+
+#~ msgid "Label"
+#~ msgstr "Етикет"
+
+#~ msgid "Other No."
+#~ msgstr "Друг No."
+
+#~ msgid "Number :"
+#~ msgstr "Номер:"
+
+#~ msgid "Number"
+#~ msgstr "Номер"
+
+#~ msgid "Passport No"
+#~ msgstr "Паспорт No"
+
+#~ msgid "Allowances"
+#~ msgstr "Обезщетения"
+
+#~ msgid "Print Report"
+#~ msgstr "Отпечатване на отчет"
+
+#~ msgid "E-mail"
+#~ msgstr "Имейл"
+
+#~ msgid "Passport"
+#~ msgstr "Паспорт"
+
+#~ msgid "Function"
+#~ msgstr "Функция"
+
+#~ msgid "Month"
+#~ msgstr "Месец"
+
+#~ msgid "Issue"
+#~ msgstr "Издание"
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "Уважаеми г-н/г-жо,"
+
+#~ msgid "Category Name"
+#~ msgstr "Име на категория"
+
+#~ msgid "Wage Type"
+#~ msgstr "Тип възнаграждение"
+
+#~ msgid "Start Date"
+#~ msgstr "Начална дата"
+
+#~ msgid "Advance"
+#~ msgstr "Напред"
+
+#~ msgid "Bank"
+#~ msgstr "Банка"
+
+#~ msgid "Total Payment"
+#~ msgstr "Общо плащане"
+
+#~ msgid "Country"
+#~ msgstr "Държава"
+
+#~ msgid "Bank Details"
+#~ msgstr "Детайли за банката"
+
+#~ msgid "Year Salary"
+#~ msgstr "Годишна заплата"
+
+#~ msgid "Net Salary"
+#~ msgstr "Запалта нето"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Платен празник"
+
+#~ msgid "Visa No"
+#~ msgstr "Visa No"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Паспорт валиден до"
+
+#~ msgid "Based on"
+#~ msgstr "Базиран на"
+
+#~ msgid "By Salary"
+#~ msgstr "По заплата"
+
+#~ msgid "Employee Code"
+#~ msgstr "Код на служител"
+
+#~ msgid "All Passports"
+#~ msgstr "Всичи паспорти"
+
+#~ msgid "Total By Company"
+#~ msgstr "Общо по фирми"
+
+#~ msgid "for period"
+#~ msgstr "за период"
+
+#~ msgid "Total Salary"
+#~ msgstr "Обща заплата"
+
+#~ msgid "Dynamic Computation"
+#~ msgstr "Динамично изчисление"
+
+#~ msgid "Other Informations"
+#~ msgstr "Други информации"
+
+#~ msgid "Net Sal."
+#~ msgstr "Нетна заплата"
+
+#~ msgid "The Passport No must be unique !"
+#~ msgstr "Номера на паспорта трябва да е уникален !"
+
+#~ msgid "Other Id"
+#~ msgstr "Друг Id"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Иплатена заплата"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Име на служителя"
+
+#~ msgid "E-mail Address"
+#~ msgstr "Имейл адрес"
diff --git a/addons/hr_payroll/i18n/ca.po b/addons/hr_payroll/i18n/ca.po
index 8cb421a80f3..7976e93a785 100644
--- a/addons/hr_payroll/i18n/ca.po
+++ b/addons/hr_payroll/i18n/ca.po
@@ -7,250 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-03-25 17:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:15+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Adreça d'Email"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Basat"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Salari net"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Recalcula plantilla"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Detalles salario de los empleados"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
-msgstr "Primes amb base:"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Departament"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Deduccions:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "Ús de propina?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Agrupa per..."
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Días de trabajo"
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Estats"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Préstec"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Registro de pago de nómina"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Nòmines"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Informe anual de salarios"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Nómina pagada"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Companyia"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "El responsable"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "Detalles de la carta"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Canvia esborrany"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "Error variable: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Venciment"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Vacances amb mitja paga"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Altres"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Nómina"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Detalles del contrato:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Campo de cálculo"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "Seleccioneu la direcció del banc des d'on es pagarà la nòmina."
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "Aviso bancario"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Rebutja"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Total:"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Fulles"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Registra"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
-"Error! No podeu seleccionar un departament que tingui l'empleat com a "
-"responsable."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Total deduccions"
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Valor"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Nombre del empleado"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr "Lineas de Registro"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -258,270 +202,176 @@ msgid "Salary Computation"
 msgstr "Cálculo de la nómina"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Import"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-"Si us plau, comproveu la configuració de %s, falta la capçalera de la nòmina"
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Percentatge"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Línea de nómina"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Altra informació"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "País de emisión"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Deducción del empleado"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Otras deducciones"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Vacaciones pagada"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Agrupa per..."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Data expiració passaport"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Vacances no pagades"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Vàlid des de"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
-msgstr "Camp usat en càlculs interns, no el col·loqueu en un formulari."
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Import (en paraules):"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Pagament"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr "Línea de nómina"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "Nº identificació"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Basat en"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Esperando verificación"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Nóminas de recursos humanos"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Fixat"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
-msgstr ""
-"Sistema de nòmines genèric\n"
-"    * Detalls d'empleat\n"
-"    * Contractes d'empleat\n"
-"    * Contractes basats en passaports\n"
-"    * Complements/deduccions\n"
-"    * Permet configurar salari base/brut/ net\n"
-"    * Nòmina d'empleat\n"
-"    * Registre mensual de nòmines\n"
-"    * Integrat amb la gestió de vacances\n"
-"    "
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Tipus d'absència"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Data :"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Subtotal"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Pagos -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "Número de Visa"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Des de"
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "Per salari"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Data final"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr "Nómina del empleado"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Deduccions per absència"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "Firma autorizada"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "Valor de función"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
-msgstr "Línea de registro de contribución"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Notes:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Província"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr "Línies de pagament"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "Altres línies"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Arguments de la funció"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
-msgstr "Contribuciones de la compañía"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -529,193 +379,183 @@ msgid "Employee"
 msgstr "Empleat"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Fórmula"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr "Línies de notificació bancària"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Tipus"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "Email"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "Nº"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Error!"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Comprova full"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
-msgstr "Nombre de dies/setmanes treballats per empleat."
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr "Nou justificant"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr "Base neta"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Salario bruto"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "Ingresos totales"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
-msgstr "Declaració salari de l'empleat"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Otros pagos"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Deduccions"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "Nº permiso trabajo"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Salario empleado"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr "Import fix"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
-msgstr "Cadascun dels nostres"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Total per empleat"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "Import fix"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Fins el"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr "Error de variable!"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Paga nòmina"
+msgid "PaySlip Batch"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
-msgstr "Compte bancari"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
-msgstr "Líneas de contribución"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "Per al mes de"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Deducción"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr "Observación aviso bancario"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr "Nòmina"
@@ -728,191 +568,129 @@ msgstr ""
 "finalització."
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr "Entrega anticipo"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr "Comprobación RH completa"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "Atentament"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr "Núm. SS"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Importe neto"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Estructura salarial:"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "Detalle salario empleado"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr "Línia de funció"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr "Full de confirmació"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Altres:"
+#: view:hr.contract:0
+msgid "Payslip Info"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr "Funció de càlcul"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "Dies treballats"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Total per companyia"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
-msgstr "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
-msgstr "País i Adreça"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Codi d'empleat"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
-msgstr "Salari base - Absències"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "Tipus d'import"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Categoria"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
-msgstr "Contribució companyia"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
-msgstr "Capçaleres"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "Imprimir declaración"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Esborrany"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr "Ingressos"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Bàsic"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Tots els passaports"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
-msgstr "Registre salarial"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Nom de l'empleat"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Detalle pasaporte"
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "Percentatge (%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr "Registre de nòmines"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "Per"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Contractes"
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr "Dies treballats"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -920,44 +698,10 @@ msgid "Employee Function"
 msgstr "Funció de l'empleat"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Pagat"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "Aprobar hoja"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "Pagat? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Validació"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Títol"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr "Cerca contribució de la companyia"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Usuari"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Línies de pagament"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -965,20 +709,15 @@ msgid "Compute Sheet"
 msgstr "Calcula full"
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Actiu"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr "Aplica aquest encapçalament en el càlcul si la condició es vertadera"
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "Detalls del salari anual"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
+msgstr ""
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
@@ -986,62 +725,39 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Error! No podeu crear una jerarquia recursiva d'empleats."
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Condició"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr "Esperant verificació de RRHH"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
-msgstr "Avís de pagament:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Calcula"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr "Designació"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "Responsable de RRHH"
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Salari base"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr "Codi categoria"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "Informació del salari"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
-msgstr "Categoria prima/deducció"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1049,348 +765,276 @@ msgid "Companies"
 msgstr "Companyies"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr "Firma autoritzada"
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Contracte"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
-msgstr "Full esborrany"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
-msgstr "Data proper mes"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Data"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "Data expiració visat"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr "Contribució"
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
-msgstr "Buscar pasaporte"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "Nº telèfon"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
-msgstr "Contribució"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "Etiqueta"
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
-msgstr "Contribució companyia"
+msgid "Refund"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
-msgstr "Altre Nº"
+#: view:hr.salary.rule:0
+msgid "Company contribution"
+msgstr "Contribució companyia"
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Codi"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
-msgstr "Avís de pagament"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "Número :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Seqüència"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
-"Això s'utilitza per calcular els valors dels camps %, en general en la seva "
-"base, però podeu utilitzar totes les capçaleres dels camps de codi en lletra "
-"petita com un nom de variable, per exemple hra, ma, lta, etc., també podeu "
-"utilitzar variable estàtica bàsica."
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
-msgstr "Resum del càlcul"
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
-msgstr "Salari sobre"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Número"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr "Estructura salarial"
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr "Línia registre"
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Cancel·la"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "Tanca"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "Import / Percentatge"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Primes"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr "Data mes actual"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Salari"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "Número de passaport"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Passaport"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Salari total"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "per període"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr "Capçalera nòmina"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr "Registre de contribució"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "Correu electrònic"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
-msgstr "Capçaleres salari"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "Imprimeix informe"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr "Cálculos"
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-"Defineix un rati de contribució de la companyia 1,00=100% de la contribució. "
-"Si l'empleat contribueix amb el 5%, llavors si aquí la companyia té un rati "
-"de 0.50, la companyia contribuirà amb el 50% del 5% de la contribució de "
-"l'empleat."
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Altra informació"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr "Incidència"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr "Càlcul dinàmic"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr "Salari base sense absències:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Funció"
+msgid "Worked Days"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr "Estats"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Estimat Sr./Sra.,"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
-msgstr "Capçaleres prima/deducció"
+msgid "Search Payslips"
+msgstr "Cerca nòmines"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
-msgstr "Sal. brut"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Descripció"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Data inici"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr "Deducció -"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ")"
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr "Registres de contribució"
 
@@ -1402,240 +1046,824 @@ msgid "Payroll"
 msgstr "Nòmina"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Tipus de salari"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "Sal. net"
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr "El número de passaport ha de ser únic!"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "Nom de categoria"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
-msgstr "hr.nòmina.any.salari"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Adreça"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr "Línia justificant"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr "Número de fulls"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Banc"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr "Cancel·la full"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "Bestreta"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
-msgstr "Primes i deduccions especials per empleat:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Nom"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr "Fulls de deducció"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "País"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Empleats"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Compte bancari"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr "Registre de contribució basat en la empresa"
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr "S'utilitza per organitzar la seqüència de càlcul"
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Pagament total"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr "Línia de deduccions per absències:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr "Esperant per a la verificació del compte"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
-msgstr "Deducció de la compañía"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "Configuració de la nòmina"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Total"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr "Si us plau, definiu el compte bancari per al treballador %s"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr "Data d'emissió del passaport"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr "Subsidi"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "Núm. de fulls"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
-msgstr "Altre id"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Detalls del banc"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
-msgstr "ID justificant"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Seqüència"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
-msgstr "Nòmina dels treballadors"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr "Contingut de la carta"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Salari anual"
+#~ msgid "Employees Salary Details"
+#~ msgstr "Detalles salario de los empleados"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr "Prima / Deducció"
+#~ msgid "Net Salary"
+#~ msgstr "Salari net"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr "Avís de pagament del banc"
+#~ msgid "Working Days"
+#~ msgstr "Días de trabajo"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr "Cerca nòmines"
+#~ msgid "Department"
+#~ msgstr "Departament"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Total"
+#~ msgid "Deductions:"
+#~ msgstr "Deduccions:"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr "Contribucions"
+#~ msgid "Use for Gratuity ?"
+#~ msgstr "Ús de propina?"
+
+#~ msgid "Based"
+#~ msgstr "Basat"
+
+#~ msgid "The Manager"
+#~ msgstr "El responsable"
+
+#~ msgid "Loan"
+#~ msgstr "Préstec"
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "Registro de pago de nómina"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Nómina pagada"
+
+#~ msgid "Year Salary Report"
+#~ msgstr "Informe anual de salarios"
+
+#~ msgid "Letter Details"
+#~ msgstr "Detalles de la carta"
+
+#~ msgid "Others"
+#~ msgstr "Altres"
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr "Seleccioneu la direcció del banc des d'on es pagarà la nòmina."
+
+#~ msgid "Half-Pay Holiday"
+#~ msgstr "Vacances amb mitja paga"
+
+#, python-format
+#~ msgid "Variable Error: %s "
+#~ msgstr "Error variable: %s "
+
+#~ msgid "Bank Advice"
+#~ msgstr "Aviso bancario"
+
+#~ msgid "Calculaton Field"
+#~ msgstr "Campo de cálculo"
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Detalles del contrato:"
+
+#~ msgid "Expire"
+#~ msgstr "Venciment"
+
+#~ msgid "Total Deductions"
+#~ msgstr "Total deduccions"
+
+#~ msgid "Register"
+#~ msgstr "Registra"
+
+#~ msgid "Leaves"
+#~ msgstr "Fulles"
+
+#~ msgid "Reject"
+#~ msgstr "Rebutja"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Nombre del empleado"
+
+#~ msgid "Value"
+#~ msgstr "Valor"
+
+#~ msgid "Register Lines"
+#~ msgstr "Lineas de Registro"
+
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Vacances no pagades"
+
+#~ msgid "Other Deduction"
+#~ msgstr "Otras deducciones"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Deducción del empleado"
+
+#~ msgid "Percentage"
+#~ msgstr "Percentatge"
+
+#~ msgid "Wating for Verification"
+#~ msgstr "Esperando verificación"
+
+#~ msgid ""
+#~ "Calculation field used for internal calculation, do not place this on form"
+#~ msgstr "Camp usat en càlculs interns, no el col·loqueu en un formulari."
+
+#~ msgid "Valid From"
+#~ msgstr "Vàlid des de"
+
+#~ msgid "Based on"
+#~ msgstr "Basat en"
+
+#~ msgid "Payment"
+#~ msgstr "Pagament"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Import (en paraules):"
+
+#~ msgid "Human Resource Payroll"
+#~ msgstr "Nóminas de recursos humanos"
+
+#~ msgid "Posted"
+#~ msgstr "Fixat"
+
+#~ msgid ""
+#~ "Generic Payroll system\n"
+#~ "    * Employee Details\n"
+#~ "    * Employee Contracts\n"
+#~ "    * Passport based Contract\n"
+#~ "    * Allowances / Deductions\n"
+#~ "    * Allow to configure Basic / Grows / Net Salary\n"
+#~ "    * Employee Payslip\n"
+#~ "    * Monthly Payroll Register\n"
+#~ "    * Integrated with Holiday Management\n"
+#~ "    "
+#~ msgstr ""
+#~ "Sistema de nòmines genèric\n"
+#~ "    * Detalls d'empleat\n"
+#~ "    * Contractes d'empleat\n"
+#~ "    * Contractes basats en passaports\n"
+#~ "    * Complements/deduccions\n"
+#~ "    * Permet configurar salari base/brut/ net\n"
+#~ "    * Nòmina d'empleat\n"
+#~ "    * Registre mensual de nòmines\n"
+#~ "    * Integrat amb la gestió de vacances\n"
+#~ "    "
+
+#~ msgid "Leave Type"
+#~ msgstr "Tipus d'absència"
+
+#~ msgid "Date :"
+#~ msgstr "Data :"
+
+#~ msgid "Payments -"
+#~ msgstr "Pagos -"
+
+#~ msgid "Sub Total"
+#~ msgstr "Subtotal"
+
+#~ msgid "Visa No"
+#~ msgstr "Número de Visa"
+
+#~ msgid "From"
+#~ msgstr "Des de"
+
+#~ msgid "By Salary"
+#~ msgstr "Per salari"
+
+#~ msgid "End Date"
+#~ msgstr "Data final"
+
+#~ msgid "Leave Deductions"
+#~ msgstr "Deduccions per absència"
+
+#~ msgid "Authorised Signature"
+#~ msgstr "Firma autorizada"
+
+#~ msgid "Notes:"
+#~ msgstr "Notes:"
+
+#~ msgid "Contribution Register Line"
+#~ msgstr "Línea de registro de contribución"
+
+#~ msgid "Function Value"
+#~ msgstr "Valor de función"
+
+#~ msgid "Function Arguments"
+#~ msgstr "Arguments de la funció"
+
+#~ msgid "Other Lines"
+#~ msgstr "Altres línies"
+
+#~ msgid "Paymeny Lines"
+#~ msgstr "Línies de pagament"
+
+#~ msgid "Formula"
+#~ msgstr "Fórmula"
+
+#~ msgid "Company Contributions"
+#~ msgstr "Contribuciones de la compañía"
+
+#~ msgid "Bank Advice Lines"
+#~ msgstr "Línies de notificació bancària"
+
+#~ msgid "E-mail Address"
+#~ msgstr "Adreça d'Email"
+
+#~ msgid "Recompute Sheet"
+#~ msgstr "Recalcula plantilla"
+
+#~ msgid "Country of Issue"
+#~ msgstr "País de emisión"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Data expiració passaport"
+
+#~ msgid "Allowances with Basic:"
+#~ msgstr "Primes amb base:"
+
+#~ msgid "Verify Sheet"
+#~ msgstr "Comprova full"
+
+#~ msgid "#"
+#~ msgstr "Nº"
+
+#~ msgid "Type"
+#~ msgstr "Tipus"
+
+#, python-format
+#~ msgid "Please check configuration of %s, payroll head is missing"
+#~ msgstr ""
+#~ "Si us plau, comproveu la configuració de %s, falta la capçalera de la nòmina"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Error!"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Vacaciones pagada"
+
+#~ msgid "New Slip"
+#~ msgstr "Nou justificant"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Salario bruto"
+
+#~ msgid "Employee Salary Statement"
+#~ msgstr "Declaració salari de l'empleat"
+
+#~ msgid "Work Permit No"
+#~ msgstr "Nº permiso trabajo"
+
+#~ msgid "Deductions"
+#~ msgstr "Deduccions"
+
+#~ msgid "Total Earnings"
+#~ msgstr "Ingresos totales"
+
+#~ msgid "Other Payment"
+#~ msgstr "Otros pagos"
+
+#~ msgid "Net Basic"
+#~ msgstr "Base neta"
+
+#~ msgid "No of Working days / week for an employee"
+#~ msgstr "Nombre de dies/setmanes treballats per empleat."
+
+#~ msgid "C/D"
+#~ msgstr "C/D"
+
+#~ msgid "Pay Salary"
+#~ msgstr "Paga nòmina"
+
+#~ msgid "Contribution Lines"
+#~ msgstr "Líneas de contribución"
+
+#~ msgid "hr.payroll.employees.detail"
+#~ msgstr "hr.payroll.employees.detail"
+
+#, python-format
+#~ msgid "Variable Error !"
+#~ msgstr "Error de variable!"
+
+#~ msgid "Total By Employee"
+#~ msgstr "Total per empleat"
+
+#~ msgid "To"
+#~ msgstr "Fins el"
+
+#~ msgid "Employee Salary"
+#~ msgstr "Salario empleado"
+
+#~ msgid "Chaque Nos"
+#~ msgstr "Cadascun dels nostres"
+
+#~ msgid "Bank Account A/C"
+#~ msgstr "Compte bancari"
+
+#~ msgid "Deduction"
+#~ msgstr "Deducción"
+
+#~ msgid "For the month of"
+#~ msgstr "Per al mes de"
+
+#~ msgid "Bank Advice Note"
+#~ msgstr "Observación aviso bancario"
+
+#~ msgid "Net Amount"
+#~ msgstr "Importe neto"
+
+#~ msgid "Yours Sincerely"
+#~ msgstr "Atentament"
+
+#~ msgid "Loan Installment"
+#~ msgstr "Entrega anticipo"
+
+#~ msgid "Complete HR Checking"
+#~ msgstr "Comprobación RH completa"
+
+#~ msgid "Salary Structure:"
+#~ msgstr "Estructura salarial:"
+
+#~ msgid "Employees Salary Detail"
+#~ msgstr "Detalle salario empleado"
+
+#~ msgid "Confirm Sheet"
+#~ msgstr "Full de confirmació"
+
+#~ msgid "Function Line"
+#~ msgstr "Línia de funció"
+
+#~ msgid "Function Calculation"
+#~ msgstr "Funció de càlcul"
+
+#~ msgid "D/C"
+#~ msgstr "D/C"
+
+#~ msgid "Country & Address"
+#~ msgstr "País i Adreça"
+
+#~ msgid "Total By Company"
+#~ msgstr "Total per companyia"
+
+#~ msgid "Others:"
+#~ msgstr "Altres:"
+
+#~ msgid "Employee Code"
+#~ msgstr "Codi d'empleat"
+
+#~ msgid "Print Statement"
+#~ msgstr "Imprimir declaración"
+
+#~ msgid "Basic"
+#~ msgstr "Bàsic"
+
+#~ msgid "Company Contribution"
+#~ msgstr "Contribució companyia"
+
+#~ msgid "Basic Salary – Leaves"
+#~ msgstr "Salari base - Absències"
+
+#~ msgid "Heads"
+#~ msgstr "Capçaleres"
+
+#~ msgid "Employee Name"
+#~ msgstr "Nom de l'empleat"
+
+#~ msgid "All Passports"
+#~ msgstr "Tots els passaports"
+
+#~ msgid "For"
+#~ msgstr "Per"
+
+#~ msgid "Paid"
+#~ msgstr "Pagat"
+
+#~ msgid "Contracts"
+#~ msgstr "Contractes"
+
+#~ msgid "Passport Detail"
+#~ msgstr "Detalle pasaporte"
+
+#~ msgid "Payroll Register"
+#~ msgstr "Registre de nòmines"
+
+#~ msgid "Salary Register"
+#~ msgstr "Registre salarial"
+
+#~ msgid "Applied this head for calculation if condition is true"
+#~ msgstr "Aplica aquest encapçalament en el càlcul si la condició es vertadera"
+
+#~ msgid "Approve Sheet"
+#~ msgstr "Aprobar hoja"
+
+#~ msgid "Validation"
+#~ msgstr "Validació"
+
+#~ msgid "Search Company Contribution"
+#~ msgstr "Cerca contribució de la companyia"
+
+#~ msgid "User"
+#~ msgstr "Usuari"
+
+#~ msgid "Title"
+#~ msgstr "Títol"
+
+#~ msgid "Payment Lines"
+#~ msgstr "Línies de pagament"
+
+#~ msgid "Paid ? "
+#~ msgstr "Pagat? "
+
+#~ msgid "Payment Advice:"
+#~ msgstr "Avís de pagament:"
+
+#~ msgid "Wating for HR Verification"
+#~ msgstr "Esperant verificació de RRHH"
+
+#~ msgid "Condition"
+#~ msgstr "Condició"
+
+#~ msgid "Yearly Salary Details"
+#~ msgstr "Detalls del salari anual"
+
+#~ msgid "Category Code"
+#~ msgstr "Codi categoria"
+
+#~ msgid "Salary Information"
+#~ msgstr "Informació del salari"
+
+#~ msgid "Basic Salary"
+#~ msgstr "Salari base"
+
+#~ msgid "Next Month Date"
+#~ msgstr "Data proper mes"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Allowance Deduction Categoty"
+#~ msgstr "Categoria prima/deducció"
+
+#~ msgid "Draft Sheet"
+#~ msgstr "Full esborrany"
+
+#~ msgid "Search Passport"
+#~ msgstr "Buscar pasaporte"
+
+#~ msgid "Payment Advice"
+#~ msgstr "Avís de pagament"
+
+#~ msgid "Other No."
+#~ msgstr "Altre Nº"
+
+#~ msgid "Number :"
+#~ msgstr "Número :"
+
+#~ msgid "Phone No."
+#~ msgstr "Nº telèfon"
+
+#~ msgid "Visa Expire Date"
+#~ msgstr "Data expiració visat"
+
+#~ msgid "Salary On"
+#~ msgstr "Salari sobre"
+
+#~ msgid "Number"
+#~ msgstr "Número"
+
+#~ msgid "Allowances"
+#~ msgstr "Primes"
+
+#~ msgid ""
+#~ "This will use to computer the % fields values, in general its on basic, but "
+#~ "You can use all heads code field in small letter as a variable name i.e. "
+#~ "hra, ma, lta, etc...., also you can use, static varible basic"
+#~ msgstr ""
+#~ "Això s'utilitza per calcular els valors dels camps %, en general en la seva "
+#~ "base, però podeu utilitzar totes les capçaleres dels camps de codi en lletra "
+#~ "petita com un nom de variable, per exemple hra, ma, lta, etc., també podeu "
+#~ "utilitzar variable estàtica bàsica."
+
+#~ msgid "Computation Overview"
+#~ msgstr "Resum del càlcul"
+
+#~ msgid "Amount / Percentage"
+#~ msgstr "Import / Percentatge"
+
+#~ msgid "Salary"
+#~ msgstr "Salari"
+
+#~ msgid "Salary Heads"
+#~ msgstr "Capçaleres salari"
+
+#~ msgid "for period"
+#~ msgstr "per període"
+
+#~ msgid "Passport No"
+#~ msgstr "Número de passaport"
+
+#~ msgid "Passport"
+#~ msgstr "Passaport"
+
+#~ msgid "Total Salary"
+#~ msgstr "Salari total"
+
+#~ msgid "E-mail"
+#~ msgstr "Correu electrònic"
+
+#~ msgid "Payroll Head"
+#~ msgstr "Capçalera nòmina"
+
+#~ msgid "Current Month Date"
+#~ msgstr "Data mes actual"
+
+#~ msgid "Function"
+#~ msgstr "Funció"
+
+#~ msgid "Print Report"
+#~ msgstr "Imprimeix informe"
+
+#~ msgid "Basic Salary without Leave:"
+#~ msgstr "Salari base sense absències:"
+
+#~ msgid "Month"
+#~ msgstr "Mes"
+
+#~ msgid "Issue"
+#~ msgstr "Incidència"
+
+#~ msgid "Dynamic Computation"
+#~ msgstr "Càlcul dinàmic"
+
+#~ msgid "Other Informations"
+#~ msgstr "Altra informació"
+
+#~ msgid "Allowance Deduction Heads"
+#~ msgstr "Capçaleres prima/deducció"
+
+#~ msgid "Gross Sal."
+#~ msgstr "Sal. brut"
+
+#~ msgid "Wage Type"
+#~ msgstr "Tipus de salari"
+
+#~ msgid "Deduction -"
+#~ msgstr "Deducció -"
+
+#~ msgid "Start Date"
+#~ msgstr "Data inici"
+
+#~ msgid "Category Name"
+#~ msgstr "Nom de categoria"
+
+#~ msgid "Number of Leaves"
+#~ msgstr "Número de fulls"
+
+#~ msgid "Slip Line"
+#~ msgstr "Línia justificant"
+
+#~ msgid "hr.payroll.year.salary"
+#~ msgstr "hr.nòmina.any.salari"
+
+#~ msgid "Net Sal."
+#~ msgstr "Sal. net"
+
+#~ msgid "Advance"
+#~ msgstr "Bestreta"
+
+#~ msgid "Cancel Sheet"
+#~ msgstr "Cancel·la full"
+
+#~ msgid "Bank"
+#~ msgstr "Banc"
+
+#~ msgid "The Passport No must be unique !"
+#~ msgstr "El número de passaport ha de ser únic!"
+
+#~ msgid "Total Payment"
+#~ msgstr "Pagament total"
+
+#~ msgid "Leave Deductions Line:"
+#~ msgstr "Línia de deduccions per absències:"
+
+#~ msgid "Contribution register based on company"
+#~ msgstr "Registre de contribució basat en la empresa"
+
+#~ msgid "Special Allowances and Deductions For Employee:"
+#~ msgstr "Primes i deduccions especials per empleat:"
+
+#~ msgid "Leaved Deduction"
+#~ msgstr "Fulls de deducció"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr ""
+#~ "Error! No podeu seleccionar un departament que tingui l'empleat com a "
+#~ "responsable."
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "Estimat Sr./Sra.,"
+
+#~ msgid "HR Manager"
+#~ msgstr "Responsable de RRHH"
+
+#~ msgid "Country"
+#~ msgstr "País"
+
+#~ msgid "SI. No."
+#~ msgstr "Núm. SS"
+
+#~ msgid "Earnings"
+#~ msgstr "Ingressos"
+
+#~ msgid "Label"
+#~ msgstr "Etiqueta"
+
+#~ msgid "Company Deduction"
+#~ msgstr "Deducció de la compañía"
+
+#~ msgid "Other Id"
+#~ msgstr "Altre id"
+
+#~ msgid "Slip ID"
+#~ msgstr "ID justificant"
+
+#~ msgid "No of Leaves"
+#~ msgstr "Núm. de fulls"
+
+#~ msgid "Bank Details"
+#~ msgstr "Detalls del banc"
+
+#~ msgid "Passport Issue Date"
+#~ msgstr "Data d'emissió del passaport"
+
+#~ msgid "Payroll Configurtion"
+#~ msgstr "Configuració de la nòmina"
+
+#~ msgid "Year Salary"
+#~ msgstr "Salari anual"
+
+#~ msgid "Contributions"
+#~ msgstr "Contribucions"
+
+#~ msgid "Allowance / Deduction"
+#~ msgstr "Prima / Deducció"
+
+#~ msgid "Employee Payslip"
+#~ msgstr "Nòmina dels treballadors"
+
+#~ msgid "Letter Content"
+#~ msgstr "Contingut de la carta"
+
+#~ msgid "Bank Payment Advice"
+#~ msgstr "Avís de pagament del banc"
+
+#~ msgid "Wating for Account Verification"
+#~ msgstr "Esperant per a la verificació del compte"
+
+#~ msgid "Compute"
+#~ msgstr "Calcula"
+
+#~ msgid "Allowance"
+#~ msgstr "Subsidi"
+
+#, python-format
+#~ msgid "Please define bank account for the %s employee"
+#~ msgstr "Si us plau, definiu el compte bancari per al treballador %s"
diff --git a/addons/hr_payroll/i18n/cs.po b/addons/hr_payroll/i18n/cs.po
index bf9a6b2bddd..d12be57ed9d 100644
--- a/addons/hr_payroll/i18n/cs.po
+++ b/addons/hr_payroll/i18n/cs.po
@@ -7,249 +7,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-11-29 13:31+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-30 05:27+0000\n"
-"X-Generator: Launchpad (build 14404)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:15+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "E-mailová adresa"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Založeno"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Čistý plat"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Přepočítat list"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Podrobnosti platu zaměstnance"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
-msgstr "Odměny se základem:"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Oddělení"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Odpočty"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "Použití pro prémie ?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Seskupit podle..."
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Pracovní dny"
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Stavy"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Půjčka"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Registr placení mzdy"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Výplatní pásky"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Roční výkaz platu"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Zaplacený plat"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Společnost"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "Správce"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "Podrobnosti dopisu"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Nastavit na koncept"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "Chyba proměnné: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Vyprší"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Na půl placená dovolená"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Jiné"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Mzdový list"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Podrobnosti smlouvy:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Výpočtové pole"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "Vyberte adresu banky, z které bude vyplacen plat"
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "Bankovní návěští"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Zamítnout"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Celkem:"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Uvolnění"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Registrace"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
-msgstr "Chyba ! Nemůžete vybrat oddělení, kterého je zaměstnanec vedoucí."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Celkem odpočty"
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Hodnota"
+#: view:hr.salary.rule:0
+msgid "Input Data"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Jméno zaměstnance"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr "Řádky registru"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -257,270 +203,176 @@ msgid "Salary Computation"
 msgstr "Výpočet mzdy"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Částka"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr "Prosíme zkontrolujte nastavení %s, chybí hlavička výplatního listu"
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Procenta"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Řádek výplatní pásky"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Jiné informace"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "Vydávající země"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Odpočty zaměstnance"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Jiné odpočty"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Placená dovolená"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Seskupit podle..."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Datum vypršení pasu"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Neplacená dovolená"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Platné od"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
-"Výpočtové pole použité pro vnitřní výpočty, neumísťujte jej do formuláře"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Částka (slovně) :"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Patba"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr "Řádek výplatní pásky"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "Identifikační č."
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Založeno na"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Čekající na ověření"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Mzdy lidských zdrojů"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Celkem:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Zasláno"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
-msgstr ""
-"Obecný mzdový systém\n"
-"    * Podrobnosti zaměstnance\n"
-"    * Smlouvy zaměstnance\n"
-"    * Smlouvy založené na pasu\n"
-"    * Přídavky / Odpočty\n"
-"    * Umožňuje nastavit základní / hrubé /čisté mzdy\n"
-"    * Výplatní pásky zaměstnanců\n"
-"    * Měsíční registr mezd\n"
-"    * Integrováno se správou dovolených\n"
-"    "
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Typ uvolnění"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Datum:"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Mezivýsledek"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Platby -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "Č. víza"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Od"
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "Podle platu"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Koncové datum"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr "Výplatní páska zaměstnance"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Odvody uvolnění"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "Oprávněný podpis"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "Hodnota funkce"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
-msgstr "Řádek registru příspěvků"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Poznámky:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Stav"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr "Řádky platby"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "Jiné řádky"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Parametry funkce"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
-msgstr "Příspěvky společnosti"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -528,193 +380,183 @@ msgid "Employee"
 msgstr "Zaměstnanec"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Vzorec"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr "Řádky bankovního avíza"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Typ"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "Email"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Chyba !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Ověřovací list"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
-msgstr "Poč. pracovních dnů / týdnů pro zaměstnance"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr "Nový list"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr "Základ čistého"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Hrubá mzda"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "Výdělek celkem"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
-msgstr "Příkaz mzdy zaměstnance"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Jiné platby"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Odpočty"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "Č. pracovního povolení"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Mzda zaměstnance"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr "Pevná částka"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
-msgstr "Č. poukázek"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Celkem podle zaměstnance"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "Pevná částka"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Komu"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr "Chyba proměnné !"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Vyplatit mzdu"
+msgid "PaySlip Batch"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
-msgstr "Bankovní účet A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
-msgstr "Řádky příspěvků"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "Pro měsíc z"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Odpočty"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr "Poznámka bankovního avíza"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr "Výplatní list"
@@ -725,191 +567,129 @@ msgid "Error! contract start-date must be lower then contract end-date."
 msgstr "Chyba! Počáteční datum smlouvy musí být nižší než konečné datum."
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr "Půjčovací zřízení"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr "Celková kontrola HR"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "S přátelským pozdravem"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr "Č. SI."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Částka čistkého"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Struktura platu:"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "Podrobnosti mezd zaměstnanců"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr "Řádek funkce"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr "Potvrzovací list"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Jiné:"
+#: view:hr.contract:0
+msgid "Payslip Info"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr "Výpoče funkce"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "Pracovních dnů"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Celkem podle společnosti"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
-msgstr "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
-msgstr "Zěmě & Adresa"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Kód zaměstnance"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
-msgstr "Základní mzda - uvolnění"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "Typ částky"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Kategorie"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
-msgstr "Příspěvek společnosti"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
-msgstr "Hlavičky"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "Tiskový příkaz"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Koncept"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr "Výdělek"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Základní"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Všechny průkazy"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
-msgstr "Registr mezd"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Jméno zaměstnance"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Podrobnosti pasu"
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "Procenta (%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr "Registr výplat"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "Pro"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Smlouvy"
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr "Pracovních dnů"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -917,44 +697,10 @@ msgid "Employee Function"
 msgstr "Funkce zaměstnance"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Placeno"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "Schvalovací list"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "Placeno ? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Ověření"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Oslovení"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr "Hledat příspěvky společnosti"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Uživatel"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Platební řádky"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -962,20 +708,15 @@ msgid "Compute Sheet"
 msgstr "Výpočtový list"
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Aktivní"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr "Tato hlavička použita pro výpočty, pokud je pravda"
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "Roční podrobnosti platu"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
+msgstr ""
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
@@ -983,62 +724,39 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Chyba ! Nemůžete vytvořit rekurzivní Hierarchii zaměstnanců"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Podmínka"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr "Čekající na ověření HR"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
-msgstr "Platební avízo:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Spočítat"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr "Zařazení"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "Správce HR"
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Základní plat"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr "Kód kategorie"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "Mzdové informace"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
-msgstr "Kategorie přídavků a odpočtů"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1046,346 +764,276 @@ msgid "Companies"
 msgstr "Společnosti"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr "Oprávněný podpis"
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Smlouva"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
-msgstr "Návrhový list"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
-msgstr "Datum dalšího měsíce"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Datum"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "Datum vypršení víza"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
-msgstr "Hledat pas"
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr "Příspěvky"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "Č. telefonu"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
-msgstr "Příspěvky"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "Označení"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
-msgstr "Příspěvky společnosti"
+msgid "Refund"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
-msgstr "Jiné č."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
+msgstr "Příspěvky společnosti"
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Kód"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
-msgstr "Platební avízo"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "Číslo :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Posloupnost"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
-"Toto bude použito pro výpočet hodnot polí %s , obecně je na základě, ale "
-"můžete použít všechny pole kódů v malých písmenných jako jména proměnných "
-"např. hra, ma, lta, atd..., také můžete použít základní statické proměnné."
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
-msgstr "Přehled výpočtů"
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
-msgstr "Mzda na"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Číslo"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr "Struktura platu"
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr "Řádek registru"
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Zrušit"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "Uzavřít"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "Částka / Procenta"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Dávky"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr "Datum aktuálního měsíce"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Plat"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "Číslo pasu"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Pas"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Celkový plat"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "pro období"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr "Hlavička výplatního listu"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr "Registr příspěvků"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "E-mail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
-msgstr "Hlavičky platu"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "Tisknout výkaz"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr "Výpočty"
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-"Určuje poměř příspěvků společnosti 1,00=100% příspěvků. Pokud je zaměstnance "
-"přispěje 5%, pak spoleřnost bude a zde 0,5 určeno, pak společnost přispěje "
-"50% na 5% příspěvek zaměstnance."
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Jiné informace"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Měsíc"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr "Vydano"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr "Dynamický výpočet"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr "Základní mzda bez uvolnění:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Funkce"
+msgid "Worked Days"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr "Stavy"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Vážený pane/paní,"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
-msgstr "Hlavičky přídavků a odpočtů"
+msgid "Search Payslips"
+msgstr "Hledat výplatní pásky"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
-msgstr "Hrubá mzda"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Popis"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Počáteční datum"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr "Odpočty -"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ")"
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr "Registr příspěvků"
 
@@ -1397,240 +1045,821 @@ msgid "Payroll"
 msgstr "Mzdy"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Typ mzdy"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "Čistá mzda"
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr "Číslo pasu musí být jedinečné !"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "Název kategorie"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
-msgstr "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Adresa"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr "Řádek listu"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr "Počet uvolnění"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Banka"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr "Zrušit list"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "Záloha"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
-msgstr "Speciální přídavky a odpočty pro zaměstnance:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Jméno"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr "Odpočty uvolnění"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "Země"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Zaměstnanci"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Bankovní účet"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr "Registr příspěvků založený na spoleřnosti"
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr "Použijte pro uspořádání pořadí výpočtů"
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Celková platba"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr "Řádek odpočtu uvolnění:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr "Čekající na ověření účtu"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
-msgstr "Odpočty společnosti"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "Nastavení mezd"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Celkem"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr "Prosíme zkontrolujte bankovní účet zaměstnance %s"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr "Datum vydání pasu"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr "Přídavky"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "Poč. uvolnění"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
-msgstr "Jiné Id"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Bankovní podrobnosti"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
-msgstr "ID výplatní pásky"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Posloupnost"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
-msgstr "Výplatní list zaměstnance"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr "Obsah dopisu"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Roční plat"
+#~ msgid "E-mail Address"
+#~ msgstr "E-mailová adresa"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr "Přídavky / odpočty"
+#~ msgid "Based"
+#~ msgstr "Založeno"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr "Avízo bankovní platby"
+#~ msgid "Net Salary"
+#~ msgstr "Čistý plat"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr "Hledat výplatní pásky"
+#~ msgid "Recompute Sheet"
+#~ msgstr "Přepočítat list"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Celkem"
+#~ msgid "Employees Salary Details"
+#~ msgstr "Podrobnosti platu zaměstnance"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr "Příspěvky"
+#~ msgid "Allowances with Basic:"
+#~ msgstr "Odměny se základem:"
+
+#~ msgid "Department"
+#~ msgstr "Oddělení"
+
+#~ msgid "Deductions:"
+#~ msgstr "Odpočty"
+
+#~ msgid "Use for Gratuity ?"
+#~ msgstr "Použití pro prémie ?"
+
+#~ msgid "Working Days"
+#~ msgstr "Pracovní dny"
+
+#~ msgid "Loan"
+#~ msgstr "Půjčka"
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "Registr placení mzdy"
+
+#~ msgid "Year Salary Report"
+#~ msgstr "Roční výkaz platu"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Zaplacený plat"
+
+#~ msgid "The Manager"
+#~ msgstr "Správce"
+
+#~ msgid "Letter Details"
+#~ msgstr "Podrobnosti dopisu"
+
+#, python-format
+#~ msgid "Variable Error: %s "
+#~ msgstr "Chyba proměnné: %s "
+
+#~ msgid "Expire"
+#~ msgstr "Vyprší"
+
+#~ msgid "Half-Pay Holiday"
+#~ msgstr "Na půl placená dovolená"
+
+#~ msgid "Others"
+#~ msgstr "Jiné"
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Podrobnosti smlouvy:"
+
+#~ msgid "Calculaton Field"
+#~ msgstr "Výpočtové pole"
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr "Vyberte adresu banky, z které bude vyplacen plat"
+
+#~ msgid "Bank Advice"
+#~ msgstr "Bankovní návěští"
+
+#~ msgid "Reject"
+#~ msgstr "Zamítnout"
+
+#~ msgid "Leaves"
+#~ msgstr "Uvolnění"
+
+#~ msgid "Register"
+#~ msgstr "Registrace"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr "Chyba ! Nemůžete vybrat oddělení, kterého je zaměstnanec vedoucí."
+
+#~ msgid "Total Deductions"
+#~ msgstr "Celkem odpočty"
+
+#~ msgid "Value"
+#~ msgstr "Hodnota"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Jméno zaměstnance"
+
+#~ msgid "Register Lines"
+#~ msgstr "Řádky registru"
+
+#, python-format
+#~ msgid "Please check configuration of %s, payroll head is missing"
+#~ msgstr "Prosíme zkontrolujte nastavení %s, chybí hlavička výplatního listu"
+
+#~ msgid "Percentage"
+#~ msgstr "Procenta"
+
+#~ msgid "Country of Issue"
+#~ msgstr "Vydávající země"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Odpočty zaměstnance"
+
+#~ msgid "Other Deduction"
+#~ msgstr "Jiné odpočty"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Placená dovolená"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Datum vypršení pasu"
+
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Neplacená dovolená"
+
+#~ msgid "Valid From"
+#~ msgstr "Platné od"
+
+#~ msgid ""
+#~ "Calculation field used for internal calculation, do not place this on form"
+#~ msgstr ""
+#~ "Výpočtové pole použité pro vnitřní výpočty, neumísťujte jej do formuláře"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Částka (slovně) :"
+
+#~ msgid "Payment"
+#~ msgstr "Patba"
+
+#~ msgid "Based on"
+#~ msgstr "Založeno na"
+
+#~ msgid "Wating for Verification"
+#~ msgstr "Čekající na ověření"
+
+#~ msgid "Human Resource Payroll"
+#~ msgstr "Mzdy lidských zdrojů"
+
+#~ msgid "Posted"
+#~ msgstr "Zasláno"
+
+#~ msgid ""
+#~ "Generic Payroll system\n"
+#~ "    * Employee Details\n"
+#~ "    * Employee Contracts\n"
+#~ "    * Passport based Contract\n"
+#~ "    * Allowances / Deductions\n"
+#~ "    * Allow to configure Basic / Grows / Net Salary\n"
+#~ "    * Employee Payslip\n"
+#~ "    * Monthly Payroll Register\n"
+#~ "    * Integrated with Holiday Management\n"
+#~ "    "
+#~ msgstr ""
+#~ "Obecný mzdový systém\n"
+#~ "    * Podrobnosti zaměstnance\n"
+#~ "    * Smlouvy zaměstnance\n"
+#~ "    * Smlouvy založené na pasu\n"
+#~ "    * Přídavky / Odpočty\n"
+#~ "    * Umožňuje nastavit základní / hrubé /čisté mzdy\n"
+#~ "    * Výplatní pásky zaměstnanců\n"
+#~ "    * Měsíční registr mezd\n"
+#~ "    * Integrováno se správou dovolených\n"
+#~ "    "
+
+#~ msgid "Leave Type"
+#~ msgstr "Typ uvolnění"
+
+#~ msgid "Date :"
+#~ msgstr "Datum:"
+
+#~ msgid "Sub Total"
+#~ msgstr "Mezivýsledek"
+
+#~ msgid "Payments -"
+#~ msgstr "Platby -"
+
+#~ msgid "Visa No"
+#~ msgstr "Č. víza"
+
+#~ msgid "From"
+#~ msgstr "Od"
+
+#~ msgid "By Salary"
+#~ msgstr "Podle platu"
+
+#~ msgid "End Date"
+#~ msgstr "Koncové datum"
+
+#~ msgid "Leave Deductions"
+#~ msgstr "Odvody uvolnění"
+
+#~ msgid "Authorised Signature"
+#~ msgstr "Oprávněný podpis"
+
+#~ msgid "Function Value"
+#~ msgstr "Hodnota funkce"
+
+#~ msgid "Contribution Register Line"
+#~ msgstr "Řádek registru příspěvků"
+
+#~ msgid "Notes:"
+#~ msgstr "Poznámky:"
+
+#~ msgid "Paymeny Lines"
+#~ msgstr "Řádky platby"
+
+#~ msgid "Other Lines"
+#~ msgstr "Jiné řádky"
+
+#~ msgid "Function Arguments"
+#~ msgstr "Parametry funkce"
+
+#~ msgid "Company Contributions"
+#~ msgstr "Příspěvky společnosti"
+
+#~ msgid "Formula"
+#~ msgstr "Vzorec"
+
+#~ msgid "Bank Advice Lines"
+#~ msgstr "Řádky bankovního avíza"
+
+#~ msgid "Type"
+#~ msgstr "Typ"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Chyba !"
+
+#~ msgid "Verify Sheet"
+#~ msgstr "Ověřovací list"
+
+#~ msgid "No of Working days / week for an employee"
+#~ msgstr "Poč. pracovních dnů / týdnů pro zaměstnance"
+
+#~ msgid "New Slip"
+#~ msgstr "Nový list"
+
+#~ msgid "Net Basic"
+#~ msgstr "Základ čistého"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Hrubá mzda"
+
+#~ msgid "Total Earnings"
+#~ msgstr "Výdělek celkem"
+
+#~ msgid "Employee Salary Statement"
+#~ msgstr "Příkaz mzdy zaměstnance"
+
+#~ msgid "Other Payment"
+#~ msgstr "Jiné platby"
+
+#~ msgid "Deductions"
+#~ msgstr "Odpočty"
+
+#~ msgid "C/D"
+#~ msgstr "C/D"
+
+#~ msgid "Work Permit No"
+#~ msgstr "Č. pracovního povolení"
+
+#~ msgid "Employee Salary"
+#~ msgstr "Mzda zaměstnance"
+
+#~ msgid "Chaque Nos"
+#~ msgstr "Č. poukázek"
+
+#~ msgid "Total By Employee"
+#~ msgstr "Celkem podle zaměstnance"
+
+#~ msgid "To"
+#~ msgstr "Komu"
+
+#, python-format
+#~ msgid "Variable Error !"
+#~ msgstr "Chyba proměnné !"
+
+#~ msgid "hr.payroll.employees.detail"
+#~ msgstr "hr.payroll.employees.detail"
+
+#~ msgid "Pay Salary"
+#~ msgstr "Vyplatit mzdu"
+
+#~ msgid "Bank Account A/C"
+#~ msgstr "Bankovní účet A/C"
+
+#~ msgid "Contribution Lines"
+#~ msgstr "Řádky příspěvků"
+
+#~ msgid "For the month of"
+#~ msgstr "Pro měsíc z"
+
+#~ msgid "Deduction"
+#~ msgstr "Odpočty"
+
+#~ msgid "Bank Advice Note"
+#~ msgstr "Poznámka bankovního avíza"
+
+#~ msgid "Loan Installment"
+#~ msgstr "Půjčovací zřízení"
+
+#~ msgid "Complete HR Checking"
+#~ msgstr "Celková kontrola HR"
+
+#~ msgid "Yours Sincerely"
+#~ msgstr "S přátelským pozdravem"
+
+#~ msgid "SI. No."
+#~ msgstr "Č. SI."
+
+#~ msgid "Net Amount"
+#~ msgstr "Částka čistkého"
+
+#~ msgid "Salary Structure:"
+#~ msgstr "Struktura platu:"
+
+#~ msgid "Employees Salary Detail"
+#~ msgstr "Podrobnosti mezd zaměstnanců"
+
+#~ msgid "Function Line"
+#~ msgstr "Řádek funkce"
+
+#~ msgid "Confirm Sheet"
+#~ msgstr "Potvrzovací list"
+
+#~ msgid "Others:"
+#~ msgstr "Jiné:"
+
+#~ msgid "Function Calculation"
+#~ msgstr "Výpoče funkce"
+
+#~ msgid "Total By Company"
+#~ msgstr "Celkem podle společnosti"
+
+#~ msgid "D/C"
+#~ msgstr "D/C"
+
+#~ msgid "Country & Address"
+#~ msgstr "Zěmě & Adresa"
+
+#~ msgid "Employee Code"
+#~ msgstr "Kód zaměstnance"
+
+#~ msgid "Basic Salary – Leaves"
+#~ msgstr "Základní mzda - uvolnění"
+
+#~ msgid "Company Contribution"
+#~ msgstr "Příspěvek společnosti"
+
+#~ msgid "Heads"
+#~ msgstr "Hlavičky"
+
+#~ msgid "Print Statement"
+#~ msgstr "Tiskový příkaz"
+
+#~ msgid "Earnings"
+#~ msgstr "Výdělek"
+
+#~ msgid "Basic"
+#~ msgstr "Základní"
+
+#~ msgid "All Passports"
+#~ msgstr "Všechny průkazy"
+
+#~ msgid "Salary Register"
+#~ msgstr "Registr mezd"
+
+#~ msgid "Employee Name"
+#~ msgstr "Jméno zaměstnance"
+
+#~ msgid "Passport Detail"
+#~ msgstr "Podrobnosti pasu"
+
+#~ msgid "Payroll Register"
+#~ msgstr "Registr výplat"
+
+#~ msgid "For"
+#~ msgstr "Pro"
+
+#~ msgid "Contracts"
+#~ msgstr "Smlouvy"
+
+#~ msgid "Paid"
+#~ msgstr "Placeno"
+
+#~ msgid "Approve Sheet"
+#~ msgstr "Schvalovací list"
+
+#~ msgid "Paid ? "
+#~ msgstr "Placeno ? "
+
+#~ msgid "Validation"
+#~ msgstr "Ověření"
+
+#~ msgid "Title"
+#~ msgstr "Oslovení"
+
+#~ msgid "Search Company Contribution"
+#~ msgstr "Hledat příspěvky společnosti"
+
+#~ msgid "User"
+#~ msgstr "Uživatel"
+
+#~ msgid "Payment Lines"
+#~ msgstr "Platební řádky"
+
+#~ msgid "Applied this head for calculation if condition is true"
+#~ msgstr "Tato hlavička použita pro výpočty, pokud je pravda"
+
+#~ msgid "Yearly Salary Details"
+#~ msgstr "Roční podrobnosti platu"
+
+#~ msgid "Condition"
+#~ msgstr "Podmínka"
+
+#~ msgid "Wating for HR Verification"
+#~ msgstr "Čekající na ověření HR"
+
+#~ msgid "Payment Advice:"
+#~ msgstr "Platební avízo:"
+
+#~ msgid "Compute"
+#~ msgstr "Spočítat"
+
+#~ msgid "HR Manager"
+#~ msgstr "Správce HR"
+
+#~ msgid "Basic Salary"
+#~ msgstr "Základní plat"
+
+#~ msgid "Category Code"
+#~ msgstr "Kód kategorie"
+
+#~ msgid "Salary Information"
+#~ msgstr "Mzdové informace"
+
+#~ msgid "Allowance Deduction Categoty"
+#~ msgstr "Kategorie přídavků a odpočtů"
+
+#~ msgid "Draft Sheet"
+#~ msgstr "Návrhový list"
+
+#~ msgid "Next Month Date"
+#~ msgstr "Datum dalšího měsíce"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Visa Expire Date"
+#~ msgstr "Datum vypršení víza"
+
+#~ msgid "Search Passport"
+#~ msgstr "Hledat pas"
+
+#~ msgid "Phone No."
+#~ msgstr "Č. telefonu"
+
+#~ msgid "Label"
+#~ msgstr "Označení"
+
+#~ msgid "Other No."
+#~ msgstr "Jiné č."
+
+#~ msgid "Payment Advice"
+#~ msgstr "Platební avízo"
+
+#~ msgid "Number :"
+#~ msgstr "Číslo :"
+
+#~ msgid ""
+#~ "This will use to computer the % fields values, in general its on basic, but "
+#~ "You can use all heads code field in small letter as a variable name i.e. "
+#~ "hra, ma, lta, etc...., also you can use, static varible basic"
+#~ msgstr ""
+#~ "Toto bude použito pro výpočet hodnot polí %s , obecně je na základě, ale "
+#~ "můžete použít všechny pole kódů v malých písmenných jako jména proměnných "
+#~ "např. hra, ma, lta, atd..., také můžete použít základní statické proměnné."
+
+#~ msgid "Computation Overview"
+#~ msgstr "Přehled výpočtů"
+
+#~ msgid "Salary On"
+#~ msgstr "Mzda na"
+
+#~ msgid "Number"
+#~ msgstr "Číslo"
+
+#~ msgid "Amount / Percentage"
+#~ msgstr "Částka / Procenta"
+
+#~ msgid "Allowances"
+#~ msgstr "Dávky"
+
+#~ msgid "Current Month Date"
+#~ msgstr "Datum aktuálního měsíce"
+
+#~ msgid "Salary"
+#~ msgstr "Plat"
+
+#~ msgid "Passport No"
+#~ msgstr "Číslo pasu"
+
+#~ msgid "Passport"
+#~ msgstr "Pas"
+
+#~ msgid "Total Salary"
+#~ msgstr "Celkový plat"
+
+#~ msgid "for period"
+#~ msgstr "pro období"
+
+#~ msgid "Payroll Head"
+#~ msgstr "Hlavička výplatního listu"
+
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
+#~ msgid "Salary Heads"
+#~ msgstr "Hlavičky platu"
+
+#~ msgid "Print Report"
+#~ msgstr "Tisknout výkaz"
+
+#~ msgid "Other Informations"
+#~ msgstr "Jiné informace"
+
+#~ msgid "Month"
+#~ msgstr "Měsíc"
+
+#~ msgid "Issue"
+#~ msgstr "Vydano"
+
+#~ msgid "Dynamic Computation"
+#~ msgstr "Dynamický výpočet"
+
+#~ msgid "Basic Salary without Leave:"
+#~ msgstr "Základní mzda bez uvolnění:"
+
+#~ msgid "Function"
+#~ msgstr "Funkce"
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "Vážený pane/paní,"
+
+#~ msgid "Allowance Deduction Heads"
+#~ msgstr "Hlavičky přídavků a odpočtů"
+
+#~ msgid "Gross Sal."
+#~ msgstr "Hrubá mzda"
+
+#~ msgid "Start Date"
+#~ msgstr "Počáteční datum"
+
+#~ msgid "Deduction -"
+#~ msgstr "Odpočty -"
+
+#~ msgid "Wage Type"
+#~ msgstr "Typ mzdy"
+
+#~ msgid "Net Sal."
+#~ msgstr "Čistá mzda"
+
+#~ msgid "The Passport No must be unique !"
+#~ msgstr "Číslo pasu musí být jedinečné !"
+
+#~ msgid "Category Name"
+#~ msgstr "Název kategorie"
+
+#~ msgid "hr.payroll.year.salary"
+#~ msgstr "hr.payroll.year.salary"
+
+#~ msgid "Slip Line"
+#~ msgstr "Řádek listu"
+
+#~ msgid "Number of Leaves"
+#~ msgstr "Počet uvolnění"
+
+#~ msgid "Bank"
+#~ msgstr "Banka"
+
+#~ msgid "Cancel Sheet"
+#~ msgstr "Zrušit list"
+
+#~ msgid "Advance"
+#~ msgstr "Záloha"
+
+#~ msgid "Special Allowances and Deductions For Employee:"
+#~ msgstr "Speciální přídavky a odpočty pro zaměstnance:"
+
+#~ msgid "Leaved Deduction"
+#~ msgstr "Odpočty uvolnění"
+
+#~ msgid "Country"
+#~ msgstr "Země"
+
+#~ msgid "Contribution register based on company"
+#~ msgstr "Registr příspěvků založený na spoleřnosti"
+
+#~ msgid "Total Payment"
+#~ msgstr "Celková platba"
+
+#~ msgid "Leave Deductions Line:"
+#~ msgstr "Řádek odpočtu uvolnění:"
+
+#~ msgid "Wating for Account Verification"
+#~ msgstr "Čekající na ověření účtu"
+
+#~ msgid "Company Deduction"
+#~ msgstr "Odpočty společnosti"
+
+#~ msgid "Payroll Configurtion"
+#~ msgstr "Nastavení mezd"
+
+#, python-format
+#~ msgid "Please define bank account for the %s employee"
+#~ msgstr "Prosíme zkontrolujte bankovní účet zaměstnance %s"
+
+#~ msgid "Passport Issue Date"
+#~ msgstr "Datum vydání pasu"
+
+#~ msgid "Allowance"
+#~ msgstr "Přídavky"
+
+#~ msgid "No of Leaves"
+#~ msgstr "Poč. uvolnění"
+
+#~ msgid "Other Id"
+#~ msgstr "Jiné Id"
+
+#~ msgid "Bank Details"
+#~ msgstr "Bankovní podrobnosti"
+
+#~ msgid "Slip ID"
+#~ msgstr "ID výplatní pásky"
+
+#~ msgid "Employee Payslip"
+#~ msgstr "Výplatní list zaměstnance"
+
+#~ msgid "Letter Content"
+#~ msgstr "Obsah dopisu"
+
+#~ msgid "Year Salary"
+#~ msgstr "Roční plat"
+
+#~ msgid "Allowance / Deduction"
+#~ msgstr "Přídavky / odpočty"
+
+#~ msgid "Bank Payment Advice"
+#~ msgstr "Avízo bankovní platby"
+
+#~ msgid "Contributions"
+#~ msgstr "Příspěvky"
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
index 24c0f020c95..042f70882a0 100644
--- a/addons/hr_payroll/i18n/de.po
+++ b/addons/hr_payroll/i18n/de.po
@@ -6,252 +6,194 @@ msgid ""
 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"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-01-26 10:24+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "E-Mail-Adresse"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Basiert auf"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Nettolohn"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Neuberechnen"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Details Mitarbeitervergütung"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
-msgstr "Zulagen basieren auf:"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Abteilung"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Abzüge:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "Anspruch auf Abfindung?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Gruppierung..."
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Arbeitstage"
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Status Abrechnung"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Anzahlung"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Monatsabrechnung Mitarbeitervergütung"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Abrechnungen Mitarbeitervergütung"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Jährliches Lohnkonto"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Vergütung Bezahlt"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Unternehmen"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "Der Vorgesetzte"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "Anschreiben Auszahlung"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Zurücksetzen"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "Fehler in Variable:%s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Gültig bis"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Teilvergüt. (50%) Abwesenh."
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Sonstige Abzüge"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Vergütungsabrechnung"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Vertragsinfo:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Berechnungsfeld"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
-"Wähle das Bankkonto, von dem die Vergütung an den Mitarbeiter gezahlt werden "
-"soll"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "Anweisung Auszahlung"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Verwerfen"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Summe:"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Abwesenheit"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Meldung"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
-"Fehler ! Sie können keine Abteilung auswählen, für die dieser Mitarbeiter "
-"die Leitung ausübt."
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Gesamte Abzüge"
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Betrag"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Name Mitarbeiter"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr "Arbeitgeberanteile"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr "Bemerkungen"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -259,270 +201,176 @@ msgid "Salary Computation"
 msgstr "Vergütungsberechnung"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Betrag"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr "Bitte prüfen Sie die Konfiguration von %s, der Abrechnungskopf fehlt"
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Prozent"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Vergütungsposition"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Weitere Informationen"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "Land"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Arbeitnehmeranteil"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Andere Abzüge"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Bezahlter Urlaub"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Gruppierung..."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Ausweis Gültig Bis"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr "Warnung !"
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Unbezahlter Urlaub"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Gültig ab"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
-"Berechnungsfeld wird für die interne Kalkulation benötigt. Nehmen Sie an "
-"dieser Stelle keinen Eintrag vor."
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Betrag (ausgeschrieben)"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Auszahlung"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr "Vergütungsposition"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "Identifikationsnummer"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Basiert auf"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Warte auf Genehmigung"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Personalabrechnung"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Summe:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Gebucht"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
-msgstr ""
-"Basismodul für Abrechnung von Mitarbeitervergütungen\n"
-"  * Mitarbeiter Stammdaten  * Arbeitsverträge  * Sozialversicherungsausweis\n"
-"  * Zulagen und Abzüge\n"
-"  * Konfiguration der Grundvergütung, Brutto und Netto Vergütung\n"
-"  * Vergütungsabrechnung für Mitarbeiter\n"
-"    * Monatliche Meldung der Vergütungsabrechnung\n"
-"  * Auszahlung der Mitarbeitervergütung\n"
-"    * Integration mit Urlaubsmanagement\n"
-"    "
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Abwesenheitstyp"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Datum:"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Zwischensumme"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Zahlungen -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "Visa Nr."
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Von"
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "Nachzahlung"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Ende am"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr "Mitarbeiterabrechnung"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Abzüge für Abwesenheit"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "Authorisierte Unterschrift"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "Berechnungsfunktion"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
-msgstr "Arbeitgeberanteile"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Bemerkungen:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Status"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr "Zahlungspositionen"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "Weitere Abrechnungspositionen"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Berechnungsfunktionen"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
-msgstr "Arbeitgeberanteile"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -530,193 +378,183 @@ msgid "Employee"
 msgstr "Mitarbeiter"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Berechnungsformel"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr "Abrechnungen für Banküberweisung"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Typ"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "EMail"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Fehler !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Genehmige Abrechnung"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
-msgstr "Arbeitstage/Woche"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr "Neue Abrechnung"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr "Netto Vergütung"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Brutto Vergütung"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "Gesamtvergütung"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
-msgstr "Abrechnung nach Mitarbeitern"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Weitere Auszahlung"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Abzüge"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr "S/H"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "Arbeitserlaubnis Nummer"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Mitarbeitervergütung"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr "Fester Betrag"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
-msgstr "Scheck Nr."
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Arbeitnehmeranteil"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "Fester Betrag"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "An"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr "Fehler bei Variable !"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Auszahlung"
+msgid "PaySlip Batch"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
-msgstr "Bank Konto A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
-msgstr "Positionen Arbeitgeberanteile"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "Für Monat"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Abzug"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr "Vergütungsauszahlung Hinweis"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr "Mitarbeiterabrechnung"
@@ -729,191 +567,129 @@ msgstr ""
 "Vertragsendes sein."
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr "Rate Mitarbeiterdarlehen"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr "Abschluss der Prüfung"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "Freundliche Grüsse"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr "SV Nr."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Netto Betrag"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Vergütungsstruktur:"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "Mitarbeitervergütung Details"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr "Auflistung der Berechnungsfunktionen"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr "Bestätigte Abrechnung"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Weitere:"
+#: view:hr.contract:0
+msgid "Payslip Info"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr "Funktionsberechnung"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "Arbeitstage"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Arbeitgeberanteil"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
-msgstr "S/H"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
-msgstr "Land & Anschrift"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Mitarbeiter Nr."
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
-msgstr "Grundvergütung - Abzug für Abwesenheit"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "Berechnungsart"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Kategorie"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
-msgstr "Arbeitgeberanteile"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
-msgstr "Zulagen und Abzüge"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "Vergütungsabrechnung drucken"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Entwurf"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr "Einkünfte"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Basis"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Alle Ausweise"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
-msgstr "Vergütungsabrechnung"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Mitarbeiter Name"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Details zum  Ausweis"
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "Prozent (%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr "Personalabrechnung"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "An"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Verträge"
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr "Arbeitstage"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -921,44 +697,10 @@ msgid "Employee Function"
 msgstr "Mitarbeiter Funktion"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Bezahlt"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "Freigabe Abrechnung"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "Bezahlt? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Genehmigung"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Bezeichnung"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr "Suche Arbeitgeberanteile"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Benutzer"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Zahlungspositionen"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -966,20 +708,15 @@ msgid "Compute Sheet"
 msgstr "Berechnen"
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Aktiv"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr "Kalkuliere diese Zulagen und Abzügen, wenn die Bedingungen zutreffen"
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "Auswertung Personalabrechnung"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
+msgstr ""
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
@@ -988,62 +725,39 @@ msgstr ""
 "Fehler ! Sie können keine rekursive Hierachie bei Mitarbeitern definieren."
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Bedingungen"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr "Freigabe wird erwartet"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
-msgstr "Zahlungsanweisung:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Berechne"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr "Abmelden"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "Personalleiter"
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Basisvergütung"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr "Kategorie Kürzel"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "Vergütungsinformation"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
-msgstr "Kategorien Zulagen u. Abzüge"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1051,350 +765,276 @@ msgid "Companies"
 msgstr "Unternehmen"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr "Auth. Unterschrift"
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Arbeitsvertrag"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
-msgstr "Entwurf Abrechnung"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
-msgstr "Nächster Monat"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Datum"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "Visa Gültig Bis"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
-msgstr "Suche Sozialversicherungsausweis"
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr "Arbeitnehmer / Arbeitgeber Anteile"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "Telefon"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
-msgstr "Arbeitnehmer / Arbeitgeber Anteile"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "Buchungstext"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
-msgstr "Arbeitgeberanteile"
+msgid "Refund"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
-msgstr "Andere Nr."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
+msgstr "Arbeitgeberanteile"
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Kurzbez."
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
-msgstr "Zahlungsanweisung"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "Nummer:"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Reihenfolge"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
-"Hierdurch erfolgt die % Berechnung, i.d.R. ist die Grundeinstellung für die "
-"Berechnung 'basic'. Sie können aber auch auf alle anderen Variablen der "
-"Zulagen und Abzüge für Ihre Berechnungspositionen referenzieren. Sie geben "
-"hierzu in kleinen Buchstaben die entsprechenden Variablen ein,  z.B. anstatt "
-"basic: hra,ma, lta,etc.... Sie können natürlich auch die statische Variable "
-"'basic' belassen."
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
-msgstr "Berechnungsübersicht"
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
-msgstr "Vergütung für"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Nummer"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr "Vergütungsstruktur"
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr "Abrechnungspositionen"
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "Beenden"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "Betrag / Prozent"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Zulagen"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr "Aktueller Monat"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Vergütung"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "Ausweis Nr."
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Ausweis"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Gesamtvergütung"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "für Periode"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr "Zulagen und Abzüge"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr "Anteile  Arbeitnehmer / Arbeitgeber"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "EMail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr "Druck"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
-msgstr "Zulagen und Abzüge"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "Drucke Report"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr "Kalkulation"
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-"Definition des Arbeitgeberanteils, z.B. 1.00=100% Arbeitgeberanteil. Wenn "
-"z.B. ein Abzug für Krankenversicherung 20% ist und an dieser Stelle 0.50 als "
-"Arbeitgeberanteil eingetragen wird ist demnach der Arbeitgeberanteil für "
-"diese Abzugsposition 10%."
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Weitere Information"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Monat"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr "Problem"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr "Dyn. Berechnung"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr "Grundlohn ohne Urlaub / Abwesenheit"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Funktion"
+msgid "Worked Days"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr "Status Abrechnung"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Sehr geehrte/r Frau/Herr,"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
-msgstr "Zulagen und Abzüge"
+msgid "Search Payslips"
+msgstr "Auszahlung Vergütungen"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
-msgstr "Brutto Vergütung"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Beschreibung"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Beginn am"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr "Abzug -"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ")"
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 
@@ -1406,245 +1046,162 @@ msgid "Payroll"
 msgstr "Personalabrechnung"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Lohnart"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "Netto Lohn"
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr "Die Nummer des Ausweis sollte eindeutig sein !"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "Kategorie Bezeichnung"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
-msgstr "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Anschrift"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr "Vergütungsposition"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr "Urlaubstage"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Bank"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr "Abbrechen Auszahlung"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "Vorschuss"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
-msgstr "Besondere Zulagen und Abzüge für Mitarbeiter:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Bezeichnung"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr "Abzug Urlaub / Abwesenheit"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "Land"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Mitarbeiter"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Bank Konto"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr "Arbeitgeberanteil"
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 "Wird genutzt zur Bestimmung der Reihenfolge bei der Vergütungsberechnung, "
 "z.B. Berechnung von Zulagen und Abzügen."
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Auszahlungsbetrag"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr "Abzüge für Abwesenheit"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr "Warte auf Freigabe"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
-msgstr "Arbeitgeberanteil"
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "Konfiguration Personalabrechnung"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr "Bitte definieren Sie die Bankverbindung für den Mitarbeiter %s"
-
-#. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr "Ausweis Gültigkeit"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr "Zulagen"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "Urlaubstage"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
-msgstr "Andere ID"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Bank Details"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Gesamt"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
-msgstr "Abrechnung ID"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Reihenfolge"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
-msgstr "Mitarbeiter Abrechnung"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr "Auszahlung Text"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Jahresvergütung"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr "Zulagen / Abzüge"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr "Vergütungsauszahlung"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr "Auszahlung Vergütungen"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Gesamt"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr "Anteile Arbeitgeber / Arbeitnehmer"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
@@ -1652,21 +1209,51 @@ msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 #~ msgid "Analytic Account for Salary Analysis"
 #~ msgstr "Analytishes Konto für Personalkosten Analyse"
 
+#~ msgid "New Slip"
+#~ msgstr "Neue Abrechnung"
+
 #~ msgid "Axis Bank"
 #~ msgstr "Axis Bank"
 
+#~ msgid "Working Days"
+#~ msgstr "Arbeitstage"
+
 #~ msgid "(Based on type Payroll will calculate basic salary)"
 #~ msgstr "(anhängig vom Typ wird der Grundgehalt berechnet)"
 
+#~ msgid "Department"
+#~ msgstr "Abteilung"
+
+#~ msgid "Deductions:"
+#~ msgstr "Abzüge:"
+
 #~ msgid "Employee No"
 #~ msgstr "Mitarbetier Nr."
 
 #~ msgid "Calculations Rules"
 #~ msgstr "Rechenregeln"
 
+#~ msgid "Year Salary Report"
+#~ msgstr "Jährliches Lohnkonto"
+
+#~ msgid "The Manager"
+#~ msgstr "Der Vorgesetzte"
+
+#~ msgid "Allowances with Basic:"
+#~ msgstr "Zulagen basieren auf:"
+
+#~ msgid "Use for Gratuity ?"
+#~ msgstr "Anspruch auf Abfindung?"
+
+#~ msgid "Paid ? "
+#~ msgstr "Bezahlt? "
+
 #~ msgid "Employee Payable Account"
 #~ msgstr "Kreditoren Konto Mitarb."
 
+#~ msgid "Half-Pay Holiday"
+#~ msgstr "Teilvergüt. (50%) Abwesenh."
+
 #~ msgid ""
 #~ "\n"
 #~ "    The Payroll system - India, Manages and depends on,\n"
@@ -1697,29 +1284,67 @@ msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 #~ msgid "Miscelleanous / Statutory"
 #~ msgstr "Diverse / Gesetzliche"
 
+#~ msgid "Leaves"
+#~ msgstr "Abwesenheit"
+
+#~ msgid "Register"
+#~ msgstr "Meldung"
+
+#~ msgid "Next Month Date"
+#~ msgstr "Nächster Monat"
+
 #~ msgid "Keep empty to use the period of the validation(Payslip) date."
 #~ msgstr "Kein Eintrag um für aktuellen Periode Löhne abzurechnen."
 
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Warnung !"
+#~ msgid "Value"
+#~ msgstr "Betrag"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Name Mitarbeiter"
+
+#~ msgid "Country of Issue"
+#~ msgstr "Land"
 
 #, python-format
 #~ msgid "Please Confirm all Expanse Invoice appear for Reimbursement"
 #~ msgstr "Bestätigen Sie alle Spesenrechnungen zwecks Erstattung"
 
+#~ msgid "Other Deduction"
+#~ msgstr "Andere Abzüge"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Bezahlter Urlaub"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Ausweis Gültig Bis"
+
 #~ msgid "Special Allowance and Deductions for Employee"
 #~ msgstr "Besondere Zulagen und Abzüge"
 
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Unbezahlter Urlaub"
+
 #~ msgid "Force Period"
 #~ msgstr "Erzwinge Periode"
 
+#~ msgid "Amount (in words) :"
+#~ msgstr "Betrag (ausgeschrieben)"
+
+#~ msgid "Payment"
+#~ msgstr "Auszahlung"
+
 #~ msgid "Analytic Account"
 #~ msgstr "Analytisches Konto"
 
 #~ msgid "Expanse To"
 #~ msgstr "Zahlung an"
 
+#~ msgid "Based on"
+#~ msgstr "Basiert auf"
+
+#~ msgid "Bank"
+#~ msgstr "Bank"
+
 #~ msgid "Expanse Entries"
 #~ msgstr "Buchungen Aufwand"
 
@@ -1730,21 +1355,48 @@ msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 #~ msgid "Please defined the Employee Home Address Along with Partners !!"
 #~ msgstr "Bitte definieren Sie die Anschrift des Mitarbeiters beim Partner"
 
+#~ msgid "Sub Total"
+#~ msgstr "Zwischensumme"
+
+#~ msgid "Visa No"
+#~ msgstr "Visa Nr."
+
+#~ msgid "From"
+#~ msgstr "Von"
+
 #~ msgid "Employee Year Salary"
 #~ msgstr "Jahreseinkommen Mitarbeiter"
 
+#~ msgid "Authorised Signature"
+#~ msgstr "Authorisierte Unterschrift"
+
 #~ msgid "Unite"
 #~ msgstr "Zusammen"
 
 #~ msgid "Salary Detail"
 #~ msgstr "Lohn und Gehalt Details"
 
+#~ msgid "Notes:"
+#~ msgstr "Bemerkungen:"
+
+#~ msgid "End Date"
+#~ msgstr "Ende am"
+
 #~ msgid "Accounting Information"
 #~ msgstr "Finanzbuchhaltung Info"
 
 #~ msgid "Amount Information"
 #~ msgstr "Betrag Info"
 
+#~ msgid "Passport"
+#~ msgstr "Ausweis"
+
+#~ msgid "Start Date"
+#~ msgstr "Beginn am"
+
+#~ msgid "Type"
+#~ msgstr "Typ"
+
 #~ msgid "Miscelleanous"
 #~ msgstr "Diverse"
 
@@ -1752,8 +1404,8 @@ msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 #~ msgid "Integrity Error !"
 #~ msgstr "Integritätsfehler !"
 
-#~ msgid "Print"
-#~ msgstr "Druck"
+#~ msgid "Verify Sheet"
+#~ msgstr "Genehmige Abrechnung"
 
 #~ msgid "Accounting Informations"
 #~ msgstr "Finanzen Informationen"
@@ -1767,9 +1419,15 @@ msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 #~ msgid "By Employee Function"
 #~ msgstr "Nach Funktionen"
 
+#~ msgid "Chaque Nos"
+#~ msgstr "Scheck Nr."
+
 #~ msgid "Year Salary Detail"
 #~ msgstr "Jahreslohn Details"
 
+#~ msgid "Wating for Verification"
+#~ msgstr "Warte auf Genehmigung"
+
 #~ msgid "Account Lines"
 #~ msgstr "Buchungspositionen"
 
@@ -1783,6 +1441,12 @@ msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 #~ msgid "Please defined the Partner in Home Address !!"
 #~ msgstr "Bitte definiere Partner für Mitarbeiter Anschrift!!"
 
+#~ msgid "For the month of"
+#~ msgstr "Für Monat"
+
+#~ msgid "Deduction"
+#~ msgstr "Abzug"
+
 #~ msgid "Passport List"
 #~ msgstr "Ausweis Liste"
 
@@ -1798,12 +1462,39 @@ msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 #~ msgid "Fided Value"
 #~ msgstr "Fester Betrag"
 
+#~ msgid "Yours Sincerely"
+#~ msgstr "Freundliche Grüsse"
+
+#~ msgid "Allowances"
+#~ msgstr "Zulagen"
+
+#~ msgid "SI. No."
+#~ msgstr "SV Nr."
+
+#~ msgid "Net Amount"
+#~ msgstr "Netto Betrag"
+
 #~ msgid "Function of the Employee"
 #~ msgstr "Funktion des Mitarbeiters"
 
+#~ msgid "Confirm Sheet"
+#~ msgstr "Bestätigte Abrechnung"
+
+#~ msgid "Wating for Account Verification"
+#~ msgstr "Warte auf Freigabe"
+
+#~ msgid "Others:"
+#~ msgstr "Weitere:"
+
+#~ msgid "Contracts"
+#~ msgstr "Verträge"
+
 #~ msgid "Passport and Visa"
 #~ msgstr "Ausweis und Visa"
 
+#~ msgid "Employee Code"
+#~ msgstr "Mitarbeiter Nr."
+
 #~ msgid "Accounting Lines"
 #~ msgstr "Abrechnung"
 
@@ -1819,9 +1510,24 @@ msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 #~ "Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen "
 #~ "haben !"
 
+#~ msgid "Earnings"
+#~ msgstr "Einkünfte"
+
+#~ msgid "Reject"
+#~ msgstr "Verwerfen"
+
+#~ msgid "All Passports"
+#~ msgstr "Alle Ausweise"
+
+#~ msgid "Employee Name"
+#~ msgstr "Mitarbeiter Name"
+
 #~ msgid "Salary Account"
 #~ msgstr "Finanzkonto L+G"
 
+#~ msgid "For"
+#~ msgstr "An"
+
 #~ msgid "Expanse Journal"
 #~ msgstr "Journal L+G"
 
@@ -1837,6 +1543,9 @@ msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 #~ msgid "Complete Accountant Checking"
 #~ msgstr "Freigabe erteilen"
 
+#~ msgid "Title"
+#~ msgstr "Bezeichnung"
+
 #~ msgid "On Attendance"
 #~ msgstr "Anwesenheit"
 
@@ -1846,45 +1555,120 @@ msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 #~ msgid "Employee Account"
 #~ msgstr "Mitarbeiter Konto"
 
+#~ msgid "Condition"
+#~ msgstr "Bedingungen"
+
+#~ msgid "Compute"
+#~ msgstr "Berechne"
+
+#~ msgid "Payment Lines"
+#~ msgstr "Zahlungspositionen"
+
+#~ msgid "HR Manager"
+#~ msgstr "Personalleiter"
+
 #~ msgid "Categoty Code"
 #~ msgstr "Kategorie"
 
+#~ msgid "Allowance Deduction Categoty"
+#~ msgstr "Kategorien Zulagen u. Abzüge"
+
 #~ msgid "Allowance / Deduction Category"
 #~ msgstr "Kategorie Zulagen u. Abzüge"
 
+#~ msgid "Draft Sheet"
+#~ msgstr "Entwurf Abrechnung"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
 #~ msgid "Basic SAL"
 #~ msgstr "Grundlohn"
 
+#~ msgid "Visa Expire Date"
+#~ msgstr "Visa Gültig Bis"
+
+#~ msgid "Phone No."
+#~ msgstr "Telefon"
+
 #~ msgid "Included in Salary ?"
 #~ msgstr "In Abrechnung berücksichtigt?"
 
 #~ msgid "General Account"
 #~ msgstr "Sachkonto"
 
+#~ msgid "Payment Advice"
+#~ msgstr "Zahlungsanweisung"
+
+#~ msgid "To"
+#~ msgstr "An"
+
 #~ msgid "Process"
 #~ msgstr "Prozess"
 
+#~ msgid "Loan"
+#~ msgstr "Anzahlung"
+
+#~ msgid "Number"
+#~ msgstr "Nummer"
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Vertragsinfo:"
+
 #~ msgid "General Information"
 #~ msgstr "Allgemeine Information"
 
+#~ msgid "Paymeny Lines"
+#~ msgstr "Zahlungspositionen"
+
+#~ msgid "Amount / Percentage"
+#~ msgstr "Betrag / Prozent"
+
 #~ msgid "Accounting Details"
 #~ msgstr "Finanzen Details"
 
+#~ msgid "Current Month Date"
+#~ msgstr "Aktueller Monat"
+
 #~ msgid "Contract Duration"
 #~ msgstr "Dauer Vertrag"
 
 #~ msgid "Process Form"
 #~ msgstr "Prozess Ansicht"
 
+#~ msgid "Passport No"
+#~ msgstr "Ausweis Nr."
+
 #~ msgid "Account Information"
 #~ msgstr "Konto Information"
 
 #~ msgid "Generalities"
 #~ msgstr "Grundregeln"
 
+#~ msgid "for period"
+#~ msgstr "für Periode"
+
+#~ msgid "Allowance / Deduction"
+#~ msgstr "Zulagen / Abzüge"
+
+#~ msgid "E-mail"
+#~ msgstr "EMail"
+
 #~ msgid "Salary Deposit Date Option?"
 #~ msgstr "Auszahlungsdatum?"
 
+#~ msgid "Other Informations"
+#~ msgstr "Weitere Information"
+
+#~ msgid "Dynamic Computation"
+#~ msgstr "Dyn. Berechnung"
+
+#~ msgid "Function"
+#~ msgstr "Funktion"
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "Sehr geehrte/r Frau/Herr,"
+
 #~ msgid "Categoty Name"
 #~ msgstr "Kategorie Bez."
 
@@ -1897,12 +1681,12 @@ msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 #~ msgid "Expanse account when Salary Expanse will be recorded"
 #~ msgstr "Aufwandskonto für Lohn und Gehalt"
 
-#~ msgid "Notes"
-#~ msgstr "Bemerkungen"
-
 #~ msgid "Configure Payroll"
 #~ msgstr "Konfiguriere Lohn und Gehalt"
 
+#~ msgid "Special Allowances and Deductions For Employee:"
+#~ msgstr "Besondere Zulagen und Abzüge für Mitarbeiter:"
+
 #~ msgid "Statutory Information"
 #~ msgstr "Gesetzliche Auskunft"
 
@@ -1915,6 +1699,21 @@ msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 #~ msgid "By Allownce / Deduction"
 #~ msgstr "Durch Zulage / Abzug"
 
+#~ msgid "Passport Issue Date"
+#~ msgstr "Ausweis Gültigkeit"
+
+#~ msgid "Allowance"
+#~ msgstr "Zulagen"
+
+#~ msgid "Bank Details"
+#~ msgstr "Bank Details"
+
+#~ msgid "Deductions"
+#~ msgstr "Abzüge"
+
+#~ msgid "Employee Payslip"
+#~ msgstr "Mitarbeiter Abrechnung"
+
 #~ msgid "By Sal"
 #~ msgstr "Nach L+G"
 
@@ -1923,3 +1722,422 @@ msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 
 #~ msgid "Print Salary Structure"
 #~ msgstr "Druck L+G Übersicht"
+
+#~ msgid "Total Deductions"
+#~ msgstr "Gesamte Abzüge"
+
+#~ msgid "Based"
+#~ msgstr "Basiert auf"
+
+#~ msgid "Recompute Sheet"
+#~ msgstr "Neuberechnen"
+
+#~ msgid "Employees Salary Details"
+#~ msgstr "Details Mitarbeitervergütung"
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "Monatsabrechnung Mitarbeitervergütung"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Vergütung Bezahlt"
+
+#~ msgid "Letter Details"
+#~ msgstr "Anschreiben Auszahlung"
+
+#~ msgid "Expire"
+#~ msgstr "Gültig bis"
+
+#~ msgid "Others"
+#~ msgstr "Sonstige Abzüge"
+
+#~ msgid "Calculaton Field"
+#~ msgstr "Berechnungsfeld"
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr ""
+#~ "Wähle das Bankkonto, von dem die Vergütung an den Mitarbeiter gezahlt werden "
+#~ "soll"
+
+#~ msgid "Bank Advice"
+#~ msgstr "Anweisung Auszahlung"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr ""
+#~ "Fehler ! Sie können keine Abteilung auswählen, für die dieser Mitarbeiter "
+#~ "die Leitung ausübt."
+
+#~ msgid "Register Lines"
+#~ msgstr "Arbeitgeberanteile"
+
+#~ msgid "Percentage"
+#~ msgstr "Prozent"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Arbeitnehmeranteil"
+
+#~ msgid "Valid From"
+#~ msgstr "Gültig ab"
+
+#~ msgid ""
+#~ "Calculation field used for internal calculation, do not place this on form"
+#~ msgstr ""
+#~ "Berechnungsfeld wird für die interne Kalkulation benötigt. Nehmen Sie an "
+#~ "dieser Stelle keinen Eintrag vor."
+
+#~ msgid "Human Resource Payroll"
+#~ msgstr "Personalabrechnung"
+
+#~ msgid "Posted"
+#~ msgstr "Gebucht"
+
+#~ msgid ""
+#~ "Generic Payroll system\n"
+#~ "    * Employee Details\n"
+#~ "    * Employee Contracts\n"
+#~ "    * Passport based Contract\n"
+#~ "    * Allowances / Deductions\n"
+#~ "    * Allow to configure Basic / Grows / Net Salary\n"
+#~ "    * Employee Payslip\n"
+#~ "    * Monthly Payroll Register\n"
+#~ "    * Integrated with Holiday Management\n"
+#~ "    "
+#~ msgstr ""
+#~ "Basismodul für Abrechnung von Mitarbeitervergütungen\n"
+#~ "  * Mitarbeiter Stammdaten  * Arbeitsverträge  * Sozialversicherungsausweis\n"
+#~ "  * Zulagen und Abzüge\n"
+#~ "  * Konfiguration der Grundvergütung, Brutto und Netto Vergütung\n"
+#~ "  * Vergütungsabrechnung für Mitarbeiter\n"
+#~ "    * Monatliche Meldung der Vergütungsabrechnung\n"
+#~ "  * Auszahlung der Mitarbeitervergütung\n"
+#~ "    * Integration mit Urlaubsmanagement\n"
+#~ "    "
+
+#~ msgid "Leave Type"
+#~ msgstr "Abwesenheitstyp"
+
+#~ msgid "Date :"
+#~ msgstr "Datum:"
+
+#~ msgid "Payments -"
+#~ msgstr "Zahlungen -"
+
+#~ msgid "By Salary"
+#~ msgstr "Nachzahlung"
+
+#~ msgid "Leave Deductions"
+#~ msgstr "Abzüge für Abwesenheit"
+
+#~ msgid "Function Value"
+#~ msgstr "Berechnungsfunktion"
+
+#~ msgid "Contribution Register Line"
+#~ msgstr "Arbeitgeberanteile"
+
+#~ msgid "Other Lines"
+#~ msgstr "Weitere Abrechnungspositionen"
+
+#~ msgid "Function Arguments"
+#~ msgstr "Berechnungsfunktionen"
+
+#~ msgid "Company Contributions"
+#~ msgstr "Arbeitgeberanteile"
+
+#~ msgid "Formula"
+#~ msgstr "Berechnungsformel"
+
+#~ msgid "Bank Advice Lines"
+#~ msgstr "Abrechnungen für Banküberweisung"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Fehler !"
+
+#~ msgid "No of Working days / week for an employee"
+#~ msgstr "Arbeitstage/Woche"
+
+#~ msgid "Net Basic"
+#~ msgstr "Netto Vergütung"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Brutto Vergütung"
+
+#~ msgid "Total Earnings"
+#~ msgstr "Gesamtvergütung"
+
+#~ msgid "Employee Salary Statement"
+#~ msgstr "Abrechnung nach Mitarbeitern"
+
+#~ msgid "Other Payment"
+#~ msgstr "Weitere Auszahlung"
+
+#~ msgid "Work Permit No"
+#~ msgstr "Arbeitserlaubnis Nummer"
+
+#~ msgid "Employee Salary"
+#~ msgstr "Mitarbeitervergütung"
+
+#~ msgid "Total By Employee"
+#~ msgstr "Arbeitnehmeranteil"
+
+#, python-format
+#~ msgid "Variable Error !"
+#~ msgstr "Fehler bei Variable !"
+
+#~ msgid "Pay Salary"
+#~ msgstr "Auszahlung"
+
+#~ msgid "Bank Account A/C"
+#~ msgstr "Bank Konto A/C"
+
+#~ msgid "Contribution Lines"
+#~ msgstr "Positionen Arbeitgeberanteile"
+
+#~ msgid "Bank Advice Note"
+#~ msgstr "Vergütungsauszahlung Hinweis"
+
+#~ msgid "Loan Installment"
+#~ msgstr "Rate Mitarbeiterdarlehen"
+
+#~ msgid "Complete HR Checking"
+#~ msgstr "Abschluss der Prüfung"
+
+#~ msgid "Salary Structure:"
+#~ msgstr "Vergütungsstruktur:"
+
+#~ msgid "Employees Salary Detail"
+#~ msgstr "Mitarbeitervergütung Details"
+
+#~ msgid "Function Line"
+#~ msgstr "Auflistung der Berechnungsfunktionen"
+
+#~ msgid "Function Calculation"
+#~ msgstr "Funktionsberechnung"
+
+#~ msgid "Total By Company"
+#~ msgstr "Arbeitgeberanteil"
+
+#~ msgid "Country & Address"
+#~ msgstr "Land & Anschrift"
+
+#~ msgid "Basic Salary – Leaves"
+#~ msgstr "Grundvergütung - Abzug für Abwesenheit"
+
+#~ msgid "Company Contribution"
+#~ msgstr "Arbeitgeberanteile"
+
+#~ msgid "Heads"
+#~ msgstr "Zulagen und Abzüge"
+
+#~ msgid "Print Statement"
+#~ msgstr "Vergütungsabrechnung drucken"
+
+#~ msgid "Salary Register"
+#~ msgstr "Vergütungsabrechnung"
+
+#~ msgid "Passport Detail"
+#~ msgstr "Details zum  Ausweis"
+
+#~ msgid "Payroll Register"
+#~ msgstr "Personalabrechnung"
+
+#~ msgid "Paid"
+#~ msgstr "Bezahlt"
+
+#~ msgid "Approve Sheet"
+#~ msgstr "Freigabe Abrechnung"
+
+#~ msgid "Validation"
+#~ msgstr "Genehmigung"
+
+#~ msgid "Search Company Contribution"
+#~ msgstr "Suche Arbeitgeberanteile"
+
+#~ msgid "User"
+#~ msgstr "Benutzer"
+
+#~ msgid "Applied this head for calculation if condition is true"
+#~ msgstr "Kalkuliere diese Zulagen und Abzügen, wenn die Bedingungen zutreffen"
+
+#~ msgid "Yearly Salary Details"
+#~ msgstr "Auswertung Personalabrechnung"
+
+#~ msgid "Wating for HR Verification"
+#~ msgstr "Freigabe wird erwartet"
+
+#~ msgid "Payment Advice:"
+#~ msgstr "Zahlungsanweisung:"
+
+#~ msgid "Basic Salary"
+#~ msgstr "Basisvergütung"
+
+#~ msgid "Salary Information"
+#~ msgstr "Vergütungsinformation"
+
+#~ msgid "Search Passport"
+#~ msgstr "Suche Sozialversicherungsausweis"
+
+#~ msgid "Label"
+#~ msgstr "Buchungstext"
+
+#~ msgid "Other No."
+#~ msgstr "Andere Nr."
+
+#~ msgid "Number :"
+#~ msgstr "Nummer:"
+
+#~ msgid ""
+#~ "This will use to computer the % fields values, in general its on basic, but "
+#~ "You can use all heads code field in small letter as a variable name i.e. "
+#~ "hra, ma, lta, etc...., also you can use, static varible basic"
+#~ msgstr ""
+#~ "Hierdurch erfolgt die % Berechnung, i.d.R. ist die Grundeinstellung für die "
+#~ "Berechnung 'basic'. Sie können aber auch auf alle anderen Variablen der "
+#~ "Zulagen und Abzüge für Ihre Berechnungspositionen referenzieren. Sie geben "
+#~ "hierzu in kleinen Buchstaben die entsprechenden Variablen ein,  z.B. anstatt "
+#~ "basic: hra,ma, lta,etc.... Sie können natürlich auch die statische Variable "
+#~ "'basic' belassen."
+
+#~ msgid "Computation Overview"
+#~ msgstr "Berechnungsübersicht"
+
+#~ msgid "Salary On"
+#~ msgstr "Vergütung für"
+
+#~ msgid "Salary"
+#~ msgstr "Vergütung"
+
+#~ msgid "Total Salary"
+#~ msgstr "Gesamtvergütung"
+
+#~ msgid "Payroll Head"
+#~ msgstr "Zulagen und Abzüge"
+
+#~ msgid "Salary Heads"
+#~ msgstr "Zulagen und Abzüge"
+
+#~ msgid "Print Report"
+#~ msgstr "Drucke Report"
+
+#~ msgid "Month"
+#~ msgstr "Monat"
+
+#~ msgid "Issue"
+#~ msgstr "Problem"
+
+#~ msgid "Basic Salary without Leave:"
+#~ msgstr "Grundlohn ohne Urlaub / Abwesenheit"
+
+#~ msgid "Allowance Deduction Heads"
+#~ msgstr "Zulagen und Abzüge"
+
+#~ msgid "Gross Sal."
+#~ msgstr "Brutto Vergütung"
+
+#~ msgid "Deduction -"
+#~ msgstr "Abzug -"
+
+#~ msgid "Wage Type"
+#~ msgstr "Lohnart"
+
+#~ msgid "Net Sal."
+#~ msgstr "Netto Lohn"
+
+#~ msgid "Year Salary"
+#~ msgstr "Jahresvergütung"
+
+#~ msgid "Slip Line"
+#~ msgstr "Vergütungsposition"
+
+#~ msgid "Number of Leaves"
+#~ msgstr "Urlaubstage"
+
+#~ msgid "Cancel Sheet"
+#~ msgstr "Abbrechen Auszahlung"
+
+#~ msgid "Advance"
+#~ msgstr "Vorschuss"
+
+#~ msgid "Leaved Deduction"
+#~ msgstr "Abzug Urlaub / Abwesenheit"
+
+#~ msgid "Country"
+#~ msgstr "Land"
+
+#~ msgid "Contribution register based on company"
+#~ msgstr "Arbeitgeberanteil"
+
+#~ msgid "Total Payment"
+#~ msgstr "Auszahlungsbetrag"
+
+#~ msgid "Leave Deductions Line:"
+#~ msgstr "Abzüge für Abwesenheit"
+
+#~ msgid "Company Deduction"
+#~ msgstr "Arbeitgeberanteil"
+
+#~ msgid "Payroll Configurtion"
+#~ msgstr "Konfiguration Personalabrechnung"
+
+#~ msgid "No of Leaves"
+#~ msgstr "Urlaubstage"
+
+#~ msgid "Other Id"
+#~ msgstr "Andere ID"
+
+#~ msgid "Slip ID"
+#~ msgstr "Abrechnung ID"
+
+#~ msgid "Letter Content"
+#~ msgstr "Auszahlung Text"
+
+#~ msgid "Bank Payment Advice"
+#~ msgstr "Vergütungsauszahlung"
+
+#~ msgid "Contributions"
+#~ msgstr "Anteile Arbeitgeber / Arbeitnehmer"
+
+#, python-format
+#~ msgid "Variable Error: %s "
+#~ msgstr "Fehler in Variable:%s "
+
+#, python-format
+#~ msgid "Please check configuration of %s, payroll head is missing"
+#~ msgstr "Bitte prüfen Sie die Konfiguration von %s, der Abrechnungskopf fehlt"
+
+#~ msgid "Basic"
+#~ msgstr "Basis"
+
+#, python-format
+#~ msgid "Please define bank account for the %s employee"
+#~ msgstr "Bitte definieren Sie die Bankverbindung für den Mitarbeiter %s"
+
+#~ msgid "The Passport No must be unique !"
+#~ msgstr "Die Nummer des Ausweis sollte eindeutig sein !"
+
+#~ msgid "hr.payroll.year.salary"
+#~ msgstr "hr.payroll.year.salary"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "hr.payroll.employees.detail"
+#~ msgstr "hr.payroll.employees.detail"
+
+#~ msgid "Net Salary"
+#~ msgstr "Nettolohn"
+
+#~ msgid "E-mail Address"
+#~ msgstr "E-Mail-Adresse"
+
+#~ msgid "Category Code"
+#~ msgstr "Kategorie Kürzel"
+
+#~ msgid "Category Name"
+#~ msgstr "Kategorie Bezeichnung"
+
+#~ msgid "D/C"
+#~ msgstr "S/H"
+
+#~ msgid "C/D"
+#~ msgstr "S/H"
diff --git a/addons/hr_payroll/i18n/en_GB.po b/addons/hr_payroll/i18n/en_GB.po
index f63101783dc..9931c6777a9 100644
--- a/addons/hr_payroll/i18n/en_GB.po
+++ b/addons/hr_payroll/i18n/en_GB.po
@@ -7,247 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-01-21 07:36+0000\n"
 "Last-Translator: Gerhard du Toit <gdutoit@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
+#: view:hr.payslip:0
+msgid "States"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Salary Annual Report"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
+#: view:hr.payslip:0
+msgid "Done Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
+#: report:contribution.register.lines:0
+msgid "Total:"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Leave Days"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr ""
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
 msgstr ""
 
 #. module: hr_payroll
@@ -256,259 +202,176 @@ msgid "Salary Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-msgid "Other Information"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
 #: view:hr.payslip:0
-msgid "Group By..."
+msgid "Other Information"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
+msgid "Draft Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Identification No"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Identification No"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
+msgid "Total Working Days"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
+#: view:hr.payslip:0
+msgid "Confirm"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -516,193 +379,183 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
+#: view:hr.salary.rule:0
+msgid "Children definition"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
+msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr ""
@@ -713,190 +566,128 @@ msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
+#: view:hr.salary.rule:0
+msgid "Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
-msgstr "Basic Salary – Leave Days"
-
-#. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: view:hr.salary.rule:0
+msgid "Conditions"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
+#: view:hr.payslip:0
+msgid "Worked Day"
 msgstr ""
 
 #. module: hr_payroll
@@ -905,43 +696,9 @@ msgid "Employee Function"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
@@ -950,82 +707,54 @@ msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "Annual Salary Detail"
-
-#. module: hr_payroll
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1034,340 +763,276 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
+#: view:hr.contribution.register:0
+msgid "Contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Other Informations"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1379,240 +1044,178 @@ msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr "Number of Leave Days"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "No of Leave Days"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Annual Salary"
+#~ msgid "Year Salary Report"
+#~ msgstr "Salary Annual Report"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr ""
+#~ msgid "Number of Leaves"
+#~ msgstr "Number of Leave Days"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr ""
+#~ msgid "No of Leaves"
+#~ msgstr "No of Leave Days"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr ""
+#~ msgid "Basic Salary – Leaves"
+#~ msgstr "Basic Salary – Leave Days"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr ""
+#~ msgid "Leaves"
+#~ msgstr "Leave Days"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr ""
+#~ msgid "Year Salary"
+#~ msgstr "Annual Salary"
+
+#~ msgid "Yearly Salary Details"
+#~ msgstr "Annual Salary Detail"
diff --git a/addons/hr_payroll/i18n/es.po b/addons/hr_payroll/i18n/es.po
index 73986d2b1c2..fcfb1fc4b9f 100644
--- a/addons/hr_payroll/i18n/es.po
+++ b/addons/hr_payroll/i18n/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-01-18 11:08+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -15,243 +15,187 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Dirección de correo electrónico"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Basado"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Salario neto"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Recalcular plantilla"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Detalles salario de los empleados"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
-msgstr "Primas con base:"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Departamento"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Deducciones:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "¿Uso de propina?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Agrupar por..."
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Días de trabajo"
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Estados"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Préstamo"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Registro de pago de nómina"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Nóminas"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Informe anual de salarios"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Nómina pagada"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "El responsable"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "Detalles de la carta"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Cambiar a borrador"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "Error variable: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Vencimiento"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Vacaciones con media paga"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Otros"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Nómina"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Detalles del contrato:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Campo de cálculo"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "Seleccione la dirección del banco de donde se pagará la nómina."
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "Aviso bancario"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Rechazado"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Total:"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Ausencias"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Registro"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
-"¡Error! No puede seleccionar un departamento que tenga el empleado como "
-"responsable."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Total deducciones"
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Valor"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Nombre del empleado"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr "Líneas de registro"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr "Notas"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -259,270 +203,176 @@ msgid "Salary Computation"
 msgstr "Cálculo de la nómina"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Importe"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-"Por favor, compruebe la configuración de %s, falta la cabecera de la nómina"
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Porcentaje"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Línea de nómina"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Otra información"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "País de emisión"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Deducción del empleado"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Otras deducciones"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Vacaciones pagada"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Agrupar por..."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Fecha expiración pasaporte"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr "¡ Aviso !"
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Vacaciones no pagadas"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Válido desde"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
-msgstr "Campo usado en cálculos internos, no lo coloque en un formulario."
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Importe (en palabras):"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Pago"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr "Línea de nómina"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "Nº identificación"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Basado en"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Esperando verificación"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Nóminas de recursos humanos"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Fijado"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
-msgstr ""
-"Sistema de nóminas genérico\n"
-"    * Detalles de empleado\n"
-"    * Contratos de empleado\n"
-"    * Contratos basados en pasaportes\n"
-"    * Complementos/deducciones\n"
-"    * Permite configurar salario base/bruto/neto\n"
-"    * Nómina de empleado\n"
-"    * Registro mensual de nóminas\n"
-"    * Integrado con la gestión de vacaciones\n"
-"    "
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Tipo de ausencia"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Fecha :"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Subtotal"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Pagos -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "Número de Visa"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Desde"
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "Por salario"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Fecha final"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr "Nómina del empleado"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Deducciones por ausencia"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "Firma autorizada"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "Valor de función"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
-msgstr "Línea de registro de contribución"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Notas:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Estado"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr "Líneas de pago"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "Otras líneas"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Argumentos de la función"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
-msgstr "Contribuciones de la compañía"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -530,193 +380,183 @@ msgid "Employee"
 msgstr "Empleado"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Fórmula"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr "Líneas de notificación bancaria"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Tipo"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "Correo electrónico"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "¡ Error !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Comprobar hoja"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
-msgstr "Número de días/semanas trabajados para un empleado."
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr "Nuevo justificante"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr "Base neta"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Salario bruto"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "Ingresos totales"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
-msgstr "Declaración salario del empleado"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Otros pagos"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Deducciones"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "Nº permiso trabajo"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Salario empleado"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr "Importe fijo"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
-msgstr "Cada uno de nuestros"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Total por empleado"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "Importe fijo"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Para"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr "¡Error de variable!"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "rrhh.nomina.empleados.detalle"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Pagar nómina"
+msgid "PaySlip Batch"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
-msgstr "Cuenta bancaria"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
-msgstr "Líneas de contribución"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "Para el mes de"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Deducción"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr "Observación aviso bancario"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr "Nómina"
@@ -729,191 +569,129 @@ msgstr ""
 "finalización."
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr "Entrega anticipo"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr "Comprobación RH completa"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "Atentamente"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr "Nº SS"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Importe neto"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Estructura salarial:"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "Detalle salario empleado"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr "Línea de función"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr "Hoja de confirmación"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Otros:"
+#: view:hr.contract:0
+msgid "Payslip Info"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr "Función de cálculo"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "Días trabajados"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Total por compañía"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
-msgstr "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
-msgstr "País y Dirección"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Código de empleado"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
-msgstr "Salario base - Ausencias"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "Tipo de importe"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Categoría"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
-msgstr "Contribución compañía"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
-msgstr "Cabeceras"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "Imprimir declaración"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Borrador"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr "Ingresos"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Básico"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Todos los pasaportes"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
-msgstr "Registro salarial"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Nombre del empleado"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Detalle pasaporte"
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "Porcentaje (%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr "Registro de nóminas"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "Para"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Contratos"
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr "Días trabajados"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -921,44 +699,10 @@ msgid "Employee Function"
 msgstr "Función del empleado"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Pagado"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "Aprobar hoja"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "¿Pagado? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Validación"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Título"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr "Buscar contribución de la compañía"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Líneas de pago"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -966,20 +710,15 @@ msgid "Compute Sheet"
 msgstr "Calcular hoja"
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Activo"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr "Aplicar este encabezado en el cálculo si la condición es verdadera"
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "Detalles del salario anual"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
+msgstr ""
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
@@ -987,62 +726,39 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Condición"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr "Esperando verificación de RRHH"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
-msgstr "Aviso de pago:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Calcular"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr "Designación"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "Responsable de RRHH"
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Salario base"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr "Código categoría"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "Información del salario"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
-msgstr "Categoría prima/deducción"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1050,348 +766,276 @@ msgid "Companies"
 msgstr "Compañías"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr "Firma autorizada"
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Contrato"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
-msgstr "Hoja borrador"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
-msgstr "Fecha próximo mes"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Fecha"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "Fecha expiración visado"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
-msgstr "Buscar pasaporte"
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr "Contribución"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "Nº Teléfono"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
-msgstr "Contribución"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "Etiqueta"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
-msgstr "Contribución compañía"
+msgid "Refund"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
-msgstr "Otro Nº"
+#: view:hr.salary.rule:0
+msgid "Company contribution"
+msgstr "Contribución compañía"
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Código"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
-msgstr "Aviso de pago"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "Número :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
-"Esto se utiliza para calcular los valores de los campos %, en general en su "
-"base, pero puede utilizar todas las cabeceras de los campos de código en "
-"letra pequeña como un nombre de variable, por ejemplo hra, ma, lta, etc., "
-"también puede utilizar variable estática básica."
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
-msgstr "Resumen del cálculo"
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
-msgstr "Salario sobre"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Número"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr "Estructura salarial"
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr "Línea registro"
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "Cerrar"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "Importe / Porcentaje"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Primas"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr "Fecha mes actual"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Salario"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "Número de pasaporte"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Pasaporte"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Salario total"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "por periodo"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr "Cabecera nómina"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr "Registro de contribución"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "Correo electrónico"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr "Imprimir"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
-msgstr "Cabeceras salario"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "Imprimir informe"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr "Cálculos"
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-"Define el ratio de contribución de la compañía 1,00=100% de la contribución. "
-"Si el empleado contribuye con el 5%, entonces si aquí la compañía tiene un "
-"ratio de 0.50, la compañía contribuirá con el 50% del 5% de la contribución "
-"del empleado."
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Otra información"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr "Incidencia"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr "Cálculo Dinámico"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr "Salario base sin ausencias:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Función"
+msgid "Worked Days"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr "Estados"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Apreciado Sr./Sra.,"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
-msgstr "Cabeceras prima/deducción"
+msgid "Search Payslips"
+msgstr "Buscar nóminas"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
-msgstr "Sal. bruto"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Descripción"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Fecha inicio"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr "Deducción -"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ")"
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr "Registros de contribución"
 
@@ -1403,250 +1047,834 @@ msgid "Payroll"
 msgstr "Nómina"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Tipo de salario"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "Sal. neto"
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr "¡El número de pasaporte debe ser único!"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "Nombre categoría"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
-msgstr "hr.nómina.año.salario"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Dirección"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr "Línea justificante"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr "Número de hojas"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Banco"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr "Cancelar hoja"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "Adelanto"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
-msgstr "Primas y deducciones especiales por empleado:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Nombre"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr "Hojas de deducción"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "País"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Empleados"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Cuenta bancaria"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr "Registro de contribución basado en la empresa"
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr "Se utiliza para organizar la secuencia de cálculo"
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Pago total"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr "Línea de deducciones por ausencias:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr "Esperando por verificación de la cuenta"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
-msgstr "Deducción de la Compañía"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "Configuración nómina"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Total"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr "Por favor, defina la cuenta bancaria para el empleado %s"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr "Fecha de emisión del pasaporte"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr "Prima"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "N º de hojas"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
-msgstr "Otro id"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Detalles bancarios"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
-msgstr "ID justificante"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
-msgstr "Nómina de los empleados"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr "Contenido carta"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Salario anual"
+#~ msgid "Passport Expire Date"
+#~ msgstr "Fecha expiración pasaporte"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr "Prima / Deducción"
+#~ msgid "Wating for Verification"
+#~ msgstr "Esperando verificación"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr "Aviso de pago del banco"
+#~ msgid "For the month of"
+#~ msgstr "Para el mes de"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr "Buscar nóminas"
+#~ msgid "Country & Address"
+#~ msgstr "País y Dirección"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Total"
+#~ msgid "Earnings"
+#~ msgstr "Ingresos"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr "Contribuciones"
+#~ msgid "Dynamic Computation"
+#~ msgstr "Cálculo Dinámico"
+
+#~ msgid "The Manager"
+#~ msgstr "El responsable"
+
+#~ msgid "Other Deduction"
+#~ msgstr "Otras deducciones"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Vacaciones pagada"
+
+#~ msgid "Net Salary"
+#~ msgstr "Salario neto"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Nombre del empleado"
+
+#~ msgid "Year Salary Report"
+#~ msgstr "Informe anual de salarios"
+
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Vacaciones no pagadas"
+
+#~ msgid ""
+#~ "Calculation field used for internal calculation, do not place this on form"
+#~ msgstr "Campo usado en cálculos internos, no lo coloque en un formulario."
+
+#~ msgid "Payments -"
+#~ msgstr "Pagos -"
+
+#~ msgid "Authorised Signature"
+#~ msgstr "Firma autorizada"
+
+#~ msgid "Company Contributions"
+#~ msgstr "Contribuciones de la compañía"
+
+#~ msgid "No of Working days / week for an employee"
+#~ msgstr "Número de días/semanas trabajados para un empleado."
+
+#~ msgid "Human Resource Payroll"
+#~ msgstr "Nóminas de recursos humanos"
+
+#~ msgid "Salary Structure:"
+#~ msgstr "Estructura salarial:"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Salario bruto"
+
+#~ msgid "Total By Employee"
+#~ msgstr "Total por empleado"
+
+#~ msgid "Net Amount"
+#~ msgstr "Importe neto"
+
+#~ msgid "Yours Sincerely"
+#~ msgstr "Atentamente"
+
+#~ msgid "Total Earnings"
+#~ msgstr "Ingresos totales"
+
+#~ msgid "Other Payment"
+#~ msgstr "Otros pagos"
+
+#~ msgid "Bank Account A/C"
+#~ msgstr "Cuenta bancaria"
+
+#~ msgid "Employee Code"
+#~ msgstr "Código de empleado"
+
+#~ msgid "Confirm Sheet"
+#~ msgstr "Hoja de confirmación"
+
+#~ msgid "Salary Register"
+#~ msgstr "Registro salarial"
+
+#~ msgid "Function Calculation"
+#~ msgstr "Función de cálculo"
+
+#~ msgid "Company Contribution"
+#~ msgstr "Contribución compañía"
+
+#~ msgid "Total By Company"
+#~ msgstr "Total por compañía"
+
+#~ msgid "Payroll Register"
+#~ msgstr "Registro de nóminas"
+
+#~ msgid "Approve Sheet"
+#~ msgstr "Aprobar hoja"
+
+#~ msgid "Search Company Contribution"
+#~ msgstr "Buscar contribución de la compañía"
+
+#~ msgid "Wating for HR Verification"
+#~ msgstr "Esperando verificación de RRHH"
+
+#~ msgid "Paid ? "
+#~ msgstr "¿Pagado? "
+
+#~ msgid "Yearly Salary Details"
+#~ msgstr "Detalles del salario anual"
+
+#~ msgid "Payment Advice:"
+#~ msgstr "Aviso de pago:"
+
+#~ msgid "HR Manager"
+#~ msgstr "Responsable de RRHH"
+
+#~ msgid "Basic Salary"
+#~ msgstr "Salario base"
+
+#~ msgid "Passport No"
+#~ msgstr "Número de pasaporte"
+
+#~ msgid "Payment Advice"
+#~ msgstr "Aviso de pago"
+
+#~ msgid "Next Month Date"
+#~ msgstr "Fecha próximo mes"
+
+#~ msgid "Number :"
+#~ msgstr "Número :"
+
+#~ msgid "Current Month Date"
+#~ msgstr "Fecha mes actual"
+
+#~ msgid "Amount / Percentage"
+#~ msgstr "Importe / Porcentaje"
+
+#~ msgid "Draft Sheet"
+#~ msgstr "Hoja borrador"
+
+#~ msgid "Visa Expire Date"
+#~ msgstr "Fecha expiración visado"
+
+#~ msgid "for period"
+#~ msgstr "por periodo"
+
+#~ msgid "Total Salary"
+#~ msgstr "Salario total"
+
+#~ msgid "Other Informations"
+#~ msgstr "Otra información"
+
+#~ msgid "E-mail Address"
+#~ msgstr "Dirección de correo electrónico"
+
+#~ msgid "Visa No"
+#~ msgstr "Número de Visa"
+
+#~ msgid "By Salary"
+#~ msgstr "Por salario"
+
+#~ msgid "Applied this head for calculation if condition is true"
+#~ msgstr "Aplicar este encabezado en el cálculo si la condición es verdadera"
+
+#~ msgid "Country of Issue"
+#~ msgstr "País de emisión"
+
+#~ msgid "Working Days"
+#~ msgstr "Días de trabajo"
+
+#~ msgid "Deductions:"
+#~ msgstr "Deducciones:"
+
+#, python-format
+#~ msgid "Variable Error: %s "
+#~ msgstr "Error variable: %s "
+
+#~ msgid "Bank Advice"
+#~ msgstr "Aviso bancario"
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "Registro de pago de nómina"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Importe (en palabras):"
+
+#~ msgid "Recompute Sheet"
+#~ msgstr "Recalcular plantilla"
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Detalles del contrato:"
+
+#~ msgid "Print Statement"
+#~ msgstr "Imprimir declaración"
+
+#~ msgid "Loan Installment"
+#~ msgstr "Entrega anticipo"
+
+#~ msgid "Complete HR Checking"
+#~ msgstr "Comprobación RH completa"
+
+#~ msgid "Function Arguments"
+#~ msgstr "Argumentos de la función"
+
+#~ msgid "Bank Advice Note"
+#~ msgstr "Observación aviso bancario"
+
+#~ msgid "Search Passport"
+#~ msgstr "Buscar pasaporte"
 
 #~ msgid "Categoty Code"
 #~ msgstr "Código de categoría"
 
+#~ msgid "Allowances with Basic:"
+#~ msgstr "Primas con base:"
+
+#~ msgid "Allowance Deduction Heads"
+#~ msgstr "Cabeceras prima/deducción"
+
+#~ msgid "Allowance / Deduction"
+#~ msgstr "Prima / Deducción"
+
+#~ msgid "Allowance"
+#~ msgstr "Prima"
+
+#~ msgid "Special Allowances and Deductions For Employee:"
+#~ msgstr "Primas y deducciones especiales por empleado:"
+
+#~ msgid "Allowance Deduction Categoty"
+#~ msgstr "Categoría prima/deducción"
+
+#~ msgid "Allowances"
+#~ msgstr "Primas"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Nómina pagada"
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr "Seleccione la dirección del banco de donde se pagará la nómina."
+
+#~ msgid "Department"
+#~ msgstr "Departamento"
+
+#~ msgid "Loan"
+#~ msgstr "Préstamo"
+
+#~ msgid "Half-Pay Holiday"
+#~ msgstr "Vacaciones con media paga"
+
+#~ msgid "Expire"
+#~ msgstr "Vencimiento"
+
+#~ msgid "Others"
+#~ msgstr "Otros"
+
+#~ msgid "Calculaton Field"
+#~ msgstr "Campo de cálculo"
+
+#~ msgid "Leaves"
+#~ msgstr "Ausencias"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr ""
+#~ "¡Error! No puede seleccionar un departamento que tenga el empleado como "
+#~ "responsable."
+
+#~ msgid "Value"
+#~ msgstr "Valor"
+
+#~ msgid "Percentage"
+#~ msgstr "Porcentaje"
+
+#~ msgid "Valid From"
+#~ msgstr "Válido desde"
+
+#~ msgid "Payment"
+#~ msgstr "Pago"
+
+#~ msgid "Sub Total"
+#~ msgstr "Subtotal"
+
+#~ msgid "Leave Type"
+#~ msgstr "Tipo de ausencia"
+
+#~ msgid "Date :"
+#~ msgstr "Fecha :"
+
+#~ msgid "From"
+#~ msgstr "Desde"
+
+#~ msgid "End Date"
+#~ msgstr "Fecha final"
+
+#~ msgid "Based on"
+#~ msgstr "Basado en"
+
+#~ msgid "Leave Deductions"
+#~ msgstr "Deducciones por ausencia"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Notes:"
+#~ msgstr "Notas:"
+
+#~ msgid "Formula"
+#~ msgstr "Fórmula"
+
+#~ msgid "Function Value"
+#~ msgstr "Valor de función"
+
+#~ msgid "Other Lines"
+#~ msgstr "Otras líneas"
+
+#~ msgid "Paymeny Lines"
+#~ msgstr "Líneas de pago"
+
+#~ msgid "Letter Details"
+#~ msgstr "Detalles de la carta"
+
+#~ msgid "Total Deductions"
+#~ msgstr "Total deducciones"
+
+#~ msgid "Register"
+#~ msgstr "Registro"
+
+#~ msgid "Reject"
+#~ msgstr "Rechazado"
+
+#~ msgid "Posted"
+#~ msgstr "Fijado"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Deducción del empleado"
+
+#~ msgid ""
+#~ "Generic Payroll system\n"
+#~ "    * Employee Details\n"
+#~ "    * Employee Contracts\n"
+#~ "    * Passport based Contract\n"
+#~ "    * Allowances / Deductions\n"
+#~ "    * Allow to configure Basic / Grows / Net Salary\n"
+#~ "    * Employee Payslip\n"
+#~ "    * Monthly Payroll Register\n"
+#~ "    * Integrated with Holiday Management\n"
+#~ "    "
+#~ msgstr ""
+#~ "Sistema de nóminas genérico\n"
+#~ "    * Detalles de empleado\n"
+#~ "    * Contratos de empleado\n"
+#~ "    * Contratos basados en pasaportes\n"
+#~ "    * Complementos/deducciones\n"
+#~ "    * Permite configurar salario base/bruto/neto\n"
+#~ "    * Nómina de empleado\n"
+#~ "    * Registro mensual de nóminas\n"
+#~ "    * Integrado con la gestión de vacaciones\n"
+#~ "    "
+
+#~ msgid "Employees Salary Details"
+#~ msgstr "Detalles salario de los empleados"
+
+#~ msgid "Employees Salary Detail"
+#~ msgstr "Detalle salario empleado"
+
+#~ msgid "Pay Salary"
+#~ msgstr "Pagar nómina"
+
+#~ msgid "Employee Salary Statement"
+#~ msgstr "Declaración salario del empleado"
+
+#~ msgid "Basic Salary – Leaves"
+#~ msgstr "Salario base - Ausencias"
+
+#~ msgid "Employee Salary"
+#~ msgstr "Salario empleado"
+
+#~ msgid "Salary Information"
+#~ msgstr "Información del salario"
+
+#~ msgid "Year Salary"
+#~ msgstr "Salario anual"
+
+#~ msgid "Basic Salary without Leave:"
+#~ msgstr "Salario base sin ausencias:"
+
+#~ msgid "Salary On"
+#~ msgstr "Salario sobre"
+
+#~ msgid "hr.payroll.year.salary"
+#~ msgstr "hr.nómina.año.salario"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "¡ Error !"
+
+#~ msgid "Based"
+#~ msgstr "Basado"
+
+#~ msgid "To"
+#~ msgstr "Para"
+
+#~ msgid "Deductions"
+#~ msgstr "Deducciones"
+
+#~ msgid "Deduction"
+#~ msgstr "Deducción"
+
+#~ msgid "Others:"
+#~ msgstr "Otros:"
+
+#~ msgid "Basic"
+#~ msgstr "Básico"
+
+#~ msgid "Heads"
+#~ msgstr "Cabeceras"
+
+#~ msgid "Employee Name"
+#~ msgstr "Nombre del empleado"
+
+#~ msgid "For"
+#~ msgstr "Para"
+
+#~ msgid "Validation"
+#~ msgstr "Validación"
+
+#~ msgid "Contracts"
+#~ msgstr "Contratos"
+
+#~ msgid "Title"
+#~ msgstr "Título"
+
+#~ msgid "Paid"
+#~ msgstr "Pagado"
+
+#~ msgid "User"
+#~ msgstr "Usuario"
+
+#~ msgid "Payment Lines"
+#~ msgstr "Líneas de pago"
+
+#~ msgid "Condition"
+#~ msgstr "Condición"
+
+#~ msgid "Compute"
+#~ msgstr "Calcular"
+
+#~ msgid "Label"
+#~ msgstr "Etiqueta"
+
+#~ msgid "Date"
+#~ msgstr "Fecha"
+
+#~ msgid "Phone No."
+#~ msgstr "Nº Teléfono"
+
+#~ msgid "Salary"
+#~ msgstr "Salario"
+
+#~ msgid "Number"
+#~ msgstr "Número"
+
+#~ msgid "Other No."
+#~ msgstr "Otro Nº"
+
+#~ msgid "Computation Overview"
+#~ msgstr "Resumen del cálculo"
+
+#~ msgid "Print Report"
+#~ msgstr "Imprimir informe"
+
+#~ msgid "Month"
+#~ msgstr "Mes"
+
+#~ msgid "Issue"
+#~ msgstr "Incidencia"
+
+#~ msgid "E-mail"
+#~ msgstr "Correo electrónico"
+
+#~ msgid "Function"
+#~ msgstr "Función"
+
+#~ msgid "Gross Sal."
+#~ msgstr "Sal. bruto"
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "Apreciado Sr./Sra.,"
+
+#~ msgid "Start Date"
+#~ msgstr "Fecha inicio"
+
+#~ msgid "Deduction -"
+#~ msgstr "Deducción -"
+
+#~ msgid "Net Sal."
+#~ msgstr "Sal. neto"
+
+#~ msgid "Advance"
+#~ msgstr "Adelanto"
+
+#~ msgid "Bank"
+#~ msgstr "Banco"
+
+#~ msgid "Wage Type"
+#~ msgstr "Tipo de salario"
+
+#~ msgid "Total Payment"
+#~ msgstr "Pago total"
+
+#~ msgid "Country"
+#~ msgstr "País"
+
+#~ msgid "Wating for Account Verification"
+#~ msgstr "Esperando por verificación de la cuenta"
+
+#~ msgid "Company Deduction"
+#~ msgstr "Deducción de la Compañía"
+
+#~ msgid "Bank Details"
+#~ msgstr "Detalles bancarios"
+
+#, python-format
+#~ msgid "Please define bank account for the %s employee"
+#~ msgstr "Por favor, defina la cuenta bancaria para el empleado %s"
+
+#~ msgid "Payroll Configurtion"
+#~ msgstr "Configuración nómina"
+
+#~ msgid "Use for Gratuity ?"
+#~ msgstr "¿Uso de propina?"
+
+#~ msgid "Passport"
+#~ msgstr "Pasaporte"
+
+#~ msgid "Other Id"
+#~ msgstr "Otro id"
+
+#~ msgid "No of Leaves"
+#~ msgstr "N º de hojas"
+
+#~ msgid "Cancel Sheet"
+#~ msgstr "Cancelar hoja"
+
+#~ msgid "Passport Issue Date"
+#~ msgstr "Fecha de emisión del pasaporte"
+
 #~ msgid "Categoty Name"
 #~ msgstr "Nombre categoría"
 
+#, python-format
+#~ msgid "Variable Error !"
+#~ msgstr "¡Error de variable!"
+
+#~ msgid "Work Permit No"
+#~ msgstr "Nº permiso trabajo"
+
+#~ msgid "The Passport No must be unique !"
+#~ msgstr "¡El número de pasaporte debe ser único!"
+
+#~ msgid "Contribution Lines"
+#~ msgstr "Líneas de contribución"
+
+#~ msgid "Contribution Register Line"
+#~ msgstr "Línea de registro de contribución"
+
+#~ msgid "All Passports"
+#~ msgstr "Todos los pasaportes"
+
+#~ msgid "Function Line"
+#~ msgstr "Línea de función"
+
+#~ msgid "Passport Detail"
+#~ msgstr "Detalle pasaporte"
+
+#~ msgid "Contribution register based on company"
+#~ msgstr "Registro de contribución basado en la empresa"
+
+#~ msgid "Number of Leaves"
+#~ msgstr "Número de hojas"
+
+#~ msgid "Employee Payslip"
+#~ msgstr "Nómina de los empleados"
+
+#~ msgid "Leaved Deduction"
+#~ msgstr "Hojas de deducción"
+
+#~ msgid "Bank Payment Advice"
+#~ msgstr "Aviso de pago del banco"
+
+#~ msgid "Verify Sheet"
+#~ msgstr "Comprobar hoja"
+
+#~ msgid "New Slip"
+#~ msgstr "Nuevo justificante"
+
+#~ msgid "hr.payroll.employees.detail"
+#~ msgstr "rrhh.nomina.empleados.detalle"
+
+#~ msgid "Category Code"
+#~ msgstr "Código categoría"
+
+#, python-format
+#~ msgid "Please check configuration of %s, payroll head is missing"
+#~ msgstr ""
+#~ "Por favor, compruebe la configuración de %s, falta la cabecera de la nómina"
+
+#~ msgid "SI. No."
+#~ msgstr "Nº SS"
+
+#~ msgid "Net Basic"
+#~ msgstr "Base neta"
+
+#~ msgid "Bank Advice Lines"
+#~ msgstr "Líneas de notificación bancaria"
+
+#~ msgid "Salary Heads"
+#~ msgstr "Cabeceras salario"
+
+#~ msgid "Category Name"
+#~ msgstr "Nombre categoría"
+
+#~ msgid "Slip Line"
+#~ msgstr "Línea justificante"
+
+#~ msgid "Payroll Head"
+#~ msgstr "Cabecera nómina"
+
+#~ msgid "Slip ID"
+#~ msgstr "ID justificante"
+
+#~ msgid "Contributions"
+#~ msgstr "Contribuciones"
+
+#~ msgid "D/C"
+#~ msgstr "D/C"
+
+#~ msgid "C/D"
+#~ msgstr "C/D"
+
+#~ msgid "Letter Content"
+#~ msgstr "Contenido carta"
+
+#~ msgid "Leave Deductions Line:"
+#~ msgstr "Línea de deducciones por ausencias:"
+
+#~ msgid ""
+#~ "This will use to computer the % fields values, in general its on basic, but "
+#~ "You can use all heads code field in small letter as a variable name i.e. "
+#~ "hra, ma, lta, etc...., also you can use, static varible basic"
+#~ msgstr ""
+#~ "Esto se utiliza para calcular los valores de los campos %, en general en su "
+#~ "base, pero puede utilizar todas las cabeceras de los campos de código en "
+#~ "letra pequeña como un nombre de variable, por ejemplo hra, ma, lta, etc., "
+#~ "también puede utilizar variable estática básica."
+
+#~ msgid "Chaque Nos"
+#~ msgstr "Cada uno de nuestros"
+
+#~ msgid "Register Lines"
+#~ msgstr "Líneas de registro"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre del modelo inválido en la definición de acción."
 
@@ -1662,10 +1890,6 @@ msgstr "Contribuciones"
 #~ msgid "Account"
 #~ msgstr "Cuenta"
 
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "¡ Aviso !"
-
 #~ msgid "Payment From"
 #~ msgstr "Pago desde"
 
@@ -1698,9 +1922,6 @@ msgstr "Contribuciones"
 #~ msgid "Accounting Informations"
 #~ msgstr "Información contable"
 
-#~ msgid "Print"
-#~ msgstr "Imprimir"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML inválido para la definición de la vista!"
 
@@ -1752,8 +1973,5 @@ msgstr "Contribuciones"
 #~ msgid "Contract Duration"
 #~ msgstr "Duración del contrato"
 
-#~ msgid "Notes"
-#~ msgstr "Notas"
-
 #~ msgid "Fiscal Year"
 #~ msgstr "Ejercicio fiscal"
diff --git a/addons/hr_payroll/i18n/es_EC.po b/addons/hr_payroll/i18n/es_EC.po
index 7ecd10485d8..373537f4ccd 100644
--- a/addons/hr_payroll/i18n/es_EC.po
+++ b/addons/hr_payroll/i18n/es_EC.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-06-11 13:23+0000\n"
 "Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
 "<chris.ormaza@gmail.com>\n"
@@ -15,243 +15,187 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Dirección de correo electrónico"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Basado"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Salario neto"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Recalcular plantilla"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Detalles de Salarios de Empleados"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Departamento"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Deducciones:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "¿Uso de propina?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Agroupar por ..."
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Días de trabajo"
+#: view:hr.payslip:0
+msgid "States"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Préstamo"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Registro de pago de nómina"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Nóminas"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Informe anual de salarios"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Nómina pagada"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "Responsable"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "Detalles de la carta"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Cambiar a borrador"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "Error variable: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Vencimiento"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Vacaciones con media paga"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Otros"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Nómina"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Detalles del contrato:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Campo de cálculo"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "Aviso bancario"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Rechazar"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Total:"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Ausencias"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Registro"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
-"¡Error! No puede seleccionar un departamento que tenga el empleado como "
-"responsable."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Total de Deducciones"
 
 #. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Valor"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Nombre del empleado"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr "Líneas de registro"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -259,270 +203,176 @@ msgid "Salary Computation"
 msgstr "Cálculo de la nómina"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Monto"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-"Por favor, compruebe la configuración de %s, falta la cabecera de la nómina"
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Porcentaje"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Línea de nómina"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Otra Información"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "País de emisión"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Deducción del Empleado"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Otras deducciones"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Vacaciones pagada"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Agroupar por ..."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Fecha de Expiración de Pasaporte"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Vacaciones no pagadas"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Válido desde"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
-msgstr "Campo usado en cálculos internos, no lo coloque en un formulario."
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Monto (en letras) :"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Pago"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr "Línea de nómina"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "Nº identificación"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Basado en"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Esperando verificación"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Nóminas de recursos humanos"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Asentado"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
-msgstr ""
-"Sistema de nóminas genérico\n"
-"    * Detalles de empleado\n"
-"    * Contratos de empleado\n"
-"    * Contratos basados en pasaportes\n"
-"    * Complementos/deducciones\n"
-"    * Permite configurar salario base/bruto/neto\n"
-"    * Nómina de empleado\n"
-"    * Registro mensual de nóminas\n"
-"    * Integrado con la gestión de vacaciones\n"
-"    "
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Tipo de ausencia"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Fecha:"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Sub Total"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Pagos -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "Número de Visa"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "De"
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "Por salario"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Fecha Final"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr "Rol de Pagos de Empleado"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Deducciones por Ausencia"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "Firma autorizada"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "Valor de función"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
-msgstr "Línea de registro de contribución"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Notas:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Estado"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr "Líneas de Pago"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "Otras Líneas"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Argumentos de la función"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
-msgstr "Contribuciones de la compañía"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -530,193 +380,183 @@ msgid "Employee"
 msgstr "Empleado(a)"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Fórmula"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr "Líneas de notificación bancaria"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Tipo"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "Correo electrónico"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "Nº"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Comprobar Hoja"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
-msgstr "Número de días/semanas trabajados por un empleado."
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr "Nuevo Justificante"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr "Base neta"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Salario bruto"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "Ingresos totales"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
-msgstr "Declaración salario del empleado"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Otros pagos"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Deducciones"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "Nº Permiso de Trabajo"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Salario del Empleado"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr "Importe fijo"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Total por empleado"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "Importe fijo"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Para"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr "¡Error de variable!"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Pagar Nómina"
+msgid "PaySlip Batch"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
-msgstr "Cuenta bancaria"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
-msgstr "Líneas de contribución"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "Para el mes de"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Deducción"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr "Nómina"
@@ -729,191 +569,129 @@ msgstr ""
 "finalización."
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr "Entrega anticipo"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr "Comprobación RH completa"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "Atentamente"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Importe neto"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Estructura salarial:"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "Detalle del salario del empleado"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr "Línea de función"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr "Hoja de confirmación"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Otros:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr "Función de cálculo"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "Días trabajados"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Total por compañía"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
-msgstr "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
-msgstr "País y Dirección"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Código de empleado"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
-msgstr "Salario base - Ausencias"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "Tipo de importe"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Categoría"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
-msgstr "Contribución compañía"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
-msgstr "Cabeceras"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "Imprimir declaración"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Borrador"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr "Ingresos"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Básico"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Todos los pasaportes"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
-msgstr "Registro Salarial"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Nombre del empleado"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Detalle del Pasaporte"
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "Porcentaje (%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr "Registro de nómina"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Contratos"
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr "Días trabajados"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -921,44 +699,10 @@ msgid "Employee Function"
 msgstr "Función del empleado"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Pagado"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "Aprobar hoja"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "¿Pagado? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Validación"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Tratamiento:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr "Buscar contribución de la compañía"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Líneas de pago"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -966,19 +710,14 @@ msgid "Compute Sheet"
 msgstr "Calcular hoja"
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Activo"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr "Aplicar este encabezado en el cálculo si la condición es verdadera"
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
@@ -987,61 +726,38 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1050,340 +766,276 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
+#: view:hr.contribution.register:0
+msgid "Contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1395,240 +1047,561 @@ msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr ""
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr ""
+#~ msgid "Employees Salary Details"
+#~ msgstr "Detalles de Salarios de Empleados"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr ""
+#~ msgid "Net Salary"
+#~ msgstr "Salario neto"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr ""
+#~ msgid "Working Days"
+#~ msgstr "Días de trabajo"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr ""
+#~ msgid "Department"
+#~ msgstr "Departamento"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr ""
+#~ msgid "Use for Gratuity ?"
+#~ msgstr "¿Uso de propina?"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr ""
+#~ msgid "E-mail Address"
+#~ msgstr "Dirección de correo electrónico"
+
+#~ msgid "Recompute Sheet"
+#~ msgstr "Recalcular plantilla"
+
+#~ msgid "Based"
+#~ msgstr "Basado"
+
+#~ msgid "The Manager"
+#~ msgstr "Responsable"
+
+#~ msgid "Loan"
+#~ msgstr "Préstamo"
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "Registro de pago de nómina"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Nómina pagada"
+
+#~ msgid "Year Salary Report"
+#~ msgstr "Informe anual de salarios"
+
+#~ msgid "Letter Details"
+#~ msgstr "Detalles de la carta"
+
+#~ msgid "Others"
+#~ msgstr "Otros"
+
+#~ msgid "Half-Pay Holiday"
+#~ msgstr "Vacaciones con media paga"
+
+#, python-format
+#~ msgid "Variable Error: %s "
+#~ msgstr "Error variable: %s "
+
+#~ msgid "Bank Advice"
+#~ msgstr "Aviso bancario"
+
+#~ msgid "Calculaton Field"
+#~ msgstr "Campo de cálculo"
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Detalles del contrato:"
+
+#~ msgid "Expire"
+#~ msgstr "Vencimiento"
+
+#~ msgid "Total Deductions"
+#~ msgstr "Total de Deducciones"
+
+#~ msgid "Register"
+#~ msgstr "Registro"
+
+#~ msgid "Leaves"
+#~ msgstr "Ausencias"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Nombre del empleado"
+
+#~ msgid "Reject"
+#~ msgstr "Rechazar"
+
+#~ msgid "Register Lines"
+#~ msgstr "Líneas de registro"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr ""
+#~ "¡Error! No puede seleccionar un departamento que tenga el empleado como "
+#~ "responsable."
+
+#~ msgid "Value"
+#~ msgstr "Valor"
+
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Vacaciones no pagadas"
+
+#~ msgid "Country of Issue"
+#~ msgstr "País de emisión"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Fecha de Expiración de Pasaporte"
+
+#~ msgid "Other Deduction"
+#~ msgstr "Otras deducciones"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Vacaciones pagada"
+
+#, python-format
+#~ msgid "Please check configuration of %s, payroll head is missing"
+#~ msgstr ""
+#~ "Por favor, compruebe la configuración de %s, falta la cabecera de la nómina"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Deducción del Empleado"
+
+#~ msgid "Percentage"
+#~ msgstr "Porcentaje"
+
+#~ msgid ""
+#~ "Calculation field used for internal calculation, do not place this on form"
+#~ msgstr "Campo usado en cálculos internos, no lo coloque en un formulario."
+
+#~ msgid "Wating for Verification"
+#~ msgstr "Esperando verificación"
+
+#~ msgid "Valid From"
+#~ msgstr "Válido desde"
+
+#~ msgid "Based on"
+#~ msgstr "Basado en"
+
+#~ msgid "Payment"
+#~ msgstr "Pago"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Monto (en letras) :"
+
+#~ msgid "Human Resource Payroll"
+#~ msgstr "Nóminas de recursos humanos"
+
+#~ msgid "Posted"
+#~ msgstr "Asentado"
+
+#~ msgid ""
+#~ "Generic Payroll system\n"
+#~ "    * Employee Details\n"
+#~ "    * Employee Contracts\n"
+#~ "    * Passport based Contract\n"
+#~ "    * Allowances / Deductions\n"
+#~ "    * Allow to configure Basic / Grows / Net Salary\n"
+#~ "    * Employee Payslip\n"
+#~ "    * Monthly Payroll Register\n"
+#~ "    * Integrated with Holiday Management\n"
+#~ "    "
+#~ msgstr ""
+#~ "Sistema de nóminas genérico\n"
+#~ "    * Detalles de empleado\n"
+#~ "    * Contratos de empleado\n"
+#~ "    * Contratos basados en pasaportes\n"
+#~ "    * Complementos/deducciones\n"
+#~ "    * Permite configurar salario base/bruto/neto\n"
+#~ "    * Nómina de empleado\n"
+#~ "    * Registro mensual de nóminas\n"
+#~ "    * Integrado con la gestión de vacaciones\n"
+#~ "    "
+
+#~ msgid "Leave Type"
+#~ msgstr "Tipo de ausencia"
+
+#~ msgid "Date :"
+#~ msgstr "Fecha:"
+
+#~ msgid "Deductions:"
+#~ msgstr "Deducciones:"
+
+#~ msgid "Sub Total"
+#~ msgstr "Sub Total"
+
+#~ msgid "Visa No"
+#~ msgstr "Número de Visa"
+
+#~ msgid "Payments -"
+#~ msgstr "Pagos -"
+
+#~ msgid "Leave Deductions"
+#~ msgstr "Deducciones por Ausencia"
+
+#~ msgid "Authorised Signature"
+#~ msgstr "Firma autorizada"
+
+#~ msgid "From"
+#~ msgstr "De"
+
+#~ msgid "By Salary"
+#~ msgstr "Por salario"
+
+#~ msgid "Notes:"
+#~ msgstr "Notas:"
+
+#~ msgid "End Date"
+#~ msgstr "Fecha Final"
+
+#~ msgid "Contribution Register Line"
+#~ msgstr "Línea de registro de contribución"
+
+#~ msgid "Function Value"
+#~ msgstr "Valor de función"
+
+#~ msgid "#"
+#~ msgstr "Nº"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Bank Advice Lines"
+#~ msgstr "Líneas de notificación bancaria"
+
+#~ msgid "Formula"
+#~ msgstr "Fórmula"
+
+#~ msgid "Company Contributions"
+#~ msgstr "Contribuciones de la compañía"
+
+#~ msgid "Function Arguments"
+#~ msgstr "Argumentos de la función"
+
+#~ msgid "Other Lines"
+#~ msgstr "Otras Líneas"
+
+#~ msgid "Paymeny Lines"
+#~ msgstr "Líneas de Pago"
+
+#~ msgid "Verify Sheet"
+#~ msgstr "Comprobar Hoja"
+
+#~ msgid "New Slip"
+#~ msgstr "Nuevo Justificante"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Salario bruto"
+
+#~ msgid "Employee Salary Statement"
+#~ msgstr "Declaración salario del empleado"
+
+#~ msgid "Deductions"
+#~ msgstr "Deducciones"
+
+#~ msgid "Total Earnings"
+#~ msgstr "Ingresos totales"
+
+#~ msgid "Other Payment"
+#~ msgstr "Otros pagos"
+
+#~ msgid "Net Basic"
+#~ msgstr "Base neta"
+
+#~ msgid "No of Working days / week for an employee"
+#~ msgstr "Número de días/semanas trabajados por un empleado."
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "¡Error!"
+
+#~ msgid "Pay Salary"
+#~ msgstr "Pagar Nómina"
+
+#~ msgid "hr.payroll.employees.detail"
+#~ msgstr "hr.payroll.employees.detail"
+
+#, python-format
+#~ msgid "Variable Error !"
+#~ msgstr "¡Error de variable!"
+
+#~ msgid "Total By Employee"
+#~ msgstr "Total por empleado"
+
+#~ msgid "To"
+#~ msgstr "Para"
+
+#~ msgid "Work Permit No"
+#~ msgstr "Nº Permiso de Trabajo"
+
+#~ msgid "C/D"
+#~ msgstr "C/D"
+
+#~ msgid "Employee Salary"
+#~ msgstr "Salario del Empleado"
+
+#~ msgid "Deduction"
+#~ msgstr "Deducción"
+
+#~ msgid "For the month of"
+#~ msgstr "Para el mes de"
+
+#~ msgid "Contribution Lines"
+#~ msgstr "Líneas de contribución"
+
+#~ msgid "Yours Sincerely"
+#~ msgstr "Atentamente"
+
+#~ msgid "Loan Installment"
+#~ msgstr "Entrega anticipo"
+
+#~ msgid "Complete HR Checking"
+#~ msgstr "Comprobación RH completa"
+
+#~ msgid "Bank Account A/C"
+#~ msgstr "Cuenta bancaria"
+
+#~ msgid "Salary Structure:"
+#~ msgstr "Estructura salarial:"
+
+#~ msgid "Employees Salary Detail"
+#~ msgstr "Detalle del salario del empleado"
+
+#~ msgid "Confirm Sheet"
+#~ msgstr "Hoja de confirmación"
+
+#~ msgid "Others:"
+#~ msgstr "Otros:"
+
+#~ msgid "Function Line"
+#~ msgstr "Línea de función"
+
+#~ msgid "Function Calculation"
+#~ msgstr "Función de cálculo"
+
+#~ msgid "Net Amount"
+#~ msgstr "Importe neto"
+
+#~ msgid "Total By Company"
+#~ msgstr "Total por compañía"
+
+#~ msgid "Employee Code"
+#~ msgstr "Código de empleado"
+
+#~ msgid "Print Statement"
+#~ msgstr "Imprimir declaración"
+
+#~ msgid "D/C"
+#~ msgstr "D/C"
+
+#~ msgid "Company Contribution"
+#~ msgstr "Contribución compañía"
+
+#~ msgid "Basic Salary – Leaves"
+#~ msgstr "Salario base - Ausencias"
+
+#~ msgid "Country & Address"
+#~ msgstr "País y Dirección"
+
+#~ msgid "Heads"
+#~ msgstr "Cabeceras"
+
+#~ msgid "Employee Name"
+#~ msgstr "Nombre del empleado"
+
+#~ msgid "All Passports"
+#~ msgstr "Todos los pasaportes"
+
+#~ msgid "Salary Register"
+#~ msgstr "Registro Salarial"
+
+#~ msgid "Basic"
+#~ msgstr "Básico"
+
+#~ msgid "Earnings"
+#~ msgstr "Ingresos"
+
+#~ msgid "Approve Sheet"
+#~ msgstr "Aprobar hoja"
+
+#~ msgid "Contracts"
+#~ msgstr "Contratos"
+
+#~ msgid "Passport Detail"
+#~ msgstr "Detalle del Pasaporte"
+
+#~ msgid "Payroll Register"
+#~ msgstr "Registro de nómina"
+
+#~ msgid "Paid ? "
+#~ msgstr "¿Pagado? "
+
+#~ msgid "Paid"
+#~ msgstr "Pagado"
+
+#~ msgid "Validation"
+#~ msgstr "Validación"
+
+#~ msgid "User"
+#~ msgstr "Usuario"
+
+#~ msgid "Applied this head for calculation if condition is true"
+#~ msgstr "Aplicar este encabezado en el cálculo si la condición es verdadera"
+
+#~ msgid "Search Company Contribution"
+#~ msgstr "Buscar contribución de la compañía"
+
+#~ msgid "Title"
+#~ msgstr "Tratamiento:"
+
+#~ msgid "Payment Lines"
+#~ msgstr "Líneas de pago"
diff --git a/addons/hr_payroll/i18n/et.po b/addons/hr_payroll/i18n/et.po
index 32865eb3b83..ae218debc5a 100644
--- a/addons/hr_payroll/i18n/et.po
+++ b/addons/hr_payroll/i18n/et.po
@@ -7,248 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2010-06-25 17:48+0000\n"
 "Last-Translator: lyyser <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:15+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "E-mail Aadres"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Osakond"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Mahaarvamised:"
-
-#. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
+#: view:hr.payslip:0
+msgid "States"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Laen"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Ettevõte"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
+#: view:hr.payslip:0
+msgid "Done Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "Kirja detailid"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Sea mustandiks"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Muud"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: report:contribution.register.lines:0
+msgid "Total:"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Keeldu"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Lehed"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Registreeri"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Kokku mahaarvamised"
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Väärtus"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr ""
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr "Märkused"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -256,259 +202,176 @@ msgid "Salary Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Hulk"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr ""
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr "Hoiatus!"
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
+#: view:hr.payslip:0
+msgid "Draft Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Summa (sõnadega) :"
-
-#. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Makse"
-
-#. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Põhineb"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Ootan valideerimist"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
+msgid "Total Working Days"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
+#: view:hr.payslip:0
+msgid "Confirm"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Vahesumma"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
+msgid "Employee PaySlip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Alates"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Lõppkuupäev"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
-msgid "Employee PaySlip"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "Volitatud isiku allkiri"
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Märkused:"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Olek"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -516,453 +379,342 @@ msgid "Employee"
 msgstr "Töötaja"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: view:hr.salary.rule:0
+msgid "Children definition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Tüüp"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "#"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Fixed Amount"
 msgstr "Kindel summa"
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Kuni"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
+msgid "Worked Days & Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Mahaarvamine"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Payslip"
+msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: constraint:hr.contract:0
-msgid "Error! contract start-date must be lower then contract end-date."
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
+#: view:hr.payslip:0
+msgid "Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Ülejäänud:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
+#: view:hr.salary.rule:0
+msgid "Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Töötaja kood"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "Summa liik"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Kategooria"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "Trüki avaldus"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Töötaja nimi"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
+#: view:hr.salary.rule:0
+msgid "Conditions"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
+#: view:hr.payslip:0
+msgid "Worked Day"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "Kellele"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Lepingud"
-
-#. module: hr_payroll
 #: view:hr.payroll.structure:0
 msgid "Employee Function"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Pealkiri"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Makseread"
-
-#. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Aktiivne"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr ""
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
@@ -971,61 +723,38 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Tingimus"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Arvuta"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr "Sihtkoht"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1034,340 +763,276 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Leping"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Kuupäev"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
+#: view:hr.contribution.register:0
+msgid "Contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "Telefon nr."
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Kood"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr ""
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Järjestus"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Number"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Katkesta"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "Summa / protsent"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Toetused"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Palk"
-
-#. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Pass"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "E-post"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr "Trüki"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr "Arvutused"
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Muu info"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr "Dünaamiline arvutamine"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Funktsioon"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "States"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Lugupeetud Härra/Proua,"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Kirjeldus"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Alguskuupäev"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1379,268 +1044,241 @@ msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr ""
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Aadress"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Pank"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "Edenema"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Nimi"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Töötajad"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Pangakonto"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr ""
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Kokku"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr "Abiraha"
-
-#. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Pangadetailid"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Järjestus"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr ""
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Kokku"
+#~ msgid "E-mail Address"
+#~ msgstr "E-mail Aadres"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr ""
+#~ msgid "Deductions:"
+#~ msgstr "Mahaarvamised:"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
+#~ msgid "Department"
+#~ msgstr "Osakond"
+
+#~ msgid "Others"
+#~ msgstr "Muud"
+
+#~ msgid "Letter Details"
+#~ msgstr "Kirja detailid"
+
+#~ msgid "Salary"
+#~ msgstr "Palk"
 
 #~ msgid "Account"
 #~ msgstr "Konto"
 
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Hoiatus!"
+#~ msgid "Register"
+#~ msgstr "Registreeri"
+
+#~ msgid "Leaves"
+#~ msgstr "Lehed"
+
+#~ msgid "Value"
+#~ msgstr "Väärtus"
+
+#~ msgid "Payment"
+#~ msgstr "Makse"
+
+#~ msgid "Bank"
+#~ msgstr "Pank"
+
+#~ msgid "Based on"
+#~ msgstr "Põhineb"
 
 #~ msgid "Analytic Account"
 #~ msgstr "Analüütiline konto"
 
+#~ msgid "Amount (in words) :"
+#~ msgstr "Summa (sõnadega) :"
+
 #~ msgid "Force Period"
 #~ msgstr "Suru periood"
 
+#~ msgid "Sub Total"
+#~ msgstr "Vahesumma"
+
+#~ msgid "From"
+#~ msgstr "Alates"
+
 #~ msgid "Error! You can not create recursive analytic accounts."
 #~ msgstr "Viga! Sa ei saa luua rekursiivseid analüütilisi kontosid."
 
+#~ msgid "Authorised Signature"
+#~ msgstr "Volitatud isiku allkiri"
+
+#~ msgid "Passport"
+#~ msgstr "Pass"
+
 #~ msgid "Amount Information"
 #~ msgstr "Summa info"
 
-#~ msgid "Print"
-#~ msgstr "Trüki"
+#~ msgid "Notes:"
+#~ msgstr "Märkused:"
+
+#~ msgid "End Date"
+#~ msgstr "Lõppkuupäev"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "Type"
+#~ msgstr "Tüüp"
 
 #, python-format
 #~ msgid "Integrity Error !"
@@ -1649,29 +1287,95 @@ msgstr ""
 #~ msgid "Miscelleanous"
 #~ msgstr "Mitmesugune"
 
+#~ msgid "Start Date"
+#~ msgstr "Alguskuupäev"
+
+#~ msgid "Deduction"
+#~ msgstr "Mahaarvamine"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Vigane XML vaate arhitektuurile!"
 
+#~ msgid "Wating for Verification"
+#~ msgstr "Ootan valideerimist"
+
+#~ msgid "Allowances"
+#~ msgstr "Toetused"
+
 #~ msgid "Expense"
 #~ msgstr "Kulu"
 
 #~ msgid "Payment Entries"
 #~ msgstr "Makse kirjed"
 
+#~ msgid "Contracts"
+#~ msgstr "Lepingud"
+
+#~ msgid "Others:"
+#~ msgstr "Ülejäänud:"
+
+#~ msgid "Employee Code"
+#~ msgstr "Töötaja kood"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
 
+#~ msgid "Employee Name"
+#~ msgstr "Töötaja nimi"
+
+#~ msgid "For"
+#~ msgstr "Kellele"
+
+#~ msgid "Reject"
+#~ msgstr "Keeldu"
+
+#~ msgid "Title"
+#~ msgstr "Pealkiri"
+
+#~ msgid "Condition"
+#~ msgstr "Tingimus"
+
+#~ msgid "Compute"
+#~ msgstr "Arvuta"
+
+#~ msgid "Payment Lines"
+#~ msgstr "Makseread"
+
+#~ msgid "Date"
+#~ msgstr "Kuupäev"
+
+#~ msgid "Phone No."
+#~ msgstr "Telefon nr."
+
 #~ msgid "General Account"
 #~ msgstr "Üldine konto"
 
+#~ msgid "Loan"
+#~ msgstr "Laen"
+
+#~ msgid "To"
+#~ msgstr "Kuni"
+
 #~ msgid "Process"
 #~ msgstr "Etapp"
 
+#~ msgid "Number"
+#~ msgstr "Number"
+
+#~ msgid "Amount / Percentage"
+#~ msgstr "Summa / protsent"
+
 #~ msgid "General Information"
 #~ msgstr "Üldine info"
 
+#~ msgid "E-mail"
+#~ msgstr "E-post"
+
+#~ msgid "Print Statement"
+#~ msgstr "Trüki avaldus"
+
 #~ msgid "Account Information"
 #~ msgstr "Konto info"
 
@@ -1681,8 +1385,20 @@ msgstr ""
 #~ msgid "Contract Duration"
 #~ msgstr "Lepingu kestus"
 
-#~ msgid "Notes"
-#~ msgstr "Märkused"
+#~ msgid "Function"
+#~ msgstr "Funktsioon"
+
+#~ msgid "Dynamic Computation"
+#~ msgstr "Dünaamiline arvutamine"
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "Lugupeetud Härra/Proua,"
+
+#~ msgid "Other Informations"
+#~ msgstr "Muu info"
+
+#~ msgid "Advance"
+#~ msgstr "Edenema"
 
 #~ msgid "Fiscal Year"
 #~ msgstr "Majandusaasta"
@@ -1693,5 +1409,14 @@ msgstr ""
 #~ msgid "Statutory Information"
 #~ msgstr "Ametlik info"
 
+#~ msgid "Allowance"
+#~ msgstr "Abiraha"
+
+#~ msgid "Bank Details"
+#~ msgstr "Pangadetailid"
+
 #~ msgid "Print Salary Structure"
 #~ msgstr "Trüki palgastruktuur"
+
+#~ msgid "Total Deductions"
+#~ msgstr "Kokku mahaarvamised"
diff --git a/addons/hr_payroll/i18n/fi.po b/addons/hr_payroll/i18n/fi.po
index 5eb02fe424a..29ff2a7ef6c 100644
--- a/addons/hr_payroll/i18n/fi.po
+++ b/addons/hr_payroll/i18n/fi.po
@@ -7,247 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-02-23 15:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:15+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Sähköpostiosoite"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Osasto"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
+#: view:hr.payslip:0
+msgid "States"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
+#: view:hr.payslip:0
+msgid "Done Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
+#: report:contribution.register.lines:0
+msgid "Total:"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr ""
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
 msgstr ""
 
 #. module: hr_payroll
@@ -256,259 +202,176 @@ msgid "Salary Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-msgid "Other Information"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
 #: view:hr.payslip:0
-msgid "Group By..."
+msgid "Other Information"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
+msgid "Draft Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Identification No"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Identification No"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
+msgid "Total Working Days"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
+#: view:hr.payslip:0
+msgid "Confirm"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -516,193 +379,183 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
+#: view:hr.salary.rule:0
+msgid "Children definition"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
+msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr ""
@@ -713,190 +566,128 @@ msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
+#: view:hr.salary.rule:0
+msgid "Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
+#: view:hr.salary.rule:0
+msgid "Conditions"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
+#: view:hr.payslip:0
+msgid "Worked Day"
 msgstr ""
 
 #. module: hr_payroll
@@ -905,43 +696,9 @@ msgid "Employee Function"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
@@ -950,19 +707,14 @@ msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr ""
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
@@ -971,61 +723,38 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1034,340 +763,276 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
+#: view:hr.contribution.register:0
+msgid "Contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1379,240 +1044,163 @@ msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr ""
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr ""
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr ""
+#~ msgid "Department"
+#~ msgstr "Osasto"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr ""
+#~ msgid "E-mail Address"
+#~ msgstr "Sähköpostiosoite"
diff --git a/addons/hr_payroll/i18n/fr.po b/addons/hr_payroll/i18n/fr.po
index fcb0a65f72b..1983cee3379 100644
--- a/addons/hr_payroll/i18n/fr.po
+++ b/addons/hr_payroll/i18n/fr.po
@@ -7,252 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-01-18 16:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Adresse courriel"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Fondé sur"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Salaire net"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Recalculer la feuille"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Détails sur le salaire des employés"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
-msgstr "Allocations de base :"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Département"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Déductions :"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "Utiliser comme prime ?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Regrouper par..."
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Jours de travail"
+#: view:hr.payslip:0
+msgid "States"
+msgstr "États"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Prêt"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Registre de paiement des salaires"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Feuilles de paye"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Rapport salarial annuel"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Salaire payé"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Société"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "Le gestionnaire"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "Détails de la lettre"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Mettre à l'état \"Brouillon\""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "Erreur sur la variable : %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Expire"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Vacances avec demi-salaire"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Autres"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Feuille de paie"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Détail du contrat :"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Champ pour le calcul"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
-"Sélectionner l'adresse de la banque à partir de laquelle le salarié va être "
-"payé."
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "Avis bancaire"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Rejetée"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Total :"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Congés"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Registre"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
-"Erreur ! Vous ne pouvez pas sélectionner un département pour lequel "
-"l'employé est le responsable."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Total des déductions"
 
 #. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Valeur"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Nom de l'employé"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr "Lignes du registre"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -260,274 +202,176 @@ msgid "Salary Computation"
 msgstr "Calcul de salaire"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Montant"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-"Veuillez vérifier la configuration de %s, l'en-tête du registre du personnel "
-"est manquante"
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Pourcentage"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Ligne de bulletin de salaire"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Autres informations"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "Pays d'émission"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Déduction pour cet employé"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Autre déduction"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Vacance payée"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Regrouper par..."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Date d'expiration du passeport"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Vacance sans solde"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Valide à partir du"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
-"Champ de calcul utilisé pour les calculs en interne, ne pas placer sur le "
-"formulaire"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Montant (en toutes lettres) :"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Paiement"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr "Ligne de bulletin de salaire"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "N° d'identification"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Basé sur"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "En attente de vérification"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Module de paye pour les ressources humaines"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Total :"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Publié"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
-msgstr ""
-"Système de paye générique \n"
-"    * Détail des employés\n"
-"    * Contrats des employés\n"
-"    * Contrat basé sur des passeports\n"
-"    * Allocations / déductions\n"
-"    * Permet de configurer les salaires de base / les salaires nets / les "
-"augmentations\n"
-"    * Feuilles de paye des employés\n"
-"    * Registre mensuels des salaires\n"
-"    * Intégration avec la gestion des congés\n"
-"    "
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Type de congé"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Date :"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Sous-total"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Paiements -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "N° de visa"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "À partir de"
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "Par salaire"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Date de fin"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr "Feuille de paye de l'employé"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Déductions pour congés"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "Signature autorisée"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "Valeur de la fonction"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
-msgstr "Ligne du registre de contribution"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Notes:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "État"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr "Lignes de paiement"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "Autres lignes"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Arguments de la fonction"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
-msgstr "Contributions de la société"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -535,193 +379,183 @@ msgid "Employee"
 msgstr "Employé"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Formule"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr "Lignes d'avis bancaire"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Type"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "Courriel"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "Nb."
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Erreur !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Vérifier la feuille"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
-msgstr "Nombre de jours travaillés par semaine pour un employé"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr "Nouvelle feuille de paye"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr "Basique net"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Salaire brut"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "Total des revenus"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
-msgstr "Déclaration de salaire de l'employé"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Autre paiement"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Déductions"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "N° de permis de travail"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Salaire de l'employé"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr "Montant fixe"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
-msgstr "Chaque Nos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Total par employé"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "Montant fixe"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "À"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr "Erreur de variable !"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Payer le salaire"
+msgid "PaySlip Batch"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
-msgstr "Compte bancaire A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
-msgstr "Lignes de contribution"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "Pour le mois de"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Déduction"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr "Avis bancaire"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr "Feuille de paye"
@@ -733,191 +567,129 @@ msgstr ""
 "Erreur ! La date de début du contrat doit être antérieure à sa date de fin."
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr "Acompte pour un prêt"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr "Vérification complète des RH"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "Cordialement"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr "SI. No."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Montant net"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Structure salariale :"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "Détail du salaire de l'employé"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr "Ligne de fonction"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr "Confirmer la feuille"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Autres"
+#: view:hr.contract:0
+msgid "Payslip Info"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr "Calcul de la fonction"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "Jour travaillé"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Total par société"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
-msgstr "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
-msgstr "Pays et adresse"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Code de l'employé"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
-msgstr "Salaire de base - congés"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "Type de montant"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Catégorie"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
-msgstr "Contribution de la société"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
-msgstr "Entêtes"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "Imprimer la déclaration"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Brouillon"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr "Gains"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Basique"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Tous les passeports"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
-msgstr "Registre des salaires"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Nom de l'employé"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Détail du passeport"
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "Pourcentage (%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr "Registre de paye"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "Pour"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Contrats"
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr "Jour travaillé"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -925,44 +697,10 @@ msgid "Employee Function"
 msgstr "Fonction de l'employé"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Payé"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "Approuver la feuille"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "Payé ? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Validation"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Titre"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr "Rechercher dans les contributions de la société"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Utilisateur"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Lignes de règlement"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -970,20 +708,15 @@ msgid "Compute Sheet"
 msgstr "Calculer la feuille"
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Actif"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr "Applique cette rubrique pour le calcul si la condition est vraie"
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "Détails du salaire annuel"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
+msgstr ""
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
@@ -992,62 +725,39 @@ msgstr ""
 "Erreur ! Vous ne pouvez pas créer de hiérarchie récursive d'employés."
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Condition"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr "En attente de vérification par les RH"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
-msgstr "Avis de paiement :"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Calculer"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr "Désignation"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "Gestionnaire des RH"
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Salaire de base"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr "Code de la catégorie"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "Information sur le salaire"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
-msgstr "Catégorie allocation / déduction"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1055,347 +765,276 @@ msgid "Companies"
 msgstr "Sociétés"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr "Signature autorisée"
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Contrat"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
-msgstr "Brouillon de feuille de paye"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
-msgstr "Date pour le mois prochain"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Date"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "Date d'expiration du visa"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
-msgstr "Rechercher dans les passeports"
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr "Contribution"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "No. de téléphone"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
-msgstr "Contribution"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "Étiquette"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
-msgstr "Contribution de la société"
+msgid "Refund"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
-msgstr "Autre n°"
+#: view:hr.salary.rule:0
+msgid "Company contribution"
+msgstr "Contribution de la société"
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Code"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
-msgstr "Avis de paiement"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "Numéro :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Séquence"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
-"Ceci servira  à calculer les valeurs des champs % , c'est basique en "
-"général, mais on peut utiliser toutes les en-têtes de codage des champs en "
-"lettres minuscules comme noms de variables c'est-à-dire : hra, ma, lta, etc "
-"..., on peut aussi utiliser de basiques variables statiques"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
-msgstr "Vue d'ensemble du calcul"
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
-msgstr "Salaire sur"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Numéro"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr "Structure salariale"
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr "Ligne du registre"
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Annuler"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "Fermer"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "Montant / Pourcentage"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Allocations"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr "Date du mois actuel"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Salaire"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "N° de passpeort"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Passeport"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Salaire total"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "pour la période"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr "Rubrique de la fiche de paye"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr "Registre de contribution"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "Courriel"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
-msgstr "Rubriques du salaire"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "Imprimer le rapport"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr "Calculs"
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-"Définit le ratio de contribution de la société : 1.00 = 100%. Si l'employé "
-"contribue pour 5% et que la valeur ici est définie à 0.50, la société "
-"contribuera à hauteur de 50% de la contribution de 5% de l'employé."
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Autres informations"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Mois"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr "Émission"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr "Calcul dynamique"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr "Salaire de base sans les congés :"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Fonction"
+msgid "Worked Days"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr "États"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Chère Madame, Cher Monsieur,"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
-msgstr "Rubriques d'allocation / de déduction"
+msgid "Search Payslips"
+msgstr "Rechercher dans les feuilles de paye"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
-msgstr "Salaire brut"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Description"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Date de début"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr "Déduction -"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ")"
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr "Registres des contributions"
 
@@ -1407,246 +1046,836 @@ msgid "Payroll"
 msgstr "Paye"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Type de salaire"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "Salaire net"
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr "Le numero de passport doit être unique !"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "Nom de la catégorie"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
-msgstr "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Adresse"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr "Ligne de feuille de paye"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr "Nombre de congés"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Banque"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr "Annuler la feuille de paye"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "Avance"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
-msgstr "Allocations et déductions spéciales pour l'employé"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Nom"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr "Déduction pour congés"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "Pays"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Employés"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Compte bancaire"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr "Registre des contributions par société"
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr "À utiliser pour définir les séquences de calcul"
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Paiement total"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr "Ligne de déductions pour congés :"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr "En attente de vérification par la comptabilité"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
-msgstr "Déduction Sociale"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "Configuration de la paye"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Total"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr "Veuillez définir le compte bancaire pour l'employé %s."
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr "Date d'émission du passeport"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr "Allocation"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "Nombre de congés"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
-msgstr "Autre identifiant"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Informations bancaires"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
-msgstr "Identifiant de la fiche de paye"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Séquence"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
-msgstr "Fiche de paye de l'employé"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr "Contenu de la lettre"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Salaire annuelle"
+#~ msgid "Working Days"
+#~ msgstr "Jours de travail"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr "Allocation / Déduction"
+#~ msgid "Paid ? "
+#~ msgstr "Payé ? "
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr "Avis de paiement bancaire"
+#~ msgid "Paid Salary"
+#~ msgstr "Salaire payé"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr "Rechercher dans les feuilles de paye"
+#~ msgid "The Manager"
+#~ msgstr "Le gestionnaire"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Total"
+#~ msgid "Employees Salary Details"
+#~ msgstr "Détails sur le salaire des employés"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr "Contributions"
+#~ msgid "Recompute Sheet"
+#~ msgstr "Recalculer la feuille"
+
+#~ msgid "Loan"
+#~ msgstr "Prêt"
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "Registre de paiement des salaires"
+
+#~ msgid "Year Salary Report"
+#~ msgstr "Rapport salarial annuel"
+
+#~ msgid "Letter Details"
+#~ msgstr "Détails de la lettre"
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr ""
+#~ "Sélectionner l'adresse de la banque à partir de laquelle le salarié va être "
+#~ "payé."
+
+#~ msgid "Total Deductions"
+#~ msgstr "Total des déductions"
+
+#~ msgid "Bank Advice"
+#~ msgstr "Avis bancaire"
+
+#~ msgid "Register Lines"
+#~ msgstr "Lignes du registre"
+
+#~ msgid "Country of Issue"
+#~ msgstr "Pays d'émission"
+
+#~ msgid "Other Deduction"
+#~ msgstr "Autre déduction"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Déduction pour cet employé"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Date d'expiration du passeport"
+
+#~ msgid ""
+#~ "Calculation field used for internal calculation, do not place this on form"
+#~ msgstr ""
+#~ "Champ de calcul utilisé pour les calculs en interne, ne pas placer sur le "
+#~ "formulaire"
+
+#~ msgid "Wating for Verification"
+#~ msgstr "En attente de vérification"
+
+#~ msgid "Payments -"
+#~ msgstr "Paiements -"
+
+#~ msgid "Leave Deductions"
+#~ msgstr "Déductions pour congés"
+
+#~ msgid "Authorised Signature"
+#~ msgstr "Signature autorisée"
+
+#~ msgid "By Salary"
+#~ msgstr "Par salaire"
+
+#~ msgid "Function Value"
+#~ msgstr "Valeur de la fonction"
+
+#~ msgid "Paymeny Lines"
+#~ msgstr "Lignes de paiement"
+
+#~ msgid "Other Lines"
+#~ msgstr "Autres lignes"
+
+#~ msgid "Company Contributions"
+#~ msgstr "Contributions de la société"
+
+#~ msgid "Bank Advice Lines"
+#~ msgstr "Lignes d'avis bancaire"
+
+#~ msgid "Verify Sheet"
+#~ msgstr "Vérifier la feuille"
+
+#~ msgid "New Slip"
+#~ msgstr "Nouvelle feuille de paye"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Salaire brut"
+
+#~ msgid "Employee Salary Statement"
+#~ msgstr "Déclaration de salaire de l'employé"
+
+#~ msgid "Total Earnings"
+#~ msgstr "Total des revenus"
+
+#~ msgid "Other Payment"
+#~ msgstr "Autre paiement"
+
+#~ msgid "Net Basic"
+#~ msgstr "Basique net"
+
+#~ msgid "No of Working days / week for an employee"
+#~ msgstr "Nombre de jours travaillés par semaine pour un employé"
+
+#~ msgid "hr.payroll.employees.detail"
+#~ msgstr "hr.payroll.employees.detail"
+
+#, python-format
+#~ msgid "Variable Error !"
+#~ msgstr "Erreur de variable !"
+
+#~ msgid "Work Permit No"
+#~ msgstr "N° de permis de travail"
+
+#~ msgid "Employee Salary"
+#~ msgstr "Salaire de l'employé"
+
+#~ msgid "Deduction"
+#~ msgstr "Déduction"
+
+#~ msgid "Pay Salary"
+#~ msgstr "Payer le salaire"
+
+#~ msgid "Contribution Lines"
+#~ msgstr "Lignes de contribution"
+
+#~ msgid "For the month of"
+#~ msgstr "Pour le mois de"
+
+#~ msgid "Loan Installment"
+#~ msgstr "Acompte pour un prêt"
+
+#~ msgid "Confirm Sheet"
+#~ msgstr "Confirmer la feuille"
+
+#~ msgid "Function Line"
+#~ msgstr "Ligne de fonction"
+
+#~ msgid "Function Calculation"
+#~ msgstr "Calcul de la fonction"
+
+#~ msgid "Employees Salary Detail"
+#~ msgstr "Détail du salaire de l'employé"
+
+#~ msgid "Net Amount"
+#~ msgstr "Montant net"
+
+#~ msgid "Yours Sincerely"
+#~ msgstr "Cordialement"
+
+#~ msgid "Complete HR Checking"
+#~ msgstr "Vérification complète des RH"
+
+#~ msgid "Employee Code"
+#~ msgstr "Code de l'employé"
+
+#~ msgid "Country & Address"
+#~ msgstr "Pays et adresse"
+
+#~ msgid "Company Contribution"
+#~ msgstr "Contribution de la société"
+
+#~ msgid "Basic Salary – Leaves"
+#~ msgstr "Salaire de base - congés"
+
+#~ msgid "Print Statement"
+#~ msgstr "Imprimer la déclaration"
+
+#~ msgid "Salary Register"
+#~ msgstr "Registre des salaires"
+
+#~ msgid "Passport Detail"
+#~ msgstr "Détail du passeport"
+
+#~ msgid "Approve Sheet"
+#~ msgstr "Approuver la feuille"
+
+#~ msgid "Validation"
+#~ msgstr "Validation"
+
+#~ msgid "Title"
+#~ msgstr "Titre"
+
+#~ msgid "Search Company Contribution"
+#~ msgstr "Rechercher dans les contributions de la société"
+
+#~ msgid "Applied this head for calculation if condition is true"
+#~ msgstr "Applique cette rubrique pour le calcul si la condition est vraie"
+
+#~ msgid "Payment Advice:"
+#~ msgstr "Avis de paiement :"
+
+#~ msgid "Wating for HR Verification"
+#~ msgstr "En attente de vérification par les RH"
+
+#~ msgid "Yearly Salary Details"
+#~ msgstr "Détails du salaire annuel"
+
+#~ msgid "Salary Information"
+#~ msgstr "Information sur le salaire"
 
 #~ msgid "Categoty Code"
 #~ msgstr "Code de catégorie"
 
+#~ msgid "Basic Salary"
+#~ msgstr "Salaire de base"
+
+#~ msgid "Allowance Deduction Categoty"
+#~ msgstr "Catégorie allocation / déduction"
+
+#~ msgid "Search Passport"
+#~ msgstr "Rechercher dans les passeports"
+
+#~ msgid "Next Month Date"
+#~ msgstr "Date pour le mois prochain"
+
+#~ msgid "Label"
+#~ msgstr "Étiquette"
+
+#~ msgid "Other No."
+#~ msgstr "Autre n°"
+
+#~ msgid "Draft Sheet"
+#~ msgstr "Brouillon de feuille de paye"
+
+#~ msgid "Visa Expire Date"
+#~ msgstr "Date d'expiration du visa"
+
+#~ msgid "Payment Advice"
+#~ msgstr "Avis de paiement"
+
+#~ msgid "Computation Overview"
+#~ msgstr "Vue d'ensemble du calcul"
+
+#~ msgid "Passport No"
+#~ msgstr "N° de passpeort"
+
+#~ msgid "for period"
+#~ msgstr "pour la période"
+
+#~ msgid "Total Salary"
+#~ msgstr "Salaire total"
+
+#~ msgid "Current Month Date"
+#~ msgstr "Date du mois actuel"
+
+#~ msgid "Amount / Percentage"
+#~ msgstr "Montant / Pourcentage"
+
+#~ msgid "Print Report"
+#~ msgstr "Imprimer le rapport"
+
+#~ msgid "Salary Heads"
+#~ msgstr "Rubriques du salaire"
+
+#~ msgid "Month"
+#~ msgstr "Mois"
+
+#~ msgid "Payroll Head"
+#~ msgstr "Rubrique de la fiche de paye"
+
+#~ msgid "Dynamic Computation"
+#~ msgstr "Calcul dynamique"
+
+#~ msgid "Allowance Deduction Heads"
+#~ msgstr "Rubriques d'allocation / de déduction"
+
+#~ msgid "Gross Sal."
+#~ msgstr "Salaire brut"
+
+#~ msgid "Deduction -"
+#~ msgstr "Déduction -"
+
+#~ msgid "Year Salary"
+#~ msgstr "Salaire annuelle"
+
 #~ msgid "Categoty Name"
 #~ msgstr "Nom de la catégorie"
+
+#~ msgid "hr.payroll.year.salary"
+#~ msgstr "hr.payroll.year.salary"
+
+#~ msgid "Net Sal."
+#~ msgstr "Salaire net"
+
+#~ msgid "Cancel Sheet"
+#~ msgstr "Annuler la feuille de paye"
+
+#~ msgid "Number of Leaves"
+#~ msgstr "Nombre de congés"
+
+#~ msgid "Slip Line"
+#~ msgstr "Ligne de feuille de paye"
+
+#~ msgid "Special Allowances and Deductions For Employee:"
+#~ msgstr "Allocations et déductions spéciales pour l'employé"
+
+#~ msgid "Leaved Deduction"
+#~ msgstr "Déduction pour congés"
+
+#~ msgid "Bank"
+#~ msgstr "Banque"
+
+#~ msgid "Total Payment"
+#~ msgstr "Paiement total"
+
+#~ msgid "Wating for Account Verification"
+#~ msgstr "En attente de vérification par la comptabilité"
+
+#~ msgid "Contribution register based on company"
+#~ msgstr "Registre des contributions par société"
+
+#~ msgid "Passport Issue Date"
+#~ msgstr "Date d'émission du passeport"
+
+#~ msgid "Letter Content"
+#~ msgstr "Contenu de la lettre"
+
+#~ msgid "Allowance / Deduction"
+#~ msgstr "Allocation / Déduction"
+
+#~ msgid "Allowance"
+#~ msgstr "Allocation"
+
+#~ msgid "No of Leaves"
+#~ msgstr "Nombre de congés"
+
+#~ msgid "Employee Payslip"
+#~ msgstr "Fiche de paye de l'employé"
+
+#~ msgid "Bank Payment Advice"
+#~ msgstr "Avis de paiement bancaire"
+
+#~ msgid "Allowances with Basic:"
+#~ msgstr "Allocations de base :"
+
+#~ msgid "Net Salary"
+#~ msgstr "Salaire net"
+
+#~ msgid "Deductions:"
+#~ msgstr "Déductions :"
+
+#~ msgid "Use for Gratuity ?"
+#~ msgstr "Utiliser comme prime ?"
+
+#~ msgid "Half-Pay Holiday"
+#~ msgstr "Vacances avec demi-salaire"
+
+#~ msgid "Leaves"
+#~ msgstr "Congés"
+
+#~ msgid "Reject"
+#~ msgstr "Rejetée"
+
+#~ msgid "Calculaton Field"
+#~ msgstr "Champ pour le calcul"
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Détail du contrat :"
+
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Vacance sans solde"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Vacance payée"
+
+#, python-format
+#~ msgid "Please check configuration of %s, payroll head is missing"
+#~ msgstr ""
+#~ "Veuillez vérifier la configuration de %s, l'en-tête du registre du personnel "
+#~ "est manquante"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Nom de l'employé"
+
+#~ msgid ""
+#~ "Generic Payroll system\n"
+#~ "    * Employee Details\n"
+#~ "    * Employee Contracts\n"
+#~ "    * Passport based Contract\n"
+#~ "    * Allowances / Deductions\n"
+#~ "    * Allow to configure Basic / Grows / Net Salary\n"
+#~ "    * Employee Payslip\n"
+#~ "    * Monthly Payroll Register\n"
+#~ "    * Integrated with Holiday Management\n"
+#~ "    "
+#~ msgstr ""
+#~ "Système de paye générique \n"
+#~ "    * Détail des employés\n"
+#~ "    * Contrats des employés\n"
+#~ "    * Contrat basé sur des passeports\n"
+#~ "    * Allocations / déductions\n"
+#~ "    * Permet de configurer les salaires de base / les salaires nets / les "
+#~ "augmentations\n"
+#~ "    * Feuilles de paye des employés\n"
+#~ "    * Registre mensuels des salaires\n"
+#~ "    * Intégration avec la gestion des congés\n"
+#~ "    "
+
+#~ msgid "Visa No"
+#~ msgstr "N° de visa"
+
+#~ msgid "Human Resource Payroll"
+#~ msgstr "Module de paye pour les ressources humaines"
+
+#~ msgid "Salary Structure:"
+#~ msgstr "Structure salariale :"
+
+#~ msgid "Number :"
+#~ msgstr "Numéro :"
+
+#~ msgid "Issue"
+#~ msgstr "Émission"
+
+#~ msgid "Basic Salary without Leave:"
+#~ msgstr "Salaire de base sans les congés :"
+
+#~ msgid "Leave Deductions Line:"
+#~ msgstr "Ligne de déductions pour congés :"
+
+#~ msgid "Payroll Configurtion"
+#~ msgstr "Configuration de la paye"
+
+#~ msgid "Other Id"
+#~ msgstr "Autre identifiant"
+
+#~ msgid "Slip ID"
+#~ msgstr "Identifiant de la fiche de paye"
+
+#, python-format
+#~ msgid "Please define bank account for the %s employee"
+#~ msgstr "Veuillez définir le compte bancaire pour l'employé %s."
+
+#~ msgid "Others"
+#~ msgstr "Autres"
+
+#~ msgid "Department"
+#~ msgstr "Département"
+
+#~ msgid "Expire"
+#~ msgstr "Expire"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Montant (en toutes lettres) :"
+
+#~ msgid "Value"
+#~ msgstr "Valeur"
+
+#~ msgid "Percentage"
+#~ msgstr "Pourcentage"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr ""
+#~ "Erreur ! Vous ne pouvez pas sélectionner un département pour lequel "
+#~ "l'employé est le responsable."
+
+#~ msgid "Valid From"
+#~ msgstr "Valide à partir du"
+
+#~ msgid "Posted"
+#~ msgstr "Publié"
+
+#~ msgid "Date :"
+#~ msgstr "Date :"
+
+#~ msgid "Sub Total"
+#~ msgstr "Sous-total"
+
+#~ msgid "From"
+#~ msgstr "À partir de"
+
+#~ msgid "Leave Type"
+#~ msgstr "Type de congé"
+
+#~ msgid "Based on"
+#~ msgstr "Basé sur"
+
+#~ msgid "Payment"
+#~ msgstr "Paiement"
+
+#~ msgid "#"
+#~ msgstr "Nb."
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid "Notes:"
+#~ msgstr "Notes:"
+
+#~ msgid "End Date"
+#~ msgstr "Date de fin"
+
+#~ msgid "Total By Employee"
+#~ msgstr "Total par employé"
+
+#~ msgid "To"
+#~ msgstr "À"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Erreur !"
+
+#~ msgid "Others:"
+#~ msgstr "Autres"
+
+#~ msgid "Total By Company"
+#~ msgstr "Total par société"
+
+#~ msgid "Contracts"
+#~ msgstr "Contrats"
+
+#~ msgid "User"
+#~ msgstr "Utilisateur"
+
+#~ msgid "Condition"
+#~ msgstr "Condition"
+
+#~ msgid "Paid"
+#~ msgstr "Payé"
+
+#~ msgid "HR Manager"
+#~ msgstr "Gestionnaire des RH"
+
+#~ msgid "Compute"
+#~ msgstr "Calculer"
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ msgid "Phone No."
+#~ msgstr "No. de téléphone"
+
+#~ msgid "Passport"
+#~ msgstr "Passeport"
+
+#~ msgid "Function"
+#~ msgstr "Fonction"
+
+#~ msgid "Advance"
+#~ msgstr "Avance"
+
+#~ msgid "Start Date"
+#~ msgstr "Date de début"
+
+#~ msgid "Wage Type"
+#~ msgstr "Type de salaire"
+
+#~ msgid "The Passport No must be unique !"
+#~ msgstr "Le numero de passport doit être unique !"
+
+#~ msgid "Deductions"
+#~ msgstr "Déductions"
+
+#~ msgid "Formula"
+#~ msgstr "Formule"
+
+#~ msgid "Contribution Register Line"
+#~ msgstr "Ligne du registre de contribution"
+
+#~ msgid "Function Arguments"
+#~ msgstr "Arguments de la fonction"
+
+#~ msgid "Based"
+#~ msgstr "Fondé sur"
+
+#~ msgid "Bank Advice Note"
+#~ msgstr "Avis bancaire"
+
+#~ msgid "Basic"
+#~ msgstr "Basique"
+
+#~ msgid "Payroll Register"
+#~ msgstr "Registre de paye"
+
+#~ msgid "Earnings"
+#~ msgstr "Gains"
+
+#~ msgid "Heads"
+#~ msgstr "Entêtes"
+
+#~ msgid "Number"
+#~ msgstr "Numéro"
+
+#~ msgid "Salary"
+#~ msgstr "Salaire"
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "Chère Madame, Cher Monsieur,"
+
+#~ msgid "Other Informations"
+#~ msgstr "Autres informations"
+
+#~ msgid "Country"
+#~ msgstr "Pays"
+
+#~ msgid "Allowances"
+#~ msgstr "Allocations"
+
+#, python-format
+#~ msgid "Variable Error: %s "
+#~ msgstr "Erreur sur la variable : %s "
+
+#~ msgid "SI. No."
+#~ msgstr "SI. No."
+
+#~ msgid "D/C"
+#~ msgstr "D/C"
+
+#~ msgid "C/D"
+#~ msgstr "C/D"
+
+#~ msgid "Bank Account A/C"
+#~ msgstr "Compte bancaire A/C"
+
+#~ msgid "Employee Name"
+#~ msgstr "Nom de l'employé"
+
+#~ msgid "All Passports"
+#~ msgstr "Tous les passeports"
+
+#~ msgid "Payment Lines"
+#~ msgstr "Lignes de règlement"
+
+#~ msgid "Salary On"
+#~ msgstr "Salaire sur"
+
+#~ msgid "Register"
+#~ msgstr "Registre"
+
+#~ msgid "Bank Details"
+#~ msgstr "Informations bancaires"
+
+#~ msgid "Contributions"
+#~ msgstr "Contributions"
+
+#~ msgid ""
+#~ "This will use to computer the % fields values, in general its on basic, but "
+#~ "You can use all heads code field in small letter as a variable name i.e. "
+#~ "hra, ma, lta, etc...., also you can use, static varible basic"
+#~ msgstr ""
+#~ "Ceci servira  à calculer les valeurs des champs % , c'est basique en "
+#~ "général, mais on peut utiliser toutes les en-têtes de codage des champs en "
+#~ "lettres minuscules comme noms de variables c'est-à-dire : hra, ma, lta, etc "
+#~ "..., on peut aussi utiliser de basiques variables statiques"
+
+#~ msgid "Company Deduction"
+#~ msgstr "Déduction Sociale"
+
+#~ msgid "Chaque Nos"
+#~ msgstr "Chaque Nos"
+
+#~ msgid "For"
+#~ msgstr "Pour"
+
+#~ msgid "Category Code"
+#~ msgstr "Code de la catégorie"
+
+#~ msgid "Category Name"
+#~ msgstr "Nom de la catégorie"
+
+#~ msgid "E-mail Address"
+#~ msgstr "Adresse courriel"
+
+#~ msgid "E-mail"
+#~ msgstr "Courriel"
diff --git a/addons/hr_payroll/i18n/gl.po b/addons/hr_payroll/i18n/gl.po
index adfff1c4cde..fd7940e66d7 100644
--- a/addons/hr_payroll/i18n/gl.po
+++ b/addons/hr_payroll/i18n/gl.po
@@ -7,250 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-05-11 08:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Enderezo de correo electrónico"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Baseado"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Salario neto"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Recalcular modelo"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Detalles salario dos empregados"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
-msgstr "Primas con base:"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Departamento"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Deducións:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "Uso de propina?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Agrupar por..."
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Días de traballo"
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Estados"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Préstamo"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Rexistro de pago da nómina"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Nóminas"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Informe anual de salarios"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Nómina pagada"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "O responsable"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "Detalles da carta"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Establecer como borrador"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "Erro variable: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Vencer"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Vacacións con media paga"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Outros"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Nómina"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Detalles do contrato:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Campo de cálculo"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "Seleccione o enderezo do banco onde se pagará a nómina."
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "Aviso bancario"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Rexeitar"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Total:"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Permisos"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Rexistro"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
-"Erro! Non pode seleccionar un departamento para o cal o empregado sexa o "
-"director."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Total deducións"
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Valor"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Nome do empregado"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr "Liñas de rexistro"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -258,265 +202,176 @@ msgid "Salary Computation"
 msgstr "Cálculo do salario"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Cantidade"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-"Por favor, comprobe a configuración da %s, falta a cabeceira da nómina"
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Porcentaxe"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Liña de nómina"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Outra información"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "País de emisión"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Dedución do empregado"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Outras deducións"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Vacacións pagada"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Agrupar por..."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Data expiración pasaporte"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Vacacións non pagadas"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Válido desde"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
-msgstr "Campo usado en cálculos internos, non o coloque nun formulario."
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Importe (en palabras):"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Pagamento"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr "Liña de nómina"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "Nº identificación"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Baseado en"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Esperando verificación"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Nóminas de recursos humanos"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Contabilizado"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
-"Sistema de nóminas xenérico* Detalles do empregado* Contratos do empregado* "
-"Contratos baseados en pasaportes* Complementos/deducións* Permite configurar "
-"o salario base/bruto/neto* Nómina do empregado* Rexistro mensual das "
-"nóminas* Integrado coa xestión das vacacións\n"
-"    "
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Tipo de permiso"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Data:"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Subtotal"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Pagos -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "Número de Visa"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Desde"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "Por salario"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Data de remate"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr "Nómina do empregado"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Deducións por ausencia"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "Sinatura autorizada"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "Valor de función"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
-msgstr "Liña de rexistro da contribución"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Notas:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Estado"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr "Liñas de pago"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "Outras liñas"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Argumentos da función"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
-msgstr "Contribucións da compañía"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -524,193 +379,183 @@ msgid "Employee"
 msgstr "Empregado"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Fórmula"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr "Liñas de notificación bancaria"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Tipo"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "E-mail"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "Nº"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Erro!"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Comprobar folla"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
-msgstr "Número de días/semanas traballados para un empregado."
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr "Novo xustificante"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr "Base neta"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Salario bruto"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "Ingresos totais"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
-msgstr "Declaración salario do empregado"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Outros pagos"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Deducións"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "Nº permiso traballo"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Salario empregado"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr "Importe fijo"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
-msgstr "Cada un de nosos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Total por empregado"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "Importe fijo"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Ata"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr "¡Erro de variable!"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "rrhh.nómina.empregados.detalle"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Pagar nómina"
+msgid "PaySlip Batch"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
-msgstr "Conta bancaria"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
-msgstr "Liñas de contribución"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "Para o mes de"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Dedución"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr "Nota de aviso bancario"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr "Nómina"
@@ -722,191 +567,129 @@ msgstr ""
 "Erro! A data de inicio do contrato debe ser anterior á data de finalización."
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr "Entrega anticipo"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr "Comprobación RH completa"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "Atentamente"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr "Nº SS"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Importe neto"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Estructura salarial:"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "Detalle salario empregado"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr "Liña de función"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr "Folla de confirmación"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Outros:"
+#: view:hr.contract:0
+msgid "Payslip Info"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr "Función de cálculo"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "Días traballados"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Total por compañía"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
-msgstr "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
-msgstr "País e enderezo"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Código de empregado"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
-msgstr "Salario base - Ausencias"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "Tipo de importe"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Categoría"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
-msgstr "Contribución compañía"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
-msgstr "Cabeceiras"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "Imprimir declaración"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Borrador"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr "Ganancias"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Básico"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Tódolos pasaportes"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
-msgstr "Rexistro salarial"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Nome do empregado"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Detalle pasaporte"
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "Porcentaxe (%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr "Rexistro de nóminas"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "Para"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Contratos"
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr "Días traballados"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -914,44 +697,10 @@ msgid "Employee Function"
 msgstr "Función do empregado"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Pagado"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "Aprobar folla"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "Pagado? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Validación"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Título"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr "Buscar contribución da compañía"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Liñas de pago"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -959,20 +708,15 @@ msgid "Compute Sheet"
 msgstr "Calcular folla"
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Activo"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr "Aplicar este encabezamento no cálculo se a condición é verdadeira"
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "Detalles do salario anual"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
+msgstr ""
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
@@ -980,61 +724,38 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Erro! Non pode crear unha xerarquía recorrente de empregados."
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Condición"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr "Esperando verificación de RRHH"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
-msgstr "Aviso de pago:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Computar"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr "Designación"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "Responsable de RRHH"
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Salario base"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr "Código da categoría"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "Información do salario"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1043,344 +764,276 @@ msgid "Companies"
 msgstr "Compañías"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr "Sinatura autorizada"
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Contrato"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
-msgstr "Folla borrador"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
-msgstr "Data mes seguinte"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Data"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "Data expiración visado"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
-msgstr "Buscar pasaporte"
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr "Contribución"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "Nº teléfono"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
-msgstr "Contribución"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "Etiqueta"
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
-msgstr "Contribución compañía"
+msgid "Refund"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
-msgstr "Outro nº"
+#: view:hr.salary.rule:0
+msgid "Company contribution"
+msgstr "Contribución compañía"
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Código"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
-msgstr "Aviso de pago"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "Número:"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
-"Utilizarase isto para o cómputo dos valores dos campos %, en xeral na súa "
-"base, pero pode utilizar tódalas cabeceiras dos campos de código en "
-"minúscula como nome de variable, por exemplo hra, ma, lta, etc., tamén pode "
-"utilizar a variable estática básica."
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
-msgstr "Resumo do cálculo"
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
-msgstr "Salario sobre"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Número"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr "Estrutura salarial"
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr "Liña rexistro"
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Anular"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "Pechar"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "Importe / Porcentaxe"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Descontos"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr "Data mes actual"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Salario"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "Nº Pasaporte"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Pasaporte"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Salario total"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "por período"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr "Cabeceira nómina"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr "Rexistro de contribución"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "E-mail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
-msgstr "Cabeceiras salario"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "Imprimir informe"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr "Cálculos"
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Outra información"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr "Asunto"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr "Cálculo dinámico"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr "Salario base sen ausencias:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Cargo"
+msgid "Worked Days"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr "Estados"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Apreciado Sr./Sra.:"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
-msgstr "Cabeceiras prima/dedución"
+msgid "Search Payslips"
+msgstr "Buscar nóminas"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
-msgstr "Sal. bruto"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Descrición"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Data de comezo"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr "Dedución -"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ")"
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr "Rexistros de contribución"
 
@@ -1392,240 +1045,816 @@ msgid "Payroll"
 msgstr "Nómina"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Tipo de salario"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "Sal. neto"
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr "O número de pasaporte debe ser único!"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "Nome da categoría"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
-msgstr "hr.nómina.ano.salario"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Enderezo"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr "Liña xustificante"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr "Número de follas"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Banco"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr "Cancelar folla"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "Adianto"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
-msgstr "Primas e deducións especiais por empregado:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Nome"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr "Follas de dedución"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "País"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Empregados"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Conta bancaria"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr "Rexistro de contribución baseado na empresa"
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr "Utilízase para organizar a secuencia de cálculo"
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Pago total"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr "Liña de deducións por ausencias:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr "Esperando pola verificación da conta"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
-msgstr "Dedución da compañía"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "Configuración nómina"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Total"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr "Por favor, defina a conta bancaria para o empregado %s"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr "Data de emisión do pasaporte"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr "Prima"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "N º de follas"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
-msgstr "Outro id"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Detalles bancarios"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
-msgstr "Xustificante ID"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
-msgstr "Nómina dos empregados"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr "Contido carta"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Salario anual"
+#~ msgid "Employees Salary Details"
+#~ msgstr "Detalles salario dos empregados"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr "Prima / Dedución"
+#~ msgid "Allowances with Basic:"
+#~ msgstr "Primas con base:"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr "Aviso de pago do banco"
+#~ msgid "Net Salary"
+#~ msgstr "Salario neto"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr "Buscar nóminas"
+#~ msgid "Working Days"
+#~ msgstr "Días de traballo"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Total"
+#~ msgid "Department"
+#~ msgstr "Departamento"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr "Contribucións"
+#~ msgid "Deductions:"
+#~ msgstr "Deducións:"
+
+#~ msgid "Use for Gratuity ?"
+#~ msgstr "Uso de propina?"
+
+#~ msgid "E-mail Address"
+#~ msgstr "Enderezo de correo electrónico"
+
+#~ msgid "Recompute Sheet"
+#~ msgstr "Recalcular modelo"
+
+#~ msgid "Based"
+#~ msgstr "Baseado"
+
+#~ msgid "The Manager"
+#~ msgstr "O responsable"
+
+#~ msgid "Loan"
+#~ msgstr "Préstamo"
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "Rexistro de pago da nómina"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Nómina pagada"
+
+#~ msgid "Year Salary Report"
+#~ msgstr "Informe anual de salarios"
+
+#~ msgid "Letter Details"
+#~ msgstr "Detalles da carta"
+
+#~ msgid "Others"
+#~ msgstr "Outros"
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr "Seleccione o enderezo do banco onde se pagará a nómina."
+
+#~ msgid "Half-Pay Holiday"
+#~ msgstr "Vacacións con media paga"
+
+#, python-format
+#~ msgid "Variable Error: %s "
+#~ msgstr "Erro variable: %s "
+
+#~ msgid "Bank Advice"
+#~ msgstr "Aviso bancario"
+
+#~ msgid "Calculaton Field"
+#~ msgstr "Campo de cálculo"
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Detalles do contrato:"
+
+#~ msgid "Expire"
+#~ msgstr "Vencer"
+
+#~ msgid "Total Deductions"
+#~ msgstr "Total deducións"
+
+#~ msgid "Register"
+#~ msgstr "Rexistro"
+
+#~ msgid "Leaves"
+#~ msgstr "Permisos"
+
+#~ msgid "Reject"
+#~ msgstr "Rexeitar"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Nome do empregado"
+
+#~ msgid "Value"
+#~ msgstr "Valor"
+
+#~ msgid "Register Lines"
+#~ msgstr "Liñas de rexistro"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr ""
+#~ "Erro! Non pode seleccionar un departamento para o cal o empregado sexa o "
+#~ "director."
+
+#~ msgid "Country of Issue"
+#~ msgstr "País de emisión"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Data expiración pasaporte"
+
+#~ msgid "Other Deduction"
+#~ msgstr "Outras deducións"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Vacacións pagada"
+
+#~ msgid "Category Code"
+#~ msgstr "Código da categoría"
+
+#, python-format
+#~ msgid "Please check configuration of %s, payroll head is missing"
+#~ msgstr ""
+#~ "Por favor, comprobe a configuración da %s, falta a cabeceira da nómina"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Dedución do empregado"
+
+#~ msgid "Percentage"
+#~ msgstr "Porcentaxe"
+
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Vacacións non pagadas"
+
+#~ msgid ""
+#~ "Calculation field used for internal calculation, do not place this on form"
+#~ msgstr "Campo usado en cálculos internos, non o coloque nun formulario."
+
+#~ msgid "Wating for Verification"
+#~ msgstr "Esperando verificación"
+
+#~ msgid "Valid From"
+#~ msgstr "Válido desde"
+
+#~ msgid "Based on"
+#~ msgstr "Baseado en"
+
+#~ msgid "Payment"
+#~ msgstr "Pagamento"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Importe (en palabras):"
+
+#~ msgid "Human Resource Payroll"
+#~ msgstr "Nóminas de recursos humanos"
+
+#~ msgid "Visa No"
+#~ msgstr "Número de Visa"
+
+#~ msgid "Posted"
+#~ msgstr "Contabilizado"
+
+#~ msgid ""
+#~ "Generic Payroll system\n"
+#~ "    * Employee Details\n"
+#~ "    * Employee Contracts\n"
+#~ "    * Passport based Contract\n"
+#~ "    * Allowances / Deductions\n"
+#~ "    * Allow to configure Basic / Grows / Net Salary\n"
+#~ "    * Employee Payslip\n"
+#~ "    * Monthly Payroll Register\n"
+#~ "    * Integrated with Holiday Management\n"
+#~ "    "
+#~ msgstr ""
+#~ "Sistema de nóminas xenérico* Detalles do empregado* Contratos do empregado* "
+#~ "Contratos baseados en pasaportes* Complementos/deducións* Permite configurar "
+#~ "o salario base/bruto/neto* Nómina do empregado* Rexistro mensual das "
+#~ "nóminas* Integrado coa xestión das vacacións\n"
+#~ "    "
+
+#~ msgid "Leave Type"
+#~ msgstr "Tipo de permiso"
+
+#~ msgid "Date :"
+#~ msgstr "Data:"
+
+#~ msgid "Payments -"
+#~ msgstr "Pagos -"
+
+#~ msgid "Sub Total"
+#~ msgstr "Subtotal"
+
+#~ msgid "From"
+#~ msgstr "Desde"
+
+#~ msgid "Leave Deductions"
+#~ msgstr "Deducións por ausencia"
+
+#~ msgid "Authorised Signature"
+#~ msgstr "Sinatura autorizada"
+
+#~ msgid "By Salary"
+#~ msgstr "Por salario"
+
+#~ msgid "Notes:"
+#~ msgstr "Notas:"
+
+#~ msgid "End Date"
+#~ msgstr "Data de remate"
+
+#~ msgid "Contribution Register Line"
+#~ msgstr "Liña de rexistro da contribución"
+
+#~ msgid "Function Value"
+#~ msgstr "Valor de función"
+
+#~ msgid "Paymeny Lines"
+#~ msgstr "Liñas de pago"
+
+#~ msgid "#"
+#~ msgstr "Nº"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Other Lines"
+#~ msgstr "Outras liñas"
+
+#~ msgid "Formula"
+#~ msgstr "Fórmula"
+
+#~ msgid "Company Contributions"
+#~ msgstr "Contribucións da compañía"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Erro!"
+
+#~ msgid "Function Arguments"
+#~ msgstr "Argumentos da función"
+
+#~ msgid "Bank Advice Lines"
+#~ msgstr "Liñas de notificación bancaria"
+
+#~ msgid "Verify Sheet"
+#~ msgstr "Comprobar folla"
+
+#~ msgid "Work Permit No"
+#~ msgstr "Nº permiso traballo"
+
+#~ msgid "New Slip"
+#~ msgstr "Novo xustificante"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Salario bruto"
+
+#~ msgid "Deductions"
+#~ msgstr "Deducións"
+
+#~ msgid "Total Earnings"
+#~ msgstr "Ingresos totais"
+
+#~ msgid "Other Payment"
+#~ msgstr "Outros pagos"
+
+#~ msgid "C/D"
+#~ msgstr "C/D"
+
+#~ msgid "Net Basic"
+#~ msgstr "Base neta"
+
+#~ msgid "No of Working days / week for an employee"
+#~ msgstr "Número de días/semanas traballados para un empregado."
+
+#~ msgid "Total By Employee"
+#~ msgstr "Total por empregado"
+
+#, python-format
+#~ msgid "Variable Error !"
+#~ msgstr "¡Erro de variable!"
+
+#~ msgid "To"
+#~ msgstr "Ata"
+
+#~ msgid "Pay Salary"
+#~ msgstr "Pagar nómina"
+
+#~ msgid "Employee Salary"
+#~ msgstr "Salario empregado"
+
+#~ msgid "Chaque Nos"
+#~ msgstr "Cada un de nosos"
+
+#~ msgid "hr.payroll.employees.detail"
+#~ msgstr "rrhh.nómina.empregados.detalle"
+
+#~ msgid "Bank Account A/C"
+#~ msgstr "Conta bancaria"
+
+#~ msgid "HR Manager"
+#~ msgstr "Responsable de RRHH"
+
+#~ msgid "Deduction"
+#~ msgstr "Dedución"
+
+#~ msgid "For the month of"
+#~ msgstr "Para o mes de"
+
+#~ msgid "Contribution Lines"
+#~ msgstr "Liñas de contribución"
+
+#~ msgid "SI. No."
+#~ msgstr "Nº SS"
+
+#~ msgid "Yours Sincerely"
+#~ msgstr "Atentamente"
+
+#~ msgid "Loan Installment"
+#~ msgstr "Entrega anticipo"
+
+#~ msgid "Bank Advice Note"
+#~ msgstr "Nota de aviso bancario"
+
+#~ msgid "Leave Deductions Line:"
+#~ msgstr "Liña de deducións por ausencias:"
+
+#~ msgid "Salary Structure:"
+#~ msgstr "Estructura salarial:"
+
+#~ msgid "Employees Salary Detail"
+#~ msgstr "Detalle salario empregado"
+
+#~ msgid "Confirm Sheet"
+#~ msgstr "Folla de confirmación"
+
+#~ msgid "Others:"
+#~ msgstr "Outros:"
+
+#~ msgid "Function Line"
+#~ msgstr "Liña de función"
+
+#~ msgid "Function Calculation"
+#~ msgstr "Función de cálculo"
+
+#~ msgid "Net Amount"
+#~ msgstr "Importe neto"
+
+#~ msgid "Total By Company"
+#~ msgstr "Total por compañía"
+
+#~ msgid "Employee Code"
+#~ msgstr "Código de empregado"
+
+#~ msgid "Category Name"
+#~ msgstr "Nome da categoría"
+
+#~ msgid "Print Statement"
+#~ msgstr "Imprimir declaración"
+
+#~ msgid "D/C"
+#~ msgstr "D/C"
+
+#~ msgid "Company Contribution"
+#~ msgstr "Contribución compañía"
+
+#~ msgid "Basic Salary – Leaves"
+#~ msgstr "Salario base - Ausencias"
+
+#~ msgid "Country & Address"
+#~ msgstr "País e enderezo"
+
+#~ msgid "Heads"
+#~ msgstr "Cabeceiras"
+
+#~ msgid "Employee Name"
+#~ msgstr "Nome do empregado"
+
+#~ msgid "All Passports"
+#~ msgstr "Tódolos pasaportes"
+
+#~ msgid "Contracts"
+#~ msgstr "Contratos"
+
+#~ msgid "For"
+#~ msgstr "Para"
+
+#~ msgid "Passport Detail"
+#~ msgstr "Detalle pasaporte"
+
+#~ msgid "Payroll Register"
+#~ msgstr "Rexistro de nóminas"
+
+#~ msgid "Salary Register"
+#~ msgstr "Rexistro salarial"
+
+#~ msgid "Earnings"
+#~ msgstr "Ganancias"
+
+#~ msgid "Basic"
+#~ msgstr "Básico"
+
+#~ msgid "Approve Sheet"
+#~ msgstr "Aprobar folla"
+
+#~ msgid "Validation"
+#~ msgstr "Validación"
+
+#~ msgid "Search Company Contribution"
+#~ msgstr "Buscar contribución da compañía"
+
+#~ msgid "Title"
+#~ msgstr "Título"
+
+#~ msgid "Payment Lines"
+#~ msgstr "Liñas de pago"
+
+#~ msgid "Paid ? "
+#~ msgstr "Pagado? "
+
+#~ msgid "Paid"
+#~ msgstr "Pagado"
+
+#~ msgid "User"
+#~ msgstr "Usuario"
+
+#~ msgid "Applied this head for calculation if condition is true"
+#~ msgstr "Aplicar este encabezamento no cálculo se a condición é verdadeira"
+
+#~ msgid "Basic Salary"
+#~ msgstr "Salario base"
+
+#~ msgid "Wating for HR Verification"
+#~ msgstr "Esperando verificación de RRHH"
+
+#~ msgid "Condition"
+#~ msgstr "Condición"
+
+#~ msgid "Compute"
+#~ msgstr "Computar"
+
+#~ msgid "Payment Advice:"
+#~ msgstr "Aviso de pago:"
+
+#~ msgid "Yearly Salary Details"
+#~ msgstr "Detalles do salario anual"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Employee Salary Statement"
+#~ msgstr "Declaración salario do empregado"
+
+#~ msgid "Salary Information"
+#~ msgstr "Información do salario"
+
+#~ msgid "Next Month Date"
+#~ msgstr "Data mes seguinte"
+
+#~ msgid "Complete HR Checking"
+#~ msgstr "Comprobación RH completa"
+
+#~ msgid "Draft Sheet"
+#~ msgstr "Folla borrador"
+
+#~ msgid "Visa Expire Date"
+#~ msgstr "Data expiración visado"
+
+#~ msgid "Search Passport"
+#~ msgstr "Buscar pasaporte"
+
+#~ msgid "Payment Advice"
+#~ msgstr "Aviso de pago"
+
+#~ msgid "Label"
+#~ msgstr "Etiqueta"
+
+#~ msgid "Other No."
+#~ msgstr "Outro nº"
+
+#~ msgid ""
+#~ "This will use to computer the % fields values, in general its on basic, but "
+#~ "You can use all heads code field in small letter as a variable name i.e. "
+#~ "hra, ma, lta, etc...., also you can use, static varible basic"
+#~ msgstr ""
+#~ "Utilizarase isto para o cómputo dos valores dos campos %, en xeral na súa "
+#~ "base, pero pode utilizar tódalas cabeceiras dos campos de código en "
+#~ "minúscula como nome de variable, por exemplo hra, ma, lta, etc., tamén pode "
+#~ "utilizar a variable estática básica."
+
+#~ msgid "Number :"
+#~ msgstr "Número:"
+
+#~ msgid "Phone No."
+#~ msgstr "Nº teléfono"
+
+#~ msgid "Salary On"
+#~ msgstr "Salario sobre"
+
+#~ msgid "Number"
+#~ msgstr "Número"
+
+#~ msgid "Allowances"
+#~ msgstr "Descontos"
+
+#~ msgid "Computation Overview"
+#~ msgstr "Resumo do cálculo"
+
+#~ msgid "Current Month Date"
+#~ msgstr "Data mes actual"
+
+#~ msgid "Amount / Percentage"
+#~ msgstr "Importe / Porcentaxe"
+
+#~ msgid "Salary"
+#~ msgstr "Salario"
+
+#~ msgid "Print Report"
+#~ msgstr "Imprimir informe"
+
+#~ msgid "Salary Heads"
+#~ msgstr "Cabeceiras salario"
+
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
+#~ msgid "Passport No"
+#~ msgstr "Nº Pasaporte"
+
+#~ msgid "for period"
+#~ msgstr "por período"
+
+#~ msgid "Passport"
+#~ msgstr "Pasaporte"
+
+#~ msgid "Total Salary"
+#~ msgstr "Salario total"
+
+#~ msgid "Payroll Head"
+#~ msgstr "Cabeceira nómina"
+
+#~ msgid "Function"
+#~ msgstr "Cargo"
+
+#~ msgid "Month"
+#~ msgstr "Mes"
+
+#~ msgid "Basic Salary without Leave:"
+#~ msgstr "Salario base sen ausencias:"
+
+#~ msgid "Issue"
+#~ msgstr "Asunto"
+
+#~ msgid "Allowance Deduction Heads"
+#~ msgstr "Cabeceiras prima/dedución"
+
+#~ msgid "Dynamic Computation"
+#~ msgstr "Cálculo dinámico"
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "Apreciado Sr./Sra.:"
+
+#~ msgid "Other Informations"
+#~ msgstr "Outra información"
+
+#~ msgid "Gross Sal."
+#~ msgstr "Sal. bruto"
+
+#~ msgid "Net Sal."
+#~ msgstr "Sal. neto"
+
+#~ msgid "Wage Type"
+#~ msgstr "Tipo de salario"
+
+#~ msgid "Deduction -"
+#~ msgstr "Dedución -"
+
+#~ msgid "Start Date"
+#~ msgstr "Data de comezo"
+
+#~ msgid "The Passport No must be unique !"
+#~ msgstr "O número de pasaporte debe ser único!"
+
+#~ msgid "Number of Leaves"
+#~ msgstr "Número de follas"
+
+#~ msgid "Slip Line"
+#~ msgstr "Liña xustificante"
+
+#~ msgid "hr.payroll.year.salary"
+#~ msgstr "hr.nómina.ano.salario"
+
+#~ msgid "Advance"
+#~ msgstr "Adianto"
+
+#~ msgid "Special Allowances and Deductions For Employee:"
+#~ msgstr "Primas e deducións especiais por empregado:"
+
+#~ msgid "Cancel Sheet"
+#~ msgstr "Cancelar folla"
+
+#~ msgid "Bank"
+#~ msgstr "Banco"
+
+#~ msgid "Leaved Deduction"
+#~ msgstr "Follas de dedución"
+
+#~ msgid "Total Payment"
+#~ msgstr "Pago total"
+
+#~ msgid "Company Deduction"
+#~ msgstr "Dedución da compañía"
+
+#~ msgid "Wating for Account Verification"
+#~ msgstr "Esperando pola verificación da conta"
+
+#~ msgid "Contribution register based on company"
+#~ msgstr "Rexistro de contribución baseado na empresa"
+
+#~ msgid "Country"
+#~ msgstr "País"
+
+#~ msgid "Payroll Configurtion"
+#~ msgstr "Configuración nómina"
+
+#~ msgid "Other Id"
+#~ msgstr "Outro id"
+
+#~ msgid "Slip ID"
+#~ msgstr "Xustificante ID"
+
+#~ msgid "Letter Content"
+#~ msgstr "Contido carta"
+
+#~ msgid "Allowance"
+#~ msgstr "Prima"
+
+#~ msgid "No of Leaves"
+#~ msgstr "N º de follas"
+
+#~ msgid "Bank Details"
+#~ msgstr "Detalles bancarios"
+
+#~ msgid "Employee Payslip"
+#~ msgstr "Nómina dos empregados"
+
+#, python-format
+#~ msgid "Please define bank account for the %s employee"
+#~ msgstr "Por favor, defina a conta bancaria para o empregado %s"
+
+#~ msgid "Passport Issue Date"
+#~ msgstr "Data de emisión do pasaporte"
+
+#~ msgid "Year Salary"
+#~ msgstr "Salario anual"
+
+#~ msgid "Contributions"
+#~ msgstr "Contribucións"
+
+#~ msgid "Allowance / Deduction"
+#~ msgstr "Prima / Dedución"
+
+#~ msgid "Bank Payment Advice"
+#~ msgstr "Aviso de pago do banco"
diff --git a/addons/hr_payroll/i18n/hr.po b/addons/hr_payroll/i18n/hr.po
index 589fca59224..f8ba0e1fbb5 100644
--- a/addons/hr_payroll/i18n/hr.po
+++ b/addons/hr_payroll/i18n/hr.po
@@ -7,247 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2010-09-29 10:21+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Odjel"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
+#: view:hr.payslip:0
+msgid "States"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Tvrtka"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
+#: view:hr.payslip:0
+msgid "Done Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Ostale"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
+#: report:contribution.register.lines:0
+msgid "Total:"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
 
 #. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Vrijednost"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
 msgstr ""
 
 #. module: hr_payroll
@@ -256,259 +202,176 @@ msgid "Salary Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Iznos"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr ""
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr "Upozorenje!"
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Iznos (slovima) :"
-
-#. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
+msgid "Draft Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Identification No"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Identification No"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
+msgid "Total Working Days"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Međuzbroj"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Od"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
+#: view:hr.payslip:0
+msgid "Confirm"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Datum završetka"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -516,193 +379,183 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: view:hr.salary.rule:0
+msgid "Children definition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Vrsta"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
+msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr ""
@@ -713,190 +566,128 @@ msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
+#: view:hr.salary.rule:0
+msgid "Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
+#: view:hr.salary.rule:0
+msgid "Conditions"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
+#: view:hr.payslip:0
+msgid "Worked Day"
 msgstr ""
 
 #. module: hr_payroll
@@ -905,43 +696,9 @@ msgid "Employee Function"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "Plaćeno ? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
@@ -950,19 +707,14 @@ msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr ""
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
@@ -971,61 +723,38 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1034,340 +763,276 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
+#: view:hr.contribution.register:0
+msgid "Contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Putovnica"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Datum početka"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1379,242 +1044,159 @@ msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr ""
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Banka"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr ""
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
 
 #~ msgid "Analytic Account for Salary Analysis"
@@ -1623,22 +1205,54 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravan naziv modela u definiciji akcije"
 
+#~ msgid "Department"
+#~ msgstr "Odjel"
+
+#~ msgid "Paid ? "
+#~ msgstr "Plaćeno ? "
+
+#~ msgid "Others"
+#~ msgstr "Ostale"
+
 #~ msgid "Account"
 #~ msgstr "Konto"
 
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Upozorenje!"
+#~ msgid "Value"
+#~ msgstr "Vrijednost"
+
+#~ msgid "Bank"
+#~ msgstr "Banka"
 
 #~ msgid "Analytic Account"
 #~ msgstr "Konto analitike"
 
+#~ msgid "Amount (in words) :"
+#~ msgstr "Iznos (slovima) :"
+
 #~ msgid "Force Period"
 #~ msgstr "Forsiraj razdoblje"
 
+#~ msgid "Sub Total"
+#~ msgstr "Međuzbroj"
+
+#~ msgid "From"
+#~ msgstr "Od"
+
 #~ msgid "Error! You can not create recursive analytic accounts."
 #~ msgstr "Greška! Ne možete kreirati rekurzivna analitička konta."
 
+#~ msgid "Passport"
+#~ msgstr "Putovnica"
+
+#~ msgid "End Date"
+#~ msgstr "Datum završetka"
+
+#~ msgid "Type"
+#~ msgstr "Vrsta"
+
 #, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "Greška integriteta !"
+
+#~ msgid "Start Date"
+#~ msgstr "Datum početka"
diff --git a/addons/hr_payroll/i18n/hu.po b/addons/hr_payroll/i18n/hu.po
index a487cbd4117..f7e2c37b3b7 100644
--- a/addons/hr_payroll/i18n/hu.po
+++ b/addons/hr_payroll/i18n/hu.po
@@ -6,7 +6,7 @@ msgid ""
 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"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-02-03 22:21+0000\n"
 "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
 "<openerp@novotrade.hu>\n"
@@ -14,243 +14,187 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "E-mail cím"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Alapul"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Nettó bér"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Táblázat újraszámítása"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Alkalmazott bérének részletei"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
-msgstr "Alapjuttatások:"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Osztály, részleg"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Levonások:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "Prémiumként?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Csoportosítás..."
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Munkanapok"
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Állapotok"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Kölcsön"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Bérkifizetési nyilvántartás"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Fizetési jegyzékek"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Éves bérkimutatás"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Kifizetett bér"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Vállalat"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "Menedzser"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "Levél részletei"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Beállítás tervezetnek"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "Változó hiba: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Lejár"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Egyéb"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Fizetési jegyzék"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Szerződés részletei:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Számítási mező"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "Itt választhatja ki a bankszámlát, amelyről a munkabért átutalják"
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "Banki értesítő"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Visszautasítás"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Összesen:"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Szabadságok"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Nyilvántartás"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
-"Hiba! Nem választhat ki olyan részleget, amelynek az alkalmazott a "
-"menedzsere."
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Összes levonás"
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Érték"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Alkalmazott neve"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr "Nyilvántartási sorok"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -258,271 +202,176 @@ msgid "Salary Computation"
 msgstr "Bér kiszámítása"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Összeg"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr "Kérem, ellenőrizze a %s beállítását, a bérlista fej hiányzik."
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Százalék"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Fizetési jegyzék sor"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Egyéb információ"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "Kiállító ország"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Alkalmazott levonásai"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Egyéb levonás"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Fizetett szabadság"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Csoportosítás..."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Útlevél lejárati dátuma"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Fizetetlen szabadság"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Érvényesség kezdete"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
-"Belső számításra használt számítási mező, kérem ne szerepeltesse nyilvános "
-"kimutatásokban"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Összeg (betűkkel) :"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Kifizetés"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr "Fizetési jegyzék sor"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "Személyi igazolvány száma"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Alapul"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Várakozás a megerősítésre"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Bérszámfejtés"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Összesen:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Könyvelt"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
-msgstr ""
-"Általános bérszámfejtő rendszer\n"
-"    * Alkalmazottak adatai\n"
-"    * Munkaszerződések\n"
-"    * Útlevél alapú szerződések\n"
-"    * Juttatások/levonások\n"
-"    * Alap/bruttó/nettó bér beállítása\n"
-"    * Fizetési jegyzék\n"
-"    * Havi bérlista\n"
-"    * Szabadságkezeléssel integrálva\n"
-"    "
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Szabadság típusa"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Dátum :"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Részösszesen"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Kifizetések -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "Vízum száma"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Kezdő dátum"
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Befejezés dátuma"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr "Alkalmazott fizetési jegyzéke"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Szabadság miatti levonás"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "Függvényérték"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Megjegyzések:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Állapot"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr "Kifizetés sorok"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "Egyéb sorok"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Függvényargumentumok"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -530,193 +379,183 @@ msgid "Employee"
 msgstr "Alkalmazott"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Képlet"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr "Banki értesítő sorok"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Típus"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "E-mail"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Hiba !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Táblázat ellenőrzése"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
-msgstr "Alkalmazott munkanapjainak/heteinek száma"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr "Új fizetési jegyzék"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr "Nettó alapbér"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Bruttó bér"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "Összes jövedelem"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
-msgstr "Alkalmazott bérkimutatása"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Egyéb kifizetés"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Levonások"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "Munkavállalási engedély száma"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Alkalmazotti bér"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr "Fix összeg"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
-msgstr "Csekk számok"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Alkalmazott összesen"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "Fix összeg"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Záró dátum"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr "Változó hiba !"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Bér kifizetése"
+msgid "PaySlip Batch"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
-msgstr "Bankszámlaszám"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "Hónapra"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Levonás"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr "Banki értesítő megjegyzés"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr "Fizetési jegyzék"
@@ -727,191 +566,129 @@ msgid "Error! contract start-date must be lower then contract end-date."
 msgstr "Hiba! A szerződés kezdetének előbb kell lennie mint a végének."
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr "Kölcsöntörlesztés"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr "HR ellenőrzés befejezése"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "Üdvözlettel:"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Nettó összeg"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Bérszerkezet:"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "Alkalmazott bérének részletei"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr "Függvénysor"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr "Táblázat megerősítése"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Egyéb:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr "Függvény kiszámítása"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "Ledolgozott nap"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Vállalat összesen"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
-msgstr "T/K"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
-msgstr "Ország & Cím"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Alkalmazott kódja"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
-msgstr "Alapbér - szabadságok"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "Összeg típusa"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Kategória"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
-msgstr "Fejek"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "Kimutatás nyomtatása"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Tervezet"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr "Jövedelem"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Alapbér"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Összes útlevél"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
-msgstr "Bérnyilvántartás"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Alkalmazott neve"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Útlevél részlete"
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "Százalék (%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr "Bérszámfejtési nyilvántartás"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Szerződések"
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr "Ledolgozott nap"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -919,128 +696,66 @@ msgid "Employee Function"
 msgstr "Alkalmazotti funkció"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Fizetve"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "Táblázat jóváhagyása"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "Fizetett? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Érvényesítés"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Felhasználó"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Kifizetés sorok"
-
-#. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
 msgstr "Táblázat kiszámítása"
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Aktív"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "Éves bér részletei"
-
-#. module: hr_payroll
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Hiba! Nem hozhat létre rekurzív alkalmazotti hierarchiát."
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Feltétel"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
-msgstr "Kifizetési értesítés:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Számítás"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr "Kijelölés"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "HR menedzser"
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Alapbér"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr "Kategória kód"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "Bér információ"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
-msgstr "Levonási kategória"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1048,340 +763,276 @@ msgid "Companies"
 msgstr "Vállalatok"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr "Cégszerű aláírás"
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Szerződés"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
-msgstr "Táblázattervezet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
-msgstr "Következő havi dátum"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Dátum"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "Vízum lejárati dátuma"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
-msgstr "Útlevél keresése"
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr "Közreműködés"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "Telefonszám"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
-msgstr "Közreműködés"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
-msgstr "Egyéb szám"
+#: view:hr.salary.rule:0
+msgid "Company contribution"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Kód"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
-msgstr "Kifizetési értesítés"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "Szám :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Sorszám"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
-msgstr "Számítás áttekintése"
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Sorszám"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr "Bérszerkezet"
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr "Nyilvántartási sor"
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Mégse"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "Zárás"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "Összeg / százalék"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Juttatások"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Bér"
-
-#. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "Útlevélszám"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Útlevél"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Összes bér"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "időszakra"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr "Bérlista fej"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "E-mail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "Jelentés kinyomtatása"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr "Számítások"
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Egyéb információ"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Hónap"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr "Kiállítás"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr "Dinamikus számítás"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr "Alapbér szabadság nélkül:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Függvény"
+msgid "Worked Days"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr "Állapotok"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Tisztelt Hölgyem/Uram!"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
-msgstr "Levonás fejek"
+msgid "Search Payslips"
+msgstr "Fizetési jegyzékek keresése"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
-msgstr "Bruttó bér"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Leírás"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Kezdő dátum"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr "Levonás -"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ")"
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1393,240 +1044,749 @@ msgid "Payroll"
 msgstr "Bérszámfejtés"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Fizetési típus"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "Nettó bér"
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr "Az útlevélszámnak egyedinek kell lennie !"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "Kategória neve"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
-msgstr "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Cím"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr "Fizetési jegyzék sor"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr "Szabadságok száma"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Bank"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr "Táblázat érvénytelenítése"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "Előleg"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Név"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr "Szabadság miatti levonás"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "Ország"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Alkalmazottak"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Bankszámlaszám"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr "Számítási sorrend beállítására szolgál"
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Összes kifizetés"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr "Szabadság miatti levonás sora:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
-msgstr "Vállalati levonás"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "Bérlista beállítás"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Összesen"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr "Kérem, állítsa be %s alkalmazott bankszámlaszámát"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr "Útlevél kiállítás dátuma"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr "Juttatás"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "Szabadságok száma"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
-msgstr "Egyéb ID"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Bankadatok"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
-msgstr "Fizetési jegyzék ID"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Sorszám"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
-msgstr "Alkalmazott fizetési jegyzéke"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr "Levél tartalma"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Éves bér"
+#~ msgid "Leave Type"
+#~ msgstr "Szabadság típusa"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr "Juttatás / Levonás"
+#~ msgid "Validation"
+#~ msgstr "Érvényesítés"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr "Bank átutalás értesítő"
+#~ msgid "Wage Type"
+#~ msgstr "Fizetési típus"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr "Fizetési jegyzékek keresése"
+#~ msgid "Allowances with Basic:"
+#~ msgstr "Alapjuttatások:"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Összesen"
+#~ msgid "Net Salary"
+#~ msgstr "Nettó bér"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr ""
+#~ msgid "Working Days"
+#~ msgstr "Munkanapok"
+
+#~ msgid "Department"
+#~ msgstr "Osztály, részleg"
+
+#~ msgid "Deductions:"
+#~ msgstr "Levonások:"
+
+#~ msgid "Use for Gratuity ?"
+#~ msgstr "Prémiumként?"
+
+#~ msgid "E-mail Address"
+#~ msgstr "E-mail cím"
+
+#~ msgid "Based"
+#~ msgstr "Alapul"
+
+#~ msgid "The Manager"
+#~ msgstr "Menedzser"
+
+#~ msgid "Loan"
+#~ msgstr "Kölcsön"
+
+#~ msgid "Letter Details"
+#~ msgstr "Levél részletei"
+
+#~ msgid "Others"
+#~ msgstr "Egyéb"
+
+#, python-format
+#~ msgid "Variable Error: %s "
+#~ msgstr "Változó hiba: %s "
+
+#~ msgid "Calculaton Field"
+#~ msgstr "Számítási mező"
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Szerződés részletei:"
+
+#~ msgid "Expire"
+#~ msgstr "Lejár"
+
+#~ msgid "Total Deductions"
+#~ msgstr "Összes levonás"
+
+#~ msgid "Register"
+#~ msgstr "Nyilvántartás"
+
+#~ msgid "Leaves"
+#~ msgstr "Szabadságok"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Alkalmazott neve"
+
+#~ msgid "Value"
+#~ msgstr "Érték"
+
+#~ msgid "Register Lines"
+#~ msgstr "Nyilvántartási sorok"
+
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Fizetetlen szabadság"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Útlevél lejárati dátuma"
+
+#~ msgid "Other Deduction"
+#~ msgstr "Egyéb levonás"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Fizetett szabadság"
+
+#~ msgid "Percentage"
+#~ msgstr "Százalék"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Alkalmazott levonásai"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Összeg (betűkkel) :"
+
+#~ msgid "Date :"
+#~ msgstr "Dátum :"
+
+#~ msgid "End Date"
+#~ msgstr "Befejezés dátuma"
+
+#~ msgid "Notes:"
+#~ msgstr "Megjegyzések:"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "Type"
+#~ msgstr "Típus"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Hiba !"
+
+#~ msgid "No of Working days / week for an employee"
+#~ msgstr "Alkalmazott munkanapjainak/heteinek száma"
+
+#~ msgid "Work Permit No"
+#~ msgstr "Munkavállalási engedély száma"
+
+#~ msgid "Deductions"
+#~ msgstr "Levonások"
+
+#~ msgid "Total Earnings"
+#~ msgstr "Összes jövedelem"
+
+#~ msgid "hr.payroll.employees.detail"
+#~ msgstr "hr.payroll.employees.detail"
+
+#, python-format
+#~ msgid "Variable Error !"
+#~ msgstr "Változó hiba !"
+
+#~ msgid "Total By Employee"
+#~ msgstr "Alkalmazott összesen"
+
+#~ msgid "Deduction"
+#~ msgstr "Levonás"
+
+#~ msgid "Net Amount"
+#~ msgstr "Nettó összeg"
+
+#~ msgid "Yours Sincerely"
+#~ msgstr "Üdvözlettel:"
+
+#~ msgid "Employee Code"
+#~ msgstr "Alkalmazott kódja"
+
+#~ msgid "Country & Address"
+#~ msgstr "Ország & Cím"
+
+#~ msgid "Total By Company"
+#~ msgstr "Vállalat összesen"
+
+#~ msgid "All Passports"
+#~ msgstr "Összes útlevél"
+
+#~ msgid "Employee Name"
+#~ msgstr "Alkalmazott neve"
+
+#~ msgid "Contracts"
+#~ msgstr "Szerződések"
+
+#~ msgid "Passport Detail"
+#~ msgstr "Útlevél részlete"
+
+#~ msgid "Payroll Register"
+#~ msgstr "Bérszámfejtési nyilvántartás"
+
+#~ msgid "Paid"
+#~ msgstr "Fizetve"
+
+#~ msgid "User"
+#~ msgstr "Felhasználó"
+
+#~ msgid "Paid ? "
+#~ msgstr "Fizetett? "
+
+#~ msgid "Category Code"
+#~ msgstr "Kategória kód"
+
+#~ msgid "HR Manager"
+#~ msgstr "HR menedzser"
+
+#~ msgid "Compute"
+#~ msgstr "Számítás"
+
+#~ msgid "Search Passport"
+#~ msgstr "Útlevél keresése"
+
+#~ msgid "Next Month Date"
+#~ msgstr "Következő havi dátum"
+
+#~ msgid "Date"
+#~ msgstr "Dátum"
+
+#~ msgid "Phone No."
+#~ msgstr "Telefonszám"
+
+#~ msgid "Visa Expire Date"
+#~ msgstr "Vízum lejárati dátuma"
+
+#~ msgid "Visa No"
+#~ msgstr "Vízum száma"
+
+#~ msgid "Other No."
+#~ msgstr "Egyéb szám"
+
+#~ msgid "Number :"
+#~ msgstr "Szám :"
+
+#~ msgid "Number"
+#~ msgstr "Sorszám"
+
+#~ msgid "Passport No"
+#~ msgstr "Útlevélszám"
+
+#~ msgid "Allowances"
+#~ msgstr "Juttatások"
+
+#~ msgid "Print Report"
+#~ msgstr "Jelentés kinyomtatása"
+
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
+#~ msgid "Passport"
+#~ msgstr "Útlevél"
+
+#~ msgid "Month"
+#~ msgstr "Hónap"
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "Tisztelt Hölgyem/Uram!"
+
+#~ msgid "Other Informations"
+#~ msgstr "Egyéb információ"
+
+#~ msgid "Category Name"
+#~ msgstr "Kategória neve"
+
+#~ msgid "Deduction -"
+#~ msgstr "Levonás -"
+
+#~ msgid "The Passport No must be unique !"
+#~ msgstr "Az útlevélszámnak egyedinek kell lennie !"
+
+#~ msgid "Number of Leaves"
+#~ msgstr "Szabadságok száma"
+
+#~ msgid "hr.payroll.year.salary"
+#~ msgstr "hr.payroll.year.salary"
+
+#~ msgid "Bank"
+#~ msgstr "Bank"
+
+#~ msgid "Country"
+#~ msgstr "Ország"
+
+#~ msgid "Other Id"
+#~ msgstr "Egyéb ID"
+
+#~ msgid "Allowance"
+#~ msgstr "Juttatás"
+
+#~ msgid "No of Leaves"
+#~ msgstr "Szabadságok száma"
+
+#~ msgid "Bank Details"
+#~ msgstr "Bankadatok"
+
+#~ msgid "Allowance / Deduction"
+#~ msgstr "Juttatás / Levonás"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr ""
+#~ "Hiba! Nem választhat ki olyan részleget, amelynek az alkalmazott a "
+#~ "menedzsere."
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr "Itt választhatja ki a bankszámlát, amelyről a munkabért átutalják"
+
+#~ msgid "Recompute Sheet"
+#~ msgstr "Táblázat újraszámítása"
+
+#~ msgid ""
+#~ "Calculation field used for internal calculation, do not place this on form"
+#~ msgstr ""
+#~ "Belső számításra használt számítási mező, kérem ne szerepeltesse nyilvános "
+#~ "kimutatásokban"
+
+#~ msgid "Posted"
+#~ msgstr "Könyvelt"
+
+#~ msgid "Payments -"
+#~ msgstr "Kifizetések -"
+
+#~ msgid "Sub Total"
+#~ msgstr "Részösszesen"
+
+#~ msgid "Valid From"
+#~ msgstr "Érvényesség kezdete"
+
+#~ msgid "Payment"
+#~ msgstr "Kifizetés"
+
+#~ msgid "From"
+#~ msgstr "Kezdő dátum"
+
+#~ msgid "Other Lines"
+#~ msgstr "Egyéb sorok"
+
+#~ msgid "Paymeny Lines"
+#~ msgstr "Kifizetés sorok"
+
+#~ msgid "Other Payment"
+#~ msgstr "Egyéb kifizetés"
+
+#~ msgid "For the month of"
+#~ msgstr "Hónapra"
+
+#~ msgid "To"
+#~ msgstr "Záró dátum"
+
+#~ msgid "Loan Installment"
+#~ msgstr "Kölcsöntörlesztés"
+
+#~ msgid "Bank Account A/C"
+#~ msgstr "Bankszámlaszám"
+
+#~ msgid "Function Line"
+#~ msgstr "Függvénysor"
+
+#~ msgid "Function Calculation"
+#~ msgstr "Függvény kiszámítása"
+
+#~ msgid "Approve Sheet"
+#~ msgstr "Táblázat jóváhagyása"
+
+#~ msgid "Payment Lines"
+#~ msgstr "Kifizetés sorok"
+
+#~ msgid "Draft Sheet"
+#~ msgstr "Táblázattervezet"
+
+#~ msgid "Amount / Percentage"
+#~ msgstr "Összeg / százalék"
+
+#~ msgid "Dynamic Computation"
+#~ msgstr "Dinamikus számítás"
+
+#~ msgid "Advance"
+#~ msgstr "Előleg"
+
+#~ msgid "Total Payment"
+#~ msgstr "Összes kifizetés"
+
+#, python-format
+#~ msgid "Please define bank account for the %s employee"
+#~ msgstr "Kérem, állítsa be %s alkalmazott bankszámlaszámát"
+
+#~ msgid "Passport Issue Date"
+#~ msgstr "Útlevél kiállítás dátuma"
+
+#~ msgid "Bank Advice"
+#~ msgstr "Banki értesítő"
+
+#~ msgid "Reject"
+#~ msgstr "Visszautasítás"
+
+#~ msgid "Country of Issue"
+#~ msgstr "Kiállító ország"
+
+#~ msgid "Leave Deductions"
+#~ msgstr "Szabadság miatti levonás"
+
+#~ msgid "Function Arguments"
+#~ msgstr "Függvényargumentumok"
+
+#~ msgid "Function Value"
+#~ msgstr "Függvényérték"
+
+#~ msgid "Formula"
+#~ msgstr "Képlet"
+
+#~ msgid "Bank Advice Lines"
+#~ msgstr "Banki értesítő sorok"
+
+#~ msgid "Net Basic"
+#~ msgstr "Nettó alapbér"
+
+#~ msgid "Chaque Nos"
+#~ msgstr "Csekk számok"
+
+#~ msgid "Salary Structure:"
+#~ msgstr "Bérszerkezet:"
+
+#~ msgid "Complete HR Checking"
+#~ msgstr "HR ellenőrzés befejezése"
+
+#~ msgid "Bank Advice Note"
+#~ msgstr "Banki értesítő megjegyzés"
+
+#~ msgid "Others:"
+#~ msgstr "Egyéb:"
+
+#~ msgid "D/C"
+#~ msgstr "T/K"
+
+#~ msgid "Print Statement"
+#~ msgstr "Kimutatás nyomtatása"
+
+#~ msgid "Basic"
+#~ msgstr "Alapbér"
+
+#~ msgid "Basic Salary – Leaves"
+#~ msgstr "Alapbér - szabadságok"
+
+#~ msgid "Earnings"
+#~ msgstr "Jövedelem"
+
+#~ msgid "Heads"
+#~ msgstr "Fejek"
+
+#~ msgid "Payment Advice:"
+#~ msgstr "Kifizetési értesítés:"
+
+#~ msgid "Salary Information"
+#~ msgstr "Bér információ"
+
+#~ msgid "Basic Salary"
+#~ msgstr "Alapbér"
+
+#~ msgid "Condition"
+#~ msgstr "Feltétel"
+
+#~ msgid "Allowance Deduction Categoty"
+#~ msgstr "Levonási kategória"
+
+#~ msgid "Computation Overview"
+#~ msgstr "Számítás áttekintése"
+
+#~ msgid "Payment Advice"
+#~ msgstr "Kifizetési értesítés"
+
+#~ msgid "for period"
+#~ msgstr "időszakra"
+
+#~ msgid "Function"
+#~ msgstr "Függvény"
+
+#~ msgid "Basic Salary without Leave:"
+#~ msgstr "Alapbér szabadság nélkül:"
+
+#~ msgid "Issue"
+#~ msgstr "Kiállítás"
+
+#~ msgid "Allowance Deduction Heads"
+#~ msgstr "Levonás fejek"
+
+#~ msgid "Start Date"
+#~ msgstr "Kezdő dátum"
+
+#~ msgid "Leaved Deduction"
+#~ msgstr "Szabadság miatti levonás"
+
+#~ msgid "Leave Deductions Line:"
+#~ msgstr "Szabadság miatti levonás sora:"
+
+#~ msgid "Company Deduction"
+#~ msgstr "Vállalati levonás"
+
+#~ msgid "Letter Content"
+#~ msgstr "Levél tartalma"
+
+#~ msgid "Bank Payment Advice"
+#~ msgstr "Bank átutalás értesítő"
+
+#~ msgid "Based on"
+#~ msgstr "Alapul"
+
+#~ msgid "Wating for Verification"
+#~ msgstr "Várakozás a megerősítésre"
+
+#~ msgid "Employees Salary Details"
+#~ msgstr "Alkalmazott bérének részletei"
+
+#~ msgid "Year Salary Report"
+#~ msgstr "Éves bérkimutatás"
+
+#~ msgid "New Slip"
+#~ msgstr "Új fizetési jegyzék"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Bruttó bér"
+
+#~ msgid "Employee Salary"
+#~ msgstr "Alkalmazotti bér"
+
+#~ msgid "Employees Salary Detail"
+#~ msgstr "Alkalmazott bérének részletei"
+
+#~ msgid "Salary Register"
+#~ msgstr "Bérnyilvántartás"
+
+#~ msgid "Yearly Salary Details"
+#~ msgstr "Éves bér részletei"
+
+#~ msgid "Salary"
+#~ msgstr "Bér"
+
+#~ msgid "Total Salary"
+#~ msgstr "Összes bér"
+
+#~ msgid "Gross Sal."
+#~ msgstr "Bruttó bér"
+
+#~ msgid "Net Sal."
+#~ msgstr "Nettó bér"
+
+#~ msgid "Slip Line"
+#~ msgstr "Fizetési jegyzék sor"
+
+#~ msgid "Slip ID"
+#~ msgstr "Fizetési jegyzék ID"
+
+#~ msgid "Employee Payslip"
+#~ msgstr "Alkalmazott fizetési jegyzéke"
+
+#~ msgid "Year Salary"
+#~ msgstr "Éves bér"
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "Bérkifizetési nyilvántartás"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Kifizetett bér"
+
+#~ msgid "Pay Salary"
+#~ msgstr "Bér kifizetése"
+
+#~ msgid "Employee Salary Statement"
+#~ msgstr "Alkalmazott bérkimutatása"
+
+#~ msgid "Confirm Sheet"
+#~ msgstr "Táblázat megerősítése"
+
+#~ msgid "Verify Sheet"
+#~ msgstr "Táblázat ellenőrzése"
+
+#~ msgid "Cancel Sheet"
+#~ msgstr "Táblázat érvénytelenítése"
+
+#~ msgid "Human Resource Payroll"
+#~ msgstr "Bérszámfejtés"
+
+#~ msgid ""
+#~ "Generic Payroll system\n"
+#~ "    * Employee Details\n"
+#~ "    * Employee Contracts\n"
+#~ "    * Passport based Contract\n"
+#~ "    * Allowances / Deductions\n"
+#~ "    * Allow to configure Basic / Grows / Net Salary\n"
+#~ "    * Employee Payslip\n"
+#~ "    * Monthly Payroll Register\n"
+#~ "    * Integrated with Holiday Management\n"
+#~ "    "
+#~ msgstr ""
+#~ "Általános bérszámfejtő rendszer\n"
+#~ "    * Alkalmazottak adatai\n"
+#~ "    * Munkaszerződések\n"
+#~ "    * Útlevél alapú szerződések\n"
+#~ "    * Juttatások/levonások\n"
+#~ "    * Alap/bruttó/nettó bér beállítása\n"
+#~ "    * Fizetési jegyzék\n"
+#~ "    * Havi bérlista\n"
+#~ "    * Szabadságkezeléssel integrálva\n"
+#~ "    "
+
+#, python-format
+#~ msgid "Please check configuration of %s, payroll head is missing"
+#~ msgstr "Kérem, ellenőrizze a %s beállítását, a bérlista fej hiányzik."
+
+#~ msgid "Payroll Head"
+#~ msgstr "Bérlista fej"
+
+#~ msgid "Payroll Configurtion"
+#~ msgstr "Bérlista beállítás"
diff --git a/addons/hr_payroll/i18n/id.po b/addons/hr_payroll/i18n/id.po
index f4b89903390..5541f739fc9 100644
--- a/addons/hr_payroll/i18n/id.po
+++ b/addons/hr_payroll/i18n/id.po
@@ -7,249 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-02-09 03:59+0000\n"
 "Last-Translator: moelyana <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Alamat E-mail"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Berdasarkan"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Gaji Bersih"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Hitung Kembali neraca"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Rincian Gaji Karyawan"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
-msgstr "Tunjangan dengan Dasar:"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Departmen"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Pengurangan:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "Gunakan untuk Gratifikasi?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Dikelompokan berdasarkan ..."
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Hari Kerja"
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Status"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Pinjaman"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Daftar Pembayaran Gaji"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Slip Pembayaran"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Laporan Gaji Tahunan"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Gaji Dibayar"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Perusahaan"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "Manajer"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "Surat Rincian"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Atur ke draft"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Kadaluarsa"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Separuh-Pembayaran Hari Libur"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Lainnya"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Slip Pembayaran"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Rincian Kontrak"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Kolom Kalkulasi"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "Pilih Alamat Bank dari mana gaji yang akan dibayarkan"
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "Saran bank"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Ditolak"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Total:"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Cuti"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Daftar"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
-"Error! Anda tidak dapat memilih  departemen  yang karyawan adalah manajer."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Jumlah Pengurangan"
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Nilai"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Nama Karyawan"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr "Baris Pendaftaran"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -257,261 +202,176 @@ msgid "Salary Computation"
 msgstr "Perhitungan Gaji"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Jumlah"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr "Mohon periksa konfigurasi dari% s, gaji pusat hilang"
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Persentase"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Informasi lainnya"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Pengurangan Karyawan"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Pengurangan lain"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Dibayar Hari Libur"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Dikelompokan berdasarkan ..."
-
-#. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Tanggal Kadaluarsa Paspor"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Valid Dari"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
 msgstr ""
-"Perhitungan kolom yang digunakan untuk perhitungan internal, jangan "
-"menempatkan  ini pada formulir"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Jumlah (dalam kata):"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Pembayaran"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
+msgid "Draft Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Identification No"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Berdasarkan"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Menunggu Verifikasi"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Identification No"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Penggajian Sumber Daya Manusia"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Diposting"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Jenis Cuti"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Tanggal"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Sub Total"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Pembayaran -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Dari"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "Berdasarkan  Gaji"
-
-#. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Tanggal berakhir"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr "Slip Pembayaran  Karyawan"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Pengurangan Cuti"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "Tanda Tangan Resmi"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "Fungsi Nilai"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
-msgstr "Kontribusi Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Catatan:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Status"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Fungsi Argumen"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
-msgstr "Kontribusi perusahaan"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -519,193 +379,183 @@ msgid "Employee"
 msgstr "Karyawan"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Formula"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Jenis"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "Email"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Ada Kesalahan !!!"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Verifikasi lembaran"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
-msgstr "Jumlah hari kerja / minggu untuk karyawan"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr "Slip Baru"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr "Dasar Bersih"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Gaji Bruto"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "Total Pendapatan"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
-msgstr "Pernyataan Gaji Karyawan"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Pembayaran Lainnya"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Pengurangan"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "Izin Kerja"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Gaji Karyawan"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr "Jumlah Tetap"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Berdasarkan Jumlah Karyawan"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "Jumlah Tetap"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Ke"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Bayar Gaji"
+msgid "PaySlip Batch"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
-msgstr "Baris Kontribusi"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Pengurangan"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr "Catatan Saran Bank"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr ""
@@ -718,191 +568,129 @@ msgstr ""
 "berakhir"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr "Kredit Angsuran"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr "Menyelesaikan Pemeriksaan  HR"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "Hormat kami"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Jumlah Bersih"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Struktur Gaji"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "Rincian Gaji Karyawan"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr "Fungsi Baris"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr "Lembar Konfirmasi"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Lainnya:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr "Fungsi Penghitungan"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "Hari kerja"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Kode karyawan"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
-msgstr "Gaji Pokok - Cuti"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "Jumlah Jenis"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Kategori"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
-msgstr "Kontribusi Perusahaan"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "Cetak Pernyataan"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Konsep"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr "Pendapatan"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Dasar"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Semua Passport"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
-msgstr "Daftar Gaji"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Nama Karyawan"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Rincian Passport"
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "Presentase"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr "Registrasi Penggajian Karyawan"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "Untuk"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Kontrak"
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr "Hari kerja"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -910,44 +698,10 @@ msgid "Employee Function"
 msgstr "Fungsi Karyawan"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Terbayar"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "Lembar Penyetujuan"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "Terbayar ? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Validasi"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Judul"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr "Pencarian  Kontribusi Perusahaan"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Pengguna"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Garis Pembayaran"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -955,21 +709,15 @@ msgid "Compute Sheet"
 msgstr "Hitung Lembar"
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Aktif"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
-"Diaplikasikan tersebut di depan untuk perhitungan  jika kondisi benar"
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "Rincian Gaji Tahunan"
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
@@ -978,62 +726,39 @@ msgstr ""
 "Error! Anda tidak dapat  membuat  Hirarki Karyawan secara rekursif  ."
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Kondisi"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr "Menunggu untuk Verifikasi HR"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
-msgstr "Saran Pembayaran"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Hitung"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr "Penunjukan"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "Manajer HR"
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Gaji Pokok"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr "Kode Kategori"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "Informasi Gaji"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
-msgstr "Kategori Penyisihan Pengurangan"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1041,343 +766,276 @@ msgid "Companies"
 msgstr "Perusahaan"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr "Tandatangan Resmi"
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Kontrak"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
-msgstr "Lembar Konsep"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
-msgstr "Tanggal Bulan Depan"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Tanggal"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "Tanggal Kadaluarsa Visa"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
-msgstr "Cari Passport"
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr "Kontribusi"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "No. Telepon"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
-msgstr "Kontribusi"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "Label"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
-msgstr "Konstribusi Perusahaan"
+msgid "Refund"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
-msgstr "No. Lain"
+#: view:hr.salary.rule:0
+msgid "Company contribution"
+msgstr "Konstribusi Perusahaan"
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Kode"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "Nomor :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Urutan"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
-msgstr "Ikhtisar Perhitungan"
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
-msgstr "Gaji Pada"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Nomor"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr "Struktur Gaji"
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr "Baris Pendaftaran"
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Batal"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "Tutup"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "Jumlah / presentase"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Tunjangan"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr "Tanggal Bulan saat ini"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Gaji"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "Nomor Passport"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Jumlah Gaji"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "untuk periode"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr "Kepala Penggajian Karyawan"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr "Kontribusi Registrasi"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "E-mail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "Cetak Laporan"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr "Kalkulasi"
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-"Tentukan rasio Kontribusi Perusahaan kontribusi 1,00 = 100%, Jika Karyawan "
-"5% Berkontribusi  maka perusahaan akan dan di sini 0,50  ,maka perusahaan "
-"akan memberikan kontribusi 50% pada kontribusi karyawan 5%"
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Informasi Lainnya"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Bulan"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr "Perhitungan Dinamis"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr "Gaji Pokok tanpa cuti"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Fungsi"
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr "Status"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Kepada Bapak/Ibu,"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
-msgstr "Pengurangan Tunjangan Kepala"
+msgid "Search Payslips"
+msgstr "Cari Slip Pembayaran"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
-msgstr "Gaji Brutto"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Keterangan"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Tanggal Mulai"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr "Pengurangan"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr "Registrasi Kontribusi"
 
@@ -1389,240 +1047,712 @@ msgid "Payroll"
 msgstr "Penggajian"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Jenis Upah"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "Gaji Bersih"
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr "Nomor Passport Harus unik"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "Nama Kategori"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Alamat"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr "Nomor Cuti"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Bank"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr "Lembaran Dibatalkan"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "kenaikan"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
-msgstr "Tunjangan Khusus dan Pengurangan Bagi Karyawan:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Nama"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr "Pengurangan cuti"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "Negara"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Karyawan"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Akun Bank"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr "Kontribusi pendaftaran berdasarkan  perusahaan"
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr "Gunakan untuk mengatur urutan perhitungan"
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Total Pembayaran"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr "Baris  Pengurangan Cuti :"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr "Menunggu Verifikasi Account"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
-msgstr "Pengurangan Perusahaan"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "Konfigurasi Penggajian Karyawan"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Total"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr "Mohon tentukan rekening bank untuk %s karyawan"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr "Edisi Tanggal Paspor"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr "Tunjangan"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "Nomor Cuti"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
-msgstr "ID Lain"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Perincian Bank"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Urutan"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
-msgstr "Slip Pembayaran Karyawan"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr "Konten Surat"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Gaji Setahun"
+#~ msgid "Allowances with Basic:"
+#~ msgstr "Tunjangan dengan Dasar:"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr "Tunjangan / Pengurangan"
+#~ msgid "Net Salary"
+#~ msgstr "Gaji Bersih"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr "Saran Pembayaran Bank"
+#~ msgid "Working Days"
+#~ msgstr "Hari Kerja"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr "Cari Slip Pembayaran"
+#~ msgid "Department"
+#~ msgstr "Departmen"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Total"
+#~ msgid "Deductions:"
+#~ msgstr "Pengurangan:"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr "Kontribusi"
+#~ msgid "Use for Gratuity ?"
+#~ msgstr "Gunakan untuk Gratifikasi?"
+
+#~ msgid "Employees Salary Details"
+#~ msgstr "Rincian Gaji Karyawan"
+
+#~ msgid "E-mail Address"
+#~ msgstr "Alamat E-mail"
+
+#~ msgid "Recompute Sheet"
+#~ msgstr "Hitung Kembali neraca"
+
+#~ msgid "Based"
+#~ msgstr "Berdasarkan"
+
+#~ msgid "The Manager"
+#~ msgstr "Manajer"
+
+#~ msgid "Loan"
+#~ msgstr "Pinjaman"
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "Daftar Pembayaran Gaji"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Gaji Dibayar"
+
+#~ msgid "Year Salary Report"
+#~ msgstr "Laporan Gaji Tahunan"
+
+#~ msgid "Letter Details"
+#~ msgstr "Surat Rincian"
+
+#~ msgid "Others"
+#~ msgstr "Lainnya"
+
+#~ msgid "Calculaton Field"
+#~ msgstr "Kolom Kalkulasi"
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr "Pilih Alamat Bank dari mana gaji yang akan dibayarkan"
+
+#~ msgid "Bank Advice"
+#~ msgstr "Saran bank"
+
+#~ msgid "Half-Pay Holiday"
+#~ msgstr "Separuh-Pembayaran Hari Libur"
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Rincian Kontrak"
+
+#~ msgid "Expire"
+#~ msgstr "Kadaluarsa"
+
+#~ msgid "Total Deductions"
+#~ msgstr "Jumlah Pengurangan"
+
+#~ msgid "Register"
+#~ msgstr "Daftar"
+
+#~ msgid "Leaves"
+#~ msgstr "Cuti"
+
+#~ msgid "Reject"
+#~ msgstr "Ditolak"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Nama Karyawan"
+
+#~ msgid "Value"
+#~ msgstr "Nilai"
+
+#~ msgid "Register Lines"
+#~ msgstr "Baris Pendaftaran"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr ""
+#~ "Error! Anda tidak dapat memilih  departemen  yang karyawan adalah manajer."
+
+#~ msgid "Other Deduction"
+#~ msgstr "Pengurangan lain"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Dibayar Hari Libur"
+
+#, python-format
+#~ msgid "Please check configuration of %s, payroll head is missing"
+#~ msgstr "Mohon periksa konfigurasi dari% s, gaji pusat hilang"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Tanggal Kadaluarsa Paspor"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Pengurangan Karyawan"
+
+#~ msgid "Percentage"
+#~ msgstr "Persentase"
+
+#~ msgid ""
+#~ "Calculation field used for internal calculation, do not place this on form"
+#~ msgstr ""
+#~ "Perhitungan kolom yang digunakan untuk perhitungan internal, jangan "
+#~ "menempatkan  ini pada formulir"
+
+#~ msgid "Valid From"
+#~ msgstr "Valid Dari"
+
+#~ msgid "Wating for Verification"
+#~ msgstr "Menunggu Verifikasi"
+
+#~ msgid "Payment"
+#~ msgstr "Pembayaran"
+
+#~ msgid "Based on"
+#~ msgstr "Berdasarkan"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Jumlah (dalam kata):"
+
+#~ msgid "Human Resource Payroll"
+#~ msgstr "Penggajian Sumber Daya Manusia"
+
+#~ msgid "Posted"
+#~ msgstr "Diposting"
+
+#~ msgid "Leave Type"
+#~ msgstr "Jenis Cuti"
+
+#~ msgid "Date :"
+#~ msgstr "Tanggal"
+
+#~ msgid "Payments -"
+#~ msgstr "Pembayaran -"
+
+#~ msgid "Sub Total"
+#~ msgstr "Sub Total"
+
+#~ msgid "From"
+#~ msgstr "Dari"
+
+#~ msgid "By Salary"
+#~ msgstr "Berdasarkan  Gaji"
+
+#~ msgid "End Date"
+#~ msgstr "Tanggal berakhir"
+
+#~ msgid "Leave Deductions"
+#~ msgstr "Pengurangan Cuti"
+
+#~ msgid "Authorised Signature"
+#~ msgstr "Tanda Tangan Resmi"
+
+#~ msgid "Notes:"
+#~ msgstr "Catatan:"
+
+#~ msgid "Contribution Register Line"
+#~ msgstr "Kontribusi Register Line"
+
+#~ msgid "Function Value"
+#~ msgstr "Fungsi Nilai"
+
+#~ msgid "Function Arguments"
+#~ msgstr "Fungsi Argumen"
+
+#~ msgid "Verify Sheet"
+#~ msgstr "Verifikasi lembaran"
+
+#~ msgid "Type"
+#~ msgstr "Jenis"
+
+#~ msgid "Formula"
+#~ msgstr "Formula"
+
+#~ msgid "Company Contributions"
+#~ msgstr "Kontribusi perusahaan"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Ada Kesalahan !!!"
+
+#~ msgid "No of Working days / week for an employee"
+#~ msgstr "Jumlah hari kerja / minggu untuk karyawan"
+
+#~ msgid "New Slip"
+#~ msgstr "Slip Baru"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Gaji Bruto"
+
+#~ msgid "Employee Salary Statement"
+#~ msgstr "Pernyataan Gaji Karyawan"
+
+#~ msgid "Work Permit No"
+#~ msgstr "Izin Kerja"
+
+#~ msgid "Deductions"
+#~ msgstr "Pengurangan"
+
+#~ msgid "Total Earnings"
+#~ msgstr "Total Pendapatan"
+
+#~ msgid "Other Payment"
+#~ msgstr "Pembayaran Lainnya"
+
+#~ msgid "Net Basic"
+#~ msgstr "Dasar Bersih"
+
+#~ msgid "Employee Salary"
+#~ msgstr "Gaji Karyawan"
+
+#~ msgid "Pay Salary"
+#~ msgstr "Bayar Gaji"
+
+#~ msgid "Contribution Lines"
+#~ msgstr "Baris Kontribusi"
+
+#~ msgid "Total By Employee"
+#~ msgstr "Berdasarkan Jumlah Karyawan"
+
+#~ msgid "To"
+#~ msgstr "Ke"
+
+#~ msgid "Deduction"
+#~ msgstr "Pengurangan"
+
+#~ msgid "Net Amount"
+#~ msgstr "Jumlah Bersih"
+
+#~ msgid "Bank Advice Note"
+#~ msgstr "Catatan Saran Bank"
+
+#~ msgid "Salary Structure:"
+#~ msgstr "Struktur Gaji"
+
+#~ msgid "Yours Sincerely"
+#~ msgstr "Hormat kami"
+
+#~ msgid "Loan Installment"
+#~ msgstr "Kredit Angsuran"
+
+#~ msgid "Complete HR Checking"
+#~ msgstr "Menyelesaikan Pemeriksaan  HR"
+
+#~ msgid "Employee Code"
+#~ msgstr "Kode karyawan"
+
+#~ msgid "Employees Salary Detail"
+#~ msgstr "Rincian Gaji Karyawan"
+
+#~ msgid "Confirm Sheet"
+#~ msgstr "Lembar Konfirmasi"
+
+#~ msgid "Others:"
+#~ msgstr "Lainnya:"
+
+#~ msgid "Function Line"
+#~ msgstr "Fungsi Baris"
+
+#~ msgid "Function Calculation"
+#~ msgstr "Fungsi Penghitungan"
+
+#~ msgid "All Passports"
+#~ msgstr "Semua Passport"
+
+#~ msgid "Print Statement"
+#~ msgstr "Cetak Pernyataan"
+
+#~ msgid "Basic"
+#~ msgstr "Dasar"
+
+#~ msgid "Company Contribution"
+#~ msgstr "Kontribusi Perusahaan"
+
+#~ msgid "Basic Salary – Leaves"
+#~ msgstr "Gaji Pokok - Cuti"
+
+#~ msgid "Earnings"
+#~ msgstr "Pendapatan"
+
+#~ msgid "Employee Name"
+#~ msgstr "Nama Karyawan"
+
+#~ msgid "For"
+#~ msgstr "Untuk"
+
+#~ msgid "Paid"
+#~ msgstr "Terbayar"
+
+#~ msgid "Contracts"
+#~ msgstr "Kontrak"
+
+#~ msgid "Approve Sheet"
+#~ msgstr "Lembar Penyetujuan"
+
+#~ msgid "Passport Detail"
+#~ msgstr "Rincian Passport"
+
+#~ msgid "Payroll Register"
+#~ msgstr "Registrasi Penggajian Karyawan"
+
+#~ msgid "Salary Register"
+#~ msgstr "Daftar Gaji"
+
+#~ msgid "Applied this head for calculation if condition is true"
+#~ msgstr ""
+#~ "Diaplikasikan tersebut di depan untuk perhitungan  jika kondisi benar"
+
+#~ msgid "Validation"
+#~ msgstr "Validasi"
+
+#~ msgid "Search Company Contribution"
+#~ msgstr "Pencarian  Kontribusi Perusahaan"
+
+#~ msgid "User"
+#~ msgstr "Pengguna"
+
+#~ msgid "Title"
+#~ msgstr "Judul"
+
+#~ msgid "Payment Lines"
+#~ msgstr "Garis Pembayaran"
+
+#~ msgid "Paid ? "
+#~ msgstr "Terbayar ? "
+
+#~ msgid "Yearly Salary Details"
+#~ msgstr "Rincian Gaji Tahunan"
+
+#~ msgid "Payment Advice:"
+#~ msgstr "Saran Pembayaran"
+
+#~ msgid "Category Code"
+#~ msgstr "Kode Kategori"
+
+#~ msgid "Salary Information"
+#~ msgstr "Informasi Gaji"
+
+#~ msgid "Basic Salary"
+#~ msgstr "Gaji Pokok"
+
+#~ msgid "Wating for HR Verification"
+#~ msgstr "Menunggu untuk Verifikasi HR"
+
+#~ msgid "Condition"
+#~ msgstr "Kondisi"
+
+#~ msgid "Compute"
+#~ msgstr "Hitung"
+
+#~ msgid "HR Manager"
+#~ msgstr "Manajer HR"
+
+#~ msgid "Search Passport"
+#~ msgstr "Cari Passport"
+
+#~ msgid "Next Month Date"
+#~ msgstr "Tanggal Bulan Depan"
+
+#~ msgid "Allowance Deduction Categoty"
+#~ msgstr "Kategori Penyisihan Pengurangan"
+
+#~ msgid "Draft Sheet"
+#~ msgstr "Lembar Konsep"
+
+#~ msgid "Date"
+#~ msgstr "Tanggal"
+
+#~ msgid "Phone No."
+#~ msgstr "No. Telepon"
+
+#~ msgid "Visa Expire Date"
+#~ msgstr "Tanggal Kadaluarsa Visa"
+
+#~ msgid "Salary On"
+#~ msgstr "Gaji Pada"
+
+#~ msgid "Label"
+#~ msgstr "Label"
+
+#~ msgid "Other No."
+#~ msgstr "No. Lain"
+
+#~ msgid "Number :"
+#~ msgstr "Nomor :"
+
+#~ msgid "Computation Overview"
+#~ msgstr "Ikhtisar Perhitungan"
+
+#~ msgid "Salary"
+#~ msgstr "Gaji"
+
+#~ msgid "Number"
+#~ msgstr "Nomor"
+
+#~ msgid "Passport No"
+#~ msgstr "Nomor Passport"
+
+#~ msgid "Allowances"
+#~ msgstr "Tunjangan"
+
+#~ msgid "Current Month Date"
+#~ msgstr "Tanggal Bulan saat ini"
+
+#~ msgid "Amount / Percentage"
+#~ msgstr "Jumlah / presentase"
+
+#~ msgid "Print Report"
+#~ msgstr "Cetak Laporan"
+
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
+#~ msgid "for period"
+#~ msgstr "untuk periode"
+
+#~ msgid "Total Salary"
+#~ msgstr "Jumlah Gaji"
+
+#~ msgid "Payroll Head"
+#~ msgstr "Kepala Penggajian Karyawan"
+
+#~ msgid "Function"
+#~ msgstr "Fungsi"
+
+#~ msgid "Dynamic Computation"
+#~ msgstr "Perhitungan Dinamis"
+
+#~ msgid "Basic Salary without Leave:"
+#~ msgstr "Gaji Pokok tanpa cuti"
+
+#~ msgid "Month"
+#~ msgstr "Bulan"
+
+#~ msgid "Allowance Deduction Heads"
+#~ msgstr "Pengurangan Tunjangan Kepala"
+
+#~ msgid "Gross Sal."
+#~ msgstr "Gaji Brutto"
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "Kepada Bapak/Ibu,"
+
+#~ msgid "Other Informations"
+#~ msgstr "Informasi Lainnya"
+
+#~ msgid "Category Name"
+#~ msgstr "Nama Kategori"
+
+#~ msgid "Net Sal."
+#~ msgstr "Gaji Bersih"
+
+#~ msgid "Wage Type"
+#~ msgstr "Jenis Upah"
+
+#~ msgid "Deduction -"
+#~ msgstr "Pengurangan"
+
+#~ msgid "Start Date"
+#~ msgstr "Tanggal Mulai"
+
+#~ msgid "The Passport No must be unique !"
+#~ msgstr "Nomor Passport Harus unik"
+
+#~ msgid "Number of Leaves"
+#~ msgstr "Nomor Cuti"
+
+#~ msgid "Advance"
+#~ msgstr "kenaikan"
+
+#~ msgid "Special Allowances and Deductions For Employee:"
+#~ msgstr "Tunjangan Khusus dan Pengurangan Bagi Karyawan:"
+
+#~ msgid "Cancel Sheet"
+#~ msgstr "Lembaran Dibatalkan"
+
+#~ msgid "Leaved Deduction"
+#~ msgstr "Pengurangan cuti"
+
+#~ msgid "Bank"
+#~ msgstr "Bank"
+
+#~ msgid "Total Payment"
+#~ msgstr "Total Pembayaran"
+
+#~ msgid "Leave Deductions Line:"
+#~ msgstr "Baris  Pengurangan Cuti :"
+
+#~ msgid "Company Deduction"
+#~ msgstr "Pengurangan Perusahaan"
+
+#~ msgid "Wating for Account Verification"
+#~ msgstr "Menunggu Verifikasi Account"
+
+#~ msgid "Contribution register based on company"
+#~ msgstr "Kontribusi pendaftaran berdasarkan  perusahaan"
+
+#~ msgid "Country"
+#~ msgstr "Negara"
+
+#~ msgid "Payroll Configurtion"
+#~ msgstr "Konfigurasi Penggajian Karyawan"
+
+#~ msgid "Other Id"
+#~ msgstr "ID Lain"
+
+#~ msgid "Employee Payslip"
+#~ msgstr "Slip Pembayaran Karyawan"
+
+#~ msgid "Letter Content"
+#~ msgstr "Konten Surat"
+
+#~ msgid "Allowance"
+#~ msgstr "Tunjangan"
+
+#~ msgid "No of Leaves"
+#~ msgstr "Nomor Cuti"
+
+#~ msgid "Bank Details"
+#~ msgstr "Perincian Bank"
+
+#, python-format
+#~ msgid "Please define bank account for the %s employee"
+#~ msgstr "Mohon tentukan rekening bank untuk %s karyawan"
+
+#~ msgid "Passport Issue Date"
+#~ msgstr "Edisi Tanggal Paspor"
+
+#~ msgid "Year Salary"
+#~ msgstr "Gaji Setahun"
+
+#~ msgid "Allowance / Deduction"
+#~ msgstr "Tunjangan / Pengurangan"
+
+#~ msgid "Bank Payment Advice"
+#~ msgstr "Saran Pembayaran Bank"
+
+#~ msgid "Contributions"
+#~ msgstr "Kontribusi"
diff --git a/addons/hr_payroll/i18n/it.po b/addons/hr_payroll/i18n/it.po
index 29d52dab0d5..d91ab4ca359 100644
--- a/addons/hr_payroll/i18n/it.po
+++ b/addons/hr_payroll/i18n/it.po
@@ -7,250 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-01-13 15:21+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Indirizzo email"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Basato"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Stipendio netto"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Ricalcola il foglio"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Dettaglio stipendio impiegati"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Dipartimento"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Raggruppa per..."
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Detrazioni"
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Stati"
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Giorni lavorativi"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Prestito"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Buste paga"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Report stipendio annuale"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Stipendio pagato"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Azienda"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "Il Manager"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "Dettagli lettera"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Imposta a \"Bozza\""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "Errore variabile: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Scadenza"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Altri"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Busta paga"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Dettaglio contratto:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Campo calcolato"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
-"Selezionare l'indirizzo bancario da cui lo stipendio sta per essere pagato"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Rifiuta"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Totale:"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Permessi"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Registra"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
-"Errore! Non è possibile selezionare un dipartimento di cui il dipendente è "
-"manager."
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Valore"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Nome dell'impiegato"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
 msgstr ""
 
 #. module: hr_payroll
@@ -259,260 +202,176 @@ msgid "Salary Computation"
 msgstr "Calcolo stipendio"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Importo"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Percentuale"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Linea busta baga"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Altre informazioni"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Detrazioni dipendente"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Altre detrazioni"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Festività pagate"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Raggruppa per..."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Data scadenza passaporto"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr "Attenzione !"
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Festività non pagate"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
-"Campo calcolato usato per calcoli interni, non inserire questo nel form"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Importo (in lettere) :"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Pagamento"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr "Linea busta baga"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "Numero identificativo"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Basato su"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "In attesa di verifica"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Risorse umane Busta paga"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Totale:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Pubblicato"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Tipo di permesso"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Data:"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Sub totale"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Pagamenti -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "N. VISA"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Da"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "Per stipendio"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Data fine"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr "Busta paga impiegato"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Detrazioni permessi"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "Valore Funzione"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Note:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Stato"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "Altre Linee"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -520,193 +379,183 @@ msgid "Employee"
 msgstr "Impiegato"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Formula"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Tipo"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "Email"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Errore!"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr "Netto base"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Stipendio lordo"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Altro pagamento"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Detrazioni"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Stipendio impiegato"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr "Importo fisso"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Totale per impiegato"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "Importo fisso"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "A"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr "Errore variabile!"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
+msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "Per il mese di"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Detrazione"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr "Busta paga"
@@ -718,319 +567,195 @@ msgstr ""
 "Errore! La data inizio contratto deve essere minore di quella di fine."
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr "Verifica completa HR"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "Sinceramente"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Importo netto"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "Dettaglio stipendio impiegati"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr "Linea funzione"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Altri:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Totale per azienda"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
-msgstr "D/C"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
-msgstr "Nazione e indirizzo"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Codice impiegato"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "Tipo di importo"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Categoria"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Bozza"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Nome Dipendente"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
+#: view:hr.salary.rule:0
+msgid "Conditions"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "Percentuale (%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
+#: view:hr.payslip:0
+msgid "Worked Day"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "per"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Contratti"
-
-#. module: hr_payroll
 #: view:hr.payroll.structure:0
 msgid "Employee Function"
 msgstr "Funzione impiegato"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Pagato"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "Pagare? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Convalida"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Titolo"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Utente"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Righe pagamento"
-
-#. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Attivo"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "Dettagli stipendi annuali"
-
-#. module: hr_payroll
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Errore! Non è possibile creare gerarchie ricorsive di impiegati."
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Condizione"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr "In attesa di verifica da HR"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Calcola"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Designation"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "Manager HR"
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Stipendio base"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1039,340 +764,276 @@ msgid "Companies"
 msgstr "Aziende"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Contratto"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Data"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "Data scadenza VISA"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
-msgstr "Cerca passaporto"
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "N. di Telefono"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "Etichetta"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Codice"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "Numero:"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Sequenza"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Numero"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Annulla"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "Chiudi"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Stipendio"
-
-#. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "Num. passaporto"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Passaporto"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Stipendio totale"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "per periodo"
-
-#. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
-msgid "Contribution Register"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "Email"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
-msgid "Calculations"
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
+msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Altre informazioni"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Mese"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
+#: view:hr.payslip.line:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Funzione"
+msgid "Worked Days"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr "Stati"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Gentile Signora/Signore,"
+msgid "Search Payslips"
+msgstr "Cerca buste paga"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
-msgstr "Stip. lordo"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Descrizione"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Data inizio"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr "Deduzione -"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ")"
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1384,246 +1045,218 @@ msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Tipo Retribuzione"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "Stip. netto"
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr "Il numero passaporto deve essere unico!"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
-msgstr "Copy text \t hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Indirizzo"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr "Numero di permessi"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Banca"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Nome"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "Paese"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Impiegati"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Conto bancario"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "Configurazione busta paga"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Totale"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "Num. di permessi"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
-msgstr "Altro ID"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Sequenza"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
-msgstr "Busta paga impiegato"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr "Contenuto lettera"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Stipendio annuale"
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modello non valido nella definizione dell'azione."
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr ""
+#~ msgid "Department"
+#~ msgstr "Dipartimento"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr ""
+#~ msgid "E-mail Address"
+#~ msgstr "Indirizzo email"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr "Cerca buste paga"
+#~ msgid "The Manager"
+#~ msgstr "Il Manager"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Totale"
+#~ msgid "Working Days"
+#~ msgstr "Giorni lavorativi"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr ""
+#~ msgid "Others"
+#~ msgstr "Altri"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
+#~ msgid "Leaves"
+#~ msgstr "Permessi"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr ""
+#~ "Errore! Non è possibile selezionare un dipartimento di cui il dipendente è "
+#~ "manager."
+
+#~ msgid "Percentage"
+#~ msgstr "Percentuale"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Data scadenza passaporto"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Importo (in lettere) :"
+
+#~ msgid "Leave Type"
+#~ msgstr "Tipo di permesso"
+
+#~ msgid "Date :"
+#~ msgstr "Data:"
+
+#~ msgid "Sub Total"
+#~ msgstr "Sub totale"
+
+#~ msgid "From"
+#~ msgstr "Da"
+
+#~ msgid "Notes:"
+#~ msgstr "Note:"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Errore!"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -1631,19 +1264,320 @@ msgstr ""
 #~ "Il nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
 #~ "speciale!"
 
+#~ msgid "Employees Salary Details"
+#~ msgstr "Dettaglio stipendio impiegati"
+
+#~ msgid "Net Salary"
+#~ msgstr "Stipendio netto"
+
+#~ msgid "Deductions:"
+#~ msgstr "Detrazioni"
+
+#~ msgid "Loan"
+#~ msgstr "Prestito"
+
+#~ msgid "Recompute Sheet"
+#~ msgstr "Ricalcola il foglio"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Stipendio pagato"
+
+#~ msgid "Year Salary Report"
+#~ msgstr "Report stipendio annuale"
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Dettaglio contratto:"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Nome dell'impiegato"
+
+#~ msgid "Value"
+#~ msgstr "Valore"
+
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Festività non pagate"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Festività pagate"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Detrazioni dipendente"
+
+#~ msgid "Based on"
+#~ msgstr "Basato su"
+
+#~ msgid "Payment"
+#~ msgstr "Pagamento"
+
+#~ msgid "Payments -"
+#~ msgstr "Pagamenti -"
+
+#~ msgid "Visa No"
+#~ msgstr "N. VISA"
+
+#~ msgid "By Salary"
+#~ msgstr "Per stipendio"
+
+#~ msgid "Wating for Verification"
+#~ msgstr "In attesa di verifica"
+
+#~ msgid "Formula"
+#~ msgstr "Formula"
+
+#~ msgid "Deductions"
+#~ msgstr "Detrazioni"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Stipendio lordo"
+
+#~ msgid "Other Payment"
+#~ msgstr "Altro pagamento"
+
+#~ msgid "Total By Employee"
+#~ msgstr "Totale per impiegato"
+
+#~ msgid "To"
+#~ msgstr "A"
+
+#~ msgid "Employee Salary"
+#~ msgstr "Stipendio impiegato"
+
+#~ msgid "Deduction"
+#~ msgstr "Detrazione"
+
+#~ msgid "For the month of"
+#~ msgstr "Per il mese di"
+
+#~ msgid "Complete HR Checking"
+#~ msgstr "Verifica completa HR"
+
+#~ msgid "Employees Salary Detail"
+#~ msgstr "Dettaglio stipendio impiegati"
+
+#~ msgid "Others:"
+#~ msgstr "Altri:"
+
+#~ msgid "Net Amount"
+#~ msgstr "Importo netto"
+
+#~ msgid "Employee Code"
+#~ msgstr "Codice impiegato"
+
+#~ msgid "Country & Address"
+#~ msgstr "Nazione e indirizzo"
+
+#, python-format
+#~ msgid "Variable Error: %s "
+#~ msgstr "Errore variabile: %s "
+
+#~ msgid "Letter Details"
+#~ msgstr "Dettagli lettera"
+
+#~ msgid "Register"
+#~ msgstr "Registra"
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr ""
+#~ "Selezionare l'indirizzo bancario da cui lo stipendio sta per essere pagato"
+
+#~ msgid "Calculaton Field"
+#~ msgstr "Campo calcolato"
+
+#~ msgid "Other Deduction"
+#~ msgstr "Altre detrazioni"
+
+#~ msgid ""
+#~ "Calculation field used for internal calculation, do not place this on form"
+#~ msgstr ""
+#~ "Campo calcolato usato per calcoli interni, non inserire questo nel form"
+
+#~ msgid "Leave Deductions"
+#~ msgstr "Detrazioni permessi"
+
+#~ msgid "Net Basic"
+#~ msgstr "Netto base"
+
+#~ msgid "hr.payroll.employees.detail"
+#~ msgstr "hr.payroll.employees.detail"
+
+#, python-format
+#~ msgid "Variable Error !"
+#~ msgstr "Errore variabile!"
+
+#~ msgid "Total By Company"
+#~ msgstr "Totale per azienda"
+
+#~ msgid "Human Resource Payroll"
+#~ msgstr "Risorse umane Busta paga"
+
+#~ msgid "End Date"
+#~ msgstr "Data fine"
+
+#~ msgid "Yours Sincerely"
+#~ msgstr "Sinceramente"
+
+#~ msgid "Function Line"
+#~ msgstr "Linea funzione"
+
+#~ msgid "Employee Name"
+#~ msgstr "Nome Dipendente"
+
+#~ msgid "For"
+#~ msgstr "per"
+
+#~ msgid "User"
+#~ msgstr "Utente"
+
+#~ msgid "Validation"
+#~ msgstr "Convalida"
+
+#~ msgid "Contracts"
+#~ msgstr "Contratti"
+
+#~ msgid "Title"
+#~ msgstr "Titolo"
+
+#~ msgid "Payment Lines"
+#~ msgstr "Righe pagamento"
+
+#~ msgid "Paid ? "
+#~ msgstr "Pagare? "
+
+#~ msgid "Paid"
+#~ msgstr "Pagato"
+
+#~ msgid "Wating for HR Verification"
+#~ msgstr "In attesa di verifica da HR"
+
+#~ msgid "Condition"
+#~ msgstr "Condizione"
+
+#~ msgid "Compute"
+#~ msgstr "Calcola"
+
+#~ msgid "Yearly Salary Details"
+#~ msgstr "Dettagli stipendi annuali"
+
 #~ msgid "Categoty Code"
 #~ msgstr "Codice categoria"
 
+#~ msgid "Basic Salary"
+#~ msgstr "Stipendio base"
+
+#~ msgid "HR Manager"
+#~ msgstr "Manager HR"
+
+#~ msgid "Search Passport"
+#~ msgstr "Cerca passaporto"
+
+#~ msgid "Label"
+#~ msgstr "Etichetta"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Phone No."
+#~ msgstr "N. di Telefono"
+
+#~ msgid "Visa Expire Date"
+#~ msgstr "Data scadenza VISA"
+
+#~ msgid "Number"
+#~ msgstr "Numero"
+
+#~ msgid "Number :"
+#~ msgstr "Numero:"
+
+#~ msgid "Salary"
+#~ msgstr "Stipendio"
+
+#~ msgid "E-mail"
+#~ msgstr "Email"
+
+#~ msgid "Passport No"
+#~ msgstr "Num. passaporto"
+
+#~ msgid "for period"
+#~ msgstr "per periodo"
+
+#~ msgid "Passport"
+#~ msgstr "Passaporto"
+
+#~ msgid "Total Salary"
+#~ msgstr "Stipendio totale"
+
+#~ msgid "Function"
+#~ msgstr "Funzione"
+
+#~ msgid "Month"
+#~ msgstr "Mese"
+
+#~ msgid "Other Informations"
+#~ msgstr "Altre informazioni"
+
+#~ msgid "Gross Sal."
+#~ msgstr "Stip. lordo"
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "Gentile Signora/Signore,"
+
+#~ msgid "Deduction -"
+#~ msgstr "Deduzione -"
+
+#~ msgid "Start Date"
+#~ msgstr "Data inizio"
+
 #~ msgid "Categoty Name"
 #~ msgstr "Nome categoria"
 
+#~ msgid "hr.payroll.year.salary"
+#~ msgstr "Copy text \t hr.payroll.year.salary"
+
+#~ msgid "Net Sal."
+#~ msgstr "Stip. netto"
+
+#~ msgid "Wage Type"
+#~ msgstr "Tipo Retribuzione"
+
+#~ msgid "Number of Leaves"
+#~ msgstr "Numero di permessi"
+
+#~ msgid "Bank"
+#~ msgstr "Banca"
+
+#~ msgid "The Passport No must be unique !"
+#~ msgstr "Il numero passaporto deve essere unico!"
+
+#~ msgid "Country"
+#~ msgstr "Paese"
+
+#~ msgid "Other Id"
+#~ msgstr "Altro ID"
+
+#~ msgid "No of Leaves"
+#~ msgstr "Num. di permessi"
+
+#~ msgid "Payroll Configurtion"
+#~ msgstr "Configurazione busta paga"
+
+#~ msgid "Year Salary"
+#~ msgstr "Stipendio annuale"
+
+#~ msgid "Employee Payslip"
+#~ msgstr "Busta paga impiegato"
+
+#~ msgid "Letter Content"
+#~ msgstr "Contenuto lettera"
+
+#~ msgid "D/C"
+#~ msgstr "D/C"
+
 #~ msgid "Account"
 #~ msgstr "Account"
 
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Attenzione !"
-
 #~ msgid "Expanse To"
 #~ msgstr "Espandi A"
 
@@ -1652,3 +1586,21 @@ msgstr ""
 
 #~ msgid "Miscelleanous"
 #~ msgstr "Varie"
+
+#~ msgid "Reject"
+#~ msgstr "Rifiuta"
+
+#~ msgid "Based"
+#~ msgstr "Basato"
+
+#~ msgid "Expire"
+#~ msgstr "Scadenza"
+
+#~ msgid "Posted"
+#~ msgstr "Pubblicato"
+
+#~ msgid "Function Value"
+#~ msgstr "Valore Funzione"
+
+#~ msgid "Other Lines"
+#~ msgstr "Altre Linee"
diff --git a/addons/hr_payroll/i18n/lo.po b/addons/hr_payroll/i18n/lo.po
index 0825bf9147b..5416376595b 100644
--- a/addons/hr_payroll/i18n/lo.po
+++ b/addons/hr_payroll/i18n/lo.po
@@ -7,247 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-01-19 15:58+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "ທີ່ຢູ່ອີ້ເມລ"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "ຫ້ອງການ"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
+#: view:hr.payslip:0
+msgid "States"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "ມື້ເຮັດວຽກ"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "ຢືມ"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "ເງີມເດືອນຈ່າຍເເລັວ"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "ບໍລິສັດ"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "ຜູ້ບໍຈັດການ"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "ໜັງສືລາຍລະອຽດ"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "ໝົດເວລາ"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "ຜູ້ອື່ນ"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
+#: report:contribution.register.lines:0
+msgid "Total:"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr ""
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
 msgstr ""
 
 #. module: hr_payroll
@@ -256,259 +202,176 @@ msgid "Salary Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-msgid "Other Information"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
 #: view:hr.payslip:0
-msgid "Group By..."
+msgid "Other Information"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
+msgid "Draft Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Identification No"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Identification No"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
+msgid "Total Working Days"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
+#: view:hr.payslip:0
+msgid "Confirm"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -516,193 +379,183 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
+#: view:hr.salary.rule:0
+msgid "Children definition"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
+msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr ""
@@ -713,190 +566,128 @@ msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
+#: view:hr.salary.rule:0
+msgid "Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
+#: view:hr.salary.rule:0
+msgid "Conditions"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
+#: view:hr.payslip:0
+msgid "Worked Day"
 msgstr ""
 
 #. module: hr_payroll
@@ -905,43 +696,9 @@ msgid "Employee Function"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
@@ -950,19 +707,14 @@ msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr ""
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
@@ -971,61 +723,38 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1034,340 +763,276 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
+#: view:hr.contribution.register:0
+msgid "Contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1379,240 +1044,184 @@ msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr ""
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr ""
+#~ msgid "Working Days"
+#~ msgstr "ມື້ເຮັດວຽກ"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr ""
+#~ msgid "E-mail Address"
+#~ msgstr "ທີ່ຢູ່ອີ້ເມລ"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr ""
+#~ msgid "Department"
+#~ msgstr "ຫ້ອງການ"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr ""
+#~ msgid "The Manager"
+#~ msgstr "ຜູ້ບໍຈັດການ"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr ""
+#~ msgid "Loan"
+#~ msgstr "ຢືມ"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr ""
+#~ msgid "Paid Salary"
+#~ msgstr "ເງີມເດືອນຈ່າຍເເລັວ"
+
+#~ msgid "Letter Details"
+#~ msgstr "ໜັງສືລາຍລະອຽດ"
+
+#~ msgid "Others"
+#~ msgstr "ຜູ້ອື່ນ"
+
+#~ msgid "Expire"
+#~ msgstr "ໝົດເວລາ"
diff --git a/addons/hr_payroll/i18n/mn.po b/addons/hr_payroll/i18n/mn.po
index 4be858eaa58..538c91d363b 100644
--- a/addons/hr_payroll/i18n/mn.po
+++ b/addons/hr_payroll/i18n/mn.po
@@ -7,249 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2010-10-28 08:59+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Имэйл хаяг"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Суурилсан"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Цэвэр цалин"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Цалингийн хуудсыг дахин тооцоолох"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Ажилтны цалингийн дэлгэрэнгүй"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
-msgstr "Үндсэн цалингаас тооцсон олголтууд"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Хэлтэс"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Суутгалууд:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "Тэтгэмж, бэлгэнд ашиглах эсэх"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Бүлэглэвэл..."
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Ажлын хоног"
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Төлөв"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Зээл"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Цалингийн төлбөрийн бүртгэл"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Цалингийн хуудас"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Жилийн цалингийн тайлан"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Төлбөр хийгдсэн цалин"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Компани"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "Менежер"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "Дэлгэрэнгүй захидал"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Ноороглох"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Дуусах огноо"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Хагас цалинтай амралт, чөлөө"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Бусад"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Гэрээний мэдээлэл:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Бодогдох талбар"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "Цалингийн төлбөрийг гаргах гэж байгаа банкийг сонгоно уу"
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "Банкны мэдэгдэл"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Татгалзах"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Бүгд:"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Амралт, чөлөө"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Бүртгүүлэх"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
-"Алдаа! Харьяа аль 1 ажилтан нь менежер байгаа хэлтсийг сонгож болохгүй."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Нийт суутгал"
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Утга"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Ажилтны нэр"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr "Ажил олгогчийн шимтгэлийн мөрүүд"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr "Тэмдэглэгээ"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -257,270 +202,176 @@ msgid "Salary Computation"
 msgstr "Цалингин тооцоолол"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Дүн"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Хувь"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Цалингийн хуудасны мөр"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Бусад мэдээлэл"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Ажилтны суутгал"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Бусад суутгал"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Цалинтай амралт, чөлөө"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Бүлэглэвэл..."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Пасспортын дуусах хугацаа"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr "Анхаар !"
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Цалингүй амралт, чөлөө"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Хүчинтэй байх хугацаа"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
-"Бодогдох талбар нь дотоод бодолтод ашиглагдах тул маягт дээр бүү байрлуул"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Дүн (үгээр) :"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Төлбөр"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr "Цалингийн хуудасны мөр"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "Ялгах дугаар"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Суурь утга"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Хянагдахаар хүлээгдэж байгаа"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Хүний нөөцийн цалин"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Бүгд:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Илгээсэн"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
-msgstr ""
-"Цалингийн ерөнхий систем\n"
-"       Ажилтны дэлгэрэнгүй\n"
-"       Ажилтны хөдөлмөрийн гэрээ\n"
-"       Паспорт дээр үндэслэсэн хөдөлмөрийн гэрээ\n"
-"       Олголт/ Суутгал\n"
-"       Үндсэн, Нийт, Цэвэр цалингийн тохиргоо\n"
-"       Ажилтны цалингийн хуудас\n"
-"       Сар бүрийн цалингийн цэсний бүртгэл\n"
-"       Амралт, чөлөөний удирдлагатай уялдаатай\n"
-"    "
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Амралт, чөлөөний төрөл"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Огноо"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Дэд дүн"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Төлбөр"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "Визний дугаар"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Хэдий хэмжээнээс"
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "Цалингаар"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Дуусах огноо"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr "Ажилтны цалингийн хуудас"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Амралт, чөлөөний суутгал"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "Эрх бүхий удирдлагын гарын үсэг"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "Үүргийн утга"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
-msgstr "Ажил олгогчийн шимтгэлийн мөр"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Тэмдэглэл:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Төлөв"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr "Мэдэгдэл дээрх төлбөрийн мөрүүд"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "Бусад мөрүүд"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Үүргийн параметрүүд"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
-msgstr "Ажил олгогчийн шимтгэл"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -528,193 +379,183 @@ msgid "Employee"
 msgstr "Ажилтан"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Суурийн томъёо"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr "Банкны мэдэгдлийн мөрүүд"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Төрөл"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "Э-мэйл"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Алдаа!"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Хуудсыг шалгах"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
-msgstr "Ажилтны долоо хоногт ажиллах хоногийн тоо"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr "Шинэ цалингийн хуудас"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr "Үндсэн цалин"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Бүтэн цалин"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "Нийт орлого"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
-msgstr "Ажилтны цалингийн хуулга"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Бусад төлбөр"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Суутгалууд"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "Ажлын зөвшөөрлийн дугаар"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Ажилтны цалин"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr "Тогтмол дүн"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Ажилтнаарх бүгд"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "Тогтмол дүн"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Хэмжээ хүртэл"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr "Хувьсагчийн алдаа!"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "Ажилчдын цалингийн дэлгэрэнгүй"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Цалингийн хуудас"
+msgid "PaySlip Batch"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
-msgstr "Банкны данс"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
-msgstr "Ажил, олгогчийн шимтгэлийн мөр"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "Тухайн сарын хувьд"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Суутгал"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr "Банкны мэдэгдэл, тэмдэглэл"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr "Цалингийн хуудас"
@@ -725,191 +566,129 @@ msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr "Зээлийн хэсэгчилсэн төлбөр"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr "Хүний нөөцөөс хянаж дуусах"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "Таныг хүндэтгэсэн"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr "Дугаар"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Цэвэр дүн"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Цалингийн шатлал"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "Ажилтны цалингийн мэдээлэл"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr "Үүргийн мөр"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr "Батлах"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Бусад:"
+#: view:hr.contract:0
+msgid "Payslip Info"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr "Үүргээр бодох"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "Ажилласан хоног"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Компанийнх нийт дүн"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
-msgstr "Улс/ хаяг"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Ажилтны код"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
-msgstr "Үндсэн цалин ба амралт, чөлөөний хоногийн ялгавар"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "Дүнгийн төрөл"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Олголт, суутгалын ангилал"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
-msgstr "Ажил олгогчийн шимтгэл"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
-msgstr "Олголт, суутгалын ангилал"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "Бүртгэлийг хэвлэх"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Ноорог"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr "Цалингийн орлого"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Үндсэн"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Бүх пасспортууд"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
-msgstr "Цалингийн бүртгэл"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Ажилтны нэр"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Пасспортын мэдээлэл"
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "Хувь (%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr "Цалингийн цэсний бүртгэл"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "Юунд"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Гэрээнүүд"
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr "Ажилласан хоног"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -917,44 +696,10 @@ msgid "Employee Function"
 msgstr "Ажилтны үүрэг"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Төлбөр хийгдсэн"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "Зөвшөөрөх"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "Төлсөн ? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Батламжлал"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Гарчиг"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr "Ажил олгогчийн шимтгэлийг хайх"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Хэрэглэгч"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Төлбөрийн мөрүүд"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -962,20 +707,15 @@ msgid "Compute Sheet"
 msgstr "Тооцоолох"
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Идэвхитэй"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr "Нөхцөл биелбэл энэ ангиллыг бодолтод хэрэглэнэ"
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "Жилийн цалингийн мэдээлэл"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
+msgstr ""
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
@@ -983,62 +723,39 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Алдаа! Ажилтны рекурс иерархийг үүсгэж болохгүй"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Нөхцөл"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr "Хүний нөөцөөс шалгахыг хүлээж байгаа"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
-msgstr "Төлбөрийн мэдэгдэл;"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Тооцоолох"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr "Цалингийн албан тушаал"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "Хүний нөөцийн менежер"
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Суурь цалин"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "Цалингийн мэдээлэл"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
-msgstr "Олголт суутгалын ангилал"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1046,346 +763,276 @@ msgid "Companies"
 msgstr "Компаниуд"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr "Эрх бүхий удирдлагын гарын үсэг"
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Гэрээ"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
-msgstr "Ноорог хуудас"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
-msgstr "Дараагийн сар(аль 1 огноо)"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Огноо"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "Виз дуусах хугацаа"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
-msgstr "Пасспортыг хайх"
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr "Ажил олгогчийн даах суутгал"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "Утасны дугаар"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
-msgstr "Ажил олгогчийн даах суутгал"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "Шошго"
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
-msgstr "Ажил олгогчийн даах суутгал"
+msgid "Refund"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
-msgstr "Бусад дугаар"
+#: view:hr.salary.rule:0
+msgid "Company contribution"
+msgstr "Ажил олгогчийн даах суутгал"
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Код"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
-msgstr "Төлбөрийн мэдэгдэл"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "Дугаар:"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Дараалал"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
-"Энэ нь голдуу үндсэн цалинг суурь болгон % талбарыг утгыг ашиглах боловч энэ "
-"basic(үндсэн) хувьсагчаас гадна олголт суутгалын бүх ангиллыг кодыг жижгээр "
-"бичин ашиглаж болно."
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
-msgstr "Хамрах сар"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Дугаар"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr "Цалингийн шатлал"
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr "Ажил олгогчийн даах суутгалын мөр"
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Цуцлах"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "Хаах"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "Дүн / Хувь"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Олголтууд"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr "Энэ сар (аль 1 огноо)"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Цалин"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "Пасспортын дугаар"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Пасспорт"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Нийт цалин"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "Мөчлөгт"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr "Цалингийн толгой"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr "Ажил олгогчийн даах суутгалын бүртгэл"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "И-мэйл"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr "Хэвлэх"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
-msgstr "Олголт, суутгалын ангилал"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "Тайлан хэвлэх"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr "Тооцоолол"
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-"Хэрэв ажилтан 5%-даах ба энд 0.50 гэсэн утга олгосон бол компани нь ажилтны "
-"5% дээр нэмж 50%-ийг даана гэсэн үг. 1.00 даах харьцаа тодорхойлбол компани "
-"бүрэн(100%) даана."
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Бусад мэдээлэл"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Сар"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr "Олгосон нь"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr "Динамик тооцоолол"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr "Амралт, чөлөөг тооцоогүй үндсэн цалин"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Үүрэг"
+msgid "Worked Days"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr "Төлөв"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Эрхэм ноён/ хатагтай"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
-msgstr "Олголт, суутгалын ангилал"
+msgid "Search Payslips"
+msgstr "Цалингийн хуудсыг хайх"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
-msgstr "Бүтэн цалин."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Тодорхойлолт"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Эхлэх огноо"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr "Суутгал -"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr "Ажил олгогчийн даах суутгалын бүртгэл"
 
@@ -1397,256 +1044,226 @@ msgid "Payroll"
 msgstr "Цалингийн цэс"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Цалингийн төрөл"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "Цэвэр уалин."
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Хаяг"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr "Цалингийн хуудасны мөр"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr "Амралт, чөлөөний тоо"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Банк"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr "Цуцлах"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "Урьдчилгаа"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
-msgstr "Тусгай олголт, суутгал:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Нэр"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr "Амралт, чөлөөний суутгал"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "Улс"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Ажилчид"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Банкны данс"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr "Компанид суурилсан ажил олгогчийн даах суутгалын бүртгэл"
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr "Цалин бодох дарааллыг зохицуулахад хэрэглэнэ"
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Бүх төлбөр"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr "Амралт, чөлөөний суутгалын мөр"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr "Нягтлан шалгахыг хүлээж байна"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
-msgstr "Компанийн суутгал"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "Цалингийн тохиргоо"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Нийт"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr "Паспорт олгосон огноо"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr "Олголт"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "Амралт, чөлөөний тоо"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
-msgstr "Бусад дугаар"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Банкны мэдээлэл"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
-msgstr "Цалингийн хуудасны дугаар"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Дараалал"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
-msgstr "Ажилтны цалингийн хуудас"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr "Захидлын агуулга"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Жилийн цалин"
+#~ msgid "Working Days"
+#~ msgstr "Ажлын хоног"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr "Олголт / Суутгал"
+#~ msgid "E-mail Address"
+#~ msgstr "Имэйл хаяг"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr "Банкны төлбөрийн мэдэгдэл"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr "Цалингийн хуудсыг хайх"
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Нийт"
+#~ msgid "Department"
+#~ msgstr "Хэлтэс"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr "Ажил олгогчийн даах суутгал"
+#~ msgid "Deductions:"
+#~ msgstr "Суутгалууд:"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+#~ msgid "Others"
+#~ msgstr "Бусад"
 
 #~ msgid "Calculations Rules"
 #~ msgstr "Тооцоолох дүрмүүд"
 
+#~ msgid "The Manager"
+#~ msgstr "Менежер"
+
+#~ msgid "Salary"
+#~ msgstr "Цалин"
+
 #~ msgid "Account"
 #~ msgstr "Данс"
 
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Анхаар !"
+#~ msgid "Name of the Employee"
+#~ msgstr "Ажилтны нэр"
+
+#~ msgid "Register"
+#~ msgstr "Бүртгүүлэх"
+
+#~ msgid "Value"
+#~ msgstr "Утга"
+
+#~ msgid "Employees Salary Details"
+#~ msgstr "Ажилтны цалингийн дэлгэрэнгүй"
+
+#~ msgid "Other Deduction"
+#~ msgstr "Бусад суутгал"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Пасспортын дуусах хугацаа"
+
+#~ msgid "Bank"
+#~ msgstr "Банк"
+
+#~ msgid "Payment"
+#~ msgstr "Төлбөр"
+
+#~ msgid "Passport Detail"
+#~ msgstr "Пасспортын мэдээлэл"
+
+#~ msgid "Sub Total"
+#~ msgstr "Дэд дүн"
+
+#~ msgid "Visa No"
+#~ msgstr "Визний дугаар"
+
+#~ msgid "By Salary"
+#~ msgstr "Цалингаар"
 
 #~ msgid "Employee Year Salary"
 #~ msgstr "Ажилтны жилийн цалин"
@@ -1654,9 +1271,21 @@ msgstr "Ажил олгогчийн даах суутгал"
 #~ msgid "Error! You can not create recursive analytic accounts."
 #~ msgstr "Алдаа! Та цикл хэлбэрийн аналитик данс үүсгэх боломжгүй."
 
+#~ msgid "Human Resource Payroll"
+#~ msgstr "Хүний нөөцийн цалин"
+
+#~ msgid "Passport"
+#~ msgstr "Пасспорт"
+
 #~ msgid "Amount Information"
 #~ msgstr "Дүнгийн мэдээлэл"
 
+#~ msgid "Notes:"
+#~ msgstr "Тэмдэглэл:"
+
+#~ msgid "End Date"
+#~ msgstr "Дуусах огноо"
+
 #~ msgid "Salary Detail"
 #~ msgstr "Цалингийн мэдээлэл"
 
@@ -1664,30 +1293,75 @@ msgstr "Ажил олгогчийн даах суутгал"
 #~ msgid "Integrity Error !"
 #~ msgstr "Нэгтгэлийн алдаа !"
 
+#~ msgid "Verify Sheet"
+#~ msgstr "Хуудсыг шалгах"
+
 #~ msgid "Accounting Informations"
 #~ msgstr "Санхүүгийн мэдээлэл"
 
-#~ msgid "Print"
-#~ msgstr "Хэвлэх"
+#~ msgid "Type"
+#~ msgstr "Төрөл"
 
 #~ msgid "Miscelleanous"
 #~ msgstr "Бусад"
 
+#~ msgid "Start Date"
+#~ msgstr "Эхлэх огноо"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Бүтэн цалин"
+
+#~ msgid "Total Earnings"
+#~ msgstr "Нийт орлого"
+
+#~ msgid "Other Payment"
+#~ msgstr "Бусад төлбөр"
+
 #~ msgid "Basic Salary - Leaves"
 #~ msgstr "Үндсэн цалин - Чөлөө"
 
+#~ msgid "Employee Salary"
+#~ msgstr "Ажилтны цалин"
+
 #~ msgid "Year Salary Detail"
 #~ msgstr "Жилийн цалингийн мэдээлэл"
 
+#~ msgid "Deduction"
+#~ msgstr "Суутгал"
+
+#~ msgid "Yours Sincerely"
+#~ msgstr "Таныг хүндэтгэсэн"
+
 #~ msgid "Expense"
 #~ msgstr "Зардал"
 
 #~ msgid "Payment Entries"
 #~ msgstr "Төлбөрийн бичилт"
 
+#~ msgid "Allowances"
+#~ msgstr "Олголтууд"
+
 #~ msgid "Function of the Employee"
 #~ msgstr "Ажилтны үүрэг"
 
+#~ msgid "Employees Salary Detail"
+#~ msgstr "Ажилтны цалингийн мэдээлэл"
+
+#~ msgid "Others:"
+#~ msgstr "Бусад:"
+
+#~ msgid "Net Amount"
+#~ msgstr "Цэвэр дүн"
+
+#~ msgid "Contracts"
+#~ msgstr "Гэрээнүүд"
+
+#~ msgid "Employee Code"
+#~ msgstr "Ажилтны код"
+
 #~ msgid "Passport and Visa"
 #~ msgstr "Пасспорт ба Виз"
 
@@ -1706,50 +1380,128 @@ msgstr "Ажил олгогчийн даах суутгал"
 #~ msgid "Salary Account"
 #~ msgstr "Цалингийн данс"
 
+#~ msgid "Employee Name"
+#~ msgstr "Ажилтны нэр"
+
+#~ msgid "All Passports"
+#~ msgstr "Бүх пасспортууд"
+
 #~ msgid "Employee Contract"
 #~ msgstr "Ажилтны гэрээ"
 
+#~ msgid "For"
+#~ msgstr "Юунд"
+
 #~ msgid "Expanse Journal"
 #~ msgstr "Зардлын журнал"
 
+#~ msgid "Reject"
+#~ msgstr "Татгалзах"
+
+#~ msgid "Title"
+#~ msgstr "Гарчиг"
+
 #~ msgid "Allowance/Deduction Heads"
 #~ msgstr "Олголт/Суутгалын толгой"
 
 #~ msgid "Working Days / Week"
 #~ msgstr "Ажлын хоног / Долоо хоног"
 
+#~ msgid "Payment Lines"
+#~ msgstr "Төлбөрийн мөрүүд"
+
+#~ msgid "Basic Salary"
+#~ msgstr "Суурь цалин"
+
+#~ msgid "HR Manager"
+#~ msgstr "Хүний нөөцийн менежер"
+
+#~ msgid "Condition"
+#~ msgstr "Нөхцөл"
+
+#~ msgid "Compute"
+#~ msgstr "Тооцоолох"
+
 #~ msgid "Employee Account"
 #~ msgstr "Ажилтны данс"
 
+#~ msgid "Yearly Salary Details"
+#~ msgstr "Жилийн цалингийн мэдээлэл"
+
+#~ msgid "Salary Information"
+#~ msgstr "Цалингийн мэдээлэл"
+
 #~ msgid "Categoty Code"
 #~ msgstr "Ангиллын код"
 
+#~ msgid "Allowance Deduction Categoty"
+#~ msgstr "Олголт суутгалын ангилал"
+
+#~ msgid "Date"
+#~ msgstr "Огноо"
+
+#~ msgid "Phone No."
+#~ msgstr "Утасны дугаар"
+
+#~ msgid "Visa Expire Date"
+#~ msgstr "Виз дуусах хугацаа"
+
 #~ msgid "General Account"
 #~ msgstr "Ерөнхий данс"
 
+#~ msgid "Loan"
+#~ msgstr "Зээл"
+
 #~ msgid "Process"
 #~ msgstr "Процесс"
 
+#~ msgid "Payroll Head"
+#~ msgstr "Цалингийн толгой"
+
 #~ msgid "Included in Salary ?"
 #~ msgstr "Цалинд багтсан ?"
 
+#~ msgid "Number"
+#~ msgstr "Дугаар"
+
 #~ msgid "General Information"
 #~ msgstr "Ерөнхий мэдээлэл"
 
+#~ msgid "Contract Detail:"
+#~ msgstr "Гэрээний мэдээлэл:"
+
+#~ msgid "Amount / Percentage"
+#~ msgstr "Дүн / Хувь"
+
+#~ msgid "Allowance / Deduction"
+#~ msgstr "Олголт / Суутгал"
+
 #~ msgid "Account Information"
 #~ msgstr "Дансны мэдээлэл"
 
 #~ msgid "Generalities"
 #~ msgstr "Ерөнхий"
 
+#~ msgid "E-mail"
+#~ msgstr "И-мэйл"
+
 #~ msgid "Contract Duration"
 #~ msgstr "Гэрээний үргэлжлэх хугацаа"
 
+#~ msgid "Year Salary"
+#~ msgstr "Жилийн цалин"
+
+#~ msgid "Function"
+#~ msgstr "Үүрэг"
+
 #~ msgid "Categoty Name"
 #~ msgstr "Ангиллын нэр"
 
-#~ msgid "Notes"
-#~ msgstr "Тэмдэглэгээ"
+#~ msgid "Advance"
+#~ msgstr "Урьдчилгаа"
+
+#~ msgid "Special Allowances and Deductions For Employee:"
+#~ msgstr "Тусгай олголт, суутгал:"
 
 #~ msgid "Fiscal Year"
 #~ msgstr "Санхүүгийн жил"
@@ -1757,9 +1509,24 @@ msgstr "Ажил олгогчийн даах суутгал"
 #~ msgid "Employee Functions"
 #~ msgstr "Ажилтны үүрэг"
 
+#~ msgid "Allowance"
+#~ msgstr "Олголт"
+
+#~ msgid "Bank Details"
+#~ msgstr "Банкны мэдээлэл"
+
+#~ msgid "Deductions"
+#~ msgstr "Суутгалууд"
+
+#~ msgid "Total Deductions"
+#~ msgstr "Нийт суутгал"
+
 #~ msgid "Print Salary Structure"
 #~ msgstr "Цалингийн задаргааг хэвлэх"
 
+#~ msgid "Net Salary"
+#~ msgstr "Цэвэр цалин"
+
 #~ msgid "Employee No"
 #~ msgstr "Ажилтны дугаар"
 
@@ -1783,12 +1550,24 @@ msgstr "Ажил олгогчийн даах суутгал"
 #~ "    * Амралт, чөлөө\n"
 #~ "    "
 
+#~ msgid "Paid ? "
+#~ msgstr "Төлсөн ? "
+
+#~ msgid "Year Salary Report"
+#~ msgstr "Жилийн цалингийн тайлан"
+
 #~ msgid "Employee Payable Account"
 #~ msgstr "Ажилтны өглөгийн данс"
 
 #~ msgid "Payment From"
 #~ msgstr "Төлөгч"
 
+#~ msgid "Work Permit No"
+#~ msgstr "Ажлын зөвшөөрлийн дугаар"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Дүн (үгээр) :"
+
 #~ msgid "Analytic Account"
 #~ msgstr "Аналитик данс"
 
@@ -1801,5 +1580,406 @@ msgstr "Ажил олгогчийн даах суутгал"
 #~ msgid "Unite"
 #~ msgstr "Нэгтгэх"
 
+#~ msgid "Recompute Sheet"
+#~ msgstr "Цалингийн хуудсыг дахин тооцоолох"
+
+#~ msgid "Based"
+#~ msgstr "Суурилсан"
+
+#~ msgid "Allowances with Basic:"
+#~ msgstr "Үндсэн цалингаас тооцсон олголтууд"
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "Цалингийн төлбөрийн бүртгэл"
+
+#~ msgid "Use for Gratuity ?"
+#~ msgstr "Тэтгэмж, бэлгэнд ашиглах эсэх"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Төлбөр хийгдсэн цалин"
+
+#~ msgid "Half-Pay Holiday"
+#~ msgstr "Хагас цалинтай амралт, чөлөө"
+
+#~ msgid "Letter Details"
+#~ msgstr "Дэлгэрэнгүй захидал"
+
+#~ msgid "Calculaton Field"
+#~ msgstr "Бодогдох талбар"
+
+#~ msgid "Expire"
+#~ msgstr "Дуусах огноо"
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr "Цалингийн төлбөрийг гаргах гэж байгаа банкийг сонгоно уу"
+
+#~ msgid "Bank Advice"
+#~ msgstr "Банкны мэдэгдэл"
+
+#~ msgid "Leaves"
+#~ msgstr "Амралт, чөлөө"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr ""
+#~ "Алдаа! Харьяа аль 1 ажилтан нь менежер байгаа хэлтсийг сонгож болохгүй."
+
+#~ msgid "Register Lines"
+#~ msgstr "Ажил олгогчийн шимтгэлийн мөрүүд"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Цалинтай амралт, чөлөө"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Ажилтны суутгал"
+
+#~ msgid "Percentage"
+#~ msgstr "Хувь"
+
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Цалингүй амралт, чөлөө"
+
+#~ msgid ""
+#~ "Calculation field used for internal calculation, do not place this on form"
+#~ msgstr ""
+#~ "Бодогдох талбар нь дотоод бодолтод ашиглагдах тул маягт дээр бүү байрлуул"
+
+#~ msgid "Wating for Verification"
+#~ msgstr "Хянагдахаар хүлээгдэж байгаа"
+
+#~ msgid "Valid From"
+#~ msgstr "Хүчинтэй байх хугацаа"
+
+#~ msgid "Based on"
+#~ msgstr "Суурь утга"
+
+#~ msgid ""
+#~ "Generic Payroll system\n"
+#~ "    * Employee Details\n"
+#~ "    * Employee Contracts\n"
+#~ "    * Passport based Contract\n"
+#~ "    * Allowances / Deductions\n"
+#~ "    * Allow to configure Basic / Grows / Net Salary\n"
+#~ "    * Employee Payslip\n"
+#~ "    * Monthly Payroll Register\n"
+#~ "    * Integrated with Holiday Management\n"
+#~ "    "
+#~ msgstr ""
+#~ "Цалингийн ерөнхий систем\n"
+#~ "       Ажилтны дэлгэрэнгүй\n"
+#~ "       Ажилтны хөдөлмөрийн гэрээ\n"
+#~ "       Паспорт дээр үндэслэсэн хөдөлмөрийн гэрээ\n"
+#~ "       Олголт/ Суутгал\n"
+#~ "       Үндсэн, Нийт, Цэвэр цалингийн тохиргоо\n"
+#~ "       Ажилтны цалингийн хуудас\n"
+#~ "       Сар бүрийн цалингийн цэсний бүртгэл\n"
+#~ "       Амралт, чөлөөний удирдлагатай уялдаатай\n"
+#~ "    "
+
+#~ msgid "Leave Type"
+#~ msgstr "Амралт, чөлөөний төрөл"
+
+#~ msgid "Date :"
+#~ msgstr "Огноо"
+
+#~ msgid "Payments -"
+#~ msgstr "Төлбөр"
+
+#~ msgid "Posted"
+#~ msgstr "Илгээсэн"
+
+#~ msgid "From"
+#~ msgstr "Хэдий хэмжээнээс"
+
+#~ msgid "Leave Deductions"
+#~ msgstr "Амралт, чөлөөний суутгал"
+
+#~ msgid "Authorised Signature"
+#~ msgstr "Эрх бүхий удирдлагын гарын үсэг"
+
+#~ msgid "Contribution Register Line"
+#~ msgstr "Ажил олгогчийн шимтгэлийн мөр"
+
+#~ msgid "Function Value"
+#~ msgstr "Үүргийн утга"
+
+#~ msgid "Paymeny Lines"
+#~ msgstr "Мэдэгдэл дээрх төлбөрийн мөрүүд"
+
+#~ msgid "Other Lines"
+#~ msgstr "Бусад мөрүүд"
+
+#~ msgid "Formula"
+#~ msgstr "Суурийн томъёо"
+
+#~ msgid "Company Contributions"
+#~ msgstr "Ажил олгогчийн шимтгэл"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Алдаа!"
+
+#~ msgid "Function Arguments"
+#~ msgstr "Үүргийн параметрүүд"
+
+#~ msgid "Bank Advice Lines"
+#~ msgstr "Банкны мэдэгдлийн мөрүүд"
+
+#~ msgid "New Slip"
+#~ msgstr "Шинэ цалингийн хуудас"
+
+#~ msgid "Employee Salary Statement"
+#~ msgstr "Ажилтны цалингийн хуулга"
+
+#~ msgid "Net Basic"
+#~ msgstr "Үндсэн цалин"
+
+#~ msgid "No of Working days / week for an employee"
+#~ msgstr "Ажилтны долоо хоногт ажиллах хоногийн тоо"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Харагдацын архитектурын xml буруу байна"
+
+#, python-format
+#~ msgid "Variable Error !"
+#~ msgstr "Хувьсагчийн алдаа!"
+
+#~ msgid "Total By Employee"
+#~ msgstr "Ажилтнаарх бүгд"
+
+#~ msgid "To"
+#~ msgstr "Хэмжээ хүртэл"
+
+#~ msgid "hr.payroll.employees.detail"
+#~ msgstr "Ажилчдын цалингийн дэлгэрэнгүй"
+
+#~ msgid "For the month of"
+#~ msgstr "Тухайн сарын хувьд"
+
+#~ msgid "Pay Salary"
+#~ msgstr "Цалингийн хуудас"
+
+#~ msgid "Contribution Lines"
+#~ msgstr "Ажил, олгогчийн шимтгэлийн мөр"
+
+#~ msgid "Bank Advice Note"
+#~ msgstr "Банкны мэдэгдэл, тэмдэглэл"
+
+#~ msgid "Loan Installment"
+#~ msgstr "Зээлийн хэсэгчилсэн төлбөр"
+
+#~ msgid "Bank Account A/C"
+#~ msgstr "Банкны данс"
+
+#~ msgid "Salary Structure:"
+#~ msgstr "Цалингийн шатлал"
+
+#~ msgid "Confirm Sheet"
+#~ msgstr "Батлах"
+
+#~ msgid "Function Line"
+#~ msgstr "Үүргийн мөр"
+
+#~ msgid "Function Calculation"
+#~ msgstr "Үүргээр бодох"
+
+#~ msgid "SI. No."
+#~ msgstr "Дугаар"
+
+#~ msgid "Complete HR Checking"
+#~ msgstr "Хүний нөөцөөс хянаж дуусах"
+
+#~ msgid "Company Contribution"
+#~ msgstr "Ажил олгогчийн шимтгэл"
+
+#~ msgid "Basic Salary – Leaves"
+#~ msgstr "Үндсэн цалин ба амралт, чөлөөний хоногийн ялгавар"
+
+#~ msgid "Country & Address"
+#~ msgstr "Улс/ хаяг"
+
+#~ msgid "Total By Company"
+#~ msgstr "Компанийнх нийт дүн"
+
+#~ msgid "Heads"
+#~ msgstr "Олголт, суутгалын ангилал"
+
+#~ msgid "Print Statement"
+#~ msgstr "Бүртгэлийг хэвлэх"
+
+#~ msgid "Salary Register"
+#~ msgstr "Цалингийн бүртгэл"
+
+#~ msgid "Earnings"
+#~ msgstr "Цалингийн орлого"
+
+#~ msgid "Basic"
+#~ msgstr "Үндсэн"
+
+#~ msgid "Payroll Register"
+#~ msgstr "Цалингийн цэсний бүртгэл"
+
+#~ msgid "Approve Sheet"
+#~ msgstr "Зөвшөөрөх"
+
+#~ msgid "Paid"
+#~ msgstr "Төлбөр хийгдсэн"
+
+#~ msgid "Validation"
+#~ msgstr "Батламжлал"
+
+#~ msgid "Search Company Contribution"
+#~ msgstr "Ажил олгогчийн шимтгэлийг хайх"
+
+#~ msgid "Applied this head for calculation if condition is true"
+#~ msgstr "Нөхцөл биелбэл энэ ангиллыг бодолтод хэрэглэнэ"
+
+#~ msgid "Payment Advice:"
+#~ msgstr "Төлбөрийн мэдэгдэл;"
+
+#~ msgid "User"
+#~ msgstr "Хэрэглэгч"
+
+#~ msgid "Wating for HR Verification"
+#~ msgstr "Хүний нөөцөөс шалгахыг хүлээж байгаа"
+
+#~ msgid "Search Passport"
+#~ msgstr "Пасспортыг хайх"
+
+#~ msgid "Next Month Date"
+#~ msgstr "Дараагийн сар(аль 1 огноо)"
+
+#~ msgid "Label"
+#~ msgstr "Шошго"
+
+#~ msgid "Draft Sheet"
+#~ msgstr "Ноорог хуудас"
+
+#~ msgid "Salary On"
+#~ msgstr "Хамрах сар"
+
+#~ msgid "Payment Advice"
+#~ msgstr "Төлбөрийн мэдэгдэл"
+
+#~ msgid "Other No."
+#~ msgstr "Бусад дугаар"
+
+#~ msgid ""
+#~ "This will use to computer the % fields values, in general its on basic, but "
+#~ "You can use all heads code field in small letter as a variable name i.e. "
+#~ "hra, ma, lta, etc...., also you can use, static varible basic"
+#~ msgstr ""
+#~ "Энэ нь голдуу үндсэн цалинг суурь болгон % талбарыг утгыг ашиглах боловч энэ "
+#~ "basic(үндсэн) хувьсагчаас гадна олголт суутгалын бүх ангиллыг кодыг жижгээр "
+#~ "бичин ашиглаж болно."
+
+#~ msgid "Number :"
+#~ msgstr "Дугаар:"
+
+#~ msgid "Passport No"
+#~ msgstr "Пасспортын дугаар"
+
+#~ msgid "for period"
+#~ msgstr "Мөчлөгт"
+
+#~ msgid "Total Salary"
+#~ msgstr "Нийт цалин"
+
+#~ msgid "Current Month Date"
+#~ msgstr "Энэ сар (аль 1 огноо)"
+
+#~ msgid "Print Report"
+#~ msgstr "Тайлан хэвлэх"
+
+#~ msgid "Salary Heads"
+#~ msgstr "Олголт, суутгалын ангилал"
+
+#~ msgid "Month"
+#~ msgstr "Сар"
+
+#~ msgid "Issue"
+#~ msgstr "Олгосон нь"
+
+#~ msgid "Other Informations"
+#~ msgstr "Бусад мэдээлэл"
+
+#~ msgid "Dynamic Computation"
+#~ msgstr "Динамик тооцоолол"
+
+#~ msgid "Basic Salary without Leave:"
+#~ msgstr "Амралт, чөлөөг тооцоогүй үндсэн цалин"
+
+#~ msgid "Allowance Deduction Heads"
+#~ msgstr "Олголт, суутгалын ангилал"
+
+#~ msgid "Gross Sal."
+#~ msgstr "Бүтэн цалин."
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "Эрхэм ноён/ хатагтай"
+
+#~ msgid "Deduction -"
+#~ msgstr "Суутгал -"
+
+#~ msgid "Slip Line"
+#~ msgstr "Цалингийн хуудасны мөр"
+
+#~ msgid "Net Sal."
+#~ msgstr "Цэвэр уалин."
+
+#~ msgid "Wage Type"
+#~ msgstr "Цалингийн төрөл"
+
+#~ msgid "Country"
+#~ msgstr "Улс"
+
+#~ msgid "Number of Leaves"
+#~ msgstr "Амралт, чөлөөний тоо"
+
+#~ msgid "Cancel Sheet"
+#~ msgstr "Цуцлах"
+
+#~ msgid "Leaved Deduction"
+#~ msgstr "Амралт, чөлөөний суутгал"
+
+#~ msgid "Total Payment"
+#~ msgstr "Бүх төлбөр"
+
+#~ msgid "Leave Deductions Line:"
+#~ msgstr "Амралт, чөлөөний суутгалын мөр"
+
+#~ msgid "Company Deduction"
+#~ msgstr "Компанийн суутгал"
+
+#~ msgid "Wating for Account Verification"
+#~ msgstr "Нягтлан шалгахыг хүлээж байна"
+
+#~ msgid "Contribution register based on company"
+#~ msgstr "Компанид суурилсан ажил олгогчийн даах суутгалын бүртгэл"
+
+#~ msgid "No of Leaves"
+#~ msgstr "Амралт, чөлөөний тоо"
+
+#~ msgid "Passport Issue Date"
+#~ msgstr "Паспорт олгосон огноо"
+
+#~ msgid "Payroll Configurtion"
+#~ msgstr "Цалингийн тохиргоо"
+
+#~ msgid "Other Id"
+#~ msgstr "Бусад дугаар"
+
+#~ msgid "Slip ID"
+#~ msgstr "Цалингийн хуудасны дугаар"
+
+#~ msgid "Employee Payslip"
+#~ msgstr "Ажилтны цалингийн хуудас"
+
+#~ msgid "Letter Content"
+#~ msgstr "Захидлын агуулга"
+
+#~ msgid "Bank Payment Advice"
+#~ msgstr "Банкны төлбөрийн мэдэгдэл"
+
+#~ msgid "Contributions"
+#~ msgstr "Ажил олгогчийн даах суутгал"
diff --git a/addons/hr_payroll/i18n/nl.po b/addons/hr_payroll/i18n/nl.po
index 911049743e1..13892fa769d 100644
--- a/addons/hr_payroll/i18n/nl.po
+++ b/addons/hr_payroll/i18n/nl.po
@@ -7,247 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-01-10 16:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:15+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
+#: view:hr.payslip:0
+msgid "States"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
-msgstr ""
+msgstr "Salarisstrook"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
-msgstr ""
+msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
+#: view:hr.payslip:0
+msgid "Done Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
-msgstr ""
+msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Zet op concept"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr ""
+msgstr "Loonafschrift"
 
 #. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
+#: report:contribution.register.lines:0
+msgid "Total:"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr ""
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
 msgstr ""
 
 #. module: hr_payroll
@@ -256,259 +202,176 @@ msgid "Salary Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-msgid "Other Information"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
 #: view:hr.payslip:0
-msgid "Group By..."
+msgid "Other Information"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
+msgid "Draft Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Identification No"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Identification No"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
+msgid "Total Working Days"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
+#: view:hr.payslip:0
+msgid "Confirm"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
-msgstr ""
+msgstr "Loonstrook werkenemer"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -516,193 +379,183 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: view:hr.salary.rule:0
+msgid "Children definition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
+msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr ""
@@ -713,190 +566,128 @@ msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
+#: view:hr.salary.rule:0
+msgid "Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
+#: view:hr.salary.rule:0
+msgid "Conditions"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
-msgstr ""
+msgstr "Percentage (%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
+#: view:hr.payslip:0
+msgid "Worked Day"
 msgstr ""
 
 #. module: hr_payroll
@@ -905,43 +696,9 @@ msgid "Employee Function"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
@@ -950,19 +707,14 @@ msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr ""
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
@@ -971,61 +723,38 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1034,340 +763,276 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
+#: view:hr.contribution.register:0
+msgid "Contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Other Informations"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1379,240 +1044,281 @@ msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr ""
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr ""
+#~ msgid "Employees Salary Details"
+#~ msgstr "Loondetail werknemers"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr ""
+#~ msgid "Net Salary"
+#~ msgstr "Nettoloon"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr ""
+#~ msgid "Working Days"
+#~ msgstr "Werkdagen"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr ""
+#~ msgid "E-mail Address"
+#~ msgstr "E-mail adres"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr ""
+#~ msgid "Year Salary Report"
+#~ msgstr "Jaarloon rapport"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr ""
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr "Kies de bankgegevens vanwaar de loon wordt uitgeschreven."
+
+#, python-format
+#~ msgid "Variable Error: %s "
+#~ msgstr "Variabele fout: %s "
+
+#~ msgid "Bank Advice"
+#~ msgstr "Bank advies"
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Details contract"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Naam van de werknemer"
+
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Onbetaald verlof"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Vervaldatum identiteitskaart"
+
+#~ msgid "Other Deduction"
+#~ msgstr "Andere kortingen"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Betaald verlof"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Werknemers korting"
+
+#~ msgid "Wating for Verification"
+#~ msgstr "Wachten op goedkeuring"
+
+#~ msgid "Visa No"
+#~ msgstr "Visa nr."
+
+#~ msgid "By Salary"
+#~ msgstr "Volgens loon"
+
+#~ msgid "Authorised Signature"
+#~ msgstr "Bevoegde handtekening"
+
+#~ msgid "Company Contributions"
+#~ msgstr "Bedrijfsbijdrage"
+
+#~ msgid "Employee Salary"
+#~ msgstr "Loon werknemer"
+
+#~ msgid "For the month of"
+#~ msgstr "Voor de maand van"
+
+#~ msgid "Pay Salary"
+#~ msgstr "Betaal loon"
+
+#~ msgid "Employee Code"
+#~ msgstr "Werknemerscode"
+
+#~ msgid "Employees Salary Detail"
+#~ msgstr "Detail werknemersloon"
+
+#~ msgid "Country & Address"
+#~ msgstr "Land & adres"
+
+#~ msgid "Company Contribution"
+#~ msgstr "Bedrijfsbijdrage"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Uitbetaald loon"
+
+#~ msgid "New Slip"
+#~ msgstr "Nieuwe loonstrook"
+
+#~ msgid "Search Company Contribution"
+#~ msgstr "Zoek bedrijfsbijdrage"
+
+#~ msgid "Amount / Percentage"
+#~ msgstr "Bedrag / Percentage"
+
+#~ msgid "Percentage"
+#~ msgstr "Percentage"
+
+#~ msgid "Department"
+#~ msgstr "Afdeling"
+
+#~ msgid "Deductions:"
+#~ msgstr "Kortingen:"
+
+#~ msgid "Loan"
+#~ msgstr "Lening"
+
+#~ msgid "Use for Gratuity ?"
+#~ msgstr "Gebruik voor de fooi?"
+
+#~ msgid "Others"
+#~ msgstr "Andere"
+
+#~ msgid "The Manager"
+#~ msgstr "De manager"
+
+#~ msgid "Letter Details"
+#~ msgstr "Brief details"
+
+#~ msgid "Reject"
+#~ msgstr "Afkeuren"
+
+#~ msgid "Expire"
+#~ msgstr "Verlooptijd"
diff --git a/addons/hr_payroll/i18n/pl.po b/addons/hr_payroll/i18n/pl.po
index 9b7ccb1b15f..6ffe2deb76d 100644
--- a/addons/hr_payroll/i18n/pl.po
+++ b/addons/hr_payroll/i18n/pl.po
@@ -7,248 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-11-05 14:41+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-06 05:24+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Adres e-mail"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Wynagrodzenie netto"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Przelicz arkusz"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Szczegóły wynagrodzenia"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Dział"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Potrącenia:"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Grupuj wg..."
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
+#: view:hr.payslip:0
+msgid "States"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Dni pracy"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Pożyczka"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Rejestr płac"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Pasek wypłaty"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Raport wynagrodzeń rocznych"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Wypłacone wynagrodzenie"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Firma"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "Przełożony"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
+#: view:hr.payslip:0
+msgid "Done Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Ustaw na projekt"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Wygasa"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Urlop półpłatny"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Inne"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Pasek wypłaty"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Szczegóły umowy:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "Wybierz adres banku, z którego wynagrodzenie ma być wypłacone."
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Odrzucone"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Suma"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Nieobecności"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Rejestr"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
-msgstr "Błąd ! Nie możesz wybrać działu, którego pracownik jest przełożonym."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Wartość"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Nazwisko pracownika"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr ""
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr "Uwagi"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -256,259 +202,176 @@ msgid "Salary Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Kwota"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Procentowo"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Pozycja paska wypłaty"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Inne informacje"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "Kraj wydania"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Inne potrącenia"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Urlop płatny"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Grupuj wg..."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Data ważności paszportu"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr "Ostrzeżenie !"
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Urlop bezpłatny"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Ważne od"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Kwota (słownie)"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Wypłata"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr "Pozycja paska wypłaty"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "Numer identyfikacyjny"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Bazując na"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Oczekuje na weryfikację"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Lista płac"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Suma"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Zaksięgowano"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Typ urlopu"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Data :"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Suma"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "Nr wizy"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Od"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "Wg wynagrodzenia"
-
-#. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Data końcowa"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Uwagi:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Stan"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -516,388 +379,316 @@ msgid "Employee"
 msgstr "Pracownik"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Formuła"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Typ"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Błąd !"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Weryfikuj arkusz"
-
-#. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Wynagrodzenie brutto"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Potrącenia"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "Nr pozwolenia na pracę"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Wymagrodzenie pracownika"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Fixed Amount"
 msgstr "Kwota stała"
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Do"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
+msgid "Worked Days & Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Potrącenie"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Payslip"
+msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: constraint:hr.contract:0
-msgid "Error! contract start-date must be lower then contract end-date."
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Kwota netto"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Struktura wynagrodzenia:"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
+#: view:hr.payslip:0
+msgid "Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr "Potwierdź listę"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Inne:"
+#: view:hr.contract:0
+msgid "Payslip Info"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Kod pracownika"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "Rodzaj Kwoty"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Kategoria"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
-msgstr "Składniki"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Projekt"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Podstawowe"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Wszystkie paszporty"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Nazwisko pracownika"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Szczegóły paszportu"
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "Procentowo (%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr "Rejestr list płac"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "Dla"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Umowy"
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -905,65 +696,26 @@ msgid "Employee Function"
 msgstr "Funkcja pracownika"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Zapłacono"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Zatwierdzenie"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Tytuł"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Użytkownik"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Pozycje płatności"
-
-#. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
 msgstr "Oblicz listę"
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Aktywne"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr "Uwzględnij ten składnik, jeśli warunek jest spełniony"
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "Szczegóły wynagrodzenia rocznego"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
+msgstr ""
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
@@ -971,61 +723,38 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Błąd ! Nie mozesz tworzyć rekurencyjnych hierarchii pracowników"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Warunek"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr "Oczekiwanie na weryfikację"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Oblicz"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "Dyrektor kadrowy"
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Wynagrodzenie podstawowe"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr "Kod Kategorii"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "Inofrmacja o wynagrodzeniu"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1034,340 +763,276 @@ msgid "Companies"
 msgstr "Firmy"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Umowa"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
-msgstr "Projekt listy"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Data"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "Data ważności wizy"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr "Dotacja"
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "Nr. Telefonu"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
-msgstr "Dotacja"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "Etykieta"
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Kod"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr ""
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Numeracja"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Numer"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr "Struktura wynagrodzenia"
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Anuluj"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "Zamknij"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "Kwota / Procent"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr "Data w tym miesiącu"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Wynagrodzenie"
-
-#. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "Nr paszportu"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Paszport"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Suma wynagrodzenia"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "dla okresu"
-
-#. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr "Nagłówek listy płac"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
-msgid "Contribution Register"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "Adres email"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
-msgstr "Składniki wynagrodzenia"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "Drukuj raport"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
-msgid "Calculations"
-msgstr "Obliczenia"
-
-#. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
+msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Inne informacje"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Miesiąc"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr "Drukuj"
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr "Wydano"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Funkcja"
+msgid "Calculations"
+msgstr "Obliczenia"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Droga(i) Pani(e)"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+#: view:hr.payslip:0
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Opis"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Data Początkowa"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1379,281 +1044,254 @@ msgid "Payroll"
 msgstr "Lista płac"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Typ zarobku"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "Nazwa kategorii"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Adres"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Bank"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr "Anuluj listę"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "Zaliczka"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Nazwa"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "Kraj"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Pracownicy"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Konto Bankowe"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Suma płatności"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "Konfiguracja listy płac"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr "Data wydania paszportu"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Suma"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "Liczba nieobecności"
-
-#. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Szczegóły banku"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Numeracja"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr "Zawartość listu"
-
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Wynagrodzenie roczne"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Suma"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
 
 #~ msgid "Analytic Account for Salary Analysis"
 #~ msgstr "Konto analityczne do analizy wynagrodzeń"
 
+#~ msgid "Net Salary"
+#~ msgstr "Wynagrodzenie netto"
+
+#~ msgid "Working Days"
+#~ msgstr "Dni pracy"
+
 #~ msgid "(Based on type Payroll will calculate basic salary)"
 #~ msgstr "(Oparty na Liście płac do obliczeń podstawowych wynagrodzeń)"
 
+#~ msgid "E-mail Address"
+#~ msgstr "Adres e-mail"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
+#~ msgid "Department"
+#~ msgstr "Dział"
+
 #~ msgid "Employee No"
 #~ msgstr "Nr pracownika"
 
+#~ msgid "Year Salary Report"
+#~ msgstr "Raport wynagrodzeń rocznych"
+
+#~ msgid "Others"
+#~ msgstr "Inne"
+
 #~ msgid "Calculations Rules"
 #~ msgstr "Reguły obliczeń"
 
+#~ msgid "Salary"
+#~ msgstr "Wynagrodzenie"
+
 #~ msgid "Account"
 #~ msgstr "Konto"
 
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Ostrzeżenie !"
+#~ msgid "Register"
+#~ msgstr "Rejestr"
+
+#~ msgid "Leaves"
+#~ msgstr "Nieobecności"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Nazwisko pracownika"
+
+#~ msgid "Value"
+#~ msgstr "Wartość"
+
+#~ msgid "Bank"
+#~ msgstr "Bank"
+
+#~ msgid "Based on"
+#~ msgstr "Bazując na"
 
 #~ msgid "Analytic Account"
 #~ msgstr "Konto analityczne"
 
+#~ msgid "Payment"
+#~ msgstr "Wypłata"
+
 #~ msgid "Force Period"
 #~ msgstr "Wymuś okres"
 
+#~ msgid "Sub Total"
+#~ msgstr "Suma"
+
+#~ msgid "From"
+#~ msgstr "Od"
+
 #~ msgid "Employee Year Salary"
 #~ msgstr "Wynagrodzenie roczne"
 
 #~ msgid "Error! You can not create recursive analytic accounts."
 #~ msgstr "Błąd! Nie możesz tworzyć rekurencyjnych kont analitycznych"
 
+#~ msgid "Human Resource Payroll"
+#~ msgstr "Lista płac"
+
+#~ msgid "Notes:"
+#~ msgstr "Uwagi:"
+
+#~ msgid "End Date"
+#~ msgstr "Data końcowa"
+
 #~ msgid "Accounting Informations"
 #~ msgstr "Informacje o koncie"
 
+#~ msgid "Type"
+#~ msgstr "Typ"
+
 #, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "Błąd integracji !"
@@ -1661,8 +1299,14 @@ msgstr ""
 #~ msgid "Miscelleanous"
 #~ msgstr "Różne"
 
-#~ msgid "Print"
-#~ msgstr "Drukuj"
+#~ msgid "Start Date"
+#~ msgstr "Data Początkowa"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Wynagrodzenie brutto"
+
+#~ msgid "Employee Salary"
+#~ msgstr "Wymagrodzenie pracownika"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Niewłaściwy XML dla architektury widoku!"
@@ -1673,6 +1317,24 @@ msgstr ""
 #~ msgid "Payment Entries"
 #~ msgstr "Zapisy płatności"
 
+#~ msgid "Salary Structure:"
+#~ msgstr "Struktura wynagrodzenia:"
+
+#~ msgid "Confirm Sheet"
+#~ msgstr "Potwierdź listę"
+
+#~ msgid "Contracts"
+#~ msgstr "Umowy"
+
+#~ msgid "Others:"
+#~ msgstr "Inne:"
+
+#~ msgid "Net Amount"
+#~ msgstr "Kwota netto"
+
+#~ msgid "Employee Code"
+#~ msgstr "Kod pracownika"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -1685,39 +1347,147 @@ msgstr ""
 #~ msgid "Salary Account"
 #~ msgstr "Konto wynagrodzenia"
 
+#~ msgid "Employee Name"
+#~ msgstr "Nazwisko pracownika"
+
 #~ msgid "Expanse Journal"
 #~ msgstr "Dziennik wydatków"
 
+#~ msgid "For"
+#~ msgstr "Dla"
+
+#~ msgid "Reject"
+#~ msgstr "Odrzucone"
+
+#~ msgid "Title"
+#~ msgstr "Tytuł"
+
+#~ msgid "Payment Lines"
+#~ msgstr "Pozycje płatności"
+
+#~ msgid "Basic Salary"
+#~ msgstr "Wynagrodzenie podstawowe"
+
+#~ msgid "Wating for HR Verification"
+#~ msgstr "Oczekiwanie na weryfikację"
+
+#~ msgid "Condition"
+#~ msgstr "Warunek"
+
+#~ msgid "Compute"
+#~ msgstr "Oblicz"
+
 #~ msgid "Employee Account"
 #~ msgstr "Konto pracownika"
 
+#~ msgid "Phone No."
+#~ msgstr "Nr. Telefonu"
+
+#~ msgid "Draft Sheet"
+#~ msgstr "Projekt listy"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
 #~ msgid "General Account"
 #~ msgstr "Konto główne"
 
+#~ msgid "Loan"
+#~ msgstr "Pożyczka"
+
+#~ msgid "To"
+#~ msgstr "Do"
+
 #~ msgid "Process"
 #~ msgstr "Przetwórz"
 
+#~ msgid "Number"
+#~ msgstr "Numer"
+
 #~ msgid "General Information"
 #~ msgstr "Informacje ogólne"
 
+#~ msgid "E-mail"
+#~ msgstr "Adres email"
+
 #~ msgid "Account Information"
 #~ msgstr "Informacje o koncie"
 
 #~ msgid "Contract Duration"
 #~ msgstr "Czas trwania umowy"
 
+#~ msgid "Year Salary"
+#~ msgstr "Wynagrodzenie roczne"
+
+#~ msgid "Function"
+#~ msgstr "Funkcja"
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "Droga(i) Pani(e)"
+
 #~ msgid "Categoty Name"
 #~ msgstr "Nazwa kategorii"
 
-#~ msgid "Notes"
-#~ msgstr "Uwagi"
-
 #~ msgid "Fiscal Year"
 #~ msgstr "Rok podatkowy"
 
+#~ msgid "Bank Details"
+#~ msgstr "Szczegóły banku"
+
+#~ msgid "Payroll Configurtion"
+#~ msgstr "Konfiguracja listy płac"
+
+#~ msgid "Deductions:"
+#~ msgstr "Potrącenia:"
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "Rejestr płac"
+
+#~ msgid "The Manager"
+#~ msgstr "Przełożony"
+
+#~ msgid "Half-Pay Holiday"
+#~ msgstr "Urlop półpłatny"
+
 #~ msgid "Payment From"
 #~ msgstr "Formularz płatności"
 
+#~ msgid "Country of Issue"
+#~ msgstr "Kraj wydania"
+
+#~ msgid "Employees Salary Details"
+#~ msgstr "Szczegóły wynagrodzenia"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Data ważności paszportu"
+
+#~ msgid "Other Deduction"
+#~ msgstr "Inne potrącenia"
+
+#~ msgid "Work Permit No"
+#~ msgstr "Nr pozwolenia na pracę"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Urlop płatny"
+
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Urlop bezpłatny"
+
+#~ msgid "Passport Detail"
+#~ msgstr "Szczegóły paszportu"
+
+#~ msgid "Visa No"
+#~ msgstr "Nr wizy"
+
+#~ msgid "By Salary"
+#~ msgstr "Wg wynagrodzenia"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Kwota (słownie)"
+
+#~ msgid "Passport"
+#~ msgstr "Paszport"
+
 #~ msgid "Salary Detail"
 #~ msgstr "Szczegóły wynagrodzenia"
 
@@ -1730,27 +1500,75 @@ msgstr ""
 #~ msgid "Year Salary Detail"
 #~ msgstr "Szczegóły wynagrodzenia rocznego"
 
+#~ msgid "Wating for Verification"
+#~ msgstr "Oczekuje na weryfikację"
+
+#~ msgid "Deduction"
+#~ msgstr "Potrącenie"
+
 #~ msgid "Passport and Visa"
 #~ msgstr "Paszport i wiza"
 
 #~ msgid "Function of the Employee"
 #~ msgstr "Funkcja pracownika"
 
+#~ msgid "All Passports"
+#~ msgstr "Wszystkie paszporty"
+
 #~ msgid "Employee Contract"
 #~ msgstr "Umowa pracownika"
 
+#~ msgid "Payroll Register"
+#~ msgstr "Rejestr list płac"
+
+#~ msgid "HR Manager"
+#~ msgstr "Dyrektor kadrowy"
+
+#~ msgid "Yearly Salary Details"
+#~ msgstr "Szczegóły wynagrodzenia rocznego"
+
+#~ msgid "Salary Information"
+#~ msgstr "Inofrmacja o wynagrodzeniu"
+
 #~ msgid "Categoty Code"
 #~ msgstr "Kod kategorii"
 
+#~ msgid "Visa Expire Date"
+#~ msgstr "Data ważności wizy"
+
+#~ msgid "Payroll Head"
+#~ msgstr "Nagłówek listy płac"
+
 #~ msgid "Included in Salary ?"
 #~ msgstr "Włączone do wynagrodzenia ?"
 
+#~ msgid "Passport No"
+#~ msgstr "Nr paszportu"
+
+#~ msgid "Current Month Date"
+#~ msgstr "Data w tym miesiącu"
+
 #~ msgid "Process Form"
 #~ msgstr "Przetwarzaj formularz"
 
+#~ msgid "Contract Detail:"
+#~ msgstr "Szczegóły umowy:"
+
+#~ msgid "Amount / Percentage"
+#~ msgstr "Kwota / Procent"
+
+#~ msgid "for period"
+#~ msgstr "dla okresu"
+
+#~ msgid "Other Informations"
+#~ msgstr "Inne informacje"
+
 #~ msgid "Configure Payroll"
 #~ msgstr "Konfiguruj listę płac"
 
+#~ msgid "Cancel Sheet"
+#~ msgstr "Anuluj listę"
+
 #~ msgid "Expanse account when Salary Expanse will be recorded"
 #~ msgstr "Konto wydatków, na którym będą zapisane wydatki wynagrodzeń"
 
@@ -1759,3 +1577,110 @@ msgstr ""
 
 #~ msgid "Employee Functions"
 #~ msgstr "Funkcja pracownika"
+
+#~ msgid "Letter Content"
+#~ msgstr "Zawartość listu"
+
+#~ msgid "Deductions"
+#~ msgstr "Potrącenia"
+
+#~ msgid "Passport Issue Date"
+#~ msgstr "Data wydania paszportu"
+
+#~ msgid "No of Leaves"
+#~ msgstr "Liczba nieobecności"
+
+#~ msgid "Recompute Sheet"
+#~ msgstr "Przelicz arkusz"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Wypłacone wynagrodzenie"
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr "Wybierz adres banku, z którego wynagrodzenie ma być wypłacone."
+
+#~ msgid "Expire"
+#~ msgstr "Wygasa"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr "Błąd ! Nie możesz wybrać działu, którego pracownik jest przełożonym."
+
+#~ msgid "Percentage"
+#~ msgstr "Procentowo"
+
+#~ msgid "Valid From"
+#~ msgstr "Ważne od"
+
+#~ msgid "Leave Type"
+#~ msgstr "Typ urlopu"
+
+#~ msgid "Date :"
+#~ msgstr "Data :"
+
+#~ msgid "Posted"
+#~ msgstr "Zaksięgowano"
+
+#~ msgid "Formula"
+#~ msgstr "Formuła"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Błąd !"
+
+#~ msgid "Verify Sheet"
+#~ msgstr "Weryfikuj arkusz"
+
+#~ msgid "Basic"
+#~ msgstr "Podstawowe"
+
+#~ msgid "Heads"
+#~ msgstr "Składniki"
+
+#~ msgid "Paid"
+#~ msgstr "Zapłacono"
+
+#~ msgid "Applied this head for calculation if condition is true"
+#~ msgstr "Uwzględnij ten składnik, jeśli warunek jest spełniony"
+
+#~ msgid "Validation"
+#~ msgstr "Zatwierdzenie"
+
+#~ msgid "User"
+#~ msgstr "Użytkownik"
+
+#~ msgid "Category Code"
+#~ msgstr "Kod Kategorii"
+
+#~ msgid "Label"
+#~ msgstr "Etykieta"
+
+#~ msgid "Print Report"
+#~ msgstr "Drukuj raport"
+
+#~ msgid "Salary Heads"
+#~ msgstr "Składniki wynagrodzenia"
+
+#~ msgid "Total Salary"
+#~ msgstr "Suma wynagrodzenia"
+
+#~ msgid "Month"
+#~ msgstr "Miesiąc"
+
+#~ msgid "Issue"
+#~ msgstr "Wydano"
+
+#~ msgid "Category Name"
+#~ msgstr "Nazwa kategorii"
+
+#~ msgid "Wage Type"
+#~ msgstr "Typ zarobku"
+
+#~ msgid "Advance"
+#~ msgstr "Zaliczka"
+
+#~ msgid "Total Payment"
+#~ msgstr "Suma płatności"
+
+#~ msgid "Country"
+#~ msgstr "Kraj"
diff --git a/addons/hr_payroll/i18n/pt.po b/addons/hr_payroll/i18n/pt.po
index a12ed73a4f6..aedb6719a94 100644
--- a/addons/hr_payroll/i18n/pt.po
+++ b/addons/hr_payroll/i18n/pt.po
@@ -7,248 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2010-12-20 11:01+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Endereço eletrónico"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Salário líquido"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Recalcular folha"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Detalhes dos salários dos empregados"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Departamento"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Agrupar por..."
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Descontos"
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Estados"
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Dias úteis"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Empréstimo"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Registo de pagamento de salário"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Recibos"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Relatório anual de salários"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Salário pago"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Empresa"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "O Gerente"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
+#: view:hr.payslip:0
+msgid "Done Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Definir como rascunho"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Caduca"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Férias pagas a 50%"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Outros"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Recibo"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Detalhes do contrato:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Campo de cálculo"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "Selecione o banco de onde será feito o pagamento do salário"
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "Nota de pagamento bancário"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Rejeitar"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Total:"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Baixas"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Registar"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
-"Erro ! Não pode selecionar um departamento cujo empregado é o gestor."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Total de deduções"
 
 #. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Valor"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Nome do empregado"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
 msgstr ""
 
 #. module: hr_payroll
@@ -257,259 +202,176 @@ msgid "Salary Computation"
 msgstr "Cálculo de salário"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
-msgstr "Quantia"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
+msgstr "Montante"
 
 #. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Percentagem"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Linha de recibo"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Outra informação"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "País emissor"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Outras deduções"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Férias pagas"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Agrupar por..."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Data de expiração do passaporte"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr "Aviso !"
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Férias não pagas"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Válido a partir de"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
-msgstr "Campo de cálculo usado internamente, não incluir em formulários"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Montante (por extenso):"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Pagamento"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr "Linha de recibo"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "Número de identificação"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Baseado em"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Aguardando verificação"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Salários de Recursos Humanos"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Publicado"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Tipo de ausência"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Data:"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Subtotal"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Pagamentos -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "Número de visto"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "De"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "Por salário"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Data de fim"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr "Recibo do empregado"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Descontos por baixa"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "Assinatura autorizada"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "Valor da função"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Notas:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Estado"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr "Linhas do pagamento"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "Outras linhas"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Argumentos da Função"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
-msgstr "Contribuições da empresa"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -517,193 +379,183 @@ msgid "Employee"
 msgstr "Empregado"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Fórmula"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Tipo"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "E-mail"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Erro !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Verificar folha"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
-msgstr "Número de dias de trabalho semanais para um empregado"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr "Novo recibo"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Salário bruto"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "Total de ganhos"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Outros pagamentos"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Deduções"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "Licença de trabalho nº"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Salário do empregado"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr "Montante fixo"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Total por empregado"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "Montante fixo"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Para"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr "Erro de variável!"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Pagar salário"
+msgid "PaySlip Batch"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "Para o mês de"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Desconto"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr "Recibo"
@@ -714,191 +566,129 @@ msgid "Error! contract start-date must be lower then contract end-date."
 msgstr "Erro! Data de início do contrato deve ser anterior à data de fim."
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr "Prestação do empréstimo"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "Com os melhores cumprimentos,"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Montante líquido"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Estrutura do salário:"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "Detalhes dos salários dos empregados"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr "Linha da função"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr "Confirmar folha"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Outros:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr "Cálculo da função"
-
-#. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "Dias de trabalho"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Total por empresa"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
-msgstr "País e Endereço"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Código de empregado"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "Tipo de quantia"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Categoria"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
-msgstr "Contribuição da empresa"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Rascunho"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Base"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Todos os passaportes"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Nome do Empregado"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Detalhe do passaporte"
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "Percentagem (%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr "Registo de salários"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "Para"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Contratos"
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr "Dias de trabalho"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -906,64 +696,25 @@ msgid "Employee Function"
 msgstr "Função do empregado"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Pago"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "Aprovar folha"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "Pago? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Validação"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Título"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Utilizador"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Linhas de pagamento"
-
-#. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
 msgstr "Calcular folha"
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Ativo"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr ""
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
@@ -972,61 +723,38 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Erro ! Não pode criar uma hierarquia recursiva de empregados."
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Condição"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr "Aguardando verificação RH"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Processar"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr "Designação"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "Gestor de RH"
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Salário base"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr "Código da categoria"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1035,340 +763,276 @@ msgid "Companies"
 msgstr "Empresas"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr "Assinatura autorizada"
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Contrato"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
-msgstr "Data do próx. mês"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Data"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "Data de expiração do visto"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
-msgstr "Procurar passaporte"
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "Número de Telefone"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
-msgstr "Contribuição da empresa"
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.payslip:0
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: view:hr.salary.rule:0
+msgid "Company contribution"
+msgstr "Contribuição da empresa"
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Código"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "Número:"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Sequência"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
-msgstr "Resumo do processamento"
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Número"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr "Estrutura do salário"
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "Fechar"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "Montante / Percentagem"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Abonos"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr "Data atual"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Salário"
-
-#. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "Número de passaporte"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Passaporte"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Salário total"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "para o período"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
-msgid "Contribution Register"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "E-mail"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
-msgstr "Rubricas salariais"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "Imprimir relatório"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
-msgid "Calculations"
-msgstr "Cálculos"
-
-#. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
+msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Outras informações"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Mês"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Função"
+msgid "Calculations"
+msgstr "Cálculos"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr "Estados"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Caro Sr./Sra."
+msgid "Worked Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+#: view:hr.payslip:0
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
-msgstr "Salário bruto"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Descrição"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Data de início"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ")"
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1380,246 +1044,232 @@ msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Tipo do salário"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "Salário líquido"
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr "O número de passaporte deve ser único!"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "Nome da categoria"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
-msgstr "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Endereço"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr "Linha do recibo"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr "Número de baixas"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Banco"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr "Cancelar folha"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "Adiantamento"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
-msgstr "Abonos e descontos específicos do empregado"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Nome"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "País"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Empregados"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Conta bancária"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Pagamento total"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "Configuração de salários"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Total"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr "Por favor indique a conta bancária do empregado %s"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr "Data de emissão do passaporte"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr "Abono"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "Número de baixas"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
-msgstr "Outro Id"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Detalhes bancários"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
-msgstr "ID Recibo"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Sequência"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Salário anual"
+#~ msgid "Employees Salary Details"
+#~ msgstr "Detalhes dos salários dos empregados"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr ""
+#~ msgid "Net Salary"
+#~ msgstr "Salário líquido"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr ""
+#~ msgid "Department"
+#~ msgstr "Departamento"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr ""
+#~ msgid "Deductions:"
+#~ msgstr "Descontos"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Total"
+#~ msgid "E-mail Address"
+#~ msgstr "Endereço eletrónico"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr "Contribuições"
+#~ msgid "The Manager"
+#~ msgstr "O Gerente"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da acção."
+#~ msgid "Working Days"
+#~ msgstr "Dias úteis"
+
+#~ msgid "Leaves"
+#~ msgstr "Baixas"
+
+#~ msgid "Reject"
+#~ msgstr "Rejeitar"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Nome do empregado"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr ""
+#~ "Erro ! Não pode selecionar um departamento cujo empregado é o gestor."
+
+#~ msgid "Country of Issue"
+#~ msgstr "País emissor"
+
+#~ msgid "Percentage"
+#~ msgstr "Percentagem"
+
+#~ msgid "Wating for Verification"
+#~ msgstr "Aguardando verificação"
+
+#~ msgid "Based on"
+#~ msgstr "Baseado em"
+
+#~ msgid "Payment"
+#~ msgstr "Pagamento"
+
+#~ msgid "Posted"
+#~ msgstr "Publicado"
+
+#~ msgid "Date :"
+#~ msgstr "Data:"
+
+#~ msgid "Sub Total"
+#~ msgstr "Subtotal"
+
+#~ msgid "Leave Deductions"
+#~ msgstr "Descontos por baixa"
+
+#~ msgid "Authorised Signature"
+#~ msgstr "Assinatura autorizada"
+
+#~ msgid "Notes:"
+#~ msgstr "Notas:"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Erro !"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -1627,11 +1277,452 @@ msgstr "Contribuições"
 #~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
 #~ "especial !"
 
+#~ msgid "Deductions"
+#~ msgstr "Deduções"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para a arquitectura da vista!"
 
+#~ msgid "Deduction"
+#~ msgstr "Desconto"
+
+#~ msgid "Net Amount"
+#~ msgstr "Montante líquido"
+
+#~ msgid "Yours Sincerely"
+#~ msgstr "Com os melhores cumprimentos,"
+
+#~ msgid "Employee Code"
+#~ msgstr "Código de empregado"
+
+#~ msgid "Country & Address"
+#~ msgstr "País e Endereço"
+
+#~ msgid "Employee Name"
+#~ msgstr "Nome do Empregado"
+
+#~ msgid "All Passports"
+#~ msgstr "Todos os passaportes"
+
+#~ msgid "Validation"
+#~ msgstr "Validação"
+
+#~ msgid "Contracts"
+#~ msgstr "Contratos"
+
+#~ msgid "Title"
+#~ msgstr "Título"
+
+#~ msgid "User"
+#~ msgstr "Utilizador"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Phone No."
+#~ msgstr "Número de Telefone"
+
+#~ msgid "Number"
+#~ msgstr "Número"
+
+#~ msgid "Salary"
+#~ msgstr "Salário"
+
+#~ msgid "Passport No"
+#~ msgstr "Número de passaporte"
+
+#~ msgid "Passport"
+#~ msgstr "Passaporte"
+
+#~ msgid "Amount / Percentage"
+#~ msgstr "Montante / Percentagem"
+
+#~ msgid "Month"
+#~ msgstr "Mês"
+
+#~ msgid "Gross Sal."
+#~ msgstr "Salário bruto"
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "Caro Sr./Sra."
+
+#~ msgid "Year Salary"
+#~ msgstr "Salário anual"
+
+#~ msgid "Net Sal."
+#~ msgstr "Salário líquido"
+
+#~ msgid "Country"
+#~ msgstr "País"
+
+#~ msgid "Number of Leaves"
+#~ msgstr "Número de baixas"
+
+#~ msgid "Bank"
+#~ msgstr "Banco"
+
+#~ msgid "No of Leaves"
+#~ msgstr "Número de baixas"
+
+#~ msgid "Bank Details"
+#~ msgstr "Detalhes bancários"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Montante (por extenso):"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Salário pago"
+
+#~ msgid "Value"
+#~ msgstr "Valor"
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "Registo de pagamento de salário"
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr "Selecione o banco de onde será feito o pagamento do salário"
+
+#~ msgid "Total Deductions"
+#~ msgstr "Total de deduções"
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Detalhes do contrato:"
+
+#~ msgid "Other Deduction"
+#~ msgstr "Outras deduções"
+
+#~ msgid "Payments -"
+#~ msgstr "Pagamentos -"
+
+#~ msgid "Visa No"
+#~ msgstr "Número de visto"
+
+#~ msgid "From"
+#~ msgstr "De"
+
+#~ msgid "By Salary"
+#~ msgstr "Por salário"
+
+#~ msgid "End Date"
+#~ msgstr "Data de fim"
+
+#~ msgid "Formula"
+#~ msgstr "Fórmula"
+
+#~ msgid "Company Contributions"
+#~ msgstr "Contribuições da empresa"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Salário bruto"
+
+#~ msgid "Total Earnings"
+#~ msgstr "Total de ganhos"
+
+#~ msgid "Other Payment"
+#~ msgstr "Outros pagamentos"
+
+#~ msgid "No of Working days / week for an employee"
+#~ msgstr "Número de dias de trabalho semanais para um empregado"
+
+#~ msgid "Pay Salary"
+#~ msgstr "Pagar salário"
+
+#~ msgid "hr.payroll.employees.detail"
+#~ msgstr "hr.payroll.employees.detail"
+
+#, python-format
+#~ msgid "Variable Error !"
+#~ msgstr "Erro de variável!"
+
+#~ msgid "Total By Employee"
+#~ msgstr "Total por empregado"
+
+#~ msgid "To"
+#~ msgstr "Para"
+
+#~ msgid "Work Permit No"
+#~ msgstr "Licença de trabalho nº"
+
+#~ msgid "Employee Salary"
+#~ msgstr "Salário do empregado"
+
+#~ msgid "Salary Structure:"
+#~ msgstr "Estrutura do salário:"
+
+#~ msgid "For the month of"
+#~ msgstr "Para o mês de"
+
+#~ msgid "Company Contribution"
+#~ msgstr "Contribuição da empresa"
+
+#~ msgid "Total By Company"
+#~ msgstr "Total por empresa"
+
+#~ msgid "For"
+#~ msgstr "Para"
+
 #~ msgid "Categoty Code"
 #~ msgstr "Código de categoria"
 
+#~ msgid "HR Manager"
+#~ msgstr "Gestor de RH"
+
+#~ msgid "Visa Expire Date"
+#~ msgstr "Data de expiração do visto"
+
+#~ msgid "Search Passport"
+#~ msgstr "Procurar passaporte"
+
+#~ msgid "Number :"
+#~ msgstr "Número:"
+
+#~ msgid "Total Salary"
+#~ msgstr "Salário total"
+
+#~ msgid "Current Month Date"
+#~ msgstr "Data atual"
+
+#~ msgid "Function"
+#~ msgstr "Função"
+
+#~ msgid "Print Report"
+#~ msgstr "Imprimir relatório"
+
+#~ msgid "The Passport No must be unique !"
+#~ msgstr "O número de passaporte deve ser único!"
+
+#~ msgid "Start Date"
+#~ msgstr "Data de início"
+
+#~ msgid "Wage Type"
+#~ msgstr "Tipo do salário"
+
 #~ msgid "Categoty Name"
 #~ msgstr "Nome da categoria"
+
+#~ msgid "Total Payment"
+#~ msgstr "Pagamento total"
+
+#~ msgid "hr.payroll.year.salary"
+#~ msgstr "hr.payroll.year.salary"
+
+#~ msgid "Contributions"
+#~ msgstr "Contribuições"
+
+#~ msgid "Basic Salary"
+#~ msgstr "Salário base"
+
+#~ msgid "Year Salary Report"
+#~ msgstr "Relatório anual de salários"
+
+#~ msgid "Valid From"
+#~ msgstr "Válido a partir de"
+
+#~ msgid "Employees Salary Detail"
+#~ msgstr "Detalhes dos salários dos empregados"
+
+#~ msgid "Recompute Sheet"
+#~ msgstr "Recalcular folha"
+
+#~ msgid "Loan"
+#~ msgstr "Empréstimo"
+
+#~ msgid "Others"
+#~ msgstr "Outros"
+
+#~ msgid "Half-Pay Holiday"
+#~ msgstr "Férias pagas a 50%"
+
+#~ msgid "Bank Advice"
+#~ msgstr "Nota de pagamento bancário"
+
+#~ msgid "Calculaton Field"
+#~ msgstr "Campo de cálculo"
+
+#~ msgid "Expire"
+#~ msgstr "Caduca"
+
+#~ msgid "Allowances with Basic:"
+#~ msgstr "Abonos incluindo Base"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Férias pagas"
+
+#~ msgid "Category Code"
+#~ msgstr "Código da categoria"
+
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Férias não pagas"
+
+#~ msgid ""
+#~ "Calculation field used for internal calculation, do not place this on form"
+#~ msgstr "Campo de cálculo usado internamente, não incluir em formulários"
+
+#~ msgid "Leave Type"
+#~ msgstr "Tipo de ausência"
+
+#~ msgid "Function Value"
+#~ msgstr "Valor da função"
+
+#~ msgid "Human Resource Payroll"
+#~ msgstr "Salários de Recursos Humanos"
+
+#~ msgid "Paymeny Lines"
+#~ msgstr "Linhas do pagamento"
+
+#~ msgid "Verify Sheet"
+#~ msgstr "Verificar folha"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "Other Lines"
+#~ msgstr "Outras linhas"
+
+#~ msgid "Net Basic"
+#~ msgstr "Base Líquido"
+
+#~ msgid "Function Arguments"
+#~ msgstr "Argumentos da Função"
+
+#~ msgid "Bank Advice Lines"
+#~ msgstr "Linhas da nota de pagamento"
+
+#~ msgid "New Slip"
+#~ msgstr "Novo recibo"
+
+#~ msgid "Function Line"
+#~ msgstr "Linha da função"
+
+#~ msgid "Loan Installment"
+#~ msgstr "Prestação do empréstimo"
+
+#~ msgid "Confirm Sheet"
+#~ msgstr "Confirmar folha"
+
+#~ msgid "Others:"
+#~ msgstr "Outros:"
+
+#~ msgid "Function Calculation"
+#~ msgstr "Cálculo da função"
+
+#~ msgid "Category Name"
+#~ msgstr "Nome da categoria"
+
+#~ msgid "Payroll Register"
+#~ msgstr "Registo de salários"
+
+#~ msgid "Approve Sheet"
+#~ msgstr "Aprovar folha"
+
+#~ msgid "Passport Detail"
+#~ msgstr "Detalhe do passaporte"
+
+#~ msgid "Paid ? "
+#~ msgstr "Pago? "
+
+#~ msgid "Paid"
+#~ msgstr "Pago"
+
+#~ msgid "Basic"
+#~ msgstr "Base"
+
+#~ msgid "Payment Lines"
+#~ msgstr "Linhas de pagamento"
+
+#~ msgid "Payment Advice:"
+#~ msgstr "Nota de pagamento:"
+
+#~ msgid "Wating for HR Verification"
+#~ msgstr "Aguardando verificação RH"
+
+#~ msgid "Condition"
+#~ msgstr "Condição"
+
+#~ msgid "Compute"
+#~ msgstr "Processar"
+
+#~ msgid "Next Month Date"
+#~ msgstr "Data do próx. mês"
+
+#~ msgid "Computation Overview"
+#~ msgstr "Resumo do processamento"
+
+#~ msgid "Salary Heads"
+#~ msgstr "Rubricas salariais"
+
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
+#~ msgid "for period"
+#~ msgstr "para o período"
+
+#~ msgid "Allowances"
+#~ msgstr "Abonos"
+
+#~ msgid "Other Informations"
+#~ msgstr "Outras informações"
+
+#~ msgid "Payroll Head"
+#~ msgstr "Rubrica salarial"
+
+#~ msgid "Special Allowances and Deductions For Employee:"
+#~ msgstr "Abonos e descontos específicos do empregado"
+
+#~ msgid "Slip Line"
+#~ msgstr "Linha do recibo"
+
+#~ msgid "Advance"
+#~ msgstr "Adiantamento"
+
+#~ msgid "Cancel Sheet"
+#~ msgstr "Cancelar folha"
+
+#~ msgid "Other Id"
+#~ msgstr "Outro Id"
+
+#~ msgid "Slip ID"
+#~ msgstr "ID Recibo"
+
+#~ msgid "Allowance"
+#~ msgstr "Abono"
+
+#, python-format
+#~ msgid "Please define bank account for the %s employee"
+#~ msgstr "Por favor indique a conta bancária do empregado %s"
+
+#~ msgid "Passport Issue Date"
+#~ msgstr "Data de emissão do passaporte"
+
+#~ msgid "Payroll Configurtion"
+#~ msgstr "Configuração de salários"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da ação"
+
+#~ msgid "D/C"
+#~ msgstr "D/C"
+
+#~ msgid "Employee No"
+#~ msgstr "Funcionário Nº"
+
+#~ msgid "Calculations Rules"
+#~ msgstr "Regras de cálculo"
+
+#~ msgid "Employee Payable Account"
+#~ msgstr "Conta a pagar do funcionário"
+
+#~ msgid "Account"
+#~ msgstr "Conta"
+
+#~ msgid "Payment From"
+#~ msgstr "Formulário de pagamento"
+
+#~ msgid "Register"
+#~ msgstr "Registo"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Data de validade do passaporte"
diff --git a/addons/hr_payroll/i18n/pt_BR.po b/addons/hr_payroll/i18n/pt_BR.po
index 6de6d66fdb2..dec268b0d7f 100644
--- a/addons/hr_payroll/i18n/pt_BR.po
+++ b/addons/hr_payroll/i18n/pt_BR.po
@@ -7,250 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-03-20 19:51+0000\n"
 "Last-Translator: Emerson <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Endereço de E-mail"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Baseado"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Salário Liquido"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Recalcular Folha"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Detalhes Salário do Funcionário"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Departamento"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Deduções:"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Agrupar Por..."
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
+#: view:hr.payslip:0
+msgid "States"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Dias Trabalhados"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Empréstimo"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Registro Pagamento de Salário"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Relatório Salário Anual"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Salário Pago"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Empresa"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "O Gerente"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
+#: view:hr.payslip:0
+msgid "Done Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Definir como Provisório"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "Erro de Variável: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Expira"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Outros"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Contracheque"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Detalhes Contrato:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Campo de Cálculo"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "Selecione o Endereço do Banco para o qual o salário deverá ser pago"
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Rejeitar"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Total:"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Folhas"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Registro"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
-"Erro! Você não pode selecionar um departamento do qual o funcionário é o "
-"gerente."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Deduções Totais"
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Valor"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Nome do Funcionário"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr "Linhas do Registro"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -258,261 +202,176 @@ msgid "Salary Computation"
 msgstr "Calculo do Salário"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Valor"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
 msgstr ""
-"Por favor, verifique a configuração da %s, Cabeçalho da folha de pagamento "
-"está faltando"
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Percentual"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Outras Informações"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "País Emissor"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Dedução do Funcionário"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Outra Dedução"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Feriado Pago"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Agrupar Por..."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Data de Expiração do Passaporte"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Feriado Não Pago"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Válido De"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Valor (por extenso) :"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Pagamento"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "No de Identificação"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Baseado em"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Aguardando Verificação"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Folha de Pagamento"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Lançado"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Data :"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Sub Total"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Pagamentos -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "Núm. do Visto"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "A partir de"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "Por Salário"
-
-#. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Data Final"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "Assinatura Autorizada"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Comentários:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Estado"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "Outras Linhas"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Argumentos da Função"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
-msgstr "Contribuições da Empresa"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -520,390 +379,318 @@ msgid "Employee"
 msgstr "Funcionário"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Fórmula"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Tipo"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "E-mail"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "Nº"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Erro!"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Planilha de Verificação"
-
-#. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "Ganhos Totais"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Outros Pagamentos"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Deduções"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Salário do Funcionário"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Fixed Amount"
 msgstr "Quantidade fixa"
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Para"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Salário"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+msgid "Worked Days & Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "Para o mês de"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Dedução"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Payslip"
+msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: constraint:hr.contract:0
-msgid "Error! contract start-date must be lower then contract end-date."
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
-"Erro! A data de início do contrato precisa ser menor que a data de término "
-"do contrato."
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
+#: view:hr.payslip:0
+msgid "Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Estrutura Salarial"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
+"Erro! A data de início do contrato precisa ser menor que a data de término "
+"do contrato."
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Outros:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "Dia Trabalhado"
-
-#. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Total por Empresa"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Código do Funcionário"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Categoria"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Rascunho"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Básico"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Nome do Funcionário"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
+#: view:hr.salary.rule:0
+msgid "Conditions"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Contratos"
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr "Dia Trabalhado"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -911,64 +698,25 @@ msgid "Employee Function"
 msgstr "Função do Funcionário"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Pago"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "Aprovar Planilha"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "Pago? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Validação"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Título"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Usuário"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Linhas de Pagamento"
-
-#. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Ativo"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr ""
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
@@ -977,61 +725,38 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1040,340 +765,276 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
+#: view:hr.contribution.register:0
+msgid "Contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1385,240 +1046,408 @@ msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr ""
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr ""
+#~ msgid "Employees Salary Details"
+#~ msgstr "Detalhes Salário do Funcionário"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr ""
+#~ msgid "Net Salary"
+#~ msgstr "Salário Liquido"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr ""
+#~ msgid "Working Days"
+#~ msgstr "Dias Trabalhados"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr ""
+#~ msgid "Department"
+#~ msgstr "Departamento"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr ""
+#~ msgid "Deductions:"
+#~ msgstr "Deduções:"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr ""
+#~ msgid "E-mail Address"
+#~ msgstr "Endereço de E-mail"
+
+#~ msgid "Recompute Sheet"
+#~ msgstr "Recalcular Folha"
+
+#~ msgid "Based"
+#~ msgstr "Baseado"
+
+#~ msgid "The Manager"
+#~ msgstr "O Gerente"
+
+#~ msgid "Loan"
+#~ msgstr "Empréstimo"
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "Registro Pagamento de Salário"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Salário Pago"
+
+#~ msgid "Year Salary Report"
+#~ msgstr "Relatório Salário Anual"
+
+#~ msgid "Others"
+#~ msgstr "Outros"
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Detalhes Contrato:"
+
+#~ msgid "Expire"
+#~ msgstr "Expira"
+
+#~ msgid "Total Deductions"
+#~ msgstr "Deduções Totais"
+
+#~ msgid "Register"
+#~ msgstr "Registro"
+
+#~ msgid "Leaves"
+#~ msgstr "Folhas"
+
+#~ msgid "Reject"
+#~ msgstr "Rejeitar"
+
+#~ msgid "Value"
+#~ msgstr "Valor"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr ""
+#~ "Erro! Você não pode selecionar um departamento do qual o funcionário é o "
+#~ "gerente."
+
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Feriado Não Pago"
+
+#~ msgid "Other Deduction"
+#~ msgstr "Outra Dedução"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Feriado Pago"
+
+#~ msgid "Percentage"
+#~ msgstr "Percentual"
+
+#, python-format
+#~ msgid "Please check configuration of %s, payroll head is missing"
+#~ msgstr ""
+#~ "Por favor, verifique a configuração da %s, Cabeçalho da folha de pagamento "
+#~ "está faltando"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Dedução do Funcionário"
+
+#~ msgid "Wating for Verification"
+#~ msgstr "Aguardando Verificação"
+
+#~ msgid "Valid From"
+#~ msgstr "Válido De"
+
+#~ msgid "Based on"
+#~ msgstr "Baseado em"
+
+#~ msgid "Payment"
+#~ msgstr "Pagamento"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Valor (por extenso) :"
+
+#~ msgid "Human Resource Payroll"
+#~ msgstr "Folha de Pagamento"
+
+#~ msgid "By Salary"
+#~ msgstr "Por Salário"
+
+#~ msgid "Date :"
+#~ msgstr "Data :"
+
+#~ msgid "Payments -"
+#~ msgstr "Pagamentos -"
+
+#~ msgid "Posted"
+#~ msgstr "Lançado"
+
+#~ msgid "Sub Total"
+#~ msgstr "Sub Total"
+
+#~ msgid "From"
+#~ msgstr "A partir de"
+
+#~ msgid "End Date"
+#~ msgstr "Data Final"
+
+#~ msgid "Authorised Signature"
+#~ msgstr "Assinatura Autorizada"
+
+#~ msgid "Notes:"
+#~ msgstr "Comentários:"
+
+#~ msgid "Function Arguments"
+#~ msgstr "Argumentos da Função"
+
+#~ msgid "#"
+#~ msgstr "Nº"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Formula"
+#~ msgstr "Fórmula"
+
+#~ msgid "Company Contributions"
+#~ msgstr "Contribuições da Empresa"
+
+#~ msgid "Deductions"
+#~ msgstr "Deduções"
+
+#~ msgid "Employee Salary"
+#~ msgstr "Salário do Funcionário"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Erro!"
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr "Selecione o Endereço do Banco para o qual o salário deverá ser pago"
+
+#, python-format
+#~ msgid "Variable Error: %s "
+#~ msgstr "Erro de Variável: %s "
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Nome do Funcionário"
+
+#~ msgid "Calculaton Field"
+#~ msgstr "Campo de Cálculo"
+
+#~ msgid "Visa No"
+#~ msgstr "Núm. do Visto"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Data de Expiração do Passaporte"
+
+#~ msgid "Register Lines"
+#~ msgstr "Linhas do Registro"
+
+#~ msgid "Verify Sheet"
+#~ msgstr "Planilha de Verificação"
+
+#~ msgid "Other Lines"
+#~ msgstr "Outras Linhas"
+
+#~ msgid "Country of Issue"
+#~ msgstr "País Emissor"
+
+#~ msgid "Total Earnings"
+#~ msgstr "Ganhos Totais"
+
+#~ msgid "Other Payment"
+#~ msgstr "Outros Pagamentos"
+
+#~ msgid "For the month of"
+#~ msgstr "Para o mês de"
+
+#~ msgid "To"
+#~ msgstr "Para"
+
+#~ msgid "Pay Salary"
+#~ msgstr "Salário"
+
+#~ msgid "Deduction"
+#~ msgstr "Dedução"
+
+#~ msgid "Salary Structure:"
+#~ msgstr "Estrutura Salarial"
+
+#~ msgid "Employee Code"
+#~ msgstr "Código do Funcionário"
+
+#~ msgid "Others:"
+#~ msgstr "Outros:"
+
+#~ msgid "Total By Company"
+#~ msgstr "Total por Empresa"
+
+#~ msgid "Basic"
+#~ msgstr "Básico"
+
+#~ msgid "Employee Name"
+#~ msgstr "Nome do Funcionário"
+
+#~ msgid "Approve Sheet"
+#~ msgstr "Aprovar Planilha"
+
+#~ msgid "Paid"
+#~ msgstr "Pago"
+
+#~ msgid "Contracts"
+#~ msgstr "Contratos"
+
+#~ msgid "Validation"
+#~ msgstr "Validação"
+
+#~ msgid "User"
+#~ msgstr "Usuário"
+
+#~ msgid "Title"
+#~ msgstr "Título"
+
+#~ msgid "Payment Lines"
+#~ msgstr "Linhas de Pagamento"
+
+#~ msgid "Paid ? "
+#~ msgstr "Pago? "
diff --git a/addons/hr_payroll/i18n/ru.po b/addons/hr_payroll/i18n/ru.po
index 1c63583e330..aba5b575be3 100644
--- a/addons/hr_payroll/i18n/ru.po
+++ b/addons/hr_payroll/i18n/ru.po
@@ -7,252 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2010-11-29 07:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Адрес эл. почты"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Основная"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Зарплата на руки"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Пересчитать таблицу"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Детали заработной платы"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Подразделение"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Удержания"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "Использовать для надбавки?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Группировать по .."
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Рабочие дни"
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Состояния"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Долги"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Журнал начисления заработной платы"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Расчетные листки"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Годовой отчет о заработной плате"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Выплаченная заработная плата"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Организация"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "Менеджер"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "Подробности письма"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Установить в 'Черновик'"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "Variable Error: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Истечение срока"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Частично оплачиваемый отпуск"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Прочие"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Расчетный листок"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Подробности о контакте:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Поле вычислений"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
-"Выберите банковские адреса, с которых будет производиться выплата заработной "
-"платы"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "Банковское извещение"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Отклонить"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Всего:"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Уходы"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Зарегистрироваться"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
-"Ошибка! Вы не можете выбрать подразделение, для которого сотрудник является "
-"руководителем."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Итого к вычету"
 
 #. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Значение"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Имя работника"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr ""
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr "Примечания"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -260,261 +202,176 @@ msgid "Salary Computation"
 msgstr "Вычисление заработной платы"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Величина"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr "Please check configuration of %s, payroll head is missing"
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "В процентах"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Строка расчетного листка"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Прочая информация"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "Страна выдачи"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Вычеты сотрудника"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Другие удержания"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Оплачиваемый отпуск"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Группировать по .."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Дата истечения срока действия паспорта"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr "Внимание!"
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Неоплачиваемый отпуск"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Действительно с"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
-"Поле вычислений используется для внутренних расчётов. Не располагайте его на "
-"форме."
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Величина (прописью)"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Платеж"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr "Строка расчетного листка"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "Табельный номер"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "На основе"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Ожидает проверки"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Начисление заработной платы"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Всего:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Написал"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Тип отсутствия"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Дата :"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Подитог"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Платежи -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "Номер визы"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "От"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "В виде зарплаты"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Дата окончания"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr "Расчетный листок работника"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Вычеты за пропуски"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "Заверенная подпись"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "Значение функции"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Примечания:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Состояние"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Аргументы функций"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
-msgstr "Вклад организации"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -522,193 +379,183 @@ msgid "Employee"
 msgstr "Сотрудник"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Формула"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr "Строки банковского извещения"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Тип"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "Эл. почта"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "№"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Ошибка !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Лист сверки"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
-msgstr "Число рабочих дней/недель сотрудника"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr "Новый расчетный листок"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr "База после налогообложения"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Зарплата без учета удержаний"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "Итоговые сборы"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
-msgstr "Платёжная ведомость сотрудника"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Иные выплаты"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Отчисления"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr "Н/О"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "Номер разрешения на работу"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Зарплата работника"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr "Фиксированная величина"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Всего на сотрудника"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "Фиксированная величина"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Кому"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr "Variable Error !"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Начисление зарплаты"
+msgid "PaySlip Batch"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
-msgstr "Строки вклада"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "В месяце:"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Удержания"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr "Заметки к банковскому извещению"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr "Расчетный листок"
@@ -720,191 +567,129 @@ msgstr ""
 "Ошибка! Дата начала действия контракта должна быть раньше даты окончания"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr "Налоговая база"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr "Полная кадровая проверка"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "Искренне Ваш,"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Величина с учетом всех удержаний"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Структура зарплаты"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "Детали зарплаты работника"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr "Лист подтверждения"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Другие:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "Отработанный день"
-
-#. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Всего по организации"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
-msgstr "Страна и адрес"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Код работника"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "Тип суммы"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "Категория"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
-msgstr "Вклад организации"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
-msgstr "Головные"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "Распечатать"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Черновик"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr "Сборы"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Основные"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Все паспорты"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Имя работника"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Паспортные данные"
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "Процентное соотношение (%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr "Журнал начисления заработной платы"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "Для"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Договоры"
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr "Отработанный день"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -912,127 +697,65 @@ msgid "Employee Function"
 msgstr "Трудовая функция работника"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Выплачено"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "Утвердить ведомость"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "Оплачено? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Проверка"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Обращение"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Пользователь"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Позиции платежа"
-
-#. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
 msgstr "Вычислить ведомость"
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Активен"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "Подробности годовых выплат"
-
-#. module: hr_payroll
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Ошибка! Структура подчинения не может быть рекурсивной."
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Состояние"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr "Ожидает проверки отделом кадров"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
-msgstr "Платёжное поручение:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Вычислить"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr "Обозначение"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "Кадровый менеджер"
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Базовая зарплата"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr "Код категории"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "Информация о зарплате"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1041,340 +764,276 @@ msgid "Companies"
 msgstr "Компании"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr "Заверенная подпись"
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Договор"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
-msgstr "Черновик ведомости"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
-msgstr "Дата в следующем месяце"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Дата"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "Дата окончания визы"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
-msgstr "Поиск паспорта"
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr "Авторы"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "№ телефона"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
-msgstr "Авторы"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "Метка"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
-msgstr "Вклад организации"
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.payslip:0
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: view:hr.salary.rule:0
+msgid "Company contribution"
+msgstr "Вклад организации"
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Код"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
-msgstr "Платёжное извещение"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "Номер:"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Последовательность"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
-msgstr "Выплата"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Номер"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr "Структура зарплаты"
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Отмена"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "Закрыть"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "Объём / соотношение"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Доплаты"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr "Дата в текущем месяце"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Заработная плата"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "№ паспорта"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Паспорт"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Итого заработная плата"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "за период"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr "Заголовок ведомости по начислению зарплаты"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "Адрес эл. почты"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr "Печать"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "Печать отчёта"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr "Расчеты"
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Прочая информация"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Месяц"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr "Запрос"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr "Динамическое вычисление"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Функция"
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr "Состояния"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Уважаемые господа,"
+msgid "Search Payslips"
+msgstr "Поиск по расчётным ведомостям"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
-msgstr "Начислено"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Описание"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Дата начала"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr "Отчисления -"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ")"
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1386,269 +1045,266 @@ msgid "Payroll"
 msgstr "Платежная ведомость"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Тип зарплаты"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "К выплате"
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "Название категории"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
-msgstr "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Адрес"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Банк"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr "Отменить ведомость"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "Перенести"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
-msgstr "Специальные пособия и вычеты для сотрудника:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Название"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "Страна"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Сотрудники"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Банковский счет"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Итого к оплате"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr "Строка отчислений за отсутствие:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr "Ожидает проверки счета"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "Настройка платёжной системы"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Всего"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr "Требуется указать банковский счёт для сотрудника %s"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr "Дата выдачи паспорта"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr "Пособие"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "Кол-во пропусков"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Банковская информация"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
-msgstr "Идентификатор ведомости"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Последовательность"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
-msgstr "Расчётная ведомость сотрудника"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr "Содержание письма"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Годовая зарплата"
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr "Доплаты / Удержания"
+#~ msgid "Analytic Account for Salary Analysis"
+#~ msgstr "Аналитический счет для анализа заработной платы"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr "Банковское платёжное извещение"
+#~ msgid "New Slip"
+#~ msgstr "Новый расчетный листок"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr "Поиск по расчётным ведомостям"
+#~ msgid "Net Salary"
+#~ msgstr "Зарплата на руки"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Всего"
+#~ msgid "Working Days"
+#~ msgstr "Рабочие дни"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr "При участии"
+#~ msgid "E-mail Address"
+#~ msgstr "Адрес эл. почты"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
+#~ msgid "Department"
+#~ msgstr "Подразделение"
 
-#~ msgid "Analytic Account for Salary Analysis"
-#~ msgstr "Аналитический счет для анализа заработной платы"
+#~ msgid "Deductions:"
+#~ msgstr "Удержания"
+
+#~ msgid "Paid ? "
+#~ msgstr "Оплачено? "
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "Журнал начисления заработной платы"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Выплаченная заработная плата"
+
+#~ msgid "Year Salary Report"
+#~ msgstr "Годовой отчет о заработной плате"
+
+#~ msgid "Others"
+#~ msgstr "Прочие"
 
 #~ msgid "Calculations Rules"
 #~ msgstr "Правила расчетов"
 
+#~ msgid "The Manager"
+#~ msgstr "Менеджер"
+
+#~ msgid "Half-Pay Holiday"
+#~ msgstr "Частично оплачиваемый отпуск"
+
+#~ msgid "Salary"
+#~ msgstr "Заработная плата"
+
 #~ msgid "Account"
 #~ msgstr "Счет"
 
 #~ msgid "Payment From"
 #~ msgstr "Платеж от"
 
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Внимание!"
+#~ msgid "Leaves"
+#~ msgstr "Уходы"
+
+#~ msgid "Next Month Date"
+#~ msgstr "Дата в следующем месяце"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Имя работника"
+
+#~ msgid "Value"
+#~ msgstr "Значение"
+
+#~ msgid "Country of Issue"
+#~ msgstr "Страна выдачи"
+
+#~ msgid "Employees Salary Details"
+#~ msgstr "Детали заработной платы"
+
+#~ msgid "Passport Expire Date"
+#~ msgstr "Дата истечения срока действия паспорта"
+
+#~ msgid "Other Deduction"
+#~ msgstr "Другие удержания"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Оплачиваемый отпуск"
 
 #~ msgid "Special Allowance and Deductions for Employee"
 #~ msgstr "Специальные доплаты и удержания работника"
 
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Неоплачиваемый отпуск"
+
+#~ msgid "Bank"
+#~ msgstr "Банк"
+
+#~ msgid "Based on"
+#~ msgstr "На основе"
+
 #~ msgid "Analytic Account"
 #~ msgstr "Аналитический счет"
 
+#~ msgid "Payment"
+#~ msgstr "Платеж"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Величина (прописью)"
+
 #~ msgid "Force Period"
 #~ msgstr "Установить период"
 
@@ -1656,29 +1312,59 @@ msgstr "При участии"
 #~ msgid "Please defined the Employee Home Address Along with Partners !!"
 #~ msgstr "Пожалуйста, задайте домашний адрес работника вместе с Партнерами"
 
+#~ msgid "Visa No"
+#~ msgstr "Номер визы"
+
+#~ msgid "From"
+#~ msgstr "От"
+
+#~ msgid "By Salary"
+#~ msgstr "В виде зарплаты"
+
 #~ msgid "Employee Year Salary"
 #~ msgstr "Годовая зарплата работника"
 
 #~ msgid "Error! You can not create recursive analytic accounts."
 #~ msgstr "Ошибка! Вы не можете создать рекурсивные счета аналитического учета."
 
+#~ msgid "Human Resource Payroll"
+#~ msgstr "Начисление заработной платы"
+
+#~ msgid "Passport Detail"
+#~ msgstr "Паспортные данные"
+
+#~ msgid "Authorised Signature"
+#~ msgstr "Заверенная подпись"
+
+#~ msgid "Passport"
+#~ msgstr "Паспорт"
+
 #~ msgid "Accounting Information"
 #~ msgstr "Учетная информация"
 
 #~ msgid "Amount Information"
 #~ msgstr "Информация о величине"
 
+#~ msgid "Notes:"
+#~ msgstr "Примечания:"
+
+#~ msgid "End Date"
+#~ msgstr "Дата окончания"
+
 #~ msgid "Unite"
 #~ msgstr "Объединить"
 
 #~ msgid "Salary Detail"
 #~ msgstr "Детали зарплаты"
 
+#~ msgid "Verify Sheet"
+#~ msgstr "Лист сверки"
+
 #~ msgid "Accounting Informations"
 #~ msgstr "Учетная информация"
 
-#~ msgid "Print"
-#~ msgstr "Печать"
+#~ msgid "Type"
+#~ msgstr "Тип"
 
 #, python-format
 #~ msgid "Integrity Error !"
@@ -1687,28 +1373,55 @@ msgstr "При участии"
 #~ msgid "Miscelleanous"
 #~ msgstr "Разное"
 
+#~ msgid "Start Date"
+#~ msgstr "Дата начала"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Зарплата без учета удержаний"
+
 #~ msgid "Contributions Configuration"
 #~ msgstr "Конфигурация вложений"
 
+#~ msgid "Total Earnings"
+#~ msgstr "Итоговые сборы"
+
+#~ msgid "Other Payment"
+#~ msgstr "Иные выплаты"
+
 #~ msgid "Basic Salary - Leaves"
 #~ msgstr "Базовая зарплата - Уходы"
 
 #~ msgid "By Employee Function"
 #~ msgstr "По должностной инструкции"
 
+#~ msgid "Employee Salary"
+#~ msgstr "Зарплата работника"
+
 #~ msgid "Year Salary Detail"
 #~ msgstr "Детали годовой зарплаты"
 
+#~ msgid "Deduction"
+#~ msgstr "Удержания"
+
+#~ msgid "For the month of"
+#~ msgstr "В месяце:"
+
 #, python-format
 #~ msgid "Please defined the Partner in Home Address !!"
 #~ msgstr "Пожалуйста, задайте Партнера через домашний адрес!!"
 
+#~ msgid "Pay Salary"
+#~ msgstr "Начисление зарплаты"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Некорректный формат XML для структуры вида!"
 
 #~ msgid "Account Lines"
 #~ msgstr "Строки счета"
 
+#~ msgid "Wating for Verification"
+#~ msgstr "Ожидает проверки"
+
 #~ msgid "Passport List"
 #~ msgstr "Список паспортов"
 
@@ -1718,9 +1431,45 @@ msgstr "При участии"
 #~ msgid "Payment Entries"
 #~ msgstr "Строки платежа"
 
+#~ msgid "Yours Sincerely"
+#~ msgstr "Искренне Ваш,"
+
+#~ msgid "Allowances"
+#~ msgstr "Доплаты"
+
+#~ msgid "Loan Installment"
+#~ msgstr "Налоговая база"
+
+#~ msgid "Complete HR Checking"
+#~ msgstr "Полная кадровая проверка"
+
+#~ msgid "Salary Structure:"
+#~ msgstr "Структура зарплаты"
+
 #~ msgid "Function of the Employee"
 #~ msgstr "Трудовая функция работника"
 
+#~ msgid "Employees Salary Detail"
+#~ msgstr "Детали зарплаты работника"
+
+#~ msgid "Wating for Account Verification"
+#~ msgstr "Ожидает проверки счета"
+
+#~ msgid "Confirm Sheet"
+#~ msgstr "Лист подтверждения"
+
+#~ msgid "Contracts"
+#~ msgstr "Договоры"
+
+#~ msgid "Others:"
+#~ msgstr "Другие:"
+
+#~ msgid "Net Amount"
+#~ msgstr "Величина с учетом всех удержаний"
+
+#~ msgid "Employee Code"
+#~ msgstr "Код работника"
+
 #~ msgid "Passport and Visa"
 #~ msgstr "Паспорт и виза"
 
@@ -1739,62 +1488,432 @@ msgstr "При участии"
 #~ msgid "Salary Account"
 #~ msgstr "Зарплатный счет"
 
+#~ msgid "Employee Name"
+#~ msgstr "Имя работника"
+
+#~ msgid "All Passports"
+#~ msgstr "Все паспорты"
+
 #~ msgid "Employee Contract"
 #~ msgstr "Договор с работником"
 
+#~ msgid "For"
+#~ msgstr "Для"
+
+#~ msgid "Earnings"
+#~ msgstr "Сборы"
+
+#~ msgid "Reject"
+#~ msgstr "Отклонить"
+
 #~ msgid "Expanse Journal"
 #~ msgstr "Журнал затрат"
 
 #~ msgid "Contribe by Company ?"
 #~ msgstr "Внесено организацией?"
 
+#~ msgid "Title"
+#~ msgstr "Обращение"
+
 #~ msgid "Complete Accountant Checking"
 #~ msgstr "Полная бухгалтерская проверка"
 
 #~ msgid "Working Days / Week"
 #~ msgstr "Рабочие дни/недели"
 
+#~ msgid "Payment Lines"
+#~ msgstr "Позиции платежа"
+
+#~ msgid "Basic Salary"
+#~ msgstr "Базовая зарплата"
+
+#~ msgid "HR Manager"
+#~ msgstr "Кадровый менеджер"
+
+#~ msgid "Condition"
+#~ msgstr "Состояние"
+
+#~ msgid "Compute"
+#~ msgstr "Вычислить"
+
 #~ msgid "Employee Account"
 #~ msgstr "Счет работника"
 
+#~ msgid "Salary Information"
+#~ msgstr "Информация о зарплате"
+
 #~ msgid "Categoty Code"
 #~ msgstr "Код категории"
 
+#~ msgid "Date"
+#~ msgstr "Дата"
+
+#~ msgid "Phone No."
+#~ msgstr "№ телефона"
+
+#~ msgid "Visa Expire Date"
+#~ msgstr "Дата окончания визы"
+
 #~ msgid "General Account"
 #~ msgstr "Базовый счет"
 
+#~ msgid "Loan"
+#~ msgstr "Долги"
+
+#~ msgid "To"
+#~ msgstr "Кому"
+
 #~ msgid "Process"
 #~ msgstr "Процесс"
 
+#~ msgid "Payroll Head"
+#~ msgstr "Заголовок ведомости по начислению зарплаты"
+
 #~ msgid "Included in Salary ?"
 #~ msgstr "Включено в зарплату"
 
+#~ msgid "Number"
+#~ msgstr "Номер"
+
 #~ msgid "General Information"
 #~ msgstr "Общая информация"
 
+#~ msgid "Allowance / Deduction"
+#~ msgstr "Доплаты / Удержания"
+
+#~ msgid "Passport No"
+#~ msgstr "№ паспорта"
+
 #~ msgid "Account Information"
 #~ msgstr "Информация об учётной записи"
 
 #~ msgid "Generalities"
 #~ msgstr "Общее положение"
 
+#~ msgid "for period"
+#~ msgstr "за период"
+
+#~ msgid "E-mail"
+#~ msgstr "Адрес эл. почты"
+
 #~ msgid "Process Form"
 #~ msgstr "Форма процесса"
 
 #~ msgid "Contract Duration"
 #~ msgstr "Срок действия договора"
 
+#~ msgid "Year Salary"
+#~ msgstr "Годовая зарплата"
+
+#~ msgid "Function"
+#~ msgstr "Функция"
+
+#~ msgid "Dynamic Computation"
+#~ msgstr "Динамическое вычисление"
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "Уважаемые господа,"
+
+#~ msgid "Other Informations"
+#~ msgstr "Прочая информация"
+
 #~ msgid "Create Analytic Structure"
 #~ msgstr "Создать аналитическую структуру"
 
 #~ msgid "Categoty Name"
 #~ msgstr "Название категории"
 
-#~ msgid "Notes"
-#~ msgstr "Примечания"
+#~ msgid "Advance"
+#~ msgstr "Перенести"
 
 #~ msgid "Configure Payroll"
 #~ msgstr "Настроить начисление зарплаты"
 
 #~ msgid "Select Bank Account from where Salary Expanse will be Paid"
 #~ msgstr "Выберите банковский счет для списания зарплаты"
+
+#~ msgid "Expire"
+#~ msgstr "Истечение срока"
+
+#~ msgid "Register"
+#~ msgstr "Зарегистрироваться"
+
+#~ msgid "Percentage"
+#~ msgstr "В процентах"
+
+#~ msgid "Posted"
+#~ msgstr "Написал"
+
+#~ msgid "Valid From"
+#~ msgstr "Действительно с"
+
+#~ msgid "Date :"
+#~ msgstr "Дата :"
+
+#~ msgid "Function Arguments"
+#~ msgstr "Аргументы функций"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Ошибка !"
+
+#~ msgid "Heads"
+#~ msgstr "Головные"
+
+#~ msgid "User"
+#~ msgstr "Пользователь"
+
+#~ msgid "Paid"
+#~ msgstr "Выплачено"
+
+#~ msgid "Basic"
+#~ msgstr "Основные"
+
+#~ msgid "Validation"
+#~ msgstr "Проверка"
+
+#~ msgid "Label"
+#~ msgstr "Метка"
+
+#~ msgid "Month"
+#~ msgstr "Месяц"
+
+#~ msgid "Issue"
+#~ msgstr "Запрос"
+
+#~ msgid "Wage Type"
+#~ msgstr "Тип зарплаты"
+
+#~ msgid "Country"
+#~ msgstr "Страна"
+
+#~ msgid "Contributions"
+#~ msgstr "При участии"
+
+#~ msgid "Bank Details"
+#~ msgstr "Банковская информация"
+
+#~ msgid "Sub Total"
+#~ msgstr "Подитог"
+
+#~ msgid "hr.payroll.employees.detail"
+#~ msgstr "hr.payroll.employees.detail"
+
+#~ msgid "hr.payroll.year.salary"
+#~ msgstr "hr.payroll.year.salary"
+
+#~ msgid "Payroll Register"
+#~ msgstr "Журнал начисления заработной платы"
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr ""
+#~ "Выберите банковские адреса, с которых будет производиться выплата заработной "
+#~ "платы"
+
+#, python-format
+#~ msgid "Variable Error: %s "
+#~ msgstr "Variable Error: %s "
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Подробности о контакте:"
+
+#~ msgid "Calculaton Field"
+#~ msgstr "Поле вычислений"
+
+#~ msgid "Recompute Sheet"
+#~ msgstr "Пересчитать таблицу"
+
+#~ msgid ""
+#~ "Calculation field used for internal calculation, do not place this on form"
+#~ msgstr ""
+#~ "Поле вычислений используется для внутренних расчётов. Не располагайте его на "
+#~ "форме."
+
+#~ msgid "Category Code"
+#~ msgstr "Код категории"
+
+#, python-format
+#~ msgid "Please check configuration of %s, payroll head is missing"
+#~ msgstr "Please check configuration of %s, payroll head is missing"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr ""
+#~ "Ошибка! Вы не можете выбрать подразделение, для которого сотрудник является "
+#~ "руководителем."
+
+#~ msgid "Leave Type"
+#~ msgstr "Тип отсутствия"
+
+#~ msgid "Payments -"
+#~ msgstr "Платежи -"
+
+#~ msgid "Formula"
+#~ msgstr "Формула"
+
+#~ msgid "Function Value"
+#~ msgstr "Значение функции"
+
+#~ msgid "#"
+#~ msgstr "№"
+
+#~ msgid "Total By Employee"
+#~ msgstr "Всего на сотрудника"
+
+#~ msgid "Work Permit No"
+#~ msgstr "Номер разрешения на работу"
+
+#~ msgid "Deductions"
+#~ msgstr "Отчисления"
+
+#~ msgid "C/D"
+#~ msgstr "Н/О"
+
+#~ msgid "Net Basic"
+#~ msgstr "База после налогообложения"
+
+#~ msgid "No of Working days / week for an employee"
+#~ msgstr "Число рабочих дней/недель сотрудника"
+
+#~ msgid "Leave Deductions Line:"
+#~ msgstr "Строка отчислений за отсутствие:"
+
+#, python-format
+#~ msgid "Variable Error !"
+#~ msgstr "Variable Error !"
+
+#~ msgid "Total By Company"
+#~ msgstr "Всего по организации"
+
+#~ msgid "Approve Sheet"
+#~ msgstr "Утвердить ведомость"
+
+#~ msgid "Category Name"
+#~ msgstr "Название категории"
+
+#~ msgid "Print Statement"
+#~ msgstr "Распечатать"
+
+#~ msgid "Company Contribution"
+#~ msgstr "Вклад организации"
+
+#~ msgid "Country & Address"
+#~ msgstr "Страна и адрес"
+
+#~ msgid "Employee Salary Statement"
+#~ msgstr "Платёжная ведомость сотрудника"
+
+#~ msgid "Wating for HR Verification"
+#~ msgstr "Ожидает проверки отделом кадров"
+
+#~ msgid "Yearly Salary Details"
+#~ msgstr "Подробности годовых выплат"
+
+#~ msgid "Draft Sheet"
+#~ msgstr "Черновик ведомости"
+
+#~ msgid "Total Salary"
+#~ msgstr "Итого заработная плата"
+
+#~ msgid "Current Month Date"
+#~ msgstr "Дата в текущем месяце"
+
+#~ msgid "Amount / Percentage"
+#~ msgstr "Объём / соотношение"
+
+#~ msgid "Number :"
+#~ msgstr "Номер:"
+
+#~ msgid "Print Report"
+#~ msgstr "Печать отчёта"
+
+#~ msgid "Gross Sal."
+#~ msgstr "Начислено"
+
+#~ msgid "Net Sal."
+#~ msgstr "К выплате"
+
+#~ msgid "Deduction -"
+#~ msgstr "Отчисления -"
+
+#~ msgid "Total Payment"
+#~ msgstr "Итого к оплате"
+
+#~ msgid "Special Allowances and Deductions For Employee:"
+#~ msgstr "Специальные пособия и вычеты для сотрудника:"
+
+#~ msgid "Cancel Sheet"
+#~ msgstr "Отменить ведомость"
+
+#~ msgid "Payroll Configurtion"
+#~ msgstr "Настройка платёжной системы"
+
+#~ msgid "Allowance"
+#~ msgstr "Пособие"
+
+#~ msgid "No of Leaves"
+#~ msgstr "Кол-во пропусков"
+
+#~ msgid "Letter Content"
+#~ msgstr "Содержание письма"
+
+#, python-format
+#~ msgid "Please define bank account for the %s employee"
+#~ msgstr "Требуется указать банковский счёт для сотрудника %s"
+
+#~ msgid "Passport Issue Date"
+#~ msgstr "Дата выдачи паспорта"
+
+#~ msgid "Total Deductions"
+#~ msgstr "Итого к вычету"
+
+#~ msgid "Bank Advice"
+#~ msgstr "Банковское извещение"
+
+#~ msgid "Use for Gratuity ?"
+#~ msgstr "Использовать для надбавки?"
+
+#~ msgid "Letter Details"
+#~ msgstr "Подробности письма"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Вычеты сотрудника"
+
+#~ msgid "Leave Deductions"
+#~ msgstr "Вычеты за пропуски"
+
+#~ msgid "Contribution Lines"
+#~ msgstr "Строки вклада"
+
+#~ msgid "Bank Advice Note"
+#~ msgstr "Заметки к банковскому извещению"
+
+#~ msgid "Company Contributions"
+#~ msgstr "Вклад организации"
+
+#~ msgid "Bank Advice Lines"
+#~ msgstr "Строки банковского извещения"
+
+#~ msgid "Search Passport"
+#~ msgstr "Поиск паспорта"
+
+#~ msgid "Payment Advice:"
+#~ msgstr "Платёжное поручение:"
+
+#~ msgid "Salary On"
+#~ msgstr "Выплата"
+
+#~ msgid "Payment Advice"
+#~ msgstr "Платёжное извещение"
+
+#~ msgid "Slip ID"
+#~ msgstr "Идентификатор ведомости"
+
+#~ msgid "Employee Payslip"
+#~ msgstr "Расчётная ведомость сотрудника"
+
+#~ msgid "Bank Payment Advice"
+#~ msgstr "Банковское платёжное извещение"
+
+#~ msgid "Based"
+#~ msgstr "Основная"
diff --git a/addons/hr_payroll/i18n/sr.po b/addons/hr_payroll/i18n/sr.po
index 4c310d06542..035f0292712 100644
--- a/addons/hr_payroll/i18n/sr.po
+++ b/addons/hr_payroll/i18n/sr.po
@@ -7,247 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-01-17 23:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
+#: view:hr.payslip:0
+msgid "States"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
+#: view:hr.payslip:0
+msgid "Done Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
+#: report:contribution.register.lines:0
+msgid "Total:"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
 
 #. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
 msgstr ""
 
 #. module: hr_payroll
@@ -256,259 +202,176 @@ msgid "Salary Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-msgid "Other Information"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
 #: view:hr.payslip:0
-msgid "Group By..."
+msgid "Other Information"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
+msgid "Draft Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Identification No"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Identification No"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
+msgid "Total Working Days"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
+#: view:hr.payslip:0
+msgid "Confirm"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -516,193 +379,183 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
+#: view:hr.salary.rule:0
+msgid "Children definition"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
+msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr ""
@@ -713,190 +566,128 @@ msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
+#: view:hr.salary.rule:0
+msgid "Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
+#: view:hr.salary.rule:0
+msgid "Conditions"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
+#: view:hr.payslip:0
+msgid "Worked Day"
 msgstr ""
 
 #. module: hr_payroll
@@ -905,43 +696,9 @@ msgid "Employee Function"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
@@ -950,19 +707,14 @@ msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr ""
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
@@ -971,61 +723,38 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1034,340 +763,276 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
+#: view:hr.contribution.register:0
+msgid "Contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1379,240 +1044,157 @@ msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr ""
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
diff --git a/addons/hr_payroll/i18n/sr@latin.po b/addons/hr_payroll/i18n/sr@latin.po
index 2d167ca3690..3fa479b80aa 100644
--- a/addons/hr_payroll/i18n/sr@latin.po
+++ b/addons/hr_payroll/i18n/sr@latin.po
@@ -7,248 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-01-21 13:19+0000\n"
 "Last-Translator: Sonja Anđelković <sardelic.sonja@gmail.com>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "E-mail Adresa"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Na osnovu"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Neto plata"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Obračunska lista"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Detalji plate zaposlenog"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
-msgstr "Odobrenja sa Osnova:"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Odeljenje"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Odbici:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "Koristi se za bonus?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Radni dani"
+#: view:hr.payslip:0
+msgid "States"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Pozajmica"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Evidencija isplate plata"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Platne liste"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Godišnji platni izveštaj"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Isplaćena plata"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Preduzeće"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "Menadžer"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
+#: view:hr.payslip:0
+msgid "Done Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Obeleži kao Nacrt"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "Promenljiva greška: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Ističe"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Polu-plaćen odmor"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Ostalo"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Platnio listovi"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Detalji ugovora:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Polje za kalkulaciju"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "Odaberite adresu banke sa koje će plata da bude isplaćena"
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "Savet banke"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Odbijanjeno"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Ostavljeno"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
 
 #. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
 msgstr ""
-"Greška ! Ne možete da izaberete odeljenje za kome je zaposleni menadžer."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Ukupni odbici"
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Vrednost"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Ime zaposlenog"
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
 msgstr ""
 
 #. module: hr_payroll
@@ -257,260 +202,176 @@ msgid "Salary Computation"
 msgstr "Obračun plata"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Iznos"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
 msgstr ""
-"Molimo vas proverite podešavanja %s, nedostaje zaglavlje platnog spiska"
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Procenat"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Ostale informacije"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "Zemlja izdavanja"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Odbici zaposlenog"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
+msgid "Draft Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Identification No"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Identification No"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
+msgid "Total Working Days"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
+#: view:hr.payslip:0
+msgid "Confirm"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -518,193 +379,183 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
+#: view:hr.salary.rule:0
+msgid "Children definition"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
+msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr ""
@@ -715,190 +566,128 @@ msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
+#: view:hr.salary.rule:0
+msgid "Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
+#: view:hr.salary.rule:0
+msgid "Conditions"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
+#: view:hr.payslip:0
+msgid "Worked Day"
 msgstr ""
 
 #. module: hr_payroll
@@ -907,43 +696,9 @@ msgid "Employee Function"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
@@ -952,19 +707,14 @@ msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr ""
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
@@ -973,61 +723,38 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1036,340 +763,276 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
+#: view:hr.contribution.register:0
+msgid "Contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1381,240 +1044,261 @@ msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr ""
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr ""
+#~ msgid "E-mail Address"
+#~ msgstr "E-mail Adresa"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr ""
+#~ msgid "Loan"
+#~ msgstr "Pozajmica"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr ""
+#~ msgid "Based"
+#~ msgstr "Na osnovu"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr ""
+#~ msgid "Net Salary"
+#~ msgstr "Neto plata"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr ""
+#~ msgid "Recompute Sheet"
+#~ msgstr "Obračunska lista"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr ""
+#~ msgid "Employees Salary Details"
+#~ msgstr "Detalji plate zaposlenog"
+
+#~ msgid "Allowances with Basic:"
+#~ msgstr "Odobrenja sa Osnova:"
+
+#~ msgid "Department"
+#~ msgstr "Odeljenje"
+
+#~ msgid "Deductions:"
+#~ msgstr "Odbici:"
+
+#~ msgid "Use for Gratuity ?"
+#~ msgstr "Koristi se za bonus?"
+
+#~ msgid "Working Days"
+#~ msgstr "Radni dani"
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "Evidencija isplate plata"
+
+#~ msgid "Year Salary Report"
+#~ msgstr "Godišnji platni izveštaj"
+
+#~ msgid "Paid Salary"
+#~ msgstr "Isplaćena plata"
+
+#~ msgid "The Manager"
+#~ msgstr "Menadžer"
+
+#, python-format
+#~ msgid "Variable Error: %s "
+#~ msgstr "Promenljiva greška: %s "
+
+#~ msgid "Expire"
+#~ msgstr "Ističe"
+
+#~ msgid "Half-Pay Holiday"
+#~ msgstr "Polu-plaćen odmor"
+
+#~ msgid "Others"
+#~ msgstr "Ostalo"
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Detalji ugovora:"
+
+#~ msgid "Calculaton Field"
+#~ msgstr "Polje za kalkulaciju"
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr "Odaberite adresu banke sa koje će plata da bude isplaćena"
+
+#~ msgid "Bank Advice"
+#~ msgstr "Savet banke"
+
+#~ msgid "Reject"
+#~ msgstr "Odbijanjeno"
+
+#~ msgid "Leaves"
+#~ msgstr "Ostavljeno"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr ""
+#~ "Greška ! Ne možete da izaberete odeljenje za kome je zaposleni menadžer."
+
+#~ msgid "Total Deductions"
+#~ msgstr "Ukupni odbici"
+
+#~ msgid "Value"
+#~ msgstr "Vrednost"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Ime zaposlenog"
+
+#, python-format
+#~ msgid "Please check configuration of %s, payroll head is missing"
+#~ msgstr ""
+#~ "Molimo vas proverite podešavanja %s, nedostaje zaglavlje platnog spiska"
+
+#~ msgid "Percentage"
+#~ msgstr "Procenat"
+
+#~ msgid "Country of Issue"
+#~ msgstr "Zemlja izdavanja"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Odbici zaposlenog"
diff --git a/addons/hr_payroll/i18n/sv.po b/addons/hr_payroll/i18n/sv.po
index 938876731ab..c0656fc98ab 100644
--- a/addons/hr_payroll/i18n/sv.po
+++ b/addons/hr_payroll/i18n/sv.po
@@ -7,247 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-01-27 17:56+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "E-postadress"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Nettolön"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Anställdas löner detaljer"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Avdelning"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Avdrag"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "Använd för dricks?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Gruppera på..."
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Arbetsdagar"
+#: view:hr.payslip:0
+msgid "States"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Lån"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Lönespecifikationer"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Utbetald lön"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Företag"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
+#: view:hr.payslip:0
+msgid "Done Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Sätt till preliminär"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "Variabel fel : %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Upphör"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Halvdag ledighet"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Övriga"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "Lönebesked"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Anställningsavtal"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "Välj det bankkonto från vilket lönen betalas ut"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Avvisa"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Totalt:"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Frånvaro"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Registrera"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
-msgstr "Fel ! Du kan inte välja en avdelning där den anställde är chef"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Totala avdrag"
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Värde"
+#: view:hr.salary.rule:0
+msgid "Input Data"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Den anställdes namn"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
 msgstr ""
 
 #. module: hr_payroll
@@ -256,259 +202,176 @@ msgid "Salary Computation"
 msgstr "Löneuträkning"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Belopp"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Procent"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Lönespecifikationsrad"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Övrig information"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "Utfärdande land"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Anställda avdrag"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Övriga avdrag"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Betald ledighet"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Gruppera på..."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Obetald ledighet"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Giltigt från"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Belopp (verbalt):"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Betalning"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr "Lönespecifikationsrad"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "Identifikations nr"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Baserad på"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Totalt:"
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "Postad"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Frånvarotyp"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Datum :"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Delsumma"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Betalningar -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Från"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
+#: view:hr.payslip:0
+msgid "Confirm"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Slutdatum"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr "Anställds lönespecifikation"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Frånvaroavdrag"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Anteckningar:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "Övriga linjer"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -516,387 +379,315 @@ msgid "Employee"
 msgstr "Anställd"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Formel"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Typ"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "Epost"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "#"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Fel!"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Bruttolön"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Avdrag"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Fixed Amount"
 msgstr "Fast belopp"
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Till"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Betala lön"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+msgid "Worked Days & Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Avdrag"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Payslip"
-msgstr ""
-
-#. module: hr_payroll
-#: constraint:hr.contract:0
-msgid "Error! contract start-date must be lower then contract end-date."
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
+#: view:hr.payslip:0
+msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
+#: view:hr.payslip:0
+msgid "Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
+#: view:hr.salary.rule:0
+msgid "Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: view:hr.salary.rule:0
+msgid "Conditions"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
+#: view:hr.payslip:0
+msgid "Worked Day"
 msgstr ""
 
 #. module: hr_payroll
@@ -905,43 +696,9 @@ msgid "Employee Function"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
@@ -950,19 +707,14 @@ msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr ""
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
@@ -971,61 +723,38 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1034,340 +763,276 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
+#: view:hr.contribution.register:0
+msgid "Contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1379,240 +1044,313 @@ msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr ""
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr ""
+#~ msgid "Net Salary"
+#~ msgstr "Nettolön"
 
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr ""
+#~ msgid "Deductions:"
+#~ msgstr "Avdrag"
 
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr ""
+#~ msgid "Working Days"
+#~ msgstr "Arbetsdagar"
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr ""
+#~ msgid "Paid Salary"
+#~ msgstr "Utbetald lön"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr ""
+#~ msgid "Loan"
+#~ msgstr "Lån"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr ""
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr "Välj det bankkonto från vilket lönen betalas ut"
+
+#~ msgid "Total Deductions"
+#~ msgstr "Totala avdrag"
+
+#~ msgid "Value"
+#~ msgstr "Värde"
+
+#~ msgid "Other Deduction"
+#~ msgstr "Övriga avdrag"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "Betald ledighet"
+
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "Obetald ledighet"
+
+#~ msgid "Valid From"
+#~ msgstr "Giltigt från"
+
+#~ msgid "Payment"
+#~ msgstr "Betalning"
+
+#~ msgid "Leave Deductions"
+#~ msgstr "Frånvaroavdrag"
+
+#~ msgid "End Date"
+#~ msgstr "Slutdatum"
+
+#~ msgid "Other Lines"
+#~ msgstr "Övriga linjer"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Fel!"
+
+#~ msgid "E-mail Address"
+#~ msgstr "E-postadress"
+
+#~ msgid "Use for Gratuity ?"
+#~ msgstr "Använd för dricks?"
+
+#~ msgid "Department"
+#~ msgstr "Avdelning"
+
+#~ msgid "Others"
+#~ msgstr "Övriga"
+
+#~ msgid "Expire"
+#~ msgstr "Upphör"
+
+#~ msgid "Register"
+#~ msgstr "Registrera"
+
+#~ msgid "Reject"
+#~ msgstr "Avvisa"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Den anställdes namn"
+
+#~ msgid "Percentage"
+#~ msgstr "Procent"
+
+#~ msgid "Country of Issue"
+#~ msgstr "Utfärdande land"
+
+#~ msgid "Based on"
+#~ msgstr "Baserad på"
+
+#~ msgid "Posted"
+#~ msgstr "Postad"
+
+#~ msgid "Date :"
+#~ msgstr "Datum :"
+
+#~ msgid "Payments -"
+#~ msgstr "Betalningar -"
+
+#~ msgid "Sub Total"
+#~ msgstr "Delsumma"
+
+#~ msgid "From"
+#~ msgstr "Från"
+
+#~ msgid "Employees Salary Details"
+#~ msgstr "Anställdas löner detaljer"
+
+#~ msgid "Half-Pay Holiday"
+#~ msgstr "Halvdag ledighet"
+
+#, python-format
+#~ msgid "Variable Error: %s "
+#~ msgstr "Variabel fel : %s "
+
+#~ msgid "Leaves"
+#~ msgstr "Frånvaro"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr "Fel ! Du kan inte välja en avdelning där den anställde är chef"
+
+#~ msgid "Contract Detail:"
+#~ msgstr "Anställningsavtal"
+
+#~ msgid "Leave Type"
+#~ msgstr "Frånvarotyp"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "Anställda avdrag"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Belopp (verbalt):"
+
+#~ msgid "Notes:"
+#~ msgstr "Anteckningar:"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "Type"
+#~ msgstr "Typ"
+
+#~ msgid "Gross Salary"
+#~ msgstr "Bruttolön"
+
+#~ msgid "Formula"
+#~ msgstr "Formel"
+
+#~ msgid "Deductions"
+#~ msgstr "Avdrag"
+
+#~ msgid "Deduction"
+#~ msgstr "Avdrag"
+
+#~ msgid "Pay Salary"
+#~ msgstr "Betala lön"
+
+#~ msgid "To"
+#~ msgstr "Till"
diff --git a/addons/hr_payroll/i18n/tr.po b/addons/hr_payroll/i18n/tr.po
index 2434ac21830..d0129bf63d3 100644
--- a/addons/hr_payroll/i18n/tr.po
+++ b/addons/hr_payroll/i18n/tr.po
@@ -7,247 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-08-23 11:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
+#: view:hr.payslip:0
+msgid "States"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
+#: view:hr.payslip:0
+msgid "Done Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
+#: report:contribution.register.lines:0
+msgid "Total:"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
+#: view:hr.salary.rule:0
+msgid "Input Data"
 msgstr ""
 
 #. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
 msgstr ""
 
 #. module: hr_payroll
@@ -256,259 +202,176 @@ msgid "Salary Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-msgid "Other Information"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
 #: view:hr.payslip:0
-msgid "Group By..."
+msgid "Other Information"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
+msgid "Draft Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Identification No"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Identification No"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
+msgid "Total Working Days"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
+#: view:hr.payslip:0
+msgid "Confirm"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -516,193 +379,183 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
+#: view:hr.salary.rule:0
+msgid "Children definition"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
+msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr ""
@@ -713,190 +566,128 @@ msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
+#: view:hr.salary.rule:0
+msgid "Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
+#: view:hr.salary.rule:0
+msgid "Conditions"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
+#: view:hr.payslip:0
+msgid "Worked Day"
 msgstr ""
 
 #. module: hr_payroll
@@ -905,43 +696,9 @@ msgid "Employee Function"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
@@ -950,19 +707,14 @@ msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr ""
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
@@ -971,61 +723,38 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1034,340 +763,276 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
+#: view:hr.contribution.register:0
+msgid "Contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1379,240 +1044,157 @@ msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr ""
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr ""
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
diff --git a/addons/hr_payroll/i18n/vi.po b/addons/hr_payroll/i18n/vi.po
index ba45b5f02c3..470f32f6661 100644
--- a/addons/hr_payroll/i18n/vi.po
+++ b/addons/hr_payroll/i18n/vi.po
@@ -7,247 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2011-07-20 09:43+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "E-mail Address"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Net Salary"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Phòng/Ban"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Các khoản giảm trừ:"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Nhóm theo..."
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
+#: view:hr.payslip:0
+msgid "States"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Khoản vay"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "Công ty"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
+#: view:hr.payslip:0
+msgid "Done Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "Đặt thành Nháp"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Khác"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
+#: view:hr.payslip.employees:0
+msgid "Generate"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr ""
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Tổng:"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Từ chối"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Ngày nghỉ"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Đăng ký"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
-msgstr "Lỗi ! Bạn không thể chọn phòng ban do nhân viên này quản lý."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Tổng Các khoản giảm trừ"
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Giá trị"
+#: view:hr.salary.rule:0
+msgid "Input Data"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Tên của nhân viên"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
 msgstr ""
 
 #. module: hr_payroll
@@ -256,259 +202,176 @@ msgid "Salary Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "Số tiền"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Phần trăm"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "Thông tin khác"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Khấu trừ Khác"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Nhóm theo..."
-
-#. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Hợp lệ từ"
-
-#. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Số tiền (bằng chữ) :"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Thanh toán"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "Số CMND"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Dựa trên"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Tổng:"
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
+msgid "Total Working Days"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Ngày :"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Tổng phụ"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr ""
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Từ"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
+#: view:hr.payslip:0
+msgid "Confirm"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Ngày Kết thúc"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Ghi chú:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "Trạng thái"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -516,432 +379,326 @@ msgid "Employee"
 msgstr "Người lao động"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Công thức"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Loại"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "Thư điện tử"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "#"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "Lỗi !"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Giảm trừ"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Fixed Amount"
 msgstr "Giá trị cố định"
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Đến"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "hr.payroll.employees.detail"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+msgid "Worked Days & Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Payslip"
-msgstr ""
-
-#. module: hr_payroll
-#: constraint:hr.contract:0
-msgid "Error! contract start-date must be lower then contract end-date."
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
+msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
+#: view:hr.payslip:0
+msgid "Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
+#: view:hr.contract:0
+msgid "Payslip Info"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Khác:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
+#: view:hr.salary.rule:0
+msgid "Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "Dự thảo"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Cơ bản"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Tên nhân viên"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
+#: view:hr.salary.rule:0
+msgid "Conditions"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr ""
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
+#: view:hr.payslip:0
+msgid "Worked Day"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Các hợp đồng"
-
-#. module: hr_payroll
 #: view:hr.payroll.structure:0
 msgid "Employee Function"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Đã thanh toán"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr ""
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Người sử dụng"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
 msgstr ""
 
 #. module: hr_payroll
@@ -950,19 +707,14 @@ msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "Hoạt động"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr ""
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
 msgstr ""
 
 #. module: hr_payroll
@@ -971,61 +723,38 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Lỗi ! Bạn không thể tạo cấu trúc đệ quy của nhân viên"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Điều kiện"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Tính toán"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Designation"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Lương Cơ bản"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "Thông tin Lương"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
@@ -1034,340 +763,276 @@ msgid "Companies"
 msgstr "Các công ty"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Hợp đồng"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Ngày"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr "Đóng góp"
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
-msgstr "Đóng góp"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "Nhãn"
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
+msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
+#: view:hr.salary.rule:0
+msgid "Company contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "Mã"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr ""
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "Trình tự"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
+#: view:hr.salary.rule:0
+msgid "General"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Số"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "Ðóng"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Các khoản Phụ cấp"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "Số Hộ chiếu"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Hộ chiếu"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "Cho giai đoạn"
-
-#. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
-msgid "Contribution Register"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "Thư điện tử"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "In Báo cáo"
-
-#. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
+msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Tháng"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Chức năng"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "States"
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
+#: view:hr.payslip:0
+msgid "Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
+#: view:hr.payslip:0
+msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
 msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "Mô tả"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Ngày bắt đầu"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ")"
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr ""
 
@@ -1379,240 +1044,342 @@ msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Loại tiền công"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "Tên Chủng loại"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
-msgstr "hr.payroll.year.salary"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "Địa chỉ"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr ""
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Ngân hàng"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
 msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "Tên"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "Quốc gia"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "Các nhân viên"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "Tài khoản Ngân hàng"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Tổng Thanh toán"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr ""
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "Tổng cộng"
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
 msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Chi tiết Ngân hàng"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Trình tự"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
 msgstr ""
 
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr ""
+#~ msgid "Net Salary"
+#~ msgstr "Net Salary"
 
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Tổng cộng"
+#~ msgid "Department"
+#~ msgstr "Phòng/Ban"
 
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr "Những đóng góp"
+#~ msgid "E-mail Address"
+#~ msgstr "E-mail Address"
+
+#~ msgid "Loan"
+#~ msgstr "Khoản vay"
+
+#~ msgid "Others"
+#~ msgstr "Khác"
+
+#~ msgid "Register"
+#~ msgstr "Đăng ký"
+
+#~ msgid "Reject"
+#~ msgstr "Từ chối"
+
+#~ msgid "Value"
+#~ msgstr "Giá trị"
+
+#~ msgid "Deductions:"
+#~ msgstr "Các khoản giảm trừ:"
+
+#~ msgid "Total Deductions"
+#~ msgstr "Tổng Các khoản giảm trừ"
+
+#~ msgid "Leaves"
+#~ msgstr "Ngày nghỉ"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "Tên của nhân viên"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr "Lỗi ! Bạn không thể chọn phòng ban do nhân viên này quản lý."
+
+#~ msgid "Other Deduction"
+#~ msgstr "Khấu trừ Khác"
+
+#~ msgid "Percentage"
+#~ msgstr "Phần trăm"
+
+#~ msgid "Valid From"
+#~ msgstr "Hợp lệ từ"
+
+#~ msgid "Based on"
+#~ msgstr "Dựa trên"
+
+#~ msgid "Payment"
+#~ msgstr "Thanh toán"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Số tiền (bằng chữ) :"
+
+#~ msgid "Date :"
+#~ msgstr "Ngày :"
+
+#~ msgid "Sub Total"
+#~ msgstr "Tổng phụ"
+
+#~ msgid "From"
+#~ msgstr "Từ"
+
+#~ msgid "End Date"
+#~ msgstr "Ngày Kết thúc"
+
+#~ msgid "Notes:"
+#~ msgstr "Ghi chú:"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "Type"
+#~ msgstr "Loại"
+
+#~ msgid "Formula"
+#~ msgstr "Công thức"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Lỗi !"
+
+#~ msgid "Deductions"
+#~ msgstr "Giảm trừ"
+
+#~ msgid "hr.payroll.employees.detail"
+#~ msgstr "hr.payroll.employees.detail"
+
+#~ msgid "To"
+#~ msgstr "Đến"
+
+#~ msgid "Others:"
+#~ msgstr "Khác:"
+
+#~ msgid "Basic"
+#~ msgstr "Cơ bản"
+
+#~ msgid "Employee Name"
+#~ msgstr "Tên nhân viên"
+
+#~ msgid "Contracts"
+#~ msgstr "Các hợp đồng"
+
+#~ msgid "Paid"
+#~ msgstr "Đã thanh toán"
+
+#~ msgid "User"
+#~ msgstr "Người sử dụng"
+
+#~ msgid "Salary Information"
+#~ msgstr "Thông tin Lương"
+
+#~ msgid "Basic Salary"
+#~ msgstr "Lương Cơ bản"
+
+#~ msgid "Condition"
+#~ msgstr "Điều kiện"
+
+#~ msgid "Compute"
+#~ msgstr "Tính toán"
+
+#~ msgid "Date"
+#~ msgstr "Ngày"
+
+#~ msgid "Number"
+#~ msgstr "Số"
+
+#~ msgid "Label"
+#~ msgstr "Nhãn"
+
+#~ msgid "Passport No"
+#~ msgstr "Số Hộ chiếu"
+
+#~ msgid "Allowances"
+#~ msgstr "Các khoản Phụ cấp"
+
+#~ msgid "Passport"
+#~ msgstr "Hộ chiếu"
+
+#~ msgid "Print Report"
+#~ msgstr "In Báo cáo"
+
+#~ msgid "E-mail"
+#~ msgstr "Thư điện tử"
+
+#~ msgid "for period"
+#~ msgstr "Cho giai đoạn"
+
+#~ msgid "Function"
+#~ msgstr "Chức năng"
+
+#~ msgid "Month"
+#~ msgstr "Tháng"
+
+#~ msgid "Category Name"
+#~ msgstr "Tên Chủng loại"
+
+#~ msgid "hr.payroll.year.salary"
+#~ msgstr "hr.payroll.year.salary"
+
+#~ msgid "Wage Type"
+#~ msgstr "Loại tiền công"
+
+#~ msgid "Start Date"
+#~ msgstr "Ngày bắt đầu"
+
+#~ msgid "Country"
+#~ msgstr "Quốc gia"
+
+#~ msgid "Bank"
+#~ msgstr "Ngân hàng"
+
+#~ msgid "Total Payment"
+#~ msgstr "Tổng Thanh toán"
+
+#~ msgid "Bank Details"
+#~ msgstr "Chi tiết Ngân hàng"
+
+#~ msgid "Contributions"
+#~ msgstr "Những đóng góp"
diff --git a/addons/hr_payroll/i18n/zh_CN.po b/addons/hr_payroll/i18n/zh_CN.po
index 4ba5a362ef7..74376192b9b 100644
--- a/addons/hr_payroll/i18n/zh_CN.po
+++ b/addons/hr_payroll/i18n/zh_CN.po
@@ -7,248 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
 "PO-Revision-Date: 2010-07-20 16:01+0000\n"
 "Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "电子邮件地址"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "基于"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "净薪酬"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "重新计算"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "员工薪酬详情"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
-msgstr "基本补贴:"
+#: field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "部门"
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "扣除："
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "这钱用于?"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "分组..."
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "工作天数"
+#: view:hr.payslip:0
+msgid "States"
+msgstr "状态"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "借款"
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "薪酬支付记录"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "工资单"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "年薪报表"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "支付薪酬"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "("
 msgstr "("
 
 #. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
+#: field:hr.contribution.register,company_id:0
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
 msgid "Company"
 msgstr "公司"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "经理"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "详细内容"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ","
 msgstr ","
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.run:0
 msgid "Set to Draft"
 msgstr "设为草稿"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "变量错误: %s "
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "到期"
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "半薪假期"
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "其它"
+#: report:contribution.register.lines:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
 #: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
+#: report:payslip:0
 msgid "Pay Slip"
 msgstr "工资单"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "合约内容:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "计算字段"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "为要支付的薪酬选择银行"
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "银行通知单"
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "拒绝"
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "合计:"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "准假"
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
 #: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "记录"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
-msgstr "错误！您不用为他选择一部门因为他是总经理(CEO)。"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "扣除合计"
-
-#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "值"
+#: view:hr.salary.rule:0
+msgid "Input Data"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "这员工姓名"
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr "记录明细"
+#: view:hr.payslip:0
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr "备注"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -256,269 +202,176 @@ msgid "Salary Computation"
 msgstr "计算薪酬"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Amount"
 msgstr "金额"
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr "请检查设置 %s，丢失薪酬类型。"
-
-#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "百分率"
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "工资单明细"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payslip:0
 msgid "Other Information"
 msgstr "其它信息"
 
 #. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "发放国家"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "员工扣除"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "其它扣除"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "带薪假期"
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "分组..."
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "护照到期日期"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr "警告 !"
 
 #. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "不带薪假期"
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "有效期从"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
-msgstr "计算字段用于内部计算，不要放入表单中。"
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "金额(口头上):"
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "付款"
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr "工资单明细"
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Identification No"
 msgstr "身份证号"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "基于"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "等待确认"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "人力资源工资表"
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "合计:"
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Posted"
-msgstr "已发"
+msgid "Total Working Days"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
 msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
-msgstr ""
-"通用工资表系统 \n"
-"    * 员工详细资料 \n"
-"    * 员工合同 \n"
-"    * 签合同的护照 \n"
-"    * 津贴 / 扣除\n"
-"    * 允许设置基本 / 增长 /净薪酬 \n"
-"    * 员工工资单 \n"
-"    * 每月的工资表 \n"
-"    * 整合假期管理\n"
-"    "
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "准假类型"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "日期:"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "小计"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "付款 -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "信用卡或借记卡号"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "来自"
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "按薪酬"
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "结束日期"
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
 msgstr "员工工资单"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "准假扣除"
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "授权签署"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all categories code field in small letter as a variable name "
+"i.e. hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "函数值"
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
-msgstr "捐款记录明细"
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "备注："
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
 msgid "State"
 msgstr "状态"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr "付款明细"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "其它明细"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "函数参数"
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
-msgstr "公司捐款"
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
@@ -526,193 +379,183 @@ msgid "Employee"
 msgstr "员工"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "公式"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr "银行通知单明细"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "类型"
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Email"
 msgstr "电子邮件"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "错误！"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "核实"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
-msgstr "员工每周的工作天数"
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr "新工资单"
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr "净基本"
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "薪酬总额"
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "总收入"
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
-msgstr "员工薪酬报表"
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "其它的付款"
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "扣除"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr "C/D"
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "工作许可证编号"
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "员工薪酬"
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr "固定金额"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
-msgstr "支票号"
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "员工合计"
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "固定金额"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "到"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error !"
-msgstr "变量错误"
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "hr.payroll.employees.detail"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "支付薪酬"
+msgid "PaySlip Batch"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
-msgstr "银行帐号 A/C"
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
-msgstr "捐款明细"
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "这月"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "扣除"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr "银行通知单备注"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr "工资单"
@@ -723,191 +566,129 @@ msgid "Error! contract start-date must be lower then contract end-date."
 msgstr "错误！合同开始日期必须小于结束日期。"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr "贷款的分期付款"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr "完成人力资源检查"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "此致"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr "身份证号"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "净金额"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "薪酬结构:"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "员工薪酬细节"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr "明细"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr "确认"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "其它："
+#: view:hr.contract:0
+msgid "Payslip Info"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr "计算函数"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "已工作天数"
+#: code:addons/hr_payroll/hr_payroll.py:870
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "公司合计"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
-msgstr "D/C"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
-msgstr "国籍&地址"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "员工编码"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
-msgstr "基本薪酬 - 准假"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
 msgstr "金额类型"
 
 #. module: hr_payroll
-#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
 msgstr "分类"
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
-msgstr "公司捐款"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
-msgstr "分类"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "打印"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Draft"
 msgstr "草稿"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr "收入"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "基本"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "所有护照"
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
-msgstr "薪酬记录"
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "员工姓名"
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "护照详细资料"
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
 msgid "Percentage (%)"
 msgstr "百分比(%)"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr "工资表记录"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "目的"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "合同"
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr "已工作天数"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -915,44 +696,10 @@ msgid "Employee Function"
 msgstr "员工职能"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "已付"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "审批表"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "已付? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "审核"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "标题"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr "查找公司捐款"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "用户"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "付款明细"
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -960,20 +707,15 @@ msgid "Compute Sheet"
 msgstr "计算"
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
 msgid "Active"
 msgstr "有效"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr "如果条件为真，用这个计算"
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "年薪细节"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
+msgstr ""
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
@@ -981,62 +723,39 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "错误！您不能创建循环的员工等级。"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "条件"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr "等待人力资源审核"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
-msgstr "付款通知："
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "计算"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Designation"
 msgstr "指定"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "人力资源经理"
-
-#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "基本薪酬"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr "分类的编码"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "薪酬信息"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
-msgstr "津贴扣减分类"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1044,340 +763,276 @@ msgid "Companies"
 msgstr "公司"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Authorized Signature"
 msgstr "授权签字"
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "合同"
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
-msgstr "草稿"
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
-msgstr "下个月日期"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "日期"
+#: code:addons/hr_payroll/hr_payroll.py:858
+#: code:addons/hr_payroll/hr_payroll.py:864
+#: code:addons/hr_payroll/hr_payroll.py:870
+#: code:addons/hr_payroll/hr_payroll.py:887
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "信用卡或借记卡到期日期"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
-msgstr "查找护照"
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr "捐款"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "电话号码"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
-msgid "Contribution"
-msgstr "捐款"
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "标签"
+#: code:addons/hr_payroll/hr_payroll.py:893
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Company contribution"
-msgstr "公司捐款"
+msgid "Refund"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
-msgstr "其它号码"
+#: view:hr.salary.rule:0
+msgid "Company contribution"
+msgstr "公司捐款"
 
 #. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
 #: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
 msgstr "编码"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
-msgstr "付款通知"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "编号："
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr "序列"
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
-msgstr "一般基本上它将使用这%字段值来计算，但你能使用所有头带编码的字段作为变量名如： hra, ma, lta等，你也可以使用静态的变量。"
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
-msgstr "计算过程"
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
-msgstr "薪酬在"
+#: code:addons/hr_payroll/hr_payroll.py:662
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "编号"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
 #: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr "薪酬结构"
 
 #. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
+#: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
 msgstr "记录明细"
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
 msgid "Cancel"
 msgstr "取消"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
 msgid "Close"
 msgstr "结束"
 
 #. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "金额/ 百分比"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "补贴"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr "本月日期"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "薪酬"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "护照号"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "护照"
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "总薪酬"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "期间"
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr "薪酬分类"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
 msgstr "捐款记录"
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "电子邮件"
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr "打印"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
-msgstr "薪酬分类"
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "打印报表"
+#: code:addons/hr_payroll/hr_payroll.py:887
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr "计算"
 
 #. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
-msgstr ""
-
-#. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "其它信息"
-
-#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "月份"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr "发出"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr "动态计算"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr "基本的无薪准假："
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "函数"
+msgid "Worked Days"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr "状态"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "尊敬的先生/女士"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
-msgstr "扣除补贴分类"
+msgid "Search Payslips"
+msgstr "查找工资单"
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
-msgstr "获得的薪酬"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
 #: field:hr.payroll.structure,note:0
-#: view:hr.payslip:0
+#: field:hr.payslip,name:0
 #: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
 msgstr "说明"
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "开始日期"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr "扣除 -"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid ")"
 msgstr ")"
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
 msgstr "捐款记录"
 
@@ -1389,256 +1044,194 @@ msgid "Payroll"
 msgstr "工资表"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "薪酬类型"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "净薪酬"
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr "护照号必须唯一"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "分类名称"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
-msgstr "hr.payroll.year.salary"
+#: selection:hr.payslip,state:0
+msgid "Waiting"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Address"
 msgstr "地址"
 
 #. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr "工资单明细"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr "准假天数"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "银行"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr "取消"
+#: code:addons/hr_payroll/hr_payroll.py:864
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "预支"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
-msgstr "特别的员工津贴和扣除"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
 #: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Name"
 msgstr "名称"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr "准假扣除"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "国家"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
 msgid "Employees"
 msgstr "员工"
 
 #. module: hr_payroll
-#: report:payroll.advice:0
+#: report:paylip.details:0
+#: report:payslip:0
 msgid "Bank Account"
 msgstr "银行帐号"
 
 #. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr "基于公司的捐款记录"
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
 msgstr "使用预定的序列排列"
 
 #. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "付款总额"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr "准假扣除明细："
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr "等待帐户审核"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
-msgstr "公司扣除"
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "工资表设置"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr "请定义员工 %s 的银行帐户"
-
-#. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr "护照签发日期"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr "补贴"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "准假天数"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
-msgstr "其它"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "银行信息"
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr "合计"
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
-msgstr "工资单ID"
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "序列"
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
-msgstr "员工工资单"
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr "信的内容"
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "年薪"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr "补贴 / 扣除"
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr "银行付款通知"
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr "查找工资单"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "合计"
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr "捐款"
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
 
 #~ msgid "Analytic Account for Salary Analysis"
 #~ msgstr "薪酬分析的辅助核算项"
 
+#~ msgid "New Slip"
+#~ msgstr "新工资单"
+
 #~ msgid "Axis Bank"
 #~ msgstr "Axis银行"
 
+#~ msgid "Working Days"
+#~ msgstr "工作天数"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "在动作定义中使用了无效的模快名。"
 
+#~ msgid "Department"
+#~ msgstr "部门"
+
+#~ msgid "Deductions:"
+#~ msgstr "扣除："
+
+#~ msgid "Paid ? "
+#~ msgstr "已付? "
+
+#~ msgid "Salary Payment Register"
+#~ msgstr "薪酬支付记录"
+
 #~ msgid "Employee No"
 #~ msgstr "员工编号"
 
+#~ msgid "Others"
+#~ msgstr "其它"
+
 #~ msgid "Calculations Rules"
 #~ msgstr "计算规则"
 
@@ -1662,6 +1255,12 @@ msgstr "捐款"
 #~ "   人力资源假期\n"
 #~ "    "
 
+#~ msgid "The Manager"
+#~ msgstr "经理"
+
+#~ msgid "Half-Pay Holiday"
+#~ msgstr "半薪假期"
+
 #~ msgid "Employee Payable Account"
 #~ msgstr "员工帐号"
 
@@ -1674,25 +1273,60 @@ msgstr "捐款"
 #~ msgid "Payment From"
 #~ msgstr "付款来自"
 
+#~ msgid "Register"
+#~ msgstr "记录"
+
+#~ msgid "Next Month Date"
+#~ msgstr "下个月日期"
+
+#~ msgid "Name of the Employee"
+#~ msgstr "这员工姓名"
+
+#~ msgid "Value"
+#~ msgstr "值"
+
 #~ msgid "Keep empty to use the period of the validation(Payslip) date."
 #~ msgstr "为空使用确认(工资单)日期"
 
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "警告 !"
+#~ msgid "Passport Expire Date"
+#~ msgstr "护照到期日期"
+
+#~ msgid "Other Deduction"
+#~ msgstr "其它扣除"
+
+#~ msgid "Work Permit No"
+#~ msgstr "工作许可证编号"
+
+#~ msgid "Paid Holiday"
+#~ msgstr "带薪假期"
 
 #~ msgid "Special Allowance and Deductions for Employee"
 #~ msgstr "特别津贴和员工的扣除"
 
+#~ msgid "Un-Paid Holiday"
+#~ msgstr "不带薪假期"
+
 #~ msgid "Expanse Entries"
 #~ msgstr "支出记录"
 
+#~ msgid "Bank"
+#~ msgstr "银行"
+
+#~ msgid "Based on"
+#~ msgstr "基于"
+
 #~ msgid "Expanse To"
 #~ msgstr "支出到"
 
 #~ msgid "Analytic Account"
 #~ msgstr "辅助核算项"
 
+#~ msgid "Payment"
+#~ msgstr "付款"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "金额(口头上):"
+
 #~ msgid "Force Period"
 #~ msgstr "强制期间"
 
@@ -1700,19 +1334,40 @@ msgstr "捐款"
 #~ msgid "Please Confirm all Expanse Invoice appear for Reimbursement"
 #~ msgstr "请确认所有退款显示的支出发票"
 
+#~ msgid "Passport Detail"
+#~ msgstr "护照详细资料"
+
 #, python-format
 #~ msgid "Please defined the Employee Home Address Along with Partners !!"
 #~ msgstr "请定义业务伙伴员工的家庭地址!"
 
+#~ msgid "Sub Total"
+#~ msgstr "小计"
+
+#~ msgid "From"
+#~ msgstr "来自"
+
 #~ msgid "Employee Year Salary"
 #~ msgstr "员工年薪"
 
 #~ msgid "Error! You can not create recursive analytic accounts."
 #~ msgstr "错误! 你不能创建递归的辅助核算项"
 
+#~ msgid "Authorised Signature"
+#~ msgstr "授权签署"
+
+#~ msgid "Passport"
+#~ msgstr "护照"
+
 #~ msgid "Accounting Information"
 #~ msgstr "会计信息"
 
+#~ msgid "Notes:"
+#~ msgstr "备注："
+
+#~ msgid "End Date"
+#~ msgstr "结束日期"
+
 #~ msgid "Unite"
 #~ msgstr "合并"
 
@@ -1722,8 +1377,11 @@ msgstr "捐款"
 #~ msgid "Accounting Informations"
 #~ msgstr "会计信息"
 
-#~ msgid "Print"
-#~ msgstr "打印"
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "Type"
+#~ msgstr "类型"
 
 #, python-format
 #~ msgid "Integrity Error !"
@@ -1732,6 +1390,9 @@ msgstr "捐款"
 #~ msgid "Miscelleanous"
 #~ msgstr "杂项"
 
+#~ msgid "Start Date"
+#~ msgstr "开始日期"
+
 #~ msgid "Contributions Configuration"
 #~ msgstr "捐助设置"
 
@@ -1741,19 +1402,34 @@ msgstr "捐款"
 #~ msgid "By Employee Function"
 #~ msgstr "按员工职能"
 
+#~ msgid "Employee Salary"
+#~ msgstr "员工薪酬"
+
 #~ msgid "Year Salary Detail"
 #~ msgstr "年薪细节"
 
+#~ msgid "Deduction"
+#~ msgstr "扣除"
+
+#~ msgid "For the month of"
+#~ msgstr "这月"
+
 #, python-format
 #~ msgid "Please defined the Partner in Home Address !!"
 #~ msgstr "请定义业务伙伴主页地址!"
 
+#~ msgid "Pay Salary"
+#~ msgstr "支付薪酬"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效的视图结构xml文件!"
 
 #~ msgid "Account Lines"
 #~ msgstr "明细"
 
+#~ msgid "Wating for Verification"
+#~ msgstr "等待确认"
+
 #~ msgid "Passport List"
 #~ msgstr "护照"
 
@@ -1769,9 +1445,27 @@ msgstr "捐款"
 #~ msgid "YTD"
 #~ msgstr "年初至今"
 
+#~ msgid "Complete HR Checking"
+#~ msgstr "完成人力资源检查"
+
+#~ msgid "Salary Structure:"
+#~ msgstr "薪酬结构:"
+
 #~ msgid "Function of the Employee"
 #~ msgstr "这员工职能"
 
+#~ msgid "Employees Salary Detail"
+#~ msgstr "员工薪酬细节"
+
+#~ msgid "Contracts"
+#~ msgstr "合同"
+
+#~ msgid "Net Amount"
+#~ msgstr "净金额"
+
+#~ msgid "Others:"
+#~ msgstr "其它："
+
 #~ msgid "Passport and Visa"
 #~ msgstr "护照和visa"
 
@@ -1779,6 +1473,12 @@ msgstr "捐款"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "对象名必须以x_开头并且不能包含特殊字符"
 
+#~ msgid "Employee Name"
+#~ msgstr "员工姓名"
+
+#~ msgid "All Passports"
+#~ msgstr "所有护照"
+
 #~ msgid "Employee Contract"
 #~ msgstr "员工合约"
 
@@ -1788,9 +1488,18 @@ msgstr "捐款"
 #~ msgid "Salary Account"
 #~ msgstr "薪酬帐号"
 
+#~ msgid "Earnings"
+#~ msgstr "收入"
+
+#~ msgid "Reject"
+#~ msgstr "拒绝"
+
 #~ msgid "Contribe by Company ?"
 #~ msgstr "公司捐助?"
 
+#~ msgid "Title"
+#~ msgstr "标题"
+
 #~ msgid "On Attendance"
 #~ msgstr "按出勤"
 
@@ -1803,18 +1512,48 @@ msgstr "捐款"
 #~ msgid "Working Days / Week"
 #~ msgstr "工作天数/ 周"
 
+#~ msgid "HR Manager"
+#~ msgstr "人力资源经理"
+
+#~ msgid "Payment Lines"
+#~ msgstr "付款明细"
+
+#~ msgid "Condition"
+#~ msgstr "条件"
+
 #~ msgid "PF Account"
 #~ msgstr "公积金帐号"
 
 #~ msgid "Employee Account"
 #~ msgstr "员工帐号"
 
+#~ msgid "Yearly Salary Details"
+#~ msgstr "年薪细节"
+
+#~ msgid "Basic Salary"
+#~ msgstr "基本薪酬"
+
+#~ msgid "Salary Information"
+#~ msgstr "薪酬信息"
+
 #~ msgid "Categoty Code"
 #~ msgstr "分类代码"
 
+#~ msgid "Allowance Deduction Categoty"
+#~ msgstr "津贴扣减分类"
+
 #~ msgid "Allowance / Deduction Category"
 #~ msgstr "津贴/ 扣减 分类"
 
+#~ msgid "Date"
+#~ msgstr "日期"
+
+#~ msgid "Phone No."
+#~ msgstr "电话号码"
+
+#~ msgid "Payment Advice"
+#~ msgstr "付款通知"
+
 #~ msgid "General Account"
 #~ msgstr "通用帐号"
 
@@ -1824,39 +1563,75 @@ msgstr "捐款"
 #~ msgid "Included in Salary ?"
 #~ msgstr "包含在薪酬?"
 
+#~ msgid "To"
+#~ msgstr "到"
+
+#~ msgid "Salary On"
+#~ msgstr "薪酬在"
+
+#~ msgid "Number"
+#~ msgstr "编号"
+
+#~ msgid "Paymeny Lines"
+#~ msgstr "付款明细"
+
 #~ msgid "General Information"
 #~ msgstr "一般信息"
 
+#~ msgid "Contract Detail:"
+#~ msgstr "合约内容:"
+
+#~ msgid "Current Month Date"
+#~ msgstr "本月日期"
+
 #~ msgid "Accounting Details"
 #~ msgstr "会计细节"
 
+#~ msgid "Amount / Percentage"
+#~ msgstr "金额/ 百分比"
+
+#~ msgid "Print Statement"
+#~ msgstr "打印"
+
 #~ msgid "Account Information"
 #~ msgstr "会计信息"
 
 #~ msgid "Generalities"
 #~ msgstr "概要"
 
+#~ msgid "for period"
+#~ msgstr "期间"
+
 #~ msgid "Process Form"
 #~ msgstr "进程表"
 
 #~ msgid "Contract Duration"
 #~ msgstr "合同有效期"
 
+#~ msgid "Year Salary"
+#~ msgstr "年薪"
+
+#~ msgid "Dynamic Computation"
+#~ msgstr "动态计算"
+
 #~ msgid "Salary Deposit Date Option?"
 #~ msgstr "薪酬存款日期选项?"
 
+#~ msgid "Other Informations"
+#~ msgstr "其它信息"
+
 #~ msgid "Create Analytic Structure"
 #~ msgstr "创建辅助核算结构"
 
 #~ msgid "Categoty Name"
 #~ msgstr "分类名"
 
+#~ msgid "Advance"
+#~ msgstr "预支"
+
 #~ msgid "Expanse account when Salary Expanse will be recorded"
 #~ msgstr "将被记录薪酬支出的支出帐号"
 
-#~ msgid "Notes"
-#~ msgstr "备注"
-
 #~ msgid "Select Bank Account from where Salary Expanse will be Paid"
 #~ msgstr "选择薪酬和将要支付的支出的银行帐号"
 
@@ -1866,14 +1641,461 @@ msgstr "捐款"
 #~ msgid "Fiscal Year"
 #~ msgstr "会计年度"
 
+#~ msgid "Bank Account A/C"
+#~ msgstr "银行帐号 A/C"
+
 #~ msgid "Employee Functions"
 #~ msgstr "员工职能"
 
 #~ msgid "Statutory Information"
 #~ msgstr "法定信息"
 
+#~ msgid "Deductions"
+#~ msgstr "扣除"
+
+#~ msgid "Employee Payslip"
+#~ msgstr "员工工资单"
+
+#~ msgid "Letter Content"
+#~ msgstr "信的内容"
+
+#~ msgid "Passport Issue Date"
+#~ msgstr "护照签发日期"
+
+#~ msgid "Total Deductions"
+#~ msgstr "扣除合计"
+
+#~ msgid "Bank Payment Advice"
+#~ msgstr "银行付款通知"
+
 #~ msgid "Print Salary Structure"
 #~ msgstr "打印薪酬结构"
 
+#~ msgid "Net Salary"
+#~ msgstr "净薪酬"
+
 #~ msgid "(Based on type Payroll will calculate basic salary)"
 #~ msgstr "(根据工资类型计算基本薪酬)"
+
+#~ msgid "Salary"
+#~ msgstr "薪酬"
+
+#~ msgid "By Salary"
+#~ msgstr "按薪酬"
+
+#~ msgid "Paid Salary"
+#~ msgstr "支付薪酬"
+
+#~ msgid "Year Salary Report"
+#~ msgstr "年薪报表"
+
+#~ msgid "Allowances with Basic:"
+#~ msgstr "基本补贴:"
+
+#~ msgid "E-mail Address"
+#~ msgstr "电子邮件地址"
+
+#~ msgid "Based"
+#~ msgstr "基于"
+
+#~ msgid "Loan"
+#~ msgstr "借款"
+
+#~ msgid "Letter Details"
+#~ msgstr "详细内容"
+
+#, python-format
+#~ msgid "Variable Error: %s "
+#~ msgstr "变量错误: %s "
+
+#~ msgid "Bank Advice"
+#~ msgstr "银行通知单"
+
+#~ msgid "Calculaton Field"
+#~ msgstr "计算字段"
+
+#~ msgid "Register Lines"
+#~ msgstr "记录明细"
+
+#~ msgid "Country of Issue"
+#~ msgstr "发放国家"
+
+#~ msgid "Category Code"
+#~ msgstr "分类的编码"
+
+#~ msgid "Employee Deduction"
+#~ msgstr "员工扣除"
+
+#~ msgid "Percentage"
+#~ msgstr "百分率"
+
+#~ msgid "Expire"
+#~ msgstr "到期"
+
+#~ msgid ""
+#~ "Calculation field used for internal calculation, do not place this on form"
+#~ msgstr "计算字段用于内部计算，不要放入表单中。"
+
+#~ msgid "Valid From"
+#~ msgstr "有效期从"
+
+#~ msgid "Posted"
+#~ msgstr "已发"
+
+#~ msgid "Date :"
+#~ msgstr "日期:"
+
+#~ msgid "Visa No"
+#~ msgstr "信用卡或借记卡号"
+
+#~ msgid "Contribution Register Line"
+#~ msgstr "捐款记录明细"
+
+#~ msgid "Function Value"
+#~ msgstr "函数值"
+
+#~ msgid "Other Lines"
+#~ msgstr "其它明细"
+
+#~ msgid "Formula"
+#~ msgstr "公式"
+
+#~ msgid "Company Contributions"
+#~ msgstr "公司捐款"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "错误！"
+
+#~ msgid "Function Arguments"
+#~ msgstr "函数参数"
+
+#~ msgid "Bank Advice Lines"
+#~ msgstr "银行通知单明细"
+
+#~ msgid "Gross Salary"
+#~ msgstr "薪酬总额"
+
+#~ msgid "Total Earnings"
+#~ msgstr "总收入"
+
+#~ msgid "Net Basic"
+#~ msgstr "净基本"
+
+#~ msgid "Chaque Nos"
+#~ msgstr "支票号"
+
+#, python-format
+#~ msgid "Variable Error !"
+#~ msgstr "变量错误"
+
+#~ msgid "Total By Employee"
+#~ msgstr "员工合计"
+
+#~ msgid "Contribution Lines"
+#~ msgstr "捐款明细"
+
+#~ msgid "Function Line"
+#~ msgstr "明细"
+
+#~ msgid "Function Calculation"
+#~ msgstr "计算函数"
+
+#~ msgid "Total By Company"
+#~ msgstr "公司合计"
+
+#~ msgid "Employee Code"
+#~ msgstr "员工编码"
+
+#~ msgid "Category Name"
+#~ msgstr "分类名称"
+
+#~ msgid "Company Contribution"
+#~ msgstr "公司捐款"
+
+#~ msgid "Country & Address"
+#~ msgstr "国籍&地址"
+
+#~ msgid "Salary Register"
+#~ msgstr "薪酬记录"
+
+#~ msgid "Basic"
+#~ msgstr "基本"
+
+#~ msgid "Approve Sheet"
+#~ msgstr "审批表"
+
+#~ msgid "Validation"
+#~ msgstr "审核"
+
+#~ msgid "Search Company Contribution"
+#~ msgstr "查找公司捐款"
+
+#~ msgid "Paid"
+#~ msgstr "已付"
+
+#~ msgid "User"
+#~ msgstr "用户"
+
+#~ msgid "Applied this head for calculation if condition is true"
+#~ msgstr "如果条件为真，用这个计算"
+
+#~ msgid "Payment Advice:"
+#~ msgstr "付款通知："
+
+#~ msgid "Wating for HR Verification"
+#~ msgstr "等待人力资源审核"
+
+#~ msgid "Compute"
+#~ msgstr "计算"
+
+#~ msgid "Visa Expire Date"
+#~ msgstr "信用卡或借记卡到期日期"
+
+#~ msgid "Label"
+#~ msgstr "标签"
+
+#~ msgid "Other No."
+#~ msgstr "其它号码"
+
+#~ msgid ""
+#~ "This will use to computer the % fields values, in general its on basic, but "
+#~ "You can use all heads code field in small letter as a variable name i.e. "
+#~ "hra, ma, lta, etc...., also you can use, static varible basic"
+#~ msgstr "一般基本上它将使用这%字段值来计算，但你能使用所有头带编码的字段作为变量名如： hra, ma, lta等，你也可以使用静态的变量。"
+
+#~ msgid "Allowances"
+#~ msgstr "补贴"
+
+#~ msgid "Computation Overview"
+#~ msgstr "计算过程"
+
+#~ msgid "Number :"
+#~ msgstr "编号："
+
+#~ msgid "Print Report"
+#~ msgstr "打印报表"
+
+#~ msgid "E-mail"
+#~ msgstr "电子邮件"
+
+#~ msgid "Passport No"
+#~ msgstr "护照号"
+
+#~ msgid "Total Salary"
+#~ msgstr "总薪酬"
+
+#~ msgid "Function"
+#~ msgstr "函数"
+
+#~ msgid "Issue"
+#~ msgstr "发出"
+
+#~ msgid "Month"
+#~ msgstr "月份"
+
+#~ msgid "Dear Sir/Madam,"
+#~ msgstr "尊敬的先生/女士"
+
+#~ msgid "Gross Sal."
+#~ msgstr "获得的薪酬"
+
+#~ msgid "Net Sal."
+#~ msgstr "净薪酬"
+
+#~ msgid "Deduction -"
+#~ msgstr "扣除 -"
+
+#~ msgid "The Passport No must be unique !"
+#~ msgstr "护照号必须唯一"
+
+#~ msgid "Total Payment"
+#~ msgstr "付款总额"
+
+#~ msgid "Company Deduction"
+#~ msgstr "公司扣除"
+
+#~ msgid "Wating for Account Verification"
+#~ msgstr "等待帐户审核"
+
+#~ msgid "Contribution register based on company"
+#~ msgstr "基于公司的捐款记录"
+
+#~ msgid "Country"
+#~ msgstr "国家"
+
+#~ msgid "Payroll Configurtion"
+#~ msgstr "工资表设置"
+
+#~ msgid "Other Id"
+#~ msgstr "其它"
+
+#~ msgid "Allowance"
+#~ msgstr "补贴"
+
+#~ msgid "Bank Details"
+#~ msgstr "银行信息"
+
+#, python-format
+#~ msgid "Please define bank account for the %s employee"
+#~ msgstr "请定义员工 %s 的银行帐户"
+
+#~ msgid "Contributions"
+#~ msgstr "捐款"
+
+#~ msgid "Allowance / Deduction"
+#~ msgstr "补贴 / 扣除"
+
+#~ msgid "Payroll Register"
+#~ msgstr "工资表记录"
+
+#~ msgid "Human Resource Payroll"
+#~ msgstr "人力资源工资表"
+
+#~ msgid "Search Passport"
+#~ msgstr "查找护照"
+
+#~ msgid "Employee Salary Statement"
+#~ msgstr "员工薪酬报表"
+
+#~ msgid "For"
+#~ msgstr "目的"
+
+#~ msgid "hr.payroll.employees.detail"
+#~ msgstr "hr.payroll.employees.detail"
+
+#~ msgid "D/C"
+#~ msgstr "D/C"
+
+#~ msgid "hr.payroll.year.salary"
+#~ msgstr "hr.payroll.year.salary"
+
+#~ msgid "SI. No."
+#~ msgstr "身份证号"
+
+#~ msgid "C/D"
+#~ msgstr "C/D"
+
+#~ msgid "Employees Salary Details"
+#~ msgstr "员工薪酬详情"
+
+#~ msgid "Use for Gratuity ?"
+#~ msgstr "这钱用于?"
+
+#~ msgid "Recompute Sheet"
+#~ msgstr "重新计算"
+
+#~ msgid "Select the Bank Address from whcih the salary is going to be paid"
+#~ msgstr "为要支付的薪酬选择银行"
+
+#~ msgid "Leaves"
+#~ msgstr "准假"
+
+#~ msgid ""
+#~ "Error ! You cannot select a department for which the employee is the manager."
+#~ msgstr "错误！您不用为他选择一部门因为他是总经理(CEO)。"
+
+#, python-format
+#~ msgid "Please check configuration of %s, payroll head is missing"
+#~ msgstr "请检查设置 %s，丢失薪酬类型。"
+
+#~ msgid ""
+#~ "Generic Payroll system\n"
+#~ "    * Employee Details\n"
+#~ "    * Employee Contracts\n"
+#~ "    * Passport based Contract\n"
+#~ "    * Allowances / Deductions\n"
+#~ "    * Allow to configure Basic / Grows / Net Salary\n"
+#~ "    * Employee Payslip\n"
+#~ "    * Monthly Payroll Register\n"
+#~ "    * Integrated with Holiday Management\n"
+#~ "    "
+#~ msgstr ""
+#~ "通用工资表系统 \n"
+#~ "    * 员工详细资料 \n"
+#~ "    * 员工合同 \n"
+#~ "    * 签合同的护照 \n"
+#~ "    * 津贴 / 扣除\n"
+#~ "    * 允许设置基本 / 增长 /净薪酬 \n"
+#~ "    * 员工工资单 \n"
+#~ "    * 每月的工资表 \n"
+#~ "    * 整合假期管理\n"
+#~ "    "
+
+#~ msgid "Leave Type"
+#~ msgstr "准假类型"
+
+#~ msgid "Leave Deductions"
+#~ msgstr "准假扣除"
+
+#~ msgid "Verify Sheet"
+#~ msgstr "核实"
+
+#~ msgid "No of Working days / week for an employee"
+#~ msgstr "员工每周的工作天数"
+
+#~ msgid "Other Payment"
+#~ msgstr "其它的付款"
+
+#~ msgid "Bank Advice Note"
+#~ msgstr "银行通知单备注"
+
+#~ msgid "Yours Sincerely"
+#~ msgstr "此致"
+
+#~ msgid "Loan Installment"
+#~ msgstr "贷款的分期付款"
+
+#~ msgid "Leave Deductions Line:"
+#~ msgstr "准假扣除明细："
+
+#~ msgid "Confirm Sheet"
+#~ msgstr "确认"
+
+#~ msgid "Heads"
+#~ msgstr "分类"
+
+#~ msgid "Basic Salary – Leaves"
+#~ msgstr "基本薪酬 - 准假"
+
+#~ msgid "Draft Sheet"
+#~ msgstr "草稿"
+
+#~ msgid "Salary Heads"
+#~ msgstr "薪酬分类"
+
+#~ msgid "Payroll Head"
+#~ msgstr "薪酬分类"
+
+#~ msgid "Allowance Deduction Heads"
+#~ msgstr "扣除补贴分类"
+
+#~ msgid "Basic Salary without Leave:"
+#~ msgstr "基本的无薪准假："
+
+#~ msgid "Wage Type"
+#~ msgstr "薪酬类型"
+
+#~ msgid "Number of Leaves"
+#~ msgstr "准假天数"
+
+#~ msgid "Slip Line"
+#~ msgstr "工资单明细"
+
+#~ msgid "Special Allowances and Deductions For Employee:"
+#~ msgstr "特别的员工津贴和扣除"
+
+#~ msgid "Cancel Sheet"
+#~ msgstr "取消"
+
+#~ msgid "Leaved Deduction"
+#~ msgstr "准假扣除"
+
+#~ msgid "Slip ID"
+#~ msgstr "工资单ID"
+
+#~ msgid "No of Leaves"
+#~ msgstr "准假天数"
+
+#~ msgid "Payments -"
+#~ msgstr "付款 -"