From c9c8503b7e2a2a67288ca5a40e6500ea789104a0 Mon Sep 17 00:00:00 2001 From: yannick Date: Fri, 13 Apr 2012 12:39:57 +0200 Subject: [PATCH 001/181] Merge 6.1 addons bzr revid: yannick@serveur-perso-20120413103957-hz0q2yevwxbwqqkm --- addons/l10n_fr/__openerp__.py | 1 + addons/l10n_fr/l10n_fr.py | 15 +- addons/l10n_fr/l10n_fr_view.xml | 22 + addons/l10n_fr_hr_payroll/__init__.py | 24 + addons/l10n_fr_hr_payroll/__openerp__.py | 45 + .../l10n_fr_hr_payroll/l10n_fr_hr_payroll.py | 57 + .../l10n_fr_hr_payroll_data.xml | 1132 +++++++++++++++++ .../l10n_fr_hr_payroll_view.xml | 70 + addons/l10n_fr_hr_payroll/report/__init__.py | 27 + .../l10n_fr_hr_payroll/report/fiche_paye.py | 76 ++ .../l10n_fr_hr_payroll/report/fiche_paye.rml | 452 +++++++ 11 files changed, 1920 insertions(+), 1 deletion(-) create mode 100755 addons/l10n_fr/l10n_fr_view.xml create mode 100755 addons/l10n_fr_hr_payroll/__init__.py create mode 100755 addons/l10n_fr_hr_payroll/__openerp__.py create mode 100755 addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py create mode 100755 addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml create mode 100755 addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml create mode 100644 addons/l10n_fr_hr_payroll/report/__init__.py create mode 100755 addons/l10n_fr_hr_payroll/report/fiche_paye.py create mode 100644 addons/l10n_fr_hr_payroll/report/fiche_paye.rml diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py index 839907c778a..d15a423b0d3 100644 --- a/addons/l10n_fr/__openerp__.py +++ b/addons/l10n_fr/__openerp__.py @@ -42,6 +42,7 @@ Credits: Sistheo Zeekom CrysaLEAD "update_xml" : [ "fr_report_demo.xml", "plan_comptable_general_demo.xml", + "l10n_fr_view.xml", "l10n_fr_wizard.xml", "fr_pcg_taxes_demo.xml", "fr_tax_demo.xml", diff --git a/addons/l10n_fr/l10n_fr.py b/addons/l10n_fr/l10n_fr.py index 573f4f7519e..5efb4244306 100644 --- a/addons/l10n_fr/l10n_fr.py +++ b/addons/l10n_fr/l10n_fr.py @@ -51,4 +51,17 @@ class l10n_fr_line(osv.osv): l10n_fr_line() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +class res_company(osv.osv): + _inherit = 'res.company' + + _columns = { + 'siret': fields.char('SIRET', size=64), + 'ape': fields.char('APE', size=64), + } + +res_company() + + + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_fr/l10n_fr_view.xml b/addons/l10n_fr/l10n_fr_view.xml new file mode 100755 index 00000000000..d21993db47b --- /dev/null +++ b/addons/l10n_fr/l10n_fr_view.xml @@ -0,0 +1,22 @@ + + + + + + res.company.form.l10n.fr + res.company + form + 20 + + + + + + + + + + + + + diff --git a/addons/l10n_fr_hr_payroll/__init__.py b/addons/l10n_fr_hr_payroll/__init__.py new file mode 100755 index 00000000000..f7fcefd3c4b --- /dev/null +++ b/addons/l10n_fr_hr_payroll/__init__.py @@ -0,0 +1,24 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2011 OpenERP SA (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see +# +############################################################################## +import l10n_fr_hr_payroll +import report + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_fr_hr_payroll/__openerp__.py b/addons/l10n_fr_hr_payroll/__openerp__.py new file mode 100755 index 00000000000..669a0b31ac9 --- /dev/null +++ b/addons/l10n_fr_hr_payroll/__openerp__.py @@ -0,0 +1,45 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2011 OpenERP SA (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +{ + 'name': 'French Payroll Rules', + 'category': 'Localization/Payroll', + 'author': 'SYNERPGY', + 'depends': ['hr_payroll', 'hr_payroll_account', 'l10n_fr'], + 'version': '1.0', + 'description': """ +French Payroll Rules +======================= + + -Configuration of hr_payroll for french localization + -Contributions Rules + -Accounting configuration + -New payslip report + """, + + 'active': False, + 'update_xml':[ + 'l10n_fr_hr_payroll_view.xml', + 'l10n_fr_hr_payroll_data.xml', + ], + 'installable': True +} + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py new file mode 100755 index 00000000000..8b08bc2385d --- /dev/null +++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py @@ -0,0 +1,57 @@ +#-*- coding:utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2011 OpenERP SA (). All Rights Reserved +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import fields, osv +import decimal_precision as dp + + +class res_company(osv.osv): + _inherit = 'res.company' + + _columns = { + 'plafond_secu': fields.float('Plafond de la Securite Sociale', digits_compute=dp.get_precision('Payroll')), + 'nombre_employes': fields.integer('Nombre d\'employes'), + 'cotisation_prevoyance': fields.float('Cotisation Patronale Prevoyance', digits_compute=dp.get_precision('Payroll')), + 'org_ss': fields.char('Organisme de securite sociale', size=64), + 'conv_coll': fields.char('Convention collective', size=64), + } + +res_company() + +class hr_contract(osv.osv): + _inherit = 'hr.contract' + + _columns = { + 'qualif': fields.char('Qualification', size=64), + 'niveau': fields.char('Niveau', size=64), + 'coef': fields.char('Coefficient', size=64), + } +hr_contract() + +class hr_payslip(osv.osv): + _inherit = 'hr.payslip' + + _columns = { + 'payment_mode': fields.char('Mode de paiement', size=64), + } +hr_payslip() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml new file mode 100755 index 00000000000..5cb7de70d90 --- /dev/null +++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml @@ -0,0 +1,1132 @@ + + + + + + + + + + + + Heures Supplementaires + True + lightblue + + + + + + + + + + 2946 + + + + + Cout total pour l'entreprise + TOTAL + + + + + Salaire Net + NET + + + + + Salaire Brut + BRUT + + + + + Salaire de base + BASE + + + + + Indemnite + INDM + + + + + Deduction + DED + + + + + Cumul Imposable + C_IMP + + + + + Total Retenues + RETENUES + + + + + Total Charges Salariales + SALC + + + + + Cotisations Patronales + COMP + + + + + Cotisations Prevoyance Patronales + PREV + + + + + Plafond de Securite Sociale + SECU + + + + + + Autres totaux + O_TOTALS + + + + + + + + + + URSSAF + + + + Organisme de retraite complementaire + + + + Chambre du commerce et de l'industrie + + + + Organisme de prevoyance + + + + + + + + + Salaire de base + BASE + 1 + total + + + + Salaire Brut + BRUT + 1000 + + result = categories.BASE + categories.INDM - categories.DED + total + + + + + Plafond Securite Sociale + SECU + 1010 + total + + + none + code + result = contract.employee_id.company_id.plafond_secu + + + + Plafond Tranche A + TA + 1011 + total + + + none + code + result = SECU + + + + Plafond Tranche B + TB + 1012 + total + + + none + code + result = SECU * 4 + + + + Plafond Tranche C + TC + 1013 + total + + + none + code + result = SECU * 8 + + + + Plafond Tranche 1 + T1 + 1014 + total + + + none + code + result = SECU + + + + Plafond Tranche 2 + T2 + 1015 + total + + + none + code + result = SECU * 3 + + + + + Total des charges salariales + 2510 + SALC + total + + + none + code + result = categories.SALC + + + + + Total Retenues + 99999 + total + + RET + none + code + + result = categories.RETENUES + + + + Cumul Imposable + 99999 + total + + C_IMP + none + code + + result = BRUT - categories.SALC + + + + + Net + 100000 + total + + result = BRUT - categories.RETENUES + + + + Total Charges Patronales + 150000 + TCOMP + total + + + none + code + result = categories.COMP + + + + + Cout total pour l'entreprise + 200000 + TOTAL + total + + + none + code + result = categories.BRUT + categories.COMP + + + + + + + + + + Assurance maladie, maternite, invalidite, deces, solidaritee des personnes agees et handicapees + C1 + 2040 + normal + none + percentage + 0.75 + categories.BRUT + + + + + + + + Assurance maladie, maternite, invalidite, deces, solidaritee des personnes agees et handicapees + C1P + 2045 + employer + none + percentage + 13.10 + categories.BRUT + + + + + + + + + Vieillesse plafonnee + C2 + 2050 + normal + none + percentage + 6.65 + min(categories.BRUT,SECU) + + + + + + + + Vieillesse plafonnee + C2P + 2055 + employer + none + percentage + 8.3 + min(categories.BRUT,SECU) + + + + + + + + + Vieillesse deplafonnee + C3 + 2060 + normal + none + percentage + 0.1 + categories.BRUT + + + + + + + + Vieillesse deplafonnee + C3P + 2065 + employer + none + percentage + 1.6 + categories.BRUT + + + + + + + + Allocations familiales + C4P + 2075 + employer + none + percentage + 5.4 + categories.BRUT + + + + + + + + + + + + Assurance chomage + C10 + 2080 + normal + none + percentage + 2.40 + min(categories.BRUT,TB) + + + + + + + + Assurance chomage + C10P + 2085 + employer + none + percentage + 4 + min(categories.BRUT,TB) + + + + + + + + + AGS (FNGS) + C11P + 2095 + employer + none + percentage + 0.3 + min(categories.BRUT,TB) + + + + + + + ARRCO Non-cadre Tranche 1 + C12 + 2100 + normal + none + percentage + 3 + min(categories.BRUT,T1) + + + + + + + + ARRCO Non-cadre Tranche 1 + C12P + 2105 + employer + none + percentage + 4.5 + min(categories.BRUT,T1) + + + + + + + + + ARRCO Non-cadre Tranche 2 + C14 + 2110 + normal + python + result = categories.BRUT > T1 + percentage + 8 + min(categories.BRUT-T1,T2-T1) + + + + + + + + ARRCO Non-cadre Tranche 2 + C14P + 2115 + employer + python + result = categories.BRUT > T1 + percentage + 12 + min(categories.BRUT-T1,T2-T1) + + + + + + + + + + AGFF Non-cadre Tranche 1 + C13 + 2120 + normal + none + percentage + 0.8 + min(categories.BRUT,T1) + + + + + + + + AGFF Non-cadre Tranche 1 + C13P + 2125 + employer + none + percentage + 1.2 + min(categories.BRUT,T1) + + + + + + + + AGFF Non-cadre Tranche 2 + C15 + 2130 + normal + python + result = categories.BRUT > T1 + percentage + 0.9 + min(categories.BRUT-T1,T2-T1) + + + + + + + + AGFF Non-cadre Tranche 2 + C15P + 2135 + employer + python + result = categories.BRUT > T1 + percentage + 1.3 + min(categories.BRUT-T1,T2-T1) + + + + + + + + + ARRCO Cadre Tranche A + C16 + 2140 + normal + none + percentage + 3 + min(categories.BRUT,TA) + + + + + + + + ARRCO Cadre Tranche A + C16P + 2145 + employer + none + percentage + 4.5 + min(categories.BRUT,TA) + + + + + + + + + AGIRC et GMP Cadre Tranche B + C17 + 2150 + normal + python + result = categories.BRUT > TA + percentage + 7.7 + min(categories.BRUT-TA,TB-TA) + + + + + + + + AGIRC et GMP Cadre Tranche B + C17P + 2155 + employer + python + result = categories.BRUT > TA + percentage + 12.6 + min(categories.BRUT-TA,TB-TA) + + + + + + + + + AGIRC Cadre Tranche C + C18P + 2165 + employer + python + result = categories.BRUT > TB + percentage + 0 + min(categories.BRUT-TB,TC-TB) + + + + + + + + AGFF Cadre Tranche A + C18 + 2170 + normal + none + percentage + 0.8 + min(categories.BRUT,TA) + + + + + + + + AGFF Cadre Tranche A + C18P + 2175 + employer + none + percentage + 1.2 + min(categories.BRUT,TA) + + + + + + + + AGFF Non-cadre Tranche B + C18 + 2180 + normal + python + result = categories.BRUT > TA + percentage + 0.9 + min(categories.BRUT-TA,TB-TA) + + + + + + + + AGFF Cadre Tranche B + C18P + 2185 + employer + python + result = categories.BRUT > TA + percentage + 1.3 + min(categories.BRUT-TA,TB-TA) + + + + + + + CET + C19 + 2190 + normal + none + percentage + 0.13 + min(categories.BRUT,TC) + + + + + + + + CET + C19P + 2195 + employer + none + percentage + 0.22 + min(categories.BRUT,TC) + + + + + + + APEC + C20 + 2200 + normal + none + percentage + 0.024 + min(categories.BRUT,TB) + + + + + + + + APEC + C20P + 2205 + employer + none + percentage + 0.036 + min(categories.BRUT,TB) + + + + + + + + Assurance deces cadres + C21P + 2215 + employer + none + percentage + 1.5 + min(categories.BRUT,TA) + + + + + + + + + + Accident du travail + C5P + 2225 + employer + none + percentage + categories.BRUT + + + + + + + Prevoyance Cadre TA + C35 + 2230 + normal + none + percentage + min(categories.BRUT,TA) + + + + + + + Prevoyance Cadre TA + C35P + 2231 + employer + none + percentage + min(categories.BRUT,TA) + + + + + + Prevoyance Cadre TB + C36 + 2232 + normal + python + result = categories.BRUT > TA + percentage + min(categories.BRUT-TA,TB-TA) + + + + + + + Prevoyance Cadre TB + C36P + 2233 + employer + python + result = categories.BRUT > TA + percentage + min(categories.BRUT-TA,TB-TA) + + + + + + Forfait Mutuelle + C37 + 2234 + normal + none + fix + + + + + + + Forfait Mutuelle + C37P + 2235 + employer + none + fix + + + + + + Taxe Prevoyance + C40P + 2239 + employer + python + result = categories.PREV != 0 + percentage + 8 + categories.PREV + + + + + + FNAL -20 Employes + C7P + 2245 + employer + range + contract.employee_id.company_id.nombre_employes + 19 + percentage + 0.1 + min(categories.BRUT,SECU) + + + + + + + + + FNAL +20 Employes + C8P + 2255 + employer + range + contract.employee_id.company_id.nombre_employes + 20 + percentage + 0.5 + categories.BRUT + + + + + + + + + Versement Transport + C9P + 2265 + employer + range + contract.employee_id.company_id.nombre_employes + 10 + percentage + + + + + + + + + + Effort a la construction + C22P + 2275 + employer + range + contract.employee_id.company_id.nombre_employes + 20 + percentage + 0.45 + categories.BRUT + + + + + + + + Taxe d'apprentissage + C23P + 2285 + employer + none + percentage + 0.5 + categories.BRUT + + + + + + + Contribution additionnelle au developpement de l'apprentissage + C24P + 2295 + employer + none + percentage + 0.18 + categories.BRUT + + + + + + + + Formation professionnelle 10- salaries + C25P + 2305 + employer + range + contract.employee_id.company_id.nombre_employes + 9 + percentage + 0.55 + categories.BRUT + + + + + + + + + Formation professionnelle 10-19 salaries + C26P + 2315 + employer + range + contract.employee_id.company_id.nombre_employes + 10 + 19 + percentage + 1.05 + categories.BRUT + + + + + + + + + Formation professionnelle 20+ salaries + C27P + 2325 + employer + range + contract.employee_id.company_id.nombre_employes + 20 + percentage + 1.60 + categories.BRUT + + + + + + + CSG deductible + C29 + 2500 + normal + none + percentage + 5.1 + (categories.BRUT + categories.PREV)*0.97 + + + + + + + CSG non deductible + C28 + 2550 + normal + none + percentage + 2.4 + (categories.BRUT + categories.PREV)*0.97 + + + + + + + + CRDS + C30 + 2560 + normal + none + percentage + 0.5 + (categories.BRUT + categories.PREV)*0.97 + + + + + + + + + + + + Cotisations de base Employe Francais + + + + + + E-NC + Employe non-cadre + + + + + + + + E-C + Employe cadre + + + + + + + + + + + + diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml new file mode 100755 index 00000000000..764213313b8 --- /dev/null +++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml @@ -0,0 +1,70 @@ + + + + + + + res.company.form.l10n.fr.payroll + res.company + form + 20 + + + + + + + + + + + + + + + + + + + hr.contract.view.form.l10n.fr.payroll + hr.contract + form + 20 + + + + + + + + + + + + hr.payslip.form.l10n.fr.payroll + hr.payslip + form + 20 + + + + + + + + + + + + + + + + diff --git a/addons/l10n_fr_hr_payroll/report/__init__.py b/addons/l10n_fr_hr_payroll/report/__init__.py new file mode 100644 index 00000000000..40d2ccc3c05 --- /dev/null +++ b/addons/l10n_fr_hr_payroll/report/__init__.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved +# d$ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +import fiche_paye + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.py b/addons/l10n_fr_hr_payroll/report/fiche_paye.py new file mode 100755 index 00000000000..3419045a788 --- /dev/null +++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.py @@ -0,0 +1,76 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved +# d$ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from report import report_sxw + +class fiche_paye_parser(report_sxw.rml_parse): + + def __init__(self, cr, uid, name, context): + super(fiche_paye_parser, self).__init__(cr, uid, name, context) + self.localcontext.update({ + 'get_payslip_lines': self.get_payslip_lines, + 'get_total_by_rule_category': self.get_total_by_rule_category, + 'get_employer_line': self.get_employer_line, + }) + + def get_payslip_lines(self, obj): + payslip_line = self.pool.get('hr.payslip.line') + res = [] + ids = [] + for id in range(len(obj)): + if obj[id].appears_on_payslip == True and ( obj[id].salary_rule_id.type != 'employer' or not obj[id].salary_rule_id.parent_rule_id ): + ids.append(obj[id].id) + if ids: + res = payslip_line.browse(self.cr, self.uid, ids) + return res + + + def get_total_by_rule_category(self, obj, code): + payslip_line = self.pool.get('hr.payslip.line') + rule_cate_obj = self.pool.get('hr.salary.rule.category') + + cate_ids = rule_cate_obj.search(self.cr, self.uid, [('code', '=', code)]) + + category_total = 0 + line_ids = payslip_line.search(self.cr, self.uid, [('slip_id', '=', obj.id),('category_id.id', '=', cate_ids[0] )]) + + for line in payslip_line.browse(self.cr, self.uid, line_ids): + category_total += line.total + + return category_total + + + def get_employer_line(self, obj, parent_line): + + payslip_line = self.pool.get('hr.payslip.line') + + line_ids = payslip_line.search(self.cr, self.uid, [('slip_id', '=', obj.id), ('salary_rule_id.parent_rule_id.id', '=', parent_line.salary_rule_id.id )]) + res = payslip_line.browse(self.cr, self.uid, line_ids[0]) + + return res + + +report_sxw.report_sxw('report.fiche.paye', 'hr.payslip', 'l10n_fr_hr_payroll/report/fiche_paye.rml', parser=fiche_paye_parser) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml new file mode 100644 index 00000000000..2abc9cd53c0 --- /dev/null +++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml @@ -0,0 +1,452 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [[repeatIn(objects,'o')]] + + + + + + + BULLETIN DE PAIE + + + + PAIE DU [[ formatLang(o.date_from, date=True) or '']] AU [[ formatLang(o.date_to, date=True) or '' ]] + + + + Matricule : + N° s.s : + Emploi : + Qualif : + Niveau : + Coef : + Entrée : + + + [[o.employee_id.sinid or '_']] + [[o.employee_id.ssnid or '_']] + [[o.contract_id.job_id.name or '_']] + [[o.contract_id.qualif or '_']] + [[o.contract_id.niveau or '_']] + [[o.contract_id.coef or '_']] + [[o.contract_id.date_start or '_']] Sortie : [[o.contract_id.date_end or '']] + + + + + ORG. S.S : + + + [[o.employee_id.company_id.org_ss or '_']] + + + + + + + + + + + + + + + + + [[o.employee_id.company_id.partner_id.title.name or '']] [[o.employee_id.company_id.name or '_']] + [[o.employee_id.company_id.street or '_']] + [[o.employee_id.company_id.street2 or '']] + [[o.employee_id.company_id.zip or '_']] [[o.employee_id.company_id.city or '']] + SIRET : [[o.employee_id.company_id.siret or '_']] APE : [[o.employee_id.company_id.ape or '_']] + + + + + + + + + + + + + + + + [[o.employee_id.name or '_']] + [[o.employee_id.address_home_id.street or '_' ]] + [[o.employee_id.address_home_id.street2 or '' ]] + [[o.employee_id.address_home_id.zip or '_' ]] [[o.employee_id.address_home_id.city or '' ]] + + + + + + + + + + + + + + + + + + + DESIGNATION + + + QUANTITE / BASE + + + TAUX + + + MONTANT + + + CHARGES PATRONALES + + + +
+ [[repeatIn(get_payslip_lines(o.line_ids),'p')]] + + + + [[ p.code or '' ]] + + + [[ p.name or '' ]] + + + [[ ((p.amount_select== 'percentage') or removeParentNode('para')) and '' ]] [[ p.base or '' ]] + [[ ((p.amount_select== 'fix') or removeParentNode('para')) and '' ]] [[ p.quantity or '' ]] + [[ ((p.amount_select<> 'fix' and p.amount_select<> 'percentage') or removeParentNode('para')) and '' ]] + + + [[ ((p.amount_select == 'percentage' and p.salary_rule_id.type <> 'employer') or removeParentNode('para')) and '' ]] [[ p.rate or '' ]] + [[ ((p.amount_select <> 'percentage' or p.salary_rule_id.type == 'employer') or removeParentNode('para')) and '' ]] + + + [[ (( p.salary_rule_id.type <> 'employer') or removeParentNode('para')) and '' ]] [[ p.amount or '' ]] + [[ (( p.salary_rule_id.type == 'employer') or removeParentNode('para')) and '' ]] + + + [[ (( p.salary_rule_id.type == 'employer') or removeParentNode('para')) and '' ]] [[ p.rate or '' ]] + [[ (( p.salary_rule_id.type <> 'employer') or removeParentNode('para')) and '' ]][[ get_employer_line(o, p).rate or '']] + + + [[ (( p.salary_rule_id.type == 'employer') or removeParentNode('para')) and '' ]] [[ p.amount or '' ]] + [[ (( p.salary_rule_id.type <> 'employer') or removeParentNode('para')) and '' ]][[ get_employer_line(o,p).amount or '' ]] + + + +
+ + + + + + + + + + Mode de reglement : [[ o.payment_mode or '' ]] + Paye le : [[ formatLang(o.move_id.date, date=True) or '']] + + + NET A PAYER + + + TOTAL CHARGES PATRONALES + + + + + Conv. Coll.: [[ o.employee_id.company_id.conv_coll or '' ]] + + + [[ get_total_by_rule_category(o, 'NET') ]] + + + [[ get_total_by_rule_category(o, 'COMP') ]] + + + + + + + SALAIRE BRUT + + + TOTAL CHARGES SALARIALES + + + NET IMPOSABLE + + + PLAFOND S.S. + + + + + + + + COUT GLOBAL SALARIE + + + + + [[ get_total_by_rule_category(o, 'BRUT') ]] + + + [[ get_total_by_rule_category(o, 'SALC') ]] + + + [[ get_total_by_rule_category(o, 'C_IMP') ]] + + + [[ o.employee_id.company_id.plafond_secu or '' ]] + + + + + + + + [[ get_total_by_rule_category(o, 'TOTAL') ]] + + + + + + + + + + + DANS VOTRE INTERET ET POUR VOUS AIDER A FAIRE VALOIR VOS DROITS, CONSERVER CE BULLETIN DE PAIE SANS LIMITATION DE DUREE + + + + From 9ba625487fa104553df76d3f8e4c2e21dbaeb14a Mon Sep 17 00:00:00 2001 From: yannick Date: Fri, 13 Apr 2012 18:05:51 +0200 Subject: [PATCH 002/181] Deleted any reference to the type field bzr revid: yannick@serveur-perso-20120413160551-fy3ucmervxo1066y --- .../l10n_fr_hr_payroll_data.xml | 278 +++++++++++++----- .../l10n_fr_hr_payroll/report/fiche_paye.py | 2 +- .../l10n_fr_hr_payroll/report/fiche_paye.rml | 13 +- 3 files changed, 207 insertions(+), 86 deletions(-) diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml index 5cb7de70d90..659af12905e 100755 --- a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml +++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml @@ -134,7 +134,6 @@ Salaire de base BASE 1 - total @@ -143,7 +142,6 @@ 1000 result = categories.BASE + categories.INDM - categories.DED - total @@ -151,7 +149,6 @@ Plafond Securite Sociale SECU 1010 - total none @@ -163,7 +160,6 @@ Plafond Tranche A TA 1011 - total none @@ -175,7 +171,6 @@ Plafond Tranche B TB 1012 - total none @@ -187,7 +182,6 @@ Plafond Tranche C TC 1013 - total none @@ -199,7 +193,6 @@ Plafond Tranche 1 T1 1014 - total none @@ -211,7 +204,6 @@ Plafond Tranche 2 T2 1015 - total none @@ -224,7 +216,6 @@ Total des charges salariales 2510 SALC - total none @@ -236,7 +227,6 @@ Total Retenues 99999 - total RET none @@ -248,7 +238,6 @@ Cumul Imposable 99999 - total C_IMP none @@ -261,7 +250,6 @@ Net 100000 - total result = BRUT - categories.RETENUES @@ -270,7 +258,6 @@ Total Charges Patronales 150000 TCOMP - total none @@ -283,7 +270,6 @@ Cout total pour l'entreprise 200000 TOTAL - total none @@ -301,7 +287,6 @@ Assurance maladie, maternite, invalidite, deces, solidaritee des personnes agees et handicapees C1 2040 - normal none percentage 0.75 @@ -316,7 +301,6 @@ Assurance maladie, maternite, invalidite, deces, solidaritee des personnes agees et handicapees C1P 2045 - employer none percentage 13.10 @@ -332,7 +316,6 @@ Vieillesse plafonnee C2 2050 - normal none percentage 6.65 @@ -347,7 +330,6 @@ Vieillesse plafonnee C2P 2055 - employer none percentage 8.3 @@ -363,7 +345,6 @@ Vieillesse deplafonnee C3 2060 - normal none percentage 0.1 @@ -378,7 +359,6 @@ Vieillesse deplafonnee C3P 2065 - employer none percentage 1.6 @@ -388,12 +368,25 @@ + + + Allocations familiales + C4 + 2070 + none + percentage + 0 + categories.BRUT + + + + + Allocations familiales C4P 2075 - employer none percentage 5.4 @@ -412,7 +405,6 @@ Assurance chomage C10 2080 - normal none percentage 2.40 @@ -427,7 +419,6 @@ Assurance chomage C10P 2085 - employer none percentage 4 @@ -437,13 +428,25 @@ + + + AGS (FNGS) + C11 + 2090 + none + percentage + 0 + min(categories.BRUT,TB) + + + + AGS (FNGS) C11P 2095 - employer none percentage 0.3 @@ -457,7 +460,6 @@ ARRCO Non-cadre Tranche 1 C12 2100 - normal none percentage 3 @@ -472,7 +474,6 @@ ARRCO Non-cadre Tranche 1 C12P 2105 - employer none percentage 4.5 @@ -488,7 +489,6 @@ ARRCO Non-cadre Tranche 2 C14 2110 - normal python result = categories.BRUT > T1 percentage @@ -504,7 +504,6 @@ ARRCO Non-cadre Tranche 2 C14P 2115 - employer python result = categories.BRUT > T1 percentage @@ -522,7 +521,6 @@ AGFF Non-cadre Tranche 1 C13 2120 - normal none percentage 0.8 @@ -531,13 +529,12 @@ - + AGFF Non-cadre Tranche 1 C13P 2125 - employer none percentage 1.2 @@ -552,7 +549,6 @@ AGFF Non-cadre Tranche 2 C15 2130 - normal python result = categories.BRUT > T1 percentage @@ -568,7 +564,6 @@ AGFF Non-cadre Tranche 2 C15P 2135 - employer python result = categories.BRUT > T1 percentage @@ -585,7 +580,6 @@ ARRCO Cadre Tranche A C16 2140 - normal none percentage 3 @@ -600,7 +594,6 @@ ARRCO Cadre Tranche A C16P 2145 - employer none percentage 4.5 @@ -616,7 +609,6 @@ AGIRC et GMP Cadre Tranche B C17 2150 - normal python result = categories.BRUT > TA percentage @@ -632,7 +624,6 @@ AGIRC et GMP Cadre Tranche B C17P 2155 - employer python result = categories.BRUT > TA percentage @@ -643,13 +634,26 @@ + + + AGIRC Cadre Tranche C + C38 + 2160 + python + result = categories.BRUT > TB + percentage + 0 + min(categories.BRUT-TB,TC-TB) + + + + AGIRC Cadre Tranche C - C18P + C38P 2165 - employer python result = categories.BRUT > TB percentage @@ -665,7 +669,6 @@ AGFF Cadre Tranche A C18 2170 - normal none percentage 0.8 @@ -680,7 +683,6 @@ AGFF Cadre Tranche A C18P 2175 - employer none percentage 1.2 @@ -695,7 +697,6 @@ AGFF Non-cadre Tranche B C18 2180 - normal python result = categories.BRUT > TA percentage @@ -711,7 +712,6 @@ AGFF Cadre Tranche B C18P 2185 - employer python result = categories.BRUT > TA percentage @@ -726,7 +726,6 @@ CET C19 2190 - normal none percentage 0.13 @@ -741,7 +740,6 @@ CET C19P 2195 - employer none percentage 0.22 @@ -755,7 +753,6 @@ APEC C20 2200 - normal none percentage 0.024 @@ -770,7 +767,6 @@ APEC C20P 2205 - employer none percentage 0.036 @@ -779,13 +775,26 @@ + + + + Assurance deces cadres + C21 + 2210 + none + percentage + 0 + min(categories.BRUT,TA) + + + + Assurance deces cadres C21P 2215 - employer none percentage 1.5 @@ -795,14 +804,25 @@ - + + + Accident du travail + C5 + 2220 + none + percentage + 0 + categories.BRUT + + + + Accident du travail C5P 2225 - employer none percentage categories.BRUT @@ -815,7 +835,6 @@ Prevoyance Cadre TA C35 2230 - normal none percentage min(categories.BRUT,TA) @@ -828,7 +847,6 @@ Prevoyance Cadre TA C35P 2231 - employer none percentage min(categories.BRUT,TA) @@ -840,7 +858,6 @@ Prevoyance Cadre TB C36 2232 - normal python result = categories.BRUT > TA percentage @@ -854,7 +871,6 @@ Prevoyance Cadre TB C36P 2233 - employer python result = categories.BRUT > TA percentage @@ -867,7 +883,6 @@ Forfait Mutuelle C37 2234 - normal none fix @@ -879,18 +894,30 @@ Forfait Mutuelle C37P 2235 - employer none fix + + + + Taxe Prevoyance + C40 + 2238 + python + result = categories.PREV != 0 + percentage + categories.PREV + + + + Taxe Prevoyance C40P 2239 - employer python result = categories.PREV != 0 percentage @@ -899,12 +926,26 @@ + + + + FNAL -20 Employes + C7 + 2240 + range + contract.employee_id.company_id.nombre_employes + 19 + percentage + min(categories.BRUT,SECU) + + + + FNAL -20 Employes C7P 2245 - employer range contract.employee_id.company_id.nombre_employes 19 @@ -916,13 +957,25 @@ - + + + FNAL +20 Employes + C8 + 2250 + range + contract.employee_id.company_id.nombre_employes + 20 + percentage + categories.BRUT + + + + FNAL +20 Employes C8P 2255 - employer range contract.employee_id.company_id.nombre_employes 20 @@ -932,15 +985,27 @@ + - + + + Versement Transport + C9 + 2260 + range + contract.employee_id.company_id.nombre_employes + 10 + percentage + + + + Versement Transport C9P 2265 - employer range contract.employee_id.company_id.nombre_employes 10 @@ -950,14 +1015,24 @@ - + + + Effort a la construction + C22 + 2270 + range + contract.employee_id.company_id.nombre_employes + 20 + percentage + + + Effort a la construction C22P 2275 - employer range contract.employee_id.company_id.nombre_employes 20 @@ -968,13 +1043,22 @@ - + + + Taxe d'apprentissage + C23 + 2280 + none + percentage + + + + Taxe d'apprentissage C23P 2285 - employer none percentage 0.5 @@ -983,12 +1067,22 @@ + + + Contribution additionnelle au developpement de l'apprentissage + C24 + 2290 + none + percentage + + + + Contribution additionnelle au developpement de l'apprentissage C24P 2295 - employer none percentage 0.18 @@ -997,13 +1091,24 @@ - + + + Formation professionnelle 10- salaries + C25 + 2300 + range + contract.employee_id.company_id.nombre_employes + 9 + percentage + + + + Formation professionnelle 10- salaries C25P 2305 - employer range contract.employee_id.company_id.nombre_employes 9 @@ -1015,13 +1120,25 @@ + + + Formation professionnelle 10-19 salaries + C26 + 2310 + range + contract.employee_id.company_id.nombre_employes + 10 + 19 + percentage + + + Formation professionnelle 10-19 salaries C26P 2315 - employer range contract.employee_id.company_id.nombre_employes 10 @@ -1033,14 +1150,24 @@ - + + + Formation professionnelle 20+ salaries + C27 + 2320 + range + contract.employee_id.company_id.nombre_employes + 20 + percentage + + + Formation professionnelle 20+ salaries C27P 2325 - employer range contract.employee_id.company_id.nombre_employes 20 @@ -1056,7 +1183,6 @@ CSG deductible C29 2500 - normal none percentage 5.1 @@ -1070,7 +1196,6 @@ CSG non deductible C28 2550 - normal none percentage 2.4 @@ -1085,7 +1210,6 @@ CRDS C30 2560 - normal none percentage 0.5 @@ -1102,7 +1226,7 @@ Cotisations de base Employe Francais - + @@ -1118,7 +1242,7 @@ E-C Employe cadre - + diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.py b/addons/l10n_fr_hr_payroll/report/fiche_paye.py index 3419045a788..027e8bfaeb8 100755 --- a/addons/l10n_fr_hr_payroll/report/fiche_paye.py +++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.py @@ -39,7 +39,7 @@ class fiche_paye_parser(report_sxw.rml_parse): res = [] ids = [] for id in range(len(obj)): - if obj[id].appears_on_payslip == True and ( obj[id].salary_rule_id.type != 'employer' or not obj[id].salary_rule_id.parent_rule_id ): + if obj[id].appears_on_payslip == True and not obj[id].salary_rule_id.parent_rule_id : ids.append(obj[id].id) if ids: res = payslip_line.browse(self.cr, self.uid, ids) diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml index 2abc9cd53c0..039ce60a354 100644 --- a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml +++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml @@ -343,20 +343,17 @@ [[ ((p.amount_select<> 'fix' and p.amount_select<> 'percentage') or removeParentNode('para')) and '' ]] - [[ ((p.amount_select == 'percentage' and p.salary_rule_id.type <> 'employer') or removeParentNode('para')) and '' ]] [[ p.rate or '' ]] - [[ ((p.amount_select <> 'percentage' or p.salary_rule_id.type == 'employer') or removeParentNode('para')) and '' ]] + [[ ((p.amount_select == 'percentage') or removeParentNode('para')) and '' ]] [[ p.rate or '' ]] + [[ ((p.amount_select <> 'percentage') or removeParentNode('para')) and '' ]] - [[ (( p.salary_rule_id.type <> 'employer') or removeParentNode('para')) and '' ]] [[ p.amount or '' ]] - [[ (( p.salary_rule_id.type == 'employer') or removeParentNode('para')) and '' ]] + [[ p.amount or '' ]] - [[ (( p.salary_rule_id.type == 'employer') or removeParentNode('para')) and '' ]] [[ p.rate or '' ]] - [[ (( p.salary_rule_id.type <> 'employer') or removeParentNode('para')) and '' ]][[ get_employer_line(o, p).rate or '']] + [[ get_employer_line(o, p).rate or '']] - [[ (( p.salary_rule_id.type == 'employer') or removeParentNode('para')) and '' ]] [[ p.amount or '' ]] - [[ (( p.salary_rule_id.type <> 'employer') or removeParentNode('para')) and '' ]][[ get_employer_line(o,p).amount or '' ]] + [[ get_employer_line(o,p).amount or '' ]] From fc121b1ecb5831ba61c5349f5ffb03428acfbb39 Mon Sep 17 00:00:00 2001 From: yannick Date: Fri, 13 Apr 2012 18:17:56 +0200 Subject: [PATCH 003/181] Updated Contributions 2012 bzr revid: yannick@serveur-perso-20120413161756-qiocyrdeeujqtvf8 --- addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml index 659af12905e..e7a0e44d21e 100755 --- a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml +++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml @@ -1186,7 +1186,7 @@ none percentage 5.1 - (categories.BRUT + categories.PREV)*0.97 + (categories.BRUT + categories.PREV)*0.9825 @@ -1199,7 +1199,7 @@ none percentage 2.4 - (categories.BRUT + categories.PREV)*0.97 + (categories.BRUT + categories.PREV)*0.9825 @@ -1213,7 +1213,7 @@ none percentage 0.5 - (categories.BRUT + categories.PREV)*0.97 + (categories.BRUT + categories.PREV)*0.9825 From 4254162e4330140b2decf5e872862c656e1e3373 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 18 Apr 2012 11:14:10 +0200 Subject: [PATCH 004/181] Remove the '_demo' suffix in filenames... as they don't contain demo data ! bzr revid: alexis@via.ecp.fr-20120418091410-2yxefhy2lio840vu --- addons/l10n_fr/__openerp__.py | 10 +++++----- ...scal_templates_demo.xml => fr_fiscal_templates.xml} | 0 .../{fr_pcg_taxes_demo.xml => fr_pcg_taxes.xml} | 0 addons/l10n_fr/{fr_report_demo.xml => fr_report.xml} | 0 addons/l10n_fr/{fr_tax_demo.xml => fr_tax.xml} | 0 ...ble_general_demo.xml => plan_comptable_general.xml} | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename addons/l10n_fr/{fr_fiscal_templates_demo.xml => fr_fiscal_templates.xml} (100%) rename addons/l10n_fr/{fr_pcg_taxes_demo.xml => fr_pcg_taxes.xml} (100%) rename addons/l10n_fr/{fr_report_demo.xml => fr_report.xml} (100%) rename addons/l10n_fr/{fr_tax_demo.xml => fr_tax.xml} (100%) rename addons/l10n_fr/{plan_comptable_general_demo.xml => plan_comptable_general.xml} (100%) diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py index 839907c778a..4dd94a92e18 100644 --- a/addons/l10n_fr/__openerp__.py +++ b/addons/l10n_fr/__openerp__.py @@ -40,12 +40,12 @@ Credits: Sistheo Zeekom CrysaLEAD "depends" : ['base_iban', 'account', 'account_chart', 'base_vat', 'l10n_fr_rib'], "init_xml" : [], "update_xml" : [ - "fr_report_demo.xml", - "plan_comptable_general_demo.xml", + "fr_report.xml", + "plan_comptable_general.xml", "l10n_fr_wizard.xml", - "fr_pcg_taxes_demo.xml", - "fr_tax_demo.xml", - "fr_fiscal_templates_demo.xml", + "fr_pcg_taxes.xml", + "fr_tax.xml", + "fr_fiscal_templates.xml", "security/ir.model.access.csv", "wizard/fr_report_bilan_view.xml", "wizard/fr_report_compute_resultant_view.xml", diff --git a/addons/l10n_fr/fr_fiscal_templates_demo.xml b/addons/l10n_fr/fr_fiscal_templates.xml similarity index 100% rename from addons/l10n_fr/fr_fiscal_templates_demo.xml rename to addons/l10n_fr/fr_fiscal_templates.xml diff --git a/addons/l10n_fr/fr_pcg_taxes_demo.xml b/addons/l10n_fr/fr_pcg_taxes.xml similarity index 100% rename from addons/l10n_fr/fr_pcg_taxes_demo.xml rename to addons/l10n_fr/fr_pcg_taxes.xml diff --git a/addons/l10n_fr/fr_report_demo.xml b/addons/l10n_fr/fr_report.xml similarity index 100% rename from addons/l10n_fr/fr_report_demo.xml rename to addons/l10n_fr/fr_report.xml diff --git a/addons/l10n_fr/fr_tax_demo.xml b/addons/l10n_fr/fr_tax.xml similarity index 100% rename from addons/l10n_fr/fr_tax_demo.xml rename to addons/l10n_fr/fr_tax.xml diff --git a/addons/l10n_fr/plan_comptable_general_demo.xml b/addons/l10n_fr/plan_comptable_general.xml similarity index 100% rename from addons/l10n_fr/plan_comptable_general_demo.xml rename to addons/l10n_fr/plan_comptable_general.xml From f1eeec97db6e9b26a78948dbe69dd3e5104efbd5 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 18 Apr 2012 11:17:02 +0200 Subject: [PATCH 005/181] Fix French chart of accounts : - type of account 44566 changed from 'view' to 'normal' - the parent of account 445662 is now 4456 bzr revid: alexis@via.ecp.fr-20120418091702-oepthwy3tyc2qy1v --- addons/l10n_fr/plan_comptable_general.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_fr/plan_comptable_general.xml b/addons/l10n_fr/plan_comptable_general.xml index b78e1821720..18a83b735dc 100644 --- a/addons/l10n_fr/plan_comptable_general.xml +++ b/addons/l10n_fr/plan_comptable_general.xml @@ -4210,7 +4210,7 @@ TVA sur autres biens et services 44566 - view + other @@ -4223,7 +4223,7 @@ other - + From 992301ddfe8b280895f210574ff36921a8c8b60d Mon Sep 17 00:00:00 2001 From: yannick Date: Sat, 21 Apr 2012 18:21:15 +0200 Subject: [PATCH 006/181] Updating l10n_fr_hr_payroll in preparation of the merge request bzr revid: yannick@serveur-perso-20120421162115-semk6axc1wh3rsve --- addons/l10n_fr_hr_payroll/__openerp__.py | 14 ++++++++++---- .../l10n_fr_hr_payroll_data.xml | 18 +++++++++++++----- .../l10n_fr_hr_payroll/report/fiche_paye.rml | 8 ++++---- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/addons/l10n_fr_hr_payroll/__openerp__.py b/addons/l10n_fr_hr_payroll/__openerp__.py index 669a0b31ac9..6a3beb52718 100755 --- a/addons/l10n_fr_hr_payroll/__openerp__.py +++ b/addons/l10n_fr_hr_payroll/__openerp__.py @@ -19,9 +19,9 @@ # ############################################################################## { - 'name': 'French Payroll Rules', + 'name': 'French Payroll', 'category': 'Localization/Payroll', - 'author': 'SYNERPGY', + 'author': 'Yannick Buron (SYNERPGY)', 'depends': ['hr_payroll', 'hr_payroll_account', 'l10n_fr'], 'version': '1.0', 'description': """ @@ -29,9 +29,15 @@ French Payroll Rules ======================= -Configuration of hr_payroll for french localization - -Contributions Rules - -Accounting configuration + -All main contributions rules for french payslip, for 'cadre' and 'non-cadre' -New payslip report + + TODO : + -Integration with holidays module for deduction and allowance + -Integration with hr_payroll_account for the automatic account_move_line creation from the payslip + -Continue to integrate the contribution. Only the main contribution are currently implemented + -Remake the report under webkit + -The payslip.line with appears_in_payslip = False should appears in the payslip interface, but not in the payslip report """, 'active': False, diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml index e7a0e44d21e..31d3ebe9654 100755 --- a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml +++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml @@ -1050,6 +1050,7 @@ 2280 none percentage + categories.BRUT @@ -1074,6 +1075,7 @@ 2290 none percentage + categories.BRUT @@ -1100,6 +1102,7 @@ contract.employee_id.company_id.nombre_employes 9 percentage + categories.BRUT @@ -1130,6 +1133,7 @@ 10 19 percentage + categories.BRUT @@ -1159,6 +1163,7 @@ contract.employee_id.company_id.nombre_employes 20 percentage + categories.BRUT @@ -1224,27 +1229,30 @@ - + + Fr-Base Cotisations de base Employe Francais + + - E-NC + Fr-NC Employe non-cadre - + - E-C + Fr-C Employe cadre - + diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml index 039ce60a354..e155f23f69d 100644 --- a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml +++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml @@ -1,6 +1,6 @@ - From 0c7a63bb3aa0762aad3685f64b54fc890b1f44d5 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 14 May 2012 17:21:32 +0200 Subject: [PATCH 115/181] [imp] added option for quick create bzr revid: nicolas.vanhoren@openerp.com-20120514152132-hgo59oucjo7v65zz --- addons/web_kanban/static/src/js/kanban.js | 9 +++------ addons/web_kanban/static/src/xml/web_kanban.xml | 6 ++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 660ad4c746d..891a68f4007 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -11,10 +11,8 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ default_nr_columns: 3, view_type: "kanban", init: function (parent, dataset, view_id, options) { - this._super(parent); - this.set_default_options(options); - this.dataset = dataset; - this.view_id = view_id; + this._super(parent, dataset, view_id, options); + _.defaults(this.options, {"quick_creatable": true}); this.fields_view = {}; this.fields_keys = []; this.group_by = null; @@ -430,8 +428,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({ */ quick_created: function (record) { var id = record[0], self = this; - new instance.web.Model(this.dataset.model).call( - 'read', [[id], this.view.fields_keys], {}) + this.dataset.read_ids([id], this.view.fields_keys) .then(function (records) { self.view.dataset.ids.push(id); self.do_add_records(records, 'prepend'); diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index d04e240bfcc..7db4345ad32 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -20,7 +20,9 @@
-
+ +
+
@@ -35,7 +37,7 @@

- + From b26da31d090a58bde89ed5b46615cff9b6dd31f2 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 14 May 2012 17:28:46 +0200 Subject: [PATCH 116/181] [imp] made kanban view read only in o2m bzr revid: nicolas.vanhoren@openerp.com-20120514152846-pke1gtxkzn0k7l1i --- addons/web/static/src/js/view_form.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 27606a564be..5722c0b2008 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2749,6 +2749,11 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ view.view_type = 'form'; } view.options.not_interactible_on_create = true; + } else if (view.view_type === "kanban") { + if (self.get("effective_readonly")) { + view.options.action_buttons = false; + view.options.quick_creatable = false; + } } views.push(view); }); From 0a1ce4c4daab076130d86f612f8add182b8fc85d Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 14 May 2012 17:51:44 +0200 Subject: [PATCH 117/181] [imp] added slow create bzr revid: nicolas.vanhoren@openerp.com-20120514155144-4lb9la1o0qv5k18o --- addons/web_kanban/static/src/js/kanban.js | 24 ++++++++++++++++--- .../web_kanban/static/src/xml/web_kanban.xml | 2 +- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 891a68f4007..9940c305f11 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -680,15 +680,33 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ */ quick_add: function () { var self = this; - // FIXME: what if name_create fails? + self.$input.val(""); this._dataset.call( 'name_create', [self.$input.val(), new instance.web.CompoundContext( this._dataset.get_context(), this._context)]) - .then(function(record) { - self.$input.val(""); + .pipe(function(record) { self.trigger('added', record); + }, function() { + return self.slow_create(); }); }, + slow_create: function() { + var self = this; + var pop = new instance.web.form.SelectCreatePopup(this); + pop.select_element( + self.field.relation, + { + title: _t("Create: ") + (this.string || this.name), + initial_view: "form", + disable_multiple_selection: true + }, + undefined, + new instance.web.CompoundContext(self.build_context(), {"default_name": self.$input.val("")}) + ); + pop.on_select_elements.add(function(element_ids) { + self.trigger('added', element_ids); + }); + } }); }; diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 7db4345ad32..29bb81087fe 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -69,7 +69,7 @@
- + From b992877c13eff8e8a12a567cb60dd0d0382c9f68 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 14 May 2012 18:08:26 +0200 Subject: [PATCH 118/181] [fix] small problem bzr revid: nicolas.vanhoren@openerp.com-20120514160826-2id8czonkdfe1zys --- addons/web_kanban/static/src/js/kanban.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 895384edf5f..4c03d619773 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -710,11 +710,11 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ */ quick_add: function () { var self = this; - self.$input.val(""); this._dataset.call( 'name_create', [self.$input.val(), new instance.web.CompoundContext( this._dataset.get_context(), this._context)]) .pipe(function(record) { + self.$input.val(""); self.trigger('added', record); }, function() { return self.slow_create(); @@ -734,6 +734,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ new instance.web.CompoundContext(self.build_context(), {"default_name": self.$input.val("")}) ); pop.on_select_elements.add(function(element_ids) { + self.$input.val(""); self.trigger('added', element_ids); }); } From 399fe249f8a52ddec15b40ad526eb4e3b9fba8fc Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 14 May 2012 18:33:23 +0200 Subject: [PATCH 119/181] [fix] fixed slow create bzr revid: nicolas.vanhoren@openerp.com-20120514163323-mqnqpmjng381wulr --- addons/web_kanban/static/src/js/kanban.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 4c03d619773..2a143934d2b 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -716,7 +716,8 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ .pipe(function(record) { self.$input.val(""); self.trigger('added', record); - }, function() { + }, function(error, event) { + event.preventDefault(); return self.slow_create(); }); }, @@ -724,14 +725,14 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ var self = this; var pop = new instance.web.form.SelectCreatePopup(this); pop.select_element( - self.field.relation, + self._dataset.model, { title: _t("Create: ") + (this.string || this.name), initial_view: "form", disable_multiple_selection: true }, - undefined, - new instance.web.CompoundContext(self.build_context(), {"default_name": self.$input.val("")}) + [], + {"default_name": self.$input.val()} ); pop.on_select_elements.add(function(element_ids) { self.$input.val(""); From 6a198b90991254c27612eceec217718830d0a68d Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 15 May 2012 17:17:56 +0200 Subject: [PATCH 120/181] [IMP] allow #menu_id= in url for client action reload bzr revid: al@openerp.com-20120515151756-cifgi1a3iugbc08l --- addons/web/static/src/js/chrome.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index d1ff69d22cb..ef75bbff6b1 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -961,9 +961,16 @@ instance.web.WebClient = instance.web.Widget.extend({ } }, on_hashchange: function(event) { + var self = this; var state = event.getState(true); if (!_.isEqual(this._current_state, state)) { - this.action_manager.do_load_state(state, !!this._current_state); + if(state.action_id === undefined && state.menu_id) { + self.menu.has_been_loaded.then(function() { + self.menu.menu_click(state.menu_id); + }); + } else { + this.action_manager.do_load_state(state, !!this._current_state); + } } this._current_state = state; }, From 33f28d3d6bc61dcb5dea33913925aae49358db27 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 15 May 2012 17:34:23 +0200 Subject: [PATCH 121/181] [FIX] #menu_id loading, move client_actions registry bzr revid: al@openerp.com-20120515153423-bj6vgiuwq26cyq5o --- addons/web/static/src/js/chrome.js | 4 +++- addons/web/static/src/js/coresetup.js | 27 +++++++++++++++++++++++++++ addons/web/static/src/js/views.js | 27 --------------------------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index ef75bbff6b1..b71a504b52f 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -966,7 +966,9 @@ instance.web.WebClient = instance.web.Widget.extend({ if (!_.isEqual(this._current_state, state)) { if(state.action_id === undefined && state.menu_id) { self.menu.has_been_loaded.then(function() { - self.menu.menu_click(state.menu_id); + self.menu.do_reload().then(function() { + self.menu.menu_click(state.menu_id) + }); }); } else { this.action_manager.do_load_state(state, !!this._current_state); diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index 8e7b5d4f75d..5a8a2b50722 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -579,6 +579,33 @@ $.async_when = function() { return old_async_when.apply(this, arguments); }; +/** + * Registry for all the client actions key: tag value: widget + */ +instance.web.client_actions = new instance.web.Registry(); + +/** + * Client action to reload the whole interface. + * If params has an entry 'menu_id', it opens the given menu entry. + */ +instance.web.client_actions.add("reload", "instance.web.Reload"); + +instance.web.Reload = instance.web.Widget.extend({ + init: function(parent, params) { + this._super(parent); + this.menu_id = (params && params.menu_id) || false; + }, + start: function() { + if (this.menu_id) { + // open the given menu id + var url_without_fragment = window.location.toString().split("#", 1)[0]; + window.location = url_without_fragment + "#menu_id=" + this.menu_id; + } else { + window.location.reload(); + } + } +}); + }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 941c1f8a207..de2ff53a71a 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -1261,33 +1261,6 @@ instance.web.str_to_xml = function(s) { return xDoc; } -/** - * Registry for all the client actions key: tag value: widget - */ -instance.web.client_actions = new instance.web.Registry(); - -/** - * Client action to reload the whole interface. - * If params has an entry 'menu_id', it opens the given menu entry. - */ -instance.web.client_actions.add("reload", "instance.web.Reload"); - -instance.web.Reload = instance.web.Widget.extend({ - init: function(parent, params) { - this._super(parent); - this.menu_id = (params && params.menu_id) || false; - }, - start: function() { - if (this.menu_id) { - // open the given menu id - var url_without_fragment = window.location.toString().split("#", 1)[0]; - window.location = url_without_fragment + "#menu_id=" + this.menu_id; - } else { - window.location.reload(); - } - } -}); - /** * Registry for all the main views */ From 86ae049b8a0c58baddcb2ff217024286e9153345 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Wed, 16 May 2012 04:50:22 +0000 Subject: [PATCH 122/181] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120516045022-5gencrjii0g9z33w --- openerp/addons/base/i18n/ja.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po index 5cad42a8e0f..9998a83e91c 100644 --- a/openerp/addons/base/i18n/ja.po +++ b/openerp/addons/base/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:44+0000\n" -"PO-Revision-Date: 2012-05-14 18:16+0000\n" +"PO-Revision-Date: 2012-05-15 06:28+0000\n" "Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-15 04:50+0000\n" -"X-Generator: Launchpad (build 15238)\n" +"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n" +"X-Generator: Launchpad (build 15247)\n" #. module: base #: model:res.country,name:base.sh @@ -71,8 +71,8 @@ msgid "" " " msgstr "" "\n" -"プロジェクト管理モジュールは複数レベルのプロジェクト、タスク、終了したタスクなどを追跡します。==============================" -"========================================================\n" +"プロジェクト管理モジュールは複数レベルのプロジェクト、タスク、作業完了したタスクなどを追跡します。============================" +"==========================================================\n" "\n" "計画の立案、タスクの命令などが可能です。\n" "\n" @@ -731,7 +731,7 @@ msgstr "アンギラ" #. module: base #: view:base.language.export:0 msgid "Export done" -msgstr "エクスポート終了" +msgstr "エクスポート完了" #. module: base #: model:ir.module.module,shortdesc:base.module_plugin_outlook @@ -839,7 +839,7 @@ msgid "" msgstr "" "手動：手動起動\n" "自動：再構成されると自動的に起動\n" -"一度だけ手動：手動起動した後、自動にセット" +"一度だけ手動：手動起動した後、自動に完了がセット" #. module: base #: selection:base.language.install,lang:0 @@ -2314,7 +2314,7 @@ msgstr "" " ・ 配達がトラックなのかUPSなのかの仕訳\n" "\n" "仕訳帳にはそうした責任があり、そして異なる状態に進展します：\n" -" ・ ドラフト、オープン、キャンセル、終了\n" +" ・ ドラフト、オープン、キャンセル、完了\n" "\n" "バッチ操作は一度に全ての受注の確認、検証、請求書集荷といった異なる仕訳帳を処理できます。\n" "\n" @@ -5191,7 +5191,7 @@ msgstr "アブハジア語 / аҧсуа" #. module: base #: view:base.module.configuration:0 msgid "System Configuration Done" -msgstr "システム設定終了" +msgstr "システム設定完了" #. module: base #: code:addons/orm.py:1459 @@ -10694,7 +10694,7 @@ msgstr "このモジュールはresユーザの中にGoogleユーザを加えま #: selection:base.module.import,state:0 #: selection:base.module.update,state:0 msgid "done" -msgstr "終了" +msgstr "完了" #. module: base #: view:ir.actions.act_window:0 @@ -11985,7 +11985,7 @@ msgstr "その他のアクション" #. module: base #: selection:ir.actions.todo,state:0 msgid "Done" -msgstr "終了" +msgstr "完了" #. module: base #: help:ir.cron,doall:0 @@ -13981,8 +13981,8 @@ msgstr "" "=============================================================================" "================================\n" "\n" -"状態：ドラフト、確認、終了、キャンセル\n" -"終了する、確認する、キャンセルする時に、製造オーダーは全ての状態行を状態に応じて設定する。\n" +"状態：ドラフト、確認、完了、キャンセル\n" +"完了する、確認する、キャンセルする時に、製造オーダーは全ての状態行を状態に応じて設定する。\n" "\n" "メニューの作成：\n" "　　製造 > 製造 > ワークオーダー\n" @@ -13991,11 +13991,11 @@ msgstr "" "\n" "ワークセンタタブの下に製造オーダーのフォームビューにボタンを追加して下さい：\n" "　・ 開始（確認状態に設定）、開始日付の設定\n" -"　・ 終了（終了状態に設定）、中止日付の設定\n" +"　・ 完了（完了状態に設定）、中止日付の設定\n" "　・ ドラフトに設定（ドラフト状態に設定）\n" "　・ キャンセル（キャンセル状態に設定）\n" "\n" -"製造オーダーが\"製造可能\"になった時、操作は確認済になります。製造オーダーが終了した時、操作は完了になります。\n" +"製造オーダーが\"製造可能\"になった時、操作は確認済になります。製造オーダーが完了した時、操作は完了になります。\n" "\n" "項目の遅れは遅れ（中止日付 - 開始日付）です。\n" "それで、理論的な遅れと実際の遅れを比較できます。\n" @@ -16208,7 +16208,7 @@ msgstr "イベントログ" #: code:addons/base/module/wizard/base_module_configuration.py:38 #, python-format msgid "System Configuration done" -msgstr "システム設定が終了しました。" +msgstr "システム設定が完了しました。" #. module: base #: view:ir.actions.server:0 From 742124c840b0b456c7eb48ebec753fb1303d883c Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Wed, 16 May 2012 05:10:16 +0000 Subject: [PATCH 123/181] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120516045107-v494g863893yktqz bzr revid: launchpad_translations_on_behalf_of_openerp-20120516051016-e707dlnmnhgrraoo --- addons/account/i18n/ja.po | 26 +- addons/account_payment/i18n/ja.po | 10 +- addons/account_voucher/i18n/ja.po | 4 +- addons/analytic/i18n/ja.po | 284 +++++++++++++++++ addons/anonymization/i18n/ja.po | 213 +++++++++++++ addons/crm_todo/i18n/ro.po | 97 ++++++ addons/edi/i18n/ro.po | 416 +++++++++++++++++++++++++ addons/google_base_account/i18n/pt.po | 122 ++++++++ addons/hr_timesheet/i18n/ja.po | 4 +- addons/hr_timesheet_invoice/i18n/ja.po | 8 +- addons/web/i18n/nl_BE.po | 112 +++---- addons/web_dashboard/i18n/nl_BE.po | 10 +- addons/web_kanban/i18n/nl_BE.po | 12 +- addons/web_mobile/i18n/nl_BE.po | 12 +- 14 files changed, 1231 insertions(+), 99 deletions(-) create mode 100644 addons/analytic/i18n/ja.po create mode 100644 addons/anonymization/i18n/ja.po create mode 100644 addons/crm_todo/i18n/ro.po create mode 100644 addons/edi/i18n/ro.po create mode 100644 addons/google_base_account/i18n/pt.po diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po index f6f1429b445..9f2bc798696 100644 --- a/addons/account/i18n/ja.po +++ b/addons/account/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-05-15 01:20+0000\n" +"PO-Revision-Date: 2012-05-15 06:17+0000\n" "Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-15 04:51+0000\n" -"X-Generator: Launchpad (build 15238)\n" +"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n" +"X-Generator: Launchpad (build 15247)\n" #. module: account #: view:account.invoice.report:0 @@ -457,7 +457,7 @@ msgid "" "it comes to 'Printed' state. When all transactions are done, it comes in " "'Done' state." msgstr "" -"仕訳帳期間が作成される場合、その状態はドラフトです。レポートが印刷された場合は、印刷済状態になります。全ての取引が終了すると終了状態となります。" +"仕訳帳期間が作成される場合、その状態はドラフトです。レポートが印刷された場合は、印刷済状態になります。全ての取引が完了すると完了状態となります。" #. module: account #: model:ir.actions.act_window,help:account.action_account_tax_chart @@ -1527,7 +1527,7 @@ msgstr "仕入先返金" #: selection:account.fiscalyear,state:0 #: selection:account.period,state:0 msgid "Closed" -msgstr "閉鎖" +msgstr "閉じた" #. module: account #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries @@ -3387,7 +3387,7 @@ msgstr "ドラフト請求書" msgid "" "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' " "or 'Done' state!" -msgstr "選択した請求書は既にキャンセルあるいは終了状態であるためキャンセルできません。" +msgstr "選択した請求書は既にキャンセルあるいは完了状態であるためキャンセルできません。" #. module: account #: view:account.invoice.line:0 @@ -4218,7 +4218,7 @@ msgid "" "* When all the payments are done it will be in 'Valid' state." msgstr "" "新しい移動行が作成された時はドラフト状態になります。\n" -"・ 全ての支払いが終了した時に、有効状態になります。" +"・ 全ての支払いが完了した時に、有効状態になります。" #. module: account #: field:account.journal,view_id:0 @@ -5961,7 +5961,7 @@ msgstr "（今期を使う場合は空のままとして下さい）" msgid "" "As soon as the reconciliation is done, the invoice's state turns to “done” " "(i.e. paid) in the system." -msgstr "消し込みを終了するや否や、請求書の状態はシステム内で終了（すなわち支払済）となります。" +msgstr "消し込みを完了するや否や、請求書の状態はシステム内で完了（すなわち支払済）となります。" #. module: account #: view:account.chart.template:0 @@ -6931,7 +6931,7 @@ msgstr "仕訳帳カラム" #: selection:account.subscription,state:0 #: selection:report.invoice.created,state:0 msgid "Done" -msgstr "終了" +msgstr "完了" #. module: account #: model:ir.actions.act_window,help:account.action_bank_tree @@ -7957,7 +7957,7 @@ msgstr "このアカウントが仕訳帳項目の消し込みを許す場合は msgid "" "When monthly periods are created. The state is 'Draft'. At the end of " "monthly period it is in 'Done' state." -msgstr "月次の期間が作成される時はその状態はドラフトです。月次の期間の終わりには状態は終了になります。" +msgstr "月次の期間が作成される時はその状態はドラフトです。月次の期間の終わりには状態は完了になります。" #. module: account #: report:account.analytic.account.inverted.balance:0 @@ -10045,7 +10045,7 @@ msgstr "償却の移動" #. module: account #: model:process.node,note:account.process_node_paidinvoice0 msgid "Invoice's state is Done" -msgstr "請求書は終了状態です。" +msgstr "請求書は完了状態です。" #. module: account #: model:ir.model,name:account.model_report_account_sales @@ -10542,12 +10542,12 @@ msgstr "原価元帳（数量のみ）" #. module: account #: model:process.node,note:account.process_node_supplierpaidinvoice0 msgid "Invoice's state is Done." -msgstr "請求書は終了状態です。" +msgstr "請求書は完了状態です。" #. module: account #: model:process.transition,note:account.process_transition_reconcilepaid0 msgid "As soon as the reconciliation is done, the invoice can be paid." -msgstr "できるだけ早く消し込みを終えるために請求書の支払が可能です。" +msgstr "できるだけ早く消し込みを完了するために請求書の支払が可能です。" #. module: account #: view:account.account.template:0 diff --git a/addons/account_payment/i18n/ja.po b/addons/account_payment/i18n/ja.po index 3b703dff7c8..cb518cdcfea 100644 --- a/addons/account_payment/i18n/ja.po +++ b/addons/account_payment/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-05-15 04:40+0000\n" +"PO-Revision-Date: 2012-05-15 06:19+0000\n" "Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-15 04:51+0000\n" -"X-Generator: Launchpad (build 15238)\n" +"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n" +"X-Generator: Launchpad (build 15247)\n" #. module: account_payment #: field:payment.order,date_scheduled:0 @@ -64,7 +64,7 @@ msgid "" msgstr "" "オーダーがなされた時に状態はドラフトになります。\n" "　銀行により確認されると状態は確認済となります。\n" -"　そしてオーダーの支払がなされると状態は終了となります。" +"　そしてオーダーの支払がなされると状態は完了となります。" #. module: account_payment #: help:account.invoice,amount_to_pay:0 @@ -556,7 +556,7 @@ msgstr "一般情報" #: view:payment.order:0 #: selection:payment.order,state:0 msgid "Done" -msgstr "終了" +msgstr "完了" #. module: account_payment #: model:ir.model,name:account_payment.model_account_invoice diff --git a/addons/account_voucher/i18n/ja.po b/addons/account_voucher/i18n/ja.po index 5a0ec9f3236..970508b5e7f 100644 --- a/addons/account_voucher/i18n/ja.po +++ b/addons/account_voucher/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-15 04:51+0000\n" -"X-Generator: Launchpad (build 15238)\n" +"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n" +"X-Generator: Launchpad (build 15247)\n" #. module: account_voucher #: view:sale.receipt.report:0 diff --git a/addons/analytic/i18n/ja.po b/addons/analytic/i18n/ja.po new file mode 100644 index 00000000000..4412d1964e0 --- /dev/null +++ b/addons/analytic/i18n/ja.po @@ -0,0 +1,284 @@ +# Japanese translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:35+0000\n" +"PO-Revision-Date: 2012-05-15 06:05+0000\n" +"Last-Translator: Akira Hiyama \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n" +"X-Generator: Launchpad (build 15247)\n" + +#. module: analytic +#: field:account.analytic.account,child_ids:0 +msgid "Child Accounts" +msgstr "子アカウント" + +#. module: analytic +#: field:account.analytic.account,name:0 +msgid "Account Name" +msgstr "アカウント名" + +#. module: analytic +#: help:account.analytic.line,unit_amount:0 +msgid "Specifies the amount of quantity to count." +msgstr "数えた数量の指定" + +#. module: analytic +#: field:account.analytic.account,state:0 +msgid "State" +msgstr "状態" + +#. module: analytic +#: field:account.analytic.account,user_id:0 +msgid "Account Manager" +msgstr "会計マネジャ" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Closed" +msgstr "閉じた" + +#. module: analytic +#: field:account.analytic.account,debit:0 +msgid "Debit" +msgstr "借方" + +#. module: analytic +#: help:account.analytic.account,state:0 +msgid "" +"* When an account is created its in 'Draft' state. " +" \n" +"* If any associated partner is there, it can be in 'Open' state. " +" \n" +"* If any pending balance is there it can be in 'Pending'. " +" \n" +"* And finally when all the transactions are over, it can be in 'Close' " +"state. \n" +"* The project can be in either if the states 'Template' and 'Running'.\n" +" If it is template then we can make projects based on the template projects. " +"If its in 'Running' state it is a normal project. " +" \n" +" If it is to be reviewed then the state is 'Pending'.\n" +" When the project is completed the state is set to 'Done'." +msgstr "" +"・ アカウントが作成されると、それはドラフト状態です。\n" +"・ 関連するパートナがいると、それは開く状態になります。\n" +"・ 保留中残高が存在すると、それは保留中状態になります。\n" +"・ 最終的に全ての取引が終了すると、それは閉じる状態になります。\n" +"・ プロジェクトの状態はテンプレートや実行中にもなります。\n" +"　テンプレートであれば、そこでテンプレートプロジェクトを元にしたプロジェクトを作成できます。それが実行中状態であれば、それは通常プロジェクトです。\n" +"　それがレビューされると、保留中状態になります。\n" +"　プロジェクトが完了した時に、完了状態にセットされます。" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "New" +msgstr "新規" + +#. module: analytic +#: field:account.analytic.account,type:0 +msgid "Account Type" +msgstr "アカウントタイプ" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Pending" +msgstr "保留中" + +#. module: analytic +#: model:ir.model,name:analytic.model_account_analytic_line +msgid "Analytic Line" +msgstr "分析行" + +#. module: analytic +#: field:account.analytic.account,description:0 +#: field:account.analytic.line,name:0 +msgid "Description" +msgstr "詳細" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "Normal" +msgstr "通常" + +#. module: analytic +#: field:account.analytic.account,company_id:0 +#: field:account.analytic.line,company_id:0 +msgid "Company" +msgstr "会社" + +#. module: analytic +#: code:addons/analytic/analytic.py:138 +#, python-format +msgid "" +"If you set a company, the currency selected has to be the same as it's " +"currency. \n" +"You can remove the company belonging, and thus change the currency, only on " +"analytic account of type 'view'. This can be really usefull for " +"consolidation purposes of several companies charts with different " +"currencies, for example." +msgstr "" +"会社を設定した場合、選択した通貨は会社の通貨と同じである必要があります。\n" +"タイプがビューである分析アカウント上でのみ、所属会社を削除して通貨を変更することができます。これは例えば、異なる通貨である複数の会社チャートを連結する目的" +"のために非常に役立ちます。" + +#. module: analytic +#: field:account.analytic.line,user_id:0 +msgid "User" +msgstr "ユーザ" + +#. module: analytic +#: field:account.analytic.account,parent_id:0 +msgid "Parent Analytic Account" +msgstr "パートナ分析アカウント" + +#. module: analytic +#: field:account.analytic.line,date:0 +msgid "Date" +msgstr "日付" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Template" +msgstr "テンプレート" + +#. module: analytic +#: field:account.analytic.account,quantity:0 +#: field:account.analytic.line,unit_amount:0 +msgid "Quantity" +msgstr "数量" + +#. module: analytic +#: help:account.analytic.line,amount:0 +msgid "" +"Calculated by multiplying the quantity and the price given in the Product's " +"cost price. Always expressed in the company main currency." +msgstr "数量と製品の原価価格を乗算して計算されます。いつも会社の主な通貨で表現されます。" + +#. module: analytic +#: field:account.analytic.account,child_complete_ids:0 +msgid "Account Hierarchy" +msgstr "アカウント階層" + +#. module: analytic +#: help:account.analytic.account,quantity_max:0 +msgid "Sets the higher limit of time to work on the contract." +msgstr "契約上の動作上限時間を設定して下さい。" + +#. module: analytic +#: field:account.analytic.account,credit:0 +msgid "Credit" +msgstr "貸方" + +#. module: analytic +#: field:account.analytic.line,amount:0 +msgid "Amount" +msgstr "金額" + +#. module: analytic +#: field:account.analytic.account,contact_id:0 +msgid "Contact" +msgstr "連絡先" + +#. module: analytic +#: field:account.analytic.account,code:0 +msgid "Code/Reference" +msgstr "コード / 参照" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Cancelled" +msgstr "キャンセル済" + +#. module: analytic +#: code:addons/analytic/analytic.py:138 +#, python-format +msgid "Error !" +msgstr "エラー" + +#. module: analytic +#: field:account.analytic.account,balance:0 +msgid "Balance" +msgstr "残高" + +#. module: analytic +#: constraint:account.analytic.account:0 +msgid "Error! You can not create recursive analytic accounts." +msgstr "エラー。反復した分析アカウントを作ることはできません。" + +#. module: analytic +#: help:account.analytic.account,type:0 +msgid "" +"If you select the View Type, it means you won't allow to create journal " +"entries using that account." +msgstr "ビュータイプを選択した場合、このアカウントを使って仕訳帳エントリーは作ることができません。" + +#. module: analytic +#: field:account.analytic.account,date:0 +msgid "Date End" +msgstr "終了日" + +#. module: analytic +#: field:account.analytic.account,quantity_max:0 +msgid "Maximum Time" +msgstr "上限時間" + +#. module: analytic +#: model:res.groups,name:analytic.group_analytic_accounting +msgid "Analytic Accounting" +msgstr "分析会計" + +#. module: analytic +#: field:account.analytic.account,complete_name:0 +msgid "Full Account Name" +msgstr "フルアカウント名" + +#. module: analytic +#: field:account.analytic.line,account_id:0 +#: model:ir.model,name:analytic.model_account_analytic_account +msgid "Analytic Account" +msgstr "分析アカウント" + +#. module: analytic +#: field:account.analytic.account,currency_id:0 +msgid "Currency" +msgstr "通貨" + +#. module: analytic +#: constraint:account.analytic.line:0 +msgid "You can not create analytic line on view account." +msgstr "ビューアカウントでは分析行を作ることはできません。" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "View" +msgstr "ビュー" + +#. module: analytic +#: field:account.analytic.account,partner_id:0 +msgid "Partner" +msgstr "パートナ" + +#. module: analytic +#: field:account.analytic.account,date_start:0 +msgid "Date Start" +msgstr "開始日" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Open" +msgstr "開く" + +#. module: analytic +#: field:account.analytic.account,line_ids:0 +msgid "Analytic Entries" +msgstr "分析エントリー" diff --git a/addons/anonymization/i18n/ja.po b/addons/anonymization/i18n/ja.po new file mode 100644 index 00000000000..8a2c195fad7 --- /dev/null +++ b/addons/anonymization/i18n/ja.po @@ -0,0 +1,213 @@ +# Japanese translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:35+0000\n" +"PO-Revision-Date: 2012-05-16 02:18+0000\n" +"Last-Translator: Akira Hiyama \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-05-16 04:51+0000\n" +"X-Generator: Launchpad (build 15247)\n" + +#. module: anonymization +#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard +msgid "ir.model.fields.anonymize.wizard" +msgstr "" + +#. module: anonymization +#: field:ir.model.fields.anonymization,field_name:0 +msgid "Field Name" +msgstr "項目名" + +#. module: anonymization +#: field:ir.model.fields.anonymization,field_id:0 +msgid "Field" +msgstr "項目" + +#. module: anonymization +#: field:ir.model.fields.anonymization.history,state:0 +#: field:ir.model.fields.anonymize.wizard,state:0 +msgid "State" +msgstr "状態" + +#. module: anonymization +#: field:ir.model.fields.anonymize.wizard,file_import:0 +msgid "Import" +msgstr "インポート" + +#. module: anonymization +#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization +msgid "ir.model.fields.anonymization" +msgstr "" + +#. module: anonymization +#: field:ir.model.fields.anonymization.history,direction:0 +msgid "Direction" +msgstr "指示" + +#. module: anonymization +#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree +#: view:ir.model.fields.anonymization:0 +#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields +msgid "Anonymized Fields" +msgstr "匿名項目" + +#. module: anonymization +#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization +msgid "Database anonymization" +msgstr "データベースの匿名化" + +#. module: anonymization +#: selection:ir.model.fields.anonymization.history,direction:0 +msgid "clear -> anonymized" +msgstr "クリア -> 匿名" + +#. module: anonymization +#: selection:ir.model.fields.anonymization,state:0 +#: selection:ir.model.fields.anonymize.wizard,state:0 +msgid "Anonymized" +msgstr "匿名化" + +#. module: anonymization +#: field:ir.model.fields.anonymization,state:0 +msgid "unknown" +msgstr "不明" + +#. module: anonymization +#: field:ir.model.fields.anonymization,model_id:0 +msgid "Object" +msgstr "オブジェクト" + +#. module: anonymization +#: field:ir.model.fields.anonymization.history,filepath:0 +msgid "File path" +msgstr "ファイルパス" + +#. module: anonymization +#: field:ir.model.fields.anonymization.history,date:0 +msgid "Date" +msgstr "日付" + +#. module: anonymization +#: field:ir.model.fields.anonymize.wizard,file_export:0 +msgid "Export" +msgstr "エクスポート" + +#. module: anonymization +#: view:ir.model.fields.anonymize.wizard:0 +msgid "Reverse the Database Anonymization" +msgstr "逆データベース匿名化" + +#. module: anonymization +#: view:ir.model.fields.anonymize.wizard:0 +msgid "Database Anonymization" +msgstr "データベース匿名化" + +#. module: anonymization +#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard +msgid "Anonymize database" +msgstr "匿名化データベース" + +#. module: anonymization +#: view:ir.model.fields.anonymization.history:0 +#: field:ir.model.fields.anonymization.history,field_ids:0 +msgid "Fields" +msgstr "項目" + +#. module: anonymization +#: selection:ir.model.fields.anonymization,state:0 +#: selection:ir.model.fields.anonymize.wizard,state:0 +msgid "Clear" +msgstr "クリア" + +#. module: anonymization +#: view:ir.model.fields.anonymize.wizard:0 +#: field:ir.model.fields.anonymize.wizard,summary:0 +msgid "Summary" +msgstr "要約" + +#. module: anonymization +#: view:ir.model.fields.anonymization:0 +msgid "Anonymized Field" +msgstr "匿名化項目" + +#. module: anonymization +#: selection:ir.model.fields.anonymize.wizard,state:0 +msgid "Unstable" +msgstr "不安定" + +#. module: anonymization +#: selection:ir.model.fields.anonymization.history,state:0 +msgid "Exception occured" +msgstr "例外発生" + +#. module: anonymization +#: selection:ir.model.fields.anonymization,state:0 +#: selection:ir.model.fields.anonymize.wizard,state:0 +msgid "Not Existing" +msgstr "未存在" + +#. module: anonymization +#: field:ir.model.fields.anonymization,model_name:0 +msgid "Object Name" +msgstr "オブジェクト名" + +#. module: anonymization +#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree +#: view:ir.model.fields.anonymization.history:0 +#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history +msgid "Anonymization History" +msgstr "匿名化履歴" + +#. module: anonymization +#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history +msgid "ir.model.fields.anonymization.history" +msgstr "" + +#. module: anonymization +#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard +#: view:ir.model.fields.anonymize.wizard:0 +msgid "Anonymize Database" +msgstr "匿名化データベース" + +#. module: anonymization +#: field:ir.model.fields.anonymize.wizard,name:0 +msgid "File Name" +msgstr "ファイル名" + +#. module: anonymization +#: selection:ir.model.fields.anonymization.history,direction:0 +msgid "anonymized -> clear" +msgstr "匿名化 -> クリア" + +#. module: anonymization +#: selection:ir.model.fields.anonymization.history,state:0 +msgid "Started" +msgstr "開始済" + +#. module: anonymization +#: selection:ir.model.fields.anonymization.history,state:0 +msgid "Done" +msgstr "完了" + +#. module: anonymization +#: view:ir.model.fields.anonymization.history:0 +#: field:ir.model.fields.anonymization.history,msg:0 +#: field:ir.model.fields.anonymize.wizard,msg:0 +msgid "Message" +msgstr "メッセージ" + +#. module: anonymization +#: code:addons/anonymization/anonymization.py:55 +#: sql_constraint:ir.model.fields.anonymization:0 +#, python-format +msgid "You cannot have two fields with the same name on the same object!" +msgstr "同じオブジェクトでは同じ名前の項目を複数持てません。" diff --git a/addons/crm_todo/i18n/ro.po b/addons/crm_todo/i18n/ro.po new file mode 100644 index 00000000000..a6856e14792 --- /dev/null +++ b/addons/crm_todo/i18n/ro.po @@ -0,0 +1,97 @@ +# Romanian translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-05-15 12:21+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-05-16 04:51+0000\n" +"X-Generator: Launchpad (build 15247)\n" + +#. module: crm_todo +#: model:ir.model,name:crm_todo.model_project_task +msgid "Task" +msgstr "Sarcina" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Timebox" +msgstr "Ceas" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "For cancelling the task" +msgstr "Pentru anularea sarcinii" + +#. module: crm_todo +#: constraint:project.task:0 +msgid "Error ! Task end-date must be greater then task start-date" +msgstr "" +"Eroare ! Data de sfarsit a sarcinii trebuie sa fie mai mare decat data de " +"inceput" + +#. module: crm_todo +#: model:ir.model,name:crm_todo.model_crm_lead +msgid "crm.lead" +msgstr "pista.crm" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Next" +msgstr "Urmatorul" + +#. module: crm_todo +#: model:ir.actions.act_window,name:crm_todo.crm_todo_action +#: model:ir.ui.menu,name:crm_todo.menu_crm_todo +msgid "My Tasks" +msgstr "Sarcinile mele" + +#. module: crm_todo +#: view:crm.lead:0 +#: field:crm.lead,task_ids:0 +msgid "Tasks" +msgstr "Sarcini" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Done" +msgstr "Efectuat" + +#. module: crm_todo +#: constraint:project.task:0 +msgid "Error ! You cannot create recursive tasks." +msgstr "Eroare ! Nu puteti crea sarcini recursive." + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Cancel" +msgstr "Anuleaza" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Extra Info" +msgstr "Informatii suplimentare" + +#. module: crm_todo +#: field:project.task,lead_id:0 +msgid "Lead / Opportunity" +msgstr "Pista / Oportunitate" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "For changing to done state" +msgstr "Pentru schimbarea in starea efectuat" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Previous" +msgstr "Precedent(a)" diff --git a/addons/edi/i18n/ro.po b/addons/edi/i18n/ro.po new file mode 100644 index 00000000000..d6b9cfd1f29 --- /dev/null +++ b/addons/edi/i18n/ro.po @@ -0,0 +1,416 @@ +# Romanian translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 01:37+0100\n" +"PO-Revision-Date: 2012-05-15 17:48+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-05-16 04:51+0000\n" +"X-Generator: Launchpad (build 15247)\n" + +#. module: edi +#: sql_constraint:res.currency:0 +msgid "The currency code must be unique per company!" +msgstr "Codul monedei trebuie sa fie unic per companie!" + +#. module: edi +#: model:ir.model,name:edi.model_res_partner_address +msgid "Partner Addresses" +msgstr "Adrese Partener" + +#. module: edi +#: sql_constraint:res.company:0 +msgid "The company name must be unique !" +msgstr "Numele companiei trebuie sa fie unic !" + +#. module: edi +#: constraint:res.partner:0 +msgid "Error ! You cannot create recursive associated members." +msgstr "Eroare ! Nu puteti crea membri asociati recursiv." + +#. module: edi +#: field:edi.document,name:0 +msgid "EDI token" +msgstr "Simbol EDI" + +#. module: edi +#: help:edi.document,name:0 +msgid "Unique identifier for retrieving an EDI document." +msgstr "Identificator unic pentru recuperarea unui document EDI." + +#. module: edi +#: constraint:res.company:0 +msgid "Error! You can not create recursive companies." +msgstr "Eroare! Nu puteti crea companii recursive." + +#. module: edi +#: model:ir.model,name:edi.model_res_company +msgid "Companies" +msgstr "Companii" + +#. module: edi +#: sql_constraint:edi.document:0 +msgid "EDI Tokens must be unique!" +msgstr "Simbolurile EDI trebuie sa fie unice!" + +#. module: edi +#: model:ir.model,name:edi.model_res_currency +msgid "Currency" +msgstr "Moneda" + +#. module: edi +#: code:addons/edi/models/edi.py:153 +#, python-format +msgid "" +"The document you are trying to import requires the OpenERP `%s` application. " +"You can install it by connecting as the administrator and opening the " +"configuration assistant." +msgstr "" +"Documentul pe care incercati sa il importati necesita aplicatia `%s` " +"OpenERP. O puteti instala conectandu-va ca administrator si deschizand " +"asistentul configurare." + +#. module: edi +#: help:edi.document,document:0 +msgid "EDI document content" +msgstr "Continut document EDI" + +#. module: edi +#: model:ir.model,name:edi.model_edi_document +msgid "EDI Document" +msgstr "Document EDI" + +#. module: edi +#: code:addons/edi/models/edi.py:48 +#, python-format +msgid "'%s' is an invalid external ID" +msgstr "'%s' este un ID extern nevalid" + +#. module: edi +#: model:ir.model,name:edi.model_res_partner +msgid "Partner" +msgstr "Partener" + +#. module: edi +#: code:addons/edi/models/edi.py:152 +#, python-format +msgid "Missing Application" +msgstr "Aplicatie Lipsa" + +#. module: edi +#: field:edi.document,document:0 +msgid "Document" +msgstr "Document" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23 +msgid "View/Print" +msgstr "Vizualizeaza/Printeaza" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28 +msgid "Import this document" +msgstr "Importa acest document" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33 +msgid "Import it into an existing OpenERP instance" +msgstr "Importati-l intr-un caz OpenERP existent" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36 +msgid "OpenERP instance address:" +msgstr "Adresa caz OpenERP" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39 +msgid "Import" +msgstr "Importa" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44 +msgid "Import it into a new OpenERP Online instance" +msgstr "Importati-l intr-o noua instanta OpenERP Online" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47 +msgid "Create my new OpenERP instance" +msgstr "Creeaza noul meu caz OpenERP" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52 +msgid "Import into another application" +msgstr "Importa intr-o alta aplicatie" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54 +msgid "" +"OpenERP's Electronic Data Interchange documents are based on a generic and " +"language\n" +" independent" +msgstr "" +"Documentele Schimb Electronic de Date OpenERP se bazeaza pe o serializare " +"generala si independenta\n" +" de limba" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56 +msgid "JSON" +msgstr "JSON" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56 +msgid "" +"serialization of the document's attribute.\n" +" It is usually very quick and straightforward to " +"create a small plug-in for your preferred\n" +" application that will be capable of importing " +"any OpenERP EDI document.\n" +" You can find out more details about how to do " +"this and what the content of OpenERP EDI documents\n" +" is like in the" +msgstr "" +"serializare a atributului documentului.\n" +" De obicei este foarte rapid si direct sa creezi " +"un plug-in mic pentru aplicatia dumneavoastra\n" +"\n" +" preferata care va putea sa importe orice " +"document EDI OpenERP.\n" +" Puteti afla mai multe detalii despre cum sa " +"faceti acest lucru si care este continutul documentelor EDI\n" +"OpenERP\n" +" in" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60 +msgid "OpenERP documentation" +msgstr "documentatia OpenERP" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61 +msgid "To get started immediately," +msgstr "Pentru a incepe imediat," + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62 +msgid "see is all it takes to use this EDI document in Python" +msgstr "" +"sa vedeti este tot ceea este nevoie pentru a folosi acest document EDI in " +"Python" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70 +msgid "You can download the raw EDI document here:" +msgstr "Puteti descarca documentul EDI brut de aici:" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73 +msgid "Download" +msgstr "Descarca" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87 +msgid "Powered by" +msgstr "Oferit de" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87 +msgid "OpenERP" +msgstr "OpenERP" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34 +msgid "Invoice" +msgstr "Factureaza" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37 +msgid "Description" +msgstr "Descriere" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41 +msgid "Date" +msgstr "Data" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40 +msgid "Your Reference" +msgstr "Referinta dumneavoastra" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57 +msgid "Product Description" +msgstr "Descriere produs" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58 +msgid "Quantity" +msgstr "Cantitate" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59 +msgid "Unit Price" +msgstr "Pret unitar" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53 +msgid "Discount" +msgstr "Reducere" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61 +msgid "Price" +msgstr "Pret" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81 +msgid "Net Total:" +msgstr "Net Total:" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92 +msgid "Taxes:" +msgstr "Taxe:" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103 +msgid "Total:" +msgstr "Total:" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106 +msgid "Tax" +msgstr "Taxa" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107 +msgid "Base Amount" +msgstr "Suma de baza" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108 +msgid "Amount" +msgstr "Suma" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113 +msgid "Notes:" +msgstr "Note:" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121 +msgid "Pay Online" +msgstr "Plateste Online" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125 +msgid "Paypal" +msgstr "Paypal" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135 +msgid "" +"You may directly pay this invoice online via Paypal's secure payment gateway:" +msgstr "" +"Puteti plati aceasta factura direct online prin intermediul lui Paypal " +"gateway plata in siguranta:" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137 +msgid "Bank Wire Transfer" +msgstr "Transfer Bancar" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139 +msgid "Please transfer" +msgstr "Va rugam sa transferati" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140 +msgid "to" +msgstr "la" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149 +msgid "" +"(postal address on the invoice header)\n" +" using one of the following bank accounts. Be sure to " +"mention the invoice\n" +" reference" +msgstr "" +"(adresa postala de pe antetul facturii)\n" +" folosind unul dintre urmatoarele conturi bancare. " +"Asigurati-va ca mentionati referinta\n" +" facturii" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151 +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143 +msgid "on the transfer:" +msgstr "in transfer:" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36 +msgid "Order" +msgstr "Comanda" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42 +msgid "Salesman" +msgstr "Agent de vanzari" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43 +msgid "Payment terms" +msgstr "Termeni de plata" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60 +msgid "Discount(%)" +msgstr "Reducere(%)" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127 +msgid "" +"You may directly pay this order online via Paypal's secure payment gateway:" +msgstr "" +"Puteti plati aceasta comanda direct online prin Paypay gateway plata in " +"siguranta:" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141 +msgid "" +"(postal address on the order header)\n" +" using one of the following bank accounts. Be sure to " +"mention the document\n" +" reference" +msgstr "" +"(adresa postala de pe antetul facturii)\n" +" folosind unul dintre urmatoarele conturi bancare. " +"Asigurati-va ca mentionati referinta\n" +" documentului" diff --git a/addons/google_base_account/i18n/pt.po b/addons/google_base_account/i18n/pt.po new file mode 100644 index 00000000000..df79a913fc4 --- /dev/null +++ b/addons/google_base_account/i18n/pt.po @@ -0,0 +1,122 @@ +# Portuguese translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-05-15 09:02+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-05-16 04:51+0000\n" +"X-Generator: Launchpad (build 15247)\n" + +#. module: google_base_account +#: field:res.users,gmail_user:0 +msgid "Username" +msgstr "Nome de utilizador" + +#. module: google_base_account +#: model:ir.actions.act_window,name:google_base_account.act_google_login_form +msgid "Google Login" +msgstr "Login Google" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:29 +#, python-format +msgid "Google Contacts Import Error!" +msgstr "Erro na importação dos contatos Google!" + +#. module: google_base_account +#: view:res.users:0 +msgid " Synchronization " +msgstr " Sincronização " + +#. module: google_base_account +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" +msgstr "Não pode ter dois utilizadores com o mesmo login!" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:75 +#, python-format +msgid "Error" +msgstr "Erro" + +#. module: google_base_account +#: view:google.login:0 +msgid "Google login" +msgstr "Login Google" + +#. module: google_base_account +#: model:ir.model,name:google_base_account.model_res_users +msgid "res.users" +msgstr "res.users" + +#. module: google_base_account +#: field:google.login,password:0 +msgid "Google Password" +msgstr "Password Google" + +#. module: google_base_account +#: view:google.login:0 +msgid "_Cancel" +msgstr "_Cancelar" + +#. module: google_base_account +#: view:res.users:0 +msgid "Google Account" +msgstr "Conta Google" + +#. module: google_base_account +#: field:google.login,user:0 +msgid "Google Username" +msgstr "Nome de Utilizador Google" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:29 +#, python-format +msgid "" +"Please install gdata-python-client from http://code.google.com/p/gdata-" +"python-client/downloads/list" +msgstr "" +"Por Favor instale gdata-python-client de http://code.google.com/p/gdata-" +"python-client/downloads/list" + +#. module: google_base_account +#: model:ir.model,name:google_base_account.model_google_login +msgid "Google Contact" +msgstr "Contato Google" + +#. module: google_base_account +#: view:google.login:0 +msgid "_Login" +msgstr "_Login" + +#. module: google_base_account +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "" +"A empresa escolhida não está entre as permitidas para este utilizador" + +#. module: google_base_account +#: field:res.users,gmail_password:0 +msgid "Password" +msgstr "Password" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:75 +#, python-format +msgid "Authentication fail check the user and password !" +msgstr "Falhou autentificação verifique o utilizador e a password !" + +#. module: google_base_account +#: view:google.login:0 +msgid "ex: user@gmail.com" +msgstr "ex: utilizador@gmail.com" diff --git a/addons/hr_timesheet/i18n/ja.po b/addons/hr_timesheet/i18n/ja.po index 51e2f47d9d8..0aa5e1bbdfd 100644 --- a/addons/hr_timesheet/i18n/ja.po +++ b/addons/hr_timesheet/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-15 04:51+0000\n" -"X-Generator: Launchpad (build 15238)\n" +"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n" +"X-Generator: Launchpad (build 15247)\n" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:43 diff --git a/addons/hr_timesheet_invoice/i18n/ja.po b/addons/hr_timesheet_invoice/i18n/ja.po index f3bef5e5439..23865a6e70a 100644 --- a/addons/hr_timesheet_invoice/i18n/ja.po +++ b/addons/hr_timesheet_invoice/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2012-05-15 03:16+0000\n" +"PO-Revision-Date: 2012-05-15 06:00+0000\n" "Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-15 04:51+0000\n" -"X-Generator: Launchpad (build 15238)\n" +"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n" +"X-Generator: Launchpad (build 15247)\n" #. module: hr_timesheet_invoice #: view:report.timesheet.line:0 @@ -260,7 +260,7 @@ msgstr "パートナ" #. module: hr_timesheet_invoice #: constraint:account.analytic.account:0 msgid "Error! You can not create recursive analytic accounts." -msgstr "エラー：反復した分析アカウントを作ることはできません" +msgstr "エラー。反復した分析アカウントを作ることはできません。" #. module: hr_timesheet_invoice #: help:hr.timesheet.invoice.create,time:0 diff --git a/addons/web/i18n/nl_BE.po b/addons/web/i18n/nl_BE.po index a31979c631f..de7fc18891c 100644 --- a/addons/web/i18n/nl_BE.po +++ b/addons/web/i18n/nl_BE.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-14 15:27+0100\n" -"PO-Revision-Date: 2011-10-07 12:50+0000\n" -"Last-Translator: Niels Huylebroeck \n" +"PO-Revision-Date: 2012-05-15 14:32+0000\n" +"Last-Translator: Els Van Vossel (Agaplan) \n" "Language-Team: Dutch (Belgium) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-15 05:06+0000\n" -"X-Generator: Launchpad (build 15238)\n" +"X-Launchpad-Export-Date: 2012-05-16 05:10+0000\n" +"X-Generator: Launchpad (build 15247)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:172 @@ -27,60 +27,60 @@ msgstr "" #: addons/web/static/src/js/view_form.js:424 #: addons/web/static/src/js/view_form.js:1239 msgid "Ok" -msgstr "Ok" +msgstr "OK" #. openerp-web #: addons/web/static/src/js/chrome.js:180 msgid "Send OpenERP Enterprise Report" -msgstr "" +msgstr "OpenERP-Entrepriserapport versturen" #. openerp-web #: addons/web/static/src/js/chrome.js:194 msgid "Dont send" -msgstr "" +msgstr "Niet versturen" #. openerp-web #: addons/web/static/src/js/chrome.js:256 #, python-format msgid "Loading (%d)" -msgstr "" +msgstr "Laden (%d)" #. openerp-web #: addons/web/static/src/js/chrome.js:288 msgid "Invalid database name" -msgstr "" +msgstr "Ongeldige databasenaam" #. openerp-web #: addons/web/static/src/js/chrome.js:483 msgid "Backed" -msgstr "" +msgstr "Back-up klaar" #. openerp-web #: addons/web/static/src/js/chrome.js:484 msgid "Database backed up successfully" -msgstr "" +msgstr "Databaseback-up geslaagd" #. openerp-web #: addons/web/static/src/js/chrome.js:527 msgid "Restored" -msgstr "" +msgstr "Teruggezet" #. openerp-web #: addons/web/static/src/js/chrome.js:527 msgid "Database restored successfully" -msgstr "" +msgstr "Database met succes teruggezet" #. openerp-web #: addons/web/static/src/js/chrome.js:708 #: addons/web/static/src/xml/base.xml:359 msgid "About" -msgstr "" +msgstr "Info" #. openerp-web #: addons/web/static/src/js/chrome.js:787 #: addons/web/static/src/xml/base.xml:356 msgid "Preferences" -msgstr "" +msgstr "Voorkeuren" #. openerp-web #: addons/web/static/src/js/chrome.js:790 @@ -102,7 +102,7 @@ msgstr "Annuleren" #. openerp-web #: addons/web/static/src/js/chrome.js:791 msgid "Change password" -msgstr "" +msgstr "Wachtwoord wijzigen" #. openerp-web #: addons/web/static/src/js/chrome.js:792 @@ -119,24 +119,24 @@ msgstr "Opslaan" #: addons/web/static/src/xml/base.xml:226 #: addons/web/static/src/xml/base.xml:1729 msgid "Change Password" -msgstr "" +msgstr "Wachtwoord wijzigen" #. openerp-web #: addons/web/static/src/js/chrome.js:1096 #: addons/web/static/src/js/chrome.js:1100 msgid "OpenERP - Unsupported/Community Version" -msgstr "" +msgstr "OpenERP - Niet-ondersteunde/Communityversie" #. openerp-web #: addons/web/static/src/js/chrome.js:1131 #: addons/web/static/src/js/chrome.js:1135 msgid "Client Error" -msgstr "" +msgstr "Clientfout" #. openerp-web #: addons/web/static/src/js/data_export.js:6 msgid "Export Data" -msgstr "" +msgstr "Gegevens exporteren" #. openerp-web #: addons/web/static/src/js/data_export.js:19 @@ -154,37 +154,37 @@ msgstr "Sluiten" #. openerp-web #: addons/web/static/src/js/data_export.js:20 msgid "Export To File" -msgstr "" +msgstr "Naar bestand exporteren" #. openerp-web #: addons/web/static/src/js/data_export.js:125 msgid "Please enter save field list name" -msgstr "" +msgstr "Geef eerst de naam van de lijst" #. openerp-web #: addons/web/static/src/js/data_export.js:360 msgid "Please select fields to save export list..." -msgstr "" +msgstr "Kies velden voor de lijst" #. openerp-web #: addons/web/static/src/js/data_export.js:373 msgid "Please select fields to export..." -msgstr "" +msgstr "Kies te exporteren velden" #. openerp-web #: addons/web/static/src/js/data_import.js:34 msgid "Import Data" -msgstr "" +msgstr "Gegevens importeren" #. openerp-web #: addons/web/static/src/js/data_import.js:70 msgid "Import File" -msgstr "" +msgstr "Bestand importeren" #. openerp-web #: addons/web/static/src/js/data_import.js:105 msgid "External ID" -msgstr "" +msgstr "Externe id" #. openerp-web #: addons/web/static/src/js/formats.js:300 @@ -192,14 +192,14 @@ msgstr "" #: addons/web/static/src/js/formats.js:322 #: addons/web/static/src/js/view_page.js:251 msgid "Download" -msgstr "" +msgstr "Downloaden" #. openerp-web #: addons/web/static/src/js/formats.js:305 #: addons/web/static/src/js/formats.js:327 #, python-format msgid "Download \"%s\"" -msgstr "" +msgstr "Download \"%s\"" #. openerp-web #: addons/web/static/src/js/search.js:191 @@ -216,70 +216,70 @@ msgstr "" #: addons/web/static/src/js/search.js:291 #: addons/web/static/src/js/search.js:296 msgid "OK" -msgstr "" +msgstr "OK" #. openerp-web #: addons/web/static/src/js/search.js:286 #: addons/web/static/src/xml/base.xml:1292 #: addons/web/static/src/js/search.js:291 msgid "Add to Dashboard" -msgstr "" +msgstr "Aan dashboard toevoegen" #. openerp-web #: addons/web/static/src/js/search.js:415 #: addons/web/static/src/js/search.js:420 msgid "Invalid Search" -msgstr "" +msgstr "Ongeldige zoekopdracht" #. openerp-web #: addons/web/static/src/js/search.js:415 #: addons/web/static/src/js/search.js:420 msgid "triggered from search view" -msgstr "" +msgstr "geactiveerd door zoekweergave" #. openerp-web #: addons/web/static/src/js/search.js:503 #: addons/web/static/src/js/search.js:508 #, python-format msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s" -msgstr "" +msgstr "Onjuiste waarde voor veld %(fieldname)s: [%(value)s] is %(message)s" #. openerp-web #: addons/web/static/src/js/search.js:839 #: addons/web/static/src/js/search.js:844 msgid "not a valid integer" -msgstr "" +msgstr "geen geldig geheel getal" #. openerp-web #: addons/web/static/src/js/search.js:853 #: addons/web/static/src/js/search.js:858 msgid "not a valid number" -msgstr "" +msgstr "geen geldig getal" #. openerp-web #: addons/web/static/src/js/search.js:931 #: addons/web/static/src/xml/base.xml:968 #: addons/web/static/src/js/search.js:936 msgid "Yes" -msgstr "" +msgstr "Ja" #. openerp-web #: addons/web/static/src/js/search.js:932 #: addons/web/static/src/js/search.js:937 msgid "No" -msgstr "" +msgstr "Nee" #. openerp-web #: addons/web/static/src/js/search.js:1290 #: addons/web/static/src/js/search.js:1295 msgid "contains" -msgstr "" +msgstr "bevat" #. openerp-web #: addons/web/static/src/js/search.js:1291 #: addons/web/static/src/js/search.js:1296 msgid "doesn't contain" -msgstr "" +msgstr "bevat niet" #. openerp-web #: addons/web/static/src/js/search.js:1292 @@ -293,7 +293,7 @@ msgstr "" #: addons/web/static/src/js/search.js:1349 #: addons/web/static/src/js/search.js:1370 msgid "is equal to" -msgstr "" +msgstr "is gelijk aan" #. openerp-web #: addons/web/static/src/js/search.js:1293 @@ -307,7 +307,7 @@ msgstr "" #: addons/web/static/src/js/search.js:1350 #: addons/web/static/src/js/search.js:1371 msgid "is not equal to" -msgstr "" +msgstr "is niet gelijk aan" #. openerp-web #: addons/web/static/src/js/search.js:1294 @@ -321,7 +321,7 @@ msgstr "" #: addons/web/static/src/js/search.js:1351 #: addons/web/static/src/js/search.js:1372 msgid "greater than" -msgstr "" +msgstr "is groter dan" #. openerp-web #: addons/web/static/src/js/search.js:1295 @@ -335,7 +335,7 @@ msgstr "" #: addons/web/static/src/js/search.js:1352 #: addons/web/static/src/js/search.js:1373 msgid "less than" -msgstr "" +msgstr "is kleiner dan" #. openerp-web #: addons/web/static/src/js/search.js:1296 @@ -349,7 +349,7 @@ msgstr "" #: addons/web/static/src/js/search.js:1353 #: addons/web/static/src/js/search.js:1374 msgid "greater or equal than" -msgstr "" +msgstr "is groter of gelijk aan" #. openerp-web #: addons/web/static/src/js/search.js:1297 @@ -363,7 +363,7 @@ msgstr "" #: addons/web/static/src/js/search.js:1354 #: addons/web/static/src/js/search.js:1375 msgid "less or equal than" -msgstr "" +msgstr "is kleiner dan of gelijk aan" #. openerp-web #: addons/web/static/src/js/search.js:1360 @@ -371,31 +371,31 @@ msgstr "" #: addons/web/static/src/js/search.js:1365 #: addons/web/static/src/js/search.js:1388 msgid "is" -msgstr "" +msgstr "is gelijk aan" #. openerp-web #: addons/web/static/src/js/search.js:1384 #: addons/web/static/src/js/search.js:1389 msgid "is not" -msgstr "" +msgstr "is niet gelijk aan" #. openerp-web #: addons/web/static/src/js/search.js:1396 #: addons/web/static/src/js/search.js:1401 msgid "is true" -msgstr "" +msgstr "is waar" #. openerp-web #: addons/web/static/src/js/search.js:1397 #: addons/web/static/src/js/search.js:1402 msgid "is false" -msgstr "" +msgstr "is onwaar" #. openerp-web #: addons/web/static/src/js/view_editor.js:20 #, python-format msgid "Manage Views (%s)" -msgstr "" +msgstr "Weergaven beheren (%s)" #. openerp-web #: addons/web/static/src/js/view_editor.js:46 @@ -411,7 +411,7 @@ msgstr "Creër" #: addons/web/static/src/xml/base.xml:483 #: addons/web/static/src/xml/base.xml:755 msgid "Edit" -msgstr "" +msgstr "Bewerken" #. openerp-web #: addons/web/static/src/js/view_editor.js:48 @@ -423,18 +423,18 @@ msgstr "Verwijderen" #: addons/web/static/src/js/view_editor.js:71 #, python-format msgid "Create a view (%s)" -msgstr "" +msgstr "Een weergave maken (%s)" #. openerp-web #: addons/web/static/src/js/view_editor.js:168 msgid "Do you really want to remove this view?" -msgstr "" +msgstr "Wilt u deze weergave echt verwijderen?" #. openerp-web #: addons/web/static/src/js/view_editor.js:364 #, python-format msgid "View Editor %d - %s" -msgstr "" +msgstr "Bekijk editor %d - %s" #. openerp-web #: addons/web/static/src/js/view_editor.js:367 @@ -449,7 +449,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/js/view_editor.js:381 msgid "Preview" -msgstr "" +msgstr "Voorbeeld" #. openerp-web #: addons/web/static/src/js/view_editor.js:501 diff --git a/addons/web_dashboard/i18n/nl_BE.po b/addons/web_dashboard/i18n/nl_BE.po index 73e965ab93e..0e19b1945a7 100644 --- a/addons/web_dashboard/i18n/nl_BE.po +++ b/addons/web_dashboard/i18n/nl_BE.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-14 15:27+0100\n" -"PO-Revision-Date: 2012-02-08 16:45+0000\n" +"PO-Revision-Date: 2012-05-15 14:13+0000\n" "Last-Translator: Els Van Vossel (Agaplan) \n" "Language-Team: Dutch (Belgium) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-15 05:06+0000\n" -"X-Generator: Launchpad (build 15238)\n" +"X-Launchpad-Export-Date: 2012-05-16 05:10+0000\n" +"X-Generator: Launchpad (build 15247)\n" #. openerp-web #: addons/web_dashboard/static/src/js/dashboard.js:63 @@ -36,12 +36,12 @@ msgstr "Zonder categorie" #: addons/web_dashboard/static/src/js/dashboard.js:324 #, python-format msgid "Execute task \"%s\"" -msgstr "" +msgstr "Taak \"%s\" uitvoeren" #. openerp-web #: addons/web_dashboard/static/src/js/dashboard.js:325 msgid "Mark this task as done" -msgstr "" +msgstr "Taak als voltooid markeren" #. openerp-web #: addons/web_dashboard/static/src/xml/web_dashboard.xml:4 diff --git a/addons/web_kanban/i18n/nl_BE.po b/addons/web_kanban/i18n/nl_BE.po index 9639398e6fd..d6bbfe2654f 100644 --- a/addons/web_kanban/i18n/nl_BE.po +++ b/addons/web_kanban/i18n/nl_BE.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-14 15:27+0100\n" -"PO-Revision-Date: 2012-02-08 16:53+0000\n" +"PO-Revision-Date: 2012-05-15 14:14+0000\n" "Last-Translator: Els Van Vossel (Agaplan) \n" "Language-Team: Dutch (Belgium) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-15 05:07+0000\n" -"X-Generator: Launchpad (build 15238)\n" +"X-Launchpad-Export-Date: 2012-05-16 05:10+0000\n" +"X-Generator: Launchpad (build 15247)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 @@ -37,17 +37,17 @@ msgstr "Wilt u dit record verwijderen?" #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:5 msgid "Create" -msgstr "" +msgstr "Maken" #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:41 msgid "Show more... (" -msgstr "" +msgstr "Meer tonen... (" #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:41 msgid "remaining)" -msgstr "" +msgstr "resterend)" #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:59 diff --git a/addons/web_mobile/i18n/nl_BE.po b/addons/web_mobile/i18n/nl_BE.po index 27c66f41148..c15eacda6a2 100644 --- a/addons/web_mobile/i18n/nl_BE.po +++ b/addons/web_mobile/i18n/nl_BE.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-07 10:13+0100\n" -"PO-Revision-Date: 2012-02-08 16:52+0000\n" +"PO-Revision-Date: 2012-05-15 14:19+0000\n" "Last-Translator: Els Van Vossel (Agaplan) \n" "Language-Team: Dutch (Belgium) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-15 05:06+0000\n" -"X-Generator: Launchpad (build 15238)\n" +"X-Launchpad-Export-Date: 2012-05-16 05:10+0000\n" +"X-Generator: Launchpad (build 15247)\n" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:17 @@ -50,12 +50,12 @@ msgstr "Verkeerde gebruikersnaam of wachtwoord" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:42 msgid "Powered by openerp.com" -msgstr "" +msgstr "Door openerp.com" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:49 msgid "Home" -msgstr "" +msgstr "Home" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:57 @@ -80,7 +80,7 @@ msgstr "Er kunnen geen records worden weergegeven" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:183 msgid "Open this resource" -msgstr "" +msgstr "Openen" #. openerp-web #: addons/web_mobile/static/src/xml/web_mobile.xml:223 From 6d70b97425e26bd6f17697baaf24dd7f4c432129 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 16 May 2012 12:16:34 +0200 Subject: [PATCH 124/181] [imp] small modif to view manager for future refactoring bzr revid: nicolas.vanhoren@openerp.com-20120516101634-bjne7hl4twvrfoy3 --- addons/web/static/src/js/view_form.js | 26 +++++++++++++++++--------- addons/web/static/src/js/views.js | 5 ++++- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 3c45e28e28f..f4820f3bd24 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2766,15 +2766,8 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ }); this.views = views; - this.viewmanager = new instance.web.ViewManager(this, this.dataset, views, { - $sidebar: false, - }); - this.viewmanager.template = 'One2Many.viewmanager'; - this.viewmanager.registry = instance.web.views.extend({ - list: 'instance.web.form.One2ManyListView', - form: 'instance.web.form.One2ManyFormView', - kanban: 'instance.web.form.One2ManyKanbanView', - }); + this.viewmanager = new instance.web.form.One2ManyViewManager(this, this.dataset, views, {}); + this.viewmanager.o2m = self; var once = $.Deferred().then(function() { self.init_form_last_update.resolve(); }); @@ -2958,6 +2951,21 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ }, }); +instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({ + template: 'One2Many.viewmanager', + init: function(parent, dataset, views, flags) { + this._super(parent, dataset, views, _.extend({}, flags, {$sidebar: false})); + this.registry = this.registry.extend({ + list: 'instance.web.form.One2ManyListView', + form: 'instance.web.form.One2ManyFormView', + kanban: 'instance.web.form.One2ManyKanbanView', + }); + }, + switch_view: function(mode, unused) { + return this._super(mode, unused); + }, +}); + instance.web.form.One2ManyDataSet = instance.web.BufferedDataSet.extend({ get_context: function() { this.context = this.o2m.build_context([this.o2m.name]); diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index de2ff53a71a..fae16dbd88f 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -295,7 +295,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ if (view.embedded_view) { controller.set_embedded_view(view.embedded_view); } - controller.do_switch_view.add_last(this.on_mode_switch); + controller.do_switch_view.add_last(_.bind(this.switch_view, this)); controller.do_prev_view.add_last(this.on_prev_view); var container = this.$element.find(".oe_view_manager_view_" + view_type); view_promise = controller.appendTo(container); @@ -342,6 +342,9 @@ instance.web.ViewManager = instance.web.Widget.extend({ }); return view_promise; }, + switch_view: function(view_type, no_store) { + return this.on_mode_switch(view_type, no_store); + }, /** * Returns to the view preceding the caller view in this manager's * navigation history (the navigation history is appended to via From 4d944fd34102bdc0f33f52c358dd56b9b476c8cc Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 16 May 2012 12:52:51 +0200 Subject: [PATCH 125/181] [imp] implemented switch_view in o2m view manager and used it in kanban view bzr revid: nicolas.vanhoren@openerp.com-20120516105251-rebt18lj9bwndydw --- addons/web/static/src/js/view_form.js | 47 ++++++++++++++------------- addons/web/static/src/js/views.js | 5 +++ 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index f4820f3bd24..25a49199241 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2962,7 +2962,30 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({ }); }, switch_view: function(mode, unused) { - return this._super(mode, unused); + if (mode !== 'form') { + return this._super(mode, unused); + } + var self = this; + var id = typeof(self.o2m.dataset.index) === "number" && self.o2m.dataset.index >= 0 ? + self.o2m.dataset.ids[self.o2m.dataset.index] : null; + var pop = new instance.web.form.FormOpenPopup(self.o2m.view); + pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(), { + title: _t("Open: ") + self.name, + auto_write: false, + alternative_form_view: self.o2m.field.views ? self.o2m.field.views["form"] : undefined, + parent_view: self.o2m.view, + child_name: self.o2m.name, + read_function: function() { + return self.o2m.dataset.read_ids.apply(self.o2m.dataset, arguments); + }, + form_view_options: {'not_interactible_on_create':true}, + readonly: self.o2m.get("effective_readonly") + }); + pop.on_write.add(function(id, data) { + self.o2m.dataset.write(id, data, {}, function(r) { + self.o2m.reload_current_view(); + }); + }); }, }); @@ -3059,28 +3082,6 @@ var lazy_build_o2m_kanban_view = function() { if (! instance.web_kanban || instance.web.form.One2ManyKanbanView) return; instance.web.form.One2ManyKanbanView = instance.web_kanban.KanbanView.extend({ - open_record: function(id) { - var self = this; - var pop = new instance.web.form.FormOpenPopup(self.o2m.view); - pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(), { - title: _t("Open: ") + self.name, - auto_write: false, - alternative_form_view: self.o2m.field.views ? self.o2m.field.views["form"] : undefined, - parent_view: self.o2m.view, - child_name: self.o2m.name, - read_function: function() { - return self.o2m.dataset.read_ids.apply(self.o2m.dataset, arguments); - }, - form_view_options: {'not_interactible_on_create':true}, - readonly: self.o2m.get("effective_readonly"), - }); - pop.on_write.add(function(id, data) { - self.o2m.dataset.write(id, data, {}, function(r) { - self.o2m.reload_current_view(); - }); - }); - - }, }); } diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index fae16dbd88f..d0af4811142 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -342,6 +342,11 @@ instance.web.ViewManager = instance.web.Widget.extend({ }); return view_promise; }, + /** + * Method used internally when a view asks to switch view. This method is meant + * to be extended by child classes to change the default behavior, which simply + * consist to switch to the asked view. + */ switch_view: function(view_type, no_store) { return this.on_mode_switch(view_type, no_store); }, From a4e5ef3bd1d962df6457f6e248f01516f101a066 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 16 May 2012 13:16:59 +0200 Subject: [PATCH 126/181] [IMP] Opportunities form view: use
for buttons, highlight first action button in topbar bzr revid: fme@openerp.com-20120516111659-zlc768ymthbyedjr --- addons/crm/crm_lead_view.xml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 44e866a3341..ca193cc48e1 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -400,7 +400,7 @@ 20
-
+
- - -
From 33c304d53154d09b20d0689717f0a17c57f63b50 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 16 May 2012 13:18:41 +0200 Subject: [PATCH 127/181] [IMP] Labels in bold bzr revid: fme@openerp.com-20120516111841-85xn2ghpbm15gjsr --- addons/web/static/src/css/base.css | 6 +++++- addons/web/static/src/css/base.sass | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 5d2102630cb..b2c4066a2c7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "UTF-8"; +@charset "utf-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -117,6 +117,9 @@ float: right; margin-left: 8px; } +.openerp .oe_text_right { + text-align: right; +} .openerp .oe_clear { clear: both; } @@ -1546,6 +1549,7 @@ padding: 0; } .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { + font-weight: bold; white-space: nowrap; padding-right: 8px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 567732ed080..411e345bc9f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -143,6 +143,8 @@ $colour4: #8a89ba .oe_right float: right margin-left: 8px + .oe_text_right + text-align: right .oe_clear clear: both .oe_wait @@ -1265,6 +1267,7 @@ $colour4: #8a89ba // FormView.label {{{ .oe_form .oe_form_label_help[for], .oe_form_label[for] + font-weight: bold white-space: nowrap padding-right: 8px span From c8838959cf64fd673ab9703cfb1d5bbcf6d3357a Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 16 May 2012 13:25:34 +0200 Subject: [PATCH 128/181] [IMP] Opportunities form view: add a clear element in case actions buttons are all hidden bzr revid: fme@openerp.com-20120516112534-suwavwiiohusvq3a --- addons/crm/crm_lead_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index ca193cc48e1..9c3bd07562c 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -411,6 +411,7 @@
+
From 57894a5361cadb6a4829de15de83a0b0ead88e16 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 16 May 2012 13:58:56 +0200 Subject: [PATCH 129/181] [imp] created AbstractFormPopup bzr revid: nicolas.vanhoren@openerp.com-20120516115856-p0tjpkfewq1y8ez8 --- addons/web/static/src/js/data.js | 3 - addons/web/static/src/js/view_form.js | 173 ++++++++++++-------------- addons/web/static/src/xml/base.xml | 27 ++-- 3 files changed, 91 insertions(+), 112 deletions(-) diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index 2dc66aaa135..29e21400b25 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -1096,7 +1096,6 @@ instance.web.ProxyDataSet = instance.web.DataSetSearch.extend({ if (this.create_function) { return this.create_function(data, callback, error_callback); } else { - console.warn("trying to create a record using default proxy dataset behavior"); return $.async_when({"result": undefined}).then(callback); } }, @@ -1106,14 +1105,12 @@ instance.web.ProxyDataSet = instance.web.DataSetSearch.extend({ if (this.write_function) { return this.write_function(id, data, options, callback); } else { - console.warn("trying to write a record using default proxy dataset behavior"); return $.async_when({"result": true}).then(callback); } }, on_write: function(id, data) {}, unlink: function(ids, callback, error_callback) { this.on_unlink(ids); - console.warn("trying to unlink a record using default proxy dataset behavior"); return $.async_when({"result": true}).then(callback); }, on_unlink: function(ids) {} diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 25a49199241..7fdcc030d83 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2966,8 +2966,7 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({ return this._super(mode, unused); } var self = this; - var id = typeof(self.o2m.dataset.index) === "number" && self.o2m.dataset.index >= 0 ? - self.o2m.dataset.ids[self.o2m.dataset.index] : null; + var id = self.o2m.dataset.index !== null ? self.o2m.dataset.ids[self.o2m.dataset.index] : null; var pop = new instance.web.form.FormOpenPopup(self.o2m.view); pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(), { title: _t("Open: ") + self.name, @@ -3362,12 +3361,73 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in } }); +instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({ + template: "AbstractFormPopup.render", + /** + * options: + */ + init_popup: function(model, row_id, domain, context, options) { + this.row_id = row_id; + this.model = model; + this.domain = domain || []; + this.context = context || {}; + this.options = options; + _.defaults(this.options, { + }); + }, + setup_form_view: function() { + var self = this; + var options = _.clone(self.options.form_view_options) || {}; + if (this.row_id !== null) { + options.initial_mode = this.options.readonly ? "view" : "edit"; + } + this.view_form = new instance.web.FormView(this, this.dataset, false, options); + if (this.options.alternative_form_view) { + this.view_form.set_embedded_view(this.options.alternative_form_view); + } + this.view_form.appendTo(this.$element.find(".oe-form-view-popup-form-placeholder")); + this.view_form.on_loaded.add_last(function() { + var $buttons = self.view_form.$element.find(".oe_form_buttons"); + var multi_select = self.row_id === null && ! self.options.disable_multiple_selection; + $buttons.html(QWeb.render("AbstractFormPopup.buttons", {multi_select: multi_select})); + var $snbutton = $buttons.find(".oe_abstractformpopup-form-save-new"); + $snbutton.click(function() { + $.when(self.view_form.do_save()).then(function() { + self.view_form.reload_mutex.exec(function() { + self.view_form.on_button_new(); + }); + }); + }); + var $sbutton = $buttons.find(".oe_abstractformpopup-form-save"); + $sbutton.click(function() { + $.when(self.view_form.do_save()).then(function() { + self.view_form.reload_mutex.exec(function() { + self.check_exit(); + }); + }); + }); + var $cbutton = $buttons.find(".oe_abstractformpopup-form-close"); + $cbutton.click(function() { + self.check_exit(); + }); + if (self.row_id !== null && self.options.readonly) { + $snbutton.hide(); + $sbutton.hide(); + $cbutton.text(_t("Close")); + } + self.view_form.do_show(); + }); + }, + check_exit: function() { + this.destroy(); + }, +}); + /** * @class * @extends instance.web.OldWidget */ -instance.web.form.SelectCreatePopup = instance.web.OldWidget.extend(/** @lends instance.web.form.SelectCreatePopup# */{ - template: "SelectCreatePopup", +instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend(/** @lends instance.web.form.SelectCreatePopup# */{ /** * options: * - initial_ids @@ -3383,12 +3443,14 @@ instance.web.form.SelectCreatePopup = instance.web.OldWidget.extend(/** @lends i */ select_element: function(model, options, domain, context) { var self = this; - this.model = model; - this.domain = domain || []; - this.context = context || {}; - this.options = _.defaults(options || {}, {"initial_view": "search", "create_function": function() { - return self.create_row.apply(self, arguments); - }, read_function: null}); + this.init_popup(model, null, domain, context, _.extend({}, options, {create_mode:true})); + _.defaults(this.options, { + "initial_view": "search", + "create_function": function() { + return self.create_row.apply(self, arguments); + }, + read_function: null, + }); this.initial_ids = this.options.initial_ids; this.created_elements = []; this.renderElement(); @@ -3521,7 +3583,6 @@ instance.web.form.SelectCreatePopup = instance.web.OldWidget.extend(/** @lends i } }, new_object: function() { - var self = this; if (this.searchview) { this.searchview.hide(); } @@ -3529,36 +3590,7 @@ instance.web.form.SelectCreatePopup = instance.web.OldWidget.extend(/** @lends i this.view_list.$element.hide(); } this.dataset.index = null; - this.view_form = new instance.web.FormView(this, this.dataset, false, self.options.form_view_options); - if (this.options.alternative_form_view) { - this.view_form.set_embedded_view(this.options.alternative_form_view); - } - this.view_form.appendTo(this.$element.find(".oe-select-create-popup-view-form")); - this.view_form.on_loaded.add_last(function() { - var $buttons = self.view_form.$element.find(".oe_form_buttons"); - $buttons.html(QWeb.render("SelectCreatePopup.form.buttons", {widget:self})); - var $nbutton = $buttons.find(".oe_selectcreatepopup-form-save-new"); - $nbutton.click(function() { - $.when(self.view_form.do_save()).then(function() { - self.view_form.reload_mutex.exec(function() { - self.view_form.on_button_new(); - }); - }); - }); - var $nbutton = $buttons.find(".oe_selectcreatepopup-form-save"); - $nbutton.click(function() { - $.when(self.view_form.do_save()).then(function() { - self.view_form.reload_mutex.exec(function() { - self.check_exit(); - }); - }); - }); - var $cbutton = $buttons.find(".oe_selectcreatepopup-form-close"); - $cbutton.click(function() { - self.check_exit(); - }); - }); - this.view_form.do_show(); + this.setup_form_view(); }, check_exit: function() { if (this.created_elements.length > 0) { @@ -3587,8 +3619,7 @@ instance.web.form.SelectCreateListView = instance.web.ListView.extend({ * @class * @extends instance.web.OldWidget */ -instance.web.form.FormOpenPopup = instance.web.OldWidget.extend(/** @lends instance.web.form.FormOpenPopup# */{ - template: "FormOpenPopup", +instance.web.form.FormOpenPopup = instance.web.form.AbstractFormPopup.extend(/** @lends instance.web.form.FormOpenPopup# */{ /** * options: * - alternative_form_view @@ -3600,10 +3631,10 @@ instance.web.form.FormOpenPopup = instance.web.OldWidget.extend(/** @lends insta * - readonly */ show_element: function(model, row_id, context, options) { - this.model = model; - this.row_id = row_id; - this.context = context || {}; - this.options = _.defaults(options || {}, {"auto_write": true}); + this.init_popup(model, row_id, [], context, _.extend({}, options, {create_mode:false})); + _.defaults(this.options, { + "auto_write": true, + }); this.renderElement(); instance.web.dialog(this.$element, { title: options.title || '', @@ -3615,15 +3646,16 @@ instance.web.form.FormOpenPopup = instance.web.OldWidget.extend(/** @lends insta }, start: function() { this._super(); - this.dataset = new instance.web.form.FormOpenDataset(this, this.model, this.context); - this.dataset.fop = this; + this.dataset = new instance.web.ProxyDataSet(this, this.model, this.context); + this.dataset.read_function = this.options.read_function; this.dataset.ids = [this.row_id]; this.dataset.index = 0; this.dataset.parent_view = this.options.parent_view; this.dataset.child_name = this.options.child_name; + this.dataset.on_write.add(this.write_row); this.setup_form_view(); }, - on_write: function(id, data) { + write_row: function(id, data) { if (!this.options.auto_write) return; var self = this; @@ -3635,47 +3667,6 @@ instance.web.form.FormOpenPopup = instance.web.OldWidget.extend(/** @lends insta }); }, on_write_completed: function() {}, - setup_form_view: function() { - var self = this; - var FormClass = instance.web.views.get_object('form'); - var options = _.clone(self.options.form_view_options) || {}; - options.initial_mode = this.options.readonly ? "view" : "edit"; - this.view_form = new FormClass(this, this.dataset, false, options); - if (this.options.alternative_form_view) { - this.view_form.set_embedded_view(this.options.alternative_form_view); - } - this.view_form.appendTo(this.$element.find(".oe-form-open-popup-form-view")); - this.view_form.on_loaded.add_last(function() { - var $buttons = self.view_form.$element.find(".oe_form_buttons"); - $buttons.html(QWeb.render("FormOpenPopup.form.buttons")); - var $nbutton = $buttons.find(".oe_formopenpopup-form-save"); - $nbutton.click(function() { - self.view_form.do_save().then(function() { - self.destroy(); - }); - }); - var $cbutton = $buttons.find(".oe_formopenpopup-form-close"); - $cbutton.click(function() { - self.destroy(); - }); - if (self.options.readonly) { - $nbutton.hide(); - $cbutton.text(_t("Close")); - } - self.view_form.do_show(); - }); - this.dataset.on_write.add(this.on_write); - } -}); - -instance.web.form.FormOpenDataset = instance.web.ProxyDataSet.extend({ - read_ids: function() { - if (this.fop.options.read_function) { - return this.fop.options.read_function.apply(null, arguments); - } else { - return this._super.apply(this, arguments); - } - } }); instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index b2af11b7078..d46c6a9fa58 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1525,7 +1525,7 @@ - +
@@ -1539,31 +1539,22 @@
-
+
- - - + + + - - - + + + - - - -
-
-
- - - - + - - - Antiques - ANTI - - - - Painting - PAINT - - - - - Furnitures - FURN - - - - - Porcelain, Ceramics, Glassmaking, ... - PCG - - - - - Sculpture, bronze, eso - SBE - - - - - Clocks and watches - CLW - - - - - Collectible and art objects - COAO - - - - - Engravings - ENGR - - - - - Graphic Arts - GART - - - - - Lightings - LGT - - - - - Metal Ware - MW - - - - - Miniatures - MAT - - - - - Collections - CLT - - - - - Musical Instruments - MI - - - - - Old weapons and militaria - OWM - - - - - Oriental Arts - OART - - - - - Chineese furnitures - CHF - - - - - Others - OTR - - - - - Posters - PST - - - - - Religiosa - REL - - - - - Scientific Instruments - SIN - - - - - Tin - TIN - - - - - Copper wares - CWA - - - - - Toys - TY - - - - - Verreries - VRS - - - - - Wine - WNE - - - - - - - Contemporary Art - CONTEM - - - - Arts - ARTS - - - - - Curiosa - CRS - - - - - Other Media - OME - - - - - Photo - PHT - - - - - Painting - CPAINT - - - - - Sculpture - SCUL - - - - - Shows - CSHW - - - - - Jewelry - JWL - - - - - - - Unclassifieds - UNCLASS - - - - African Arts - AFART - - - - - Argenterie - ARGENT - - - - - Art from the Ivory Coast - ARTFORM - - - - - African Arts - AFRART - - - - - Books, manuscripts, eso. - BME - - - - - Carpet and textilles - CARPTEX - - - - - Cartoons - CATOON - - - - - - - - - diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml deleted file mode 100644 index 5100e8d9d0a..00000000000 --- a/addons/auction/auction_demo.xml +++ /dev/null @@ -1,924 +0,0 @@ - - - - - - - - - - - Tax - tax - unreconciled - - - - Auction Adjudications - A0 - view - - - - - - - - - Auction Adjudication Expenses - A1 - view - - - - - - - - - Auction Adjudications - A7x* - - other - - - - - - Auction Adjudication Expenses - A6x* - - other - - - - - - Auction Buyer Costs - A8x* - other - - - - - - Auction Seller Costs - A9x* - other - - - - - - - Author rights (4%) - percent - code - 0.04 - sabam - - - result = (price_unit>=1250) - - - Buyer Costs (20%) - percent - 0.20 - auction - - - - - Seller Costs (12%) - percent - -0.12 - auction - - - - - - 770.0 - 700.0 - - - - - - - Unknown - 1 - - - - Bruxelles1 - Benoit Mortie1r1 - 1030 - - info@opensides.be - (+32)2 211 34 83 - Rue des Palais 44, bte 33 - default - - - - - - Avignon CEDEX 091 - Lara - 84911 - - contact@tecsas.fr - (+33)4.32.74.10.57 - 85 rue du traite de Rome - default - - - - - - Louvain-la-Neuve - Thomas Passot - 1348 - - info@mediapole.net - (+32).10.45.17.73 - Rue de l'Angelique, 1 - - - - - - - - Philippe Lavilier - 1345-1450 - - - - POREAU OSWALD - 1877-1955 - - - - - - VAT 1% - VAT01 - - - - - VAT 20% - VAT20 - - - - - - VAT 10% - VAT10 - - - - - VAT 12% - VAT12 - - - - - VAT 5% - VAT5 - - - - - - - - Droit d'auteur - 0.05 - sabam - - - - - - TVA - 0.12 - auction - - - - - - TVA1 - 0.2 - auction - - - - - - Buyer Costs - 0.21 - auction - - - - - - Seller Costs1 - -0.10 - auction - - - - - - Seller Costs - -0.10 - auction - - - - - - - - Frais de vente - -0.15 - auction - - - - - - Frais de vente0 - 0 - auction - - - - - - Oeuvres a 21% - - - - - - - - Painting - 1 - - - - - Furniture - 2 - - - - - Glass - 2 - - - - - Sculpture - 10 - - - - - Jawellery - 6 - - - - - - - - - painting Exhibition - - - - - - - - - - - - - - - Antique Items Exhibition - - - - - - - - - - - - - - - - - - - - - keep - - - - - - keep - - - - - - keep - - - - - - keep - - - - - - keep - - - - - Aera Glasses - 1 - 500 - 700 - show pices - 465.00 - 1 - 0.00 - - - - - - - - lake Photos - 2 - 1000 - 1700 - show pices - 0.00 - 2 - 1500.00 - - - - - - - - - fancy mask - 3 - 500 - 700 - show pices - 650 - 4 - 0.00 - - - - - - - - Dining Table - 4 - 200 - 400 - show pices - 0.00 - 4 - 375 - - - - - - - - Plastic glass - 5 - 300 - 500 - show pices - 0.00 - 5 - 460 - - - - - - - - Mountain photos - 6 - - 50 - 100 - show pices - 0.00 - 6 - 85 - - - - - - - - bresslet - 7 - 150 - 400 - show pices - 100 - 1 - 0 - - - - - - - - gold chain - 11 - 400 - 700 - show pices - 0.00 - 11 - 550 - - - - - - - - fiber glass - 8 - 300 - 500 - show pices - 0.00 - 8 - 450 - - - - - - - - lake photos - 9 - 100 - 200 - show pices - 150 - 9 - 0.00 - - - - - - - - mobile photos - 10 - 4500 - 4700 - show models - 4650 - 10 - 4800.00 - - - - - - - - Antique photos - 11 - 1600 - 2200 - show map Items - 2150 - 11 - 2050.00 - - - - - - - - Hardware photos - 12 - 2600 - 2800 - show map Items - 2550 - 12 - 2050.00 - - - - - - - - Home Appliance photos - 12 - - 1600 - 2200 - show map Items - 2150 - 12 - 2050.00 - - - - - - - - mobile accesories photos - 13 - 1600 - 2200 - show map Items - 2150 - 13 - 2050.00 - - - - - - - - pikes-candles - 14 - 30 - 50 - show map Items - 20 - 14 - 0 - - - - - - - - Coffee Service - 15 - 10 - 20 - show map Items - 0 - 15 - 25 - - - - - - - - Pendulum - 16 - 100 - 200 - show map Items - 0 - 16 - 150 - - - - - - - - Cassolette marble - 17 - 400 - 500 - Marble Saint Remi - 150 - 17 - 0 - - - - - - - - Table - 18 - 1600 - 2200 - show map Items - 2150 - 18 - 2050.00 - - - - - - - - Yourself - 19 - 180 - 220 - Red - 0 - 19 - 190.00 - - - - - - - - Digital photo - 20 - 160 - 340 - map Items - 0 - 20 - 150.00 - - - - - - - bid1 - - - - - - - - - - - bid2 - - - - - - - - - - - bid3 - - - - - - - - - - - bid4 - - - - - - - - - - - bid5 - - - - - - - - - - - bid6 - - - - - - - - - - - bid7 - - - - - - - - - - - bid8 - - - - - - - - - - - bid9 - - - - - - - - - - - bid10 - - - - - - - - - - - - - Demo - - - - - - - - sign_in - - - - - - sign_out - - - - - - sign_in - - - - - - sign_out - - - - - - sign_in - - - - - - sign_out - - - - - - sign_in - - - - - - sign_out - - - - - - - - sign_in - - - - - - sign_out - - - - - - sign_in - - - - - - sign_out - - - - - - sign_in - - - - - - sign_out - - - - - - sign_in - - - - - - sign_out - - - - - - - diff --git a/addons/auction/auction_report.xml b/addons/auction/auction_report.xml deleted file mode 100644 index 4df44c9c96a..00000000000 --- a/addons/auction/auction_report.xml +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/addons/auction/auction_sequence.xml b/addons/auction/auction_sequence.xml deleted file mode 100644 index 2ae69235843..00000000000 --- a/addons/auction/auction_sequence.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - Auction deposit - auction.deposit - - - - Auction deposit - auction.deposit - AD/ - 3 - - - - - - Auction bid - auction.bid - - - - Auction bid - auction.bid - bid/ - 3 - - - - diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml deleted file mode 100644 index a807b7c2ce1..00000000000 --- a/addons/auction/auction_view.xml +++ /dev/null @@ -1,783 +0,0 @@ - - - - - - - - - - - - auction.artists.tree - auction.artists - tree - - - - - - - - - auction.artists.form - auction.artists - form - - - - - - - - - - - - - - - - Auction Artists - auction.artists - form - - - - - - - - - auction.lot.category.tree - auction.lot.category - tree - - - - - - - - - auction.lot.category.form - auction.lot.category - form - -
- - - - - - - - -
- - - Auction object Categories - auction.lot.category - form - - - - - - - - - Auction dates - auction.dates - tree - - - - - - - - - - - - Auction dates - auction.dates - form - -
- - - - - - - - - - - - - - - - - -