diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index c4cffdc012a..083142c550d 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -33,7 +33,6 @@ - diff --git a/addons/hr_payroll/i18n/fa.po b/addons/hr_payroll/i18n/fa.po new file mode 100644 index 00000000000..54d5fd7fc84 --- /dev/null +++ b/addons/hr_payroll/i18n/fa.po @@ -0,0 +1,1251 @@ +# Persian translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-12-21 17:04+0000\n" +"PO-Revision-Date: 2014-04-23 14:46+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Persian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-04-24 06:02+0000\n" +"X-Generator: Launchpad (build 16985)\n" + +#. module: hr_payroll +#: field:hr.payslip.line,condition_select:0 +#: field:hr.salary.rule,condition_select:0 +msgid "Condition Based on" +msgstr "" + +#. module: hr_payroll +#: selection:hr.contract,schedule_pay:0 +msgid "Monthly" +msgstr "ماهانه" + +#. module: hr_payroll +#: field:hr.payslip.line,rate:0 +msgid "Rate (%)" +msgstr "امتیاز (%)" + +#. module: hr_payroll +#: 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 +#: field:hr.payslip.worked_days,number_of_days:0 +msgid "Number of Days" +msgstr "تعداد روزها" + +#. module: hr_payroll +#: 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 +#: view:hr.payslip:0 +#: view:hr.payslip.line:0 +#: view:hr.salary.rule:0 +msgid "Group By..." +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "States" +msgstr "وضعیت ها" + +#. module: hr_payroll +#: 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.payslip.line,parent_rule_id:0 +#: field:hr.salary.rule,parent_rule_id:0 +msgid "Parent Salary Rule" +msgstr "" + +#. module: hr_payroll +#: view:hr.employee:0 +#: field:hr.employee,slip_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 +#: field:hr.payroll.structure,parent_id:0 +#: field:hr.salary.rule.category,parent_id:0 +msgid "Parent" +msgstr "" + +#. module: hr_payroll +#: 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 +#: view:hr.payslip:0 +msgid "Done Slip" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +#: view:hr.payslip.run:0 +msgid "Set to Draft" +msgstr "" + +#. module: hr_payroll +#: model:ir.model,name:hr_payroll.model_hr_salary_rule +msgid "hr.salary.rule" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +#: view:hr.payslip.run:0 +msgid "to" +msgstr "" + +#. module: hr_payroll +#: field:hr.payslip,payslip_run_id:0 +#: view:hr.payslip.run:0 +#: model:ir.model,name:hr_payroll.model_hr_payslip_run +msgid "Payslip Batches" +msgstr "" + +#. module: hr_payroll +#: 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:contribution.register.lines:0 +#: report:paylip.details:0 +#: report:payslip:0 +msgid "Quantity/Rate" +msgstr "" + +#. module: hr_payroll +#: view:hr.salary.rule:0 +msgid "Children Definition" +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:0 +msgid "Pay Slip" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip.employees:0 +msgid "Generate" +msgstr "" + +#. module: hr_payroll +#: 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 +#: report:contribution.register.lines:0 +msgid "Total:" +msgstr "" + +#. module: hr_payroll +#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules +msgid "All Children Rules" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +#: view:hr.salary.rule:0 +msgid "Input Data" +msgstr "" + +#. module: hr_payroll +#: constraint:hr.payslip:0 +msgid "Payslip 'Date From' must be before 'Date To'." +msgstr "" + +#. module: hr_payroll +#: view:hr.salary.rule.category:0 +msgid "Notes" +msgstr "" + +#. module: hr_payroll +#: code:addons/hr_payroll/hr_payroll.py:871 +#: code:addons/hr_payroll/hr_payroll.py:876 +#: code:addons/hr_payroll/hr_payroll.py:882 +#: code:addons/hr_payroll/hr_payroll.py:899 +#: code:addons/hr_payroll/hr_payroll.py:905 +#, python-format +msgid "Error!" +msgstr "" + +#. module: hr_payroll +#: 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 +#: 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:hr.payslip:0 +msgid "Other Information" +msgstr "" + +#. module: hr_payroll +#: field:hr.config.settings,module_hr_payroll_account:0 +msgid "Link your payroll to accounting system" +msgstr "" + +#. module: hr_payroll +#: 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:payslip.lines.contribution.register:0 +msgid "Contribution Register's Payslip Lines" +msgstr "" + +#. module: hr_payroll +#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52 +#, python-format +msgid "Warning !" +msgstr "" + +#. module: hr_payroll +#: report:paylip.details:0 +msgid "Details by Salary Rule Category:" +msgstr "" + +#. module: hr_payroll +#: report:paylip.details:0 +#: report:payslip:0 +msgid "Note" +msgstr "" + +#. module: hr_payroll +#: 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.payslip:0 +msgid "Draft Slip" +msgstr "" + +#. module: hr_payroll +#: code:addons/hr_payroll/hr_payroll.py:432 +#, python-format +msgid "Normal Working Days paid at 100%" +msgstr "" + +#. module: hr_payroll +#: field:hr.payslip.line,condition_range_max:0 +#: field:hr.salary.rule,condition_range_max:0 +msgid "Maximum Range" +msgstr "" + +#. module: hr_payroll +#: report:paylip.details:0 +#: report:payslip:0 +msgid "Identification No" +msgstr "" + +#. module: hr_payroll +#: field:hr.payslip,struct_id:0 +msgid "Structure" +msgstr "" + +#. module: hr_payroll +#: field:hr.contribution.register,partner_id:0 +msgid "Partner" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "Total Working Days" +msgstr "" + +#. module: hr_payroll +#: help:hr.payslip.line,code:0 +#: help:hr.salary.rule,code:0 +msgid "" +"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 +#: selection:hr.contract,schedule_pay:0 +msgid "Weekly" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "From" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "Confirm" +msgstr "" + +#. module: hr_payroll +#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form +msgid "" +"

\n" +" Click to add a new contribution register.\n" +"

\n" +" A contribution register is a third party involved in the " +"salary\n" +" payment of the employees. It can be the social security, " +"the\n" +" estate or anyone that collect or inject money on payslips.\n" +"

\n" +" " +msgstr "" + +#. module: hr_payroll +#: 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 +#: 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 +#: report:contribution.register.lines:0 +#: report:paylip.details:0 +msgid "Register Name" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip.employees:0 +msgid "Payslips by Employees" +msgstr "" + +#. module: hr_payroll +#: selection:hr.contract,schedule_pay:0 +msgid "Quarterly" +msgstr "" + +#. module: hr_payroll +#: selection:hr.payslip,state:0 +msgid "Waiting" +msgstr "" + +#. module: hr_payroll +#: 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:hr.salary.rule:0 +msgid "Search Salary Rule" +msgstr "" + +#. module: hr_payroll +#: field:hr.payslip,employee_id:0 +#: field:hr.payslip.line,employee_id:0 +#: model:ir.model,name:hr_payroll.model_hr_employee +msgid "Employee" +msgstr "" + +#. module: hr_payroll +#: selection:hr.contract,schedule_pay:0 +msgid "Semi-annually" +msgstr "" + +#. module: hr_payroll +#: report:paylip.details:0 +#: report:payslip:0 +msgid "Email" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip.run:0 +msgid "Search Payslip Batches" +msgstr "" + +#. module: hr_payroll +#: field:hr.payslip.line,amount_percentage_base:0 +#: field:hr.salary.rule,amount_percentage_base:0 +msgid "Percentage based on" +msgstr "" + +#. module: hr_payroll +#: code:addons/hr_payroll/hr_payroll.py:90 +#, python-format +msgid "%s (copy)" +msgstr "" + +#. module: hr_payroll +#: help:hr.config.settings,module_hr_payroll_account:0 +msgid "Create journal entries from payslips" +msgstr "" + +#. module: hr_payroll +#: field:hr.payslip,paid:0 +msgid "Made Payment Order ? " +msgstr "" + +#. module: hr_payroll +#: report:contribution.register.lines:0 +msgid "PaySlip Lines by Contribution Register" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +#: field:hr.payslip,line_ids:0 +#: view:hr.payslip.line:0 +#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines +msgid "Payslip Lines" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "Miscellaneous" +msgstr "" + +#. module: hr_payroll +#: selection:hr.payslip,state:0 +msgid "Rejected" +msgstr "" + +#. module: hr_payroll +#: 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 +#: code:addons/hr_payroll/hr_payroll.py:341 +#, python-format +msgid "Refund: " +msgstr "" + +#. module: hr_payroll +#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register +msgid "PaySlip Lines by Contribution Registers" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +#: selection:hr.payslip,state:0 +#: view:hr.payslip.run:0 +msgid "Done" +msgstr "" + +#. module: hr_payroll +#: 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.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 +#: code:addons/hr_payroll/hr_payroll.py:370 +#, python-format +msgid "Warning!" +msgstr "" + +#. module: hr_payroll +#: 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.payslip,state:0 +#: field:hr.payslip.run,state:0 +msgid "Status" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "Worked Days & Inputs" +msgstr "" + +#. module: hr_payroll +#: field:hr.payslip,details_by_salary_rule_category:0 +msgid "Details by Salary Rule Category" +msgstr "" + +#. module: hr_payroll +#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register +msgid "PaySlip Lines" +msgstr "" + +#. module: hr_payroll +#: 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 +#: field:hr.payslip.worked_days,number_of_hours:0 +msgid "Number of Hours" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "PaySlip Batch" +msgstr "" + +#. module: hr_payroll +#: field:hr.payslip.line,condition_range_min:0 +#: field:hr.salary.rule,condition_range_min:0 +msgid "Minimum Range" +msgstr "" + +#. module: hr_payroll +#: field:hr.payslip.line,child_ids:0 +#: field:hr.salary.rule,child_ids:0 +msgid "Child Salary Rule" +msgstr "" + +#. module: hr_payroll +#: 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 +#: selection:hr.payslip.line,condition_select:0 +#: selection:hr.salary.rule,condition_select:0 +msgid "Range" +msgstr "" + +#. module: hr_payroll +#: 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 +#: 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 "Payslip" +msgstr "" + +#. module: hr_payroll +#: field:hr.payslip,credit_note:0 +#: field:hr.payslip.run,credit_note:0 +msgid "Credit Note" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines +msgid "Payslip Computation Details" +msgstr "" + +#. module: hr_payroll +#: help:hr.payslip.line,appears_on_payslip:0 +#: help:hr.salary.rule,appears_on_payslip:0 +msgid "Used to display the salary rule on payslip." +msgstr "" + +#. module: hr_payroll +#: model:ir.model,name:hr_payroll.model_hr_payslip_input +msgid "Payslip Input" +msgstr "" + +#. module: hr_payroll +#: 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 +#: 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.salary.rule:0 +msgid "Computation" +msgstr "" + +#. module: hr_payroll +#: code:addons/hr_payroll/hr_payroll.py:899 +#, python-format +msgid "Wrong range condition defined for salary rule %s (%s)." +msgstr "" + +#. module: hr_payroll +#: 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 +#: 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 +#: 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:hr.salary.rule:0 +msgid "Company Contribution" +msgstr "" + +#. module: hr_payroll +#: 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 +#: code:addons/hr_payroll/hr_payroll.py:876 +#, python-format +msgid "Wrong percentage base or quantity defined for salary rule %s (%s)." +msgstr "" + +#. module: hr_payroll +#: 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 +#: 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: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 +#: view:hr.payslip.run:0 +msgid "Done Payslip Batches" +msgstr "" + +#. module: hr_payroll +#: report:paylip.details:0 +msgid "Payslip Lines by Contribution Register:" +msgstr "" + +#. module: hr_payroll +#: view:hr.salary.rule:0 +msgid "Conditions" +msgstr "" + +#. module: hr_payroll +#: 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 +#: code:addons/hr_payroll/hr_payroll.py:871 +#, python-format +msgid "Wrong quantity defined for salary rule %s (%s)." +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "Worked Day" +msgstr "" + +#. module: hr_payroll +#: view:hr.payroll.structure:0 +msgid "Employee Function" +msgstr "" + +#. module: hr_payroll +#: model:ir.actions.report.xml,name:hr_payroll.payslip_report +msgid "Employee PaySlip" +msgstr "" + +#. module: hr_payroll +#: field:hr.payslip.line,salary_rule_id:0 +msgid "Rule" +msgstr "" + +#. module: hr_payroll +#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report +msgid "PaySlip Details" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "Compute Sheet" +msgstr "" + +#. module: hr_payroll +#: field:hr.payslip.line,active:0 +#: field:hr.salary.rule,active:0 +msgid "Active" +msgstr "" + +#. module: hr_payroll +#: view:hr.salary.rule:0 +msgid "Child Rules" +msgstr "" + +#. module: hr_payroll +#: 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 +#: selection:hr.payslip.line,condition_select:0 +#: selection:hr.salary.rule,condition_select:0 +msgid "Python Expression" +msgstr "" + +#. module: hr_payroll +#: report:paylip.details:0 +#: report:payslip:0 +msgid "Designation" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "Companies" +msgstr "" + +#. module: hr_payroll +#: 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 +#: 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 +#: 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 +#: 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 "" + +#. module: hr_payroll +#: code:addons/hr_payroll/hr_payroll.py:351 +#, python-format +msgid "Refund Payslip" +msgstr "" + +#. module: hr_payroll +#: 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.payslip.line,quantity:0 +#: field:hr.salary.rule,quantity:0 +msgid "Quantity" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "Refund" +msgstr "" + +#. module: hr_payroll +#: report:contribution.register.lines:0 +#: field:hr.payslip.input,code:0 +#: field:hr.payslip.line,code: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 +#: 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 +#: 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 +#: view:hr.payslip:0 +msgid "Period" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip.run:0 +msgid "Period from" +msgstr "" + +#. module: hr_payroll +#: view:hr.salary.rule:0 +msgid "General" +msgstr "" + +#. module: hr_payroll +#: code:addons/hr_payroll/hr_payroll.py:674 +#, python-format +msgid "Salary Slip of %s for %s" +msgstr "" + +#. module: hr_payroll +#: 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 +#: view:hr.payroll.structure:0 +#: view:hr.payslip:0 +#: view:hr.payslip.line:0 +#: model:ir.model,name:hr_payroll.model_hr_payroll_structure +msgid "Salary Structure" +msgstr "" + +#. module: hr_payroll +#: field:hr.contribution.register,register_line_ids:0 +msgid "Register Line" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "Cancel" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip.run:0 +#: selection:hr.payslip.run,state:0 +msgid "Close" +msgstr "" + +#. module: hr_payroll +#: 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.payroll.structure,children_ids:0 +#: field:hr.salary.rule.category,children_ids:0 +msgid "Children" +msgstr "" + +#. module: hr_payroll +#: help:hr.payslip,credit_note:0 +msgid "Indicates this payslip has a refund of another" +msgstr "" + +#. module: hr_payroll +#: selection:hr.contract,schedule_pay:0 +msgid "Bi-monthly" +msgstr "" + +#. module: hr_payroll +#: report:paylip.details:0 +msgid "Pay Slip Details" +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 Payslips" +msgstr "" + +#. module: hr_payroll +#: model:ir.model,name:hr_payroll.model_hr_config_settings +msgid "hr.config.settings" +msgstr "" + +#. module: hr_payroll +#: 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 +#: view:payslip.lines.contribution.register:0 +msgid "Print" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip.line:0 +msgid "Calculations" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "Worked Days" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "Search Payslips" +msgstr "" + +#. module: hr_payroll +#: 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:hr.contribution.register:0 +#: field:hr.contribution.register,note:0 +#: field:hr.payroll.structure,note:0 +#: field:hr.payslip,name:0 +#: field:hr.payslip,note:0 +#: field:hr.payslip.input,name: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.employee,total_wage:0 +msgid "Total Basic Salary" +msgstr "" + +#. module: hr_payroll +#: 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 "" + +#. module: hr_payroll +#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting +#: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll +#: model:ir.ui.menu,name:hr_payroll.payroll_configure +msgid "Payroll" +msgstr "" + +#. module: hr_payroll +#: model:ir.actions.report.xml,name:hr_payroll.contribution_register +msgid "PaySlip Lines By Conribution Register" +msgstr "" + +#. module: hr_payroll +#: code:addons/hr_payroll/hr_payroll.py:370 +#, python-format +msgid "You cannot delete a payslip which is not draft or cancelled!" +msgstr "" + +#. module: hr_payroll +#: report:paylip.details:0 +#: report:payslip:0 +msgid "Address" +msgstr "" + +#. module: hr_payroll +#: 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 +#: view:hr.salary.rule.category:0 +msgid "Salary Categories" +msgstr "" + +#. module: hr_payroll +#: report:contribution.register.lines:0 +#: field:hr.contribution.register,name:0 +#: field:hr.payroll.structure,name:0 +#: field:hr.payslip.line,name: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 +#: 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 +#: view:hr.payroll.structure:0 +msgid "Payroll Structures" +msgstr "" + +#. module: hr_payroll +#: 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:paylip.details:0 +#: report:payslip:0 +msgid "Bank Account" +msgstr "" + +#. module: hr_payroll +#: help:hr.payslip.line,sequence:0 +#: help:hr.salary.rule,sequence:0 +msgid "Use to arrange calculation sequence" +msgstr "" + +#. module: hr_payroll +#: help:hr.payslip,state:0 +msgid "" +"* When the payslip is created the status is 'Draft'. \n" +"* If the payslip is under verification, the status is 'Waiting'. " +"\n" +"* If the payslip is confirmed then status is set to 'Done'. \n" +"* When user cancel payslip the status is 'Rejected'." +msgstr "" + +#. module: hr_payroll +#: help:hr.payslip.line,condition_range:0 +#: help:hr.salary.rule,condition_range:0 +msgid "" +"This will be used to compute the % fields values; in general it is on basic, " +"but you can also use categories code fields in lowercase as a variable names " +"(hra, ma, lta, etc.) and the variable basic." +msgstr "" + +#. module: hr_payroll +#: selection:hr.contract,schedule_pay:0 +msgid "Annually" +msgstr "" + +#. module: hr_payroll +#: field:hr.payslip,input_line_ids:0 +msgid "Payslip Inputs" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "Other Inputs" +msgstr "" + +#. module: hr_payroll +#: 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:882 +#, python-format +msgid "Wrong python code defined for salary rule %s (%s)." +msgstr "" + +#. module: hr_payroll +#: report:contribution.register.lines:0 +#: field:hr.payslip.line,total:0 +#: report:paylip.details:0 +#: report:payslip:0 +msgid "Total" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "Salary Computation" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "Details By Salary Rule Category" +msgstr "" + +#. module: hr_payroll +#: 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 +#: code:addons/hr_payroll/hr_payroll.py:905 +#, python-format +msgid "Wrong python condition defined for salary rule %s (%s)." +msgstr "" + +#. module: hr_payroll +#: 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.payslip.line:0 +msgid "Search Payslip Lines" +msgstr "" + +#. module: hr_payroll +#: selection:hr.contract,schedule_pay:0 +msgid "Bi-weekly" +msgstr "" + +#. module: hr_payroll +#: selection:hr.payslip.line,condition_select:0 +#: selection:hr.salary.rule,condition_select:0 +msgid "Always True" +msgstr "" + +#. module: hr_payroll +#: report:contribution.register.lines:0 +msgid "PaySlip Name" +msgstr "" + +#. module: hr_payroll +#: view:hr.payslip:0 +msgid "Accounting" +msgstr "" + +#. module: hr_payroll +#: field:hr.payslip.line,condition_range:0 +#: field:hr.salary.rule,condition_range:0 +msgid "Range Based on" +msgstr "" diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index c214b2efa75..4d15481070f 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -8,7 +8,6 @@ - diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py index 86246bc2745..33f5f1f8a83 100644 --- a/addons/mail/mail_followers.py +++ b/addons/mail/mail_followers.py @@ -109,8 +109,7 @@ class mail_notification(osv.Model): Administrator

- Sent by Your Company using OpenERP. OR - Sent by Administrator using OpenERP. + Sent from Your Company using OpenERP.
""" footer = "" @@ -132,7 +131,7 @@ class mail_notification(osv.Model): company = "%s" % (website_url, user.company_id.name) else: company = user.company_id.name - sent_by = _('Sent by %(company)s using %(openerp)s.') + sent_by = _('Sent from %(company)s using %(openerp)s') signature_company = '%s' % (sent_by % { 'company': company, 'openerp': "OpenERP" diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py index 12903d02236..ebce0988dd3 100644 --- a/addons/mail/mail_mail.py +++ b/addons/mail/mail_mail.py @@ -147,6 +147,8 @@ class mail_mail(osv.Model): def _get_partner_access_link(self, cr, uid, mail, partner=None, context=None): """Generate URLs for links in mails: partner has access (is user): link to action_mail_redirect action that will redirect to doc or Inbox """ + if context is None: + context = {} if partner and partner.user_ids: base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') # the parameters to encode for the query and fragment part of url @@ -161,7 +163,7 @@ class mail_mail(osv.Model): fragment.update(model=mail.model, res_id=mail.res_id) url = urljoin(base_url, "/web?%s#%s" % (urlencode(query), urlencode(fragment))) - return _("""Access your messages and documents in OpenERP""") % url + return _("""about %s %s""") % (url, context.get('model_name', ''), mail.record_name) else: return None @@ -233,10 +235,19 @@ class mail_mail(osv.Model): email sending process has failed :return: True """ + if context is None: + context = {} ir_mail_server = self.pool.get('ir.mail_server') - for mail in self.browse(cr, SUPERUSER_ID, ids, context=context): try: + # TDE note: remove me when model_id field is present on mail.message - done here to avoid doing it multiple times in the sub method + if mail.model: + model_id = self.pool['ir.model'].search(cr, SUPERUSER_ID, [('model', '=', mail.model)], context=context)[0] + model = self.pool['ir.model'].browse(cr, SUPERUSER_ID, model_id, context=context) + else: + model = None + if model: + context['model_name'] = model.name # handle attachments attachments = [] for attach in mail.attachment_ids: diff --git a/addons/portal/mail_mail.py b/addons/portal/mail_mail.py index 0fe2081fa45..79e5be49612 100644 --- a/addons/portal/mail_mail.py +++ b/addons/portal/mail_mail.py @@ -39,8 +39,8 @@ class mail_mail(osv.Model): if partner and not partner.user_ids: contex_signup = dict(context, signup_valid=True) signup_url = partner_obj._get_signup_url_for_action(cr, SUPERUSER_ID, [partner.id], - model=mail.model, res_id=mail.res_id, - context=contex_signup)[partner.id] - return _("""Access your messages and documents through our Customer Portal""") % signup_url + model=mail.model, res_id=mail.res_id, + context=contex_signup)[partner.id] + return _(""", access %s %s through our Customer Portal""") % (context.get('model_name', ''), mail.record_name, signup_url) else: return super(mail_mail, self)._get_partner_access_link(cr, uid, mail, partner=partner, context=context) diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index bae014029e1..0177e8b8b64 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -130,6 +130,7 @@ */ + var dummy = function () {}; var website = openerp.website; website.add_template_file('/website/static/src/xml/website.snippets.xml'); @@ -161,7 +162,6 @@ return this._super.apply(this, arguments); }, save: function () { - website.snippet.clean_for_save = true; this.snippets.clean_for_save(); this._super(); }, @@ -362,15 +362,21 @@ }, clean_for_save: function () { var self = this; - $(website.snippet.globalSelector).each(function () { - var $snippet = $(this); - self.make_active($snippet); - self.make_active(false); - var editor = $snippet.data("snippet-editor"); - if (editor) { - editor.clean_for_save(); + + $("*[contentEditable], *[attributeEditable]") + .removeAttr('contentEditable') + .removeAttr('attributeEditable'); + + var options = website.snippet.options; + var template = website.snippet.templateOptions; + for (var k in options) { + if (template[k] && options[k].prototype.clean_for_save !== dummy) { + var $snippet = this.dom_filter(template[k].selector); + $snippet.each(function () { + new options[k](self, null, $(this), k).clean_for_save(); + }); } - }); + } }, make_active: function ($snippet) { if ($snippet && this.$active_snipped_id && this.$active_snipped_id.get(0) === $snippet.get(0)) { @@ -854,8 +860,7 @@ } }, - clean_for_save: function () { - } + clean_for_save: dummy }); website.snippet.options.background = website.snippet.Option.extend({ @@ -943,8 +948,7 @@ this.id = this.unique_id(); this.$target.attr("id", this.id); this.$target.find("[data-slide]").attr("data-cke-saved-href", "#" + this.id); - this.$target.find("[data-slide-to]").attr("data-target", "#" + this.id); - + this.$target.find("[data-target]").attr("data-target", "#" + this.id); this.rebind_event(); }, on_clone: function ($clone) { @@ -964,7 +968,7 @@ }, clean_for_save: function () { this._super(); - this.$target.find(".item").removeClass("next prev left right"); + $(".carousel").find(".item").removeClass("next prev left right active"); if(!this.$target.find(".item.active").length) { this.$target.find(".item:first").addClass("active"); } @@ -1519,9 +1523,6 @@ }); }, onFocus : function () { - // don't open media editor before clean for save - if (website.snippet.clean_for_save) return; - var self = this; if (this.$target.parent().data("oe-field") === "image") { this.$overlay.addClass("hidden"); @@ -1761,19 +1762,6 @@ } this.$overlay.removeClass('oe_active'); }, - - /* clean_for_save - * function called just before save vue - */ - clean_for_save: function () { - for (var i in this.styles){ - this.styles[i].clean_for_save(); - } - this.$target.removeAttr('contentEditable') - .find('*').removeAttr('contentEditable'); - this.$target.removeAttr('attributeEditable') - .find('*').removeAttr('attributeEditable'); - }, }); })(); diff --git a/addons/website_project/controllers/main.py b/addons/website_project/controllers/main.py index e487a981996..c16d49e9f44 100644 --- a/addons/website_project/controllers/main.py +++ b/addons/website_project/controllers/main.py @@ -21,22 +21,6 @@ from openerp.addons.web import http from openerp.addons.web.http import request -from openerp.osv import osv - - -class Website(osv.Model): - _inherit = "website" - - def preprocess_request(self, cr, uid, ids, request, context=None): - project_obj = request.registry['project.project'] - project_ids = project_obj.search(cr, uid, [('privacy_visibility', "=", "public")], context=request.context) - - request.context.update({ - 'website_project_ids': project_obj.browse(cr, uid, project_ids, context=request.context) - }) - - return super(Website, self).preprocess_request(cr, uid, ids, request, context=None) - class website_project(http.Controller): diff --git a/addons/website_project/views/website_project.xml b/addons/website_project/views/website_project.xml index 1d511ba3ef1..a7e8b465d73 100644 --- a/addons/website_project/views/website_project.xml +++ b/addons/website_project/views/website_project.xml @@ -2,15 +2,6 @@ - - -