diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index 1fa0a5c6cfa..ba33185119e 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -167,7 +167,7 @@ class res_partner(osv.osv): _columns = { 'contract_ids': fields.one2many('account.analytic.account', \ - 'partner_id', 'Contracts'), + 'partner_id', 'Contracts', readonly=True), } res_partner() diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 2da7c71021c..1565b2d0aa8 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -481,21 +481,5 @@ - - - - res.partner.invoice.info.inherit - res.partner - form - - - - - - - - - - diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 6c5be231657..1edb56d6044 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -351,7 +351,7 @@ - + diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po index 68344247171..84652c621ae 100644 --- a/addons/account/i18n/eu.po +++ b/addons/account/i18n/eu.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-05-17 13:10+0000\n" -"Last-Translator: Jon A. Ortuondo (Euskotec) \n" +"PO-Revision-Date: 2010-05-23 09:59+0000\n" +"Last-Translator: ninaiz \n" "Language-Team: Basque \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n" +"X-Launchpad-Export-Date: 2010-05-24 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -236,7 +236,7 @@ msgstr "" #: field:account.tax.template,amount:0 #: xsl:account.transfer:0 msgid "Amount" -msgstr "" +msgstr "Kopurua" #. module: account #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger @@ -338,7 +338,7 @@ msgstr "" #: field:account.invoice,amount_tax:0 #: field:account.move.line,account_tax_id:0 msgid "Tax" -msgstr "" +msgstr "Zerga" #. module: account #: rml:account.general.journal:0 @@ -465,7 +465,7 @@ msgstr "" #. module: account #: rml:account.invoice:0 msgid "Disc.(%)" -msgstr "" +msgstr "Desk. (%)" #. module: account #: rml:account.general.ledger:0 diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po index 1785d79bf38..e6bddde1647 100644 --- a/addons/account/i18n/fr.po +++ b/addons/account/i18n/fr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-02-18 09:24+0000\n" -"Last-Translator: Olivier Dony (OpenERP) \n" +"PO-Revision-Date: 2010-05-21 17:48+0000\n" +"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n" +"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -2495,7 +2495,8 @@ msgid "Analytic Entry" msgstr "Ecriture analytique" #. module: account -#: view:res.company:0 field:res.company,overdue_msg:0 +#: view:res.company:0 +#: field:res.company,overdue_msg:0 msgid "Overdue Payments Message" msgstr "Message pour les paiements en retard" @@ -2784,7 +2785,7 @@ msgstr "Ouvrir journal" #. module: account #: rml:account.analytic.account.journal:0 msgid "KI" -msgstr "" +msgstr "KI" #. module: account #: model:ir.actions.wizard,name:account.action_account_analytic_line @@ -3034,7 +3035,7 @@ msgstr "-" #. module: account #: rml:account.analytic.account.journal:0 msgid "asgfas" -msgstr "" +msgstr "asgfas" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2 @@ -6082,3 +6083,6 @@ msgid "" msgstr "" "Cochez cette case si l'utilisateur peut réconcilier les entrées dans ce " "compte." + +#~ msgid "account.config.wizard" +#~ msgstr "account.config.wizard" diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po index 180ce8da31a..e757e240d9a 100644 --- a/addons/account/i18n/oc.po +++ b/addons/account/i18n/oc.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-05-18 08:45+0000\n" +"PO-Revision-Date: 2010-05-24 12:19+0000\n" "Last-Translator: Cédric VALMARY (Tot en òc) \n" "Language-Team: Occitan (post 1500) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n" +"X-Launchpad-Export-Date: 2010-05-25 03:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -118,7 +118,7 @@ msgstr "Parent" #. module: account #: selection:account.move,type:0 msgid "Journal Voucher" -msgstr "" +msgstr "Jornal dels chèques" #. module: account #: field:account.invoice,residual:0 @@ -225,7 +225,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries msgid "Recurrent Entries" -msgstr "" +msgstr "Escrituras recurentas" #. module: account #: field:account.analytic.line,amount:0 @@ -423,7 +423,7 @@ msgstr "Negatiu" #. module: account #: rml:account.partner.balance:0 msgid "(Account/Partner) Name" -msgstr "" +msgstr "Nom (Compte/Partenari)" #. module: account #: selection:account.move,type:0 @@ -493,7 +493,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_finance_periodical_processing msgid "Periodical Processing" -msgstr "" +msgstr "Tractaments periodics" #. module: account #: view:report.hr.timesheet.invoice.journal:0 @@ -504,12 +504,12 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form msgid "Tax Code Templates" -msgstr "" +msgstr "Modèl de còde de taxa" #. module: account #: view:account.invoice:0 msgid "Supplier invoice" -msgstr "" +msgstr "Factura del provesidor" #. module: account #: model:process.transition,name:account.process_transition_reconcilepaid0 diff --git a/addons/account/invoice.py b/addons/account/invoice.py index dbaa321f329..e4c810fa6be 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -1525,7 +1525,7 @@ class res_partner(osv.osv): _inherit = 'res.partner' _columns = { - 'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices'), + 'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True), } res_partner() diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index 113db6f2ea2..e434f28d947 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -118,10 +118,27 @@ + + + + + res.partner.account.info.inherit + res.partner + form + + + + + + + + + + diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index e57629d2618..14e65a2a9ac 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -443,21 +443,6 @@ - - - - - res.partner.contract.info.inherit - res.partner - form - - - - - - - - diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 160a77f6ffa..b974afdb8a3 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -17,7 +17,6 @@ - @@ -57,13 +56,13 @@ - - + + help="Invoices of last 30 days"/> + - - + + - - - - + - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + - - - + + - - - - - - + + - + diff --git a/addons/account_analytic_analysis/i18n/oc.po b/addons/account_analytic_analysis/i18n/oc.po index 81e5b7a776c..5be9dc55d02 100644 --- a/addons/account_analytic_analysis/i18n/oc.po +++ b/addons/account_analytic_analysis/i18n/oc.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-12 13:35+0000\n" -"Last-Translator: Cédric VALMARY (Per Tot en òc) \n" +"PO-Revision-Date: 2010-05-24 12:18+0000\n" +"Last-Translator: Cédric VALMARY (Tot en òc) \n" "Language-Team: Occitan (post 1500) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n" +"X-Launchpad-Export-Date: 2010-05-25 03:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis @@ -27,12 +27,12 @@ msgstr "" #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user msgid "Hours summary by user" -msgstr "" +msgstr "Resumit de las oras per utilizaire" #. module: account_analytic_analysis #: field:account.analytic.account,last_invoice_date:0 msgid "Last Invoice Date" -msgstr "" +msgstr "Data de la darrièra factura" #. module: account_analytic_analysis #: help:account.analytic.account,remaining_ca:0 @@ -47,13 +47,13 @@ msgstr "" #. module: account_analytic_analysis #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all msgid "All Analytic Accounts" -msgstr "" +msgstr "Totes los comptes analitics" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open msgid "My Current Accounts" -msgstr "" +msgstr "Mos comptes gerits" #. module: account_analytic_analysis #: constraint:ir.ui.view:0 @@ -68,12 +68,12 @@ msgstr "" #. module: account_analytic_analysis #: field:account.analytic.account,ca_theorical:0 msgid "Theorical Revenue" -msgstr "" +msgstr "Revengut teoric" #. module: account_analytic_analysis #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nom del Modèl invalid per la definicion de l'accion." #. module: account_analytic_analysis #: help:account.analytic.account,theorical_margin:0 @@ -85,6 +85,8 @@ msgstr "" msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs " +"especials !" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new @@ -95,7 +97,7 @@ msgstr "" #. module: account_analytic_analysis #: field:account.analytic.account,theorical_margin:0 msgid "Theorical Margin" -msgstr "" +msgstr "Marge teoric" #. module: account_analytic_analysis #: field:account.analytic.account,real_margin_rate:0 @@ -123,7 +125,7 @@ msgstr "" #. module: account_analytic_analysis #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing msgid "Invoicing" -msgstr "" +msgstr "Facturacion" #. module: account_analytic_analysis #: field:account.analytic.account,last_worked_date:0 @@ -145,7 +147,7 @@ msgstr "" #. module: account_analytic_analysis #: field:account.analytic.account,remaining_hours:0 msgid "Remaining Hours" -msgstr "" +msgstr "Oras que demòran" #. module: account_analytic_analysis #: help:account.analytic.account,ca_theorical:0 @@ -165,7 +167,7 @@ msgstr "Utilizaire" #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending msgid "My Pending Accounts" -msgstr "" +msgstr "Mos comptes en espèra" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my @@ -200,7 +202,7 @@ msgstr "" #. module: account_analytic_analysis #: field:account.analytic.account,hours_quantity:0 msgid "Hours Tot" -msgstr "" +msgstr "Total de las oras" #. module: account_analytic_analysis #: model:ir.ui.menu,name:account_analytic_analysis.menu_account diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py index 84fd933d9a9..1db16ca8787 100644 --- a/addons/account_analytic_default/account_analytic_default.py +++ b/addons/account_analytic_default/account_analytic_default.py @@ -47,7 +47,7 @@ class account_analytic_default(osv.osv): domain += ['|',('partner_id','=',partner_id)] domain += [('partner_id','=',False)] if user_id: - domain += ['|',('user_id','=',uid)] + domain += ['|',('user_id','=',user_id)] domain += [('user_id','=',False)] if date: domain += ['|',('date_start','<=',date),('date_start','=',False)] diff --git a/addons/account_coda/__init__.py b/addons/account_coda/__init__.py new file mode 100644 index 00000000000..af866f5dc70 --- /dev/null +++ b/addons/account_coda/__init__.py @@ -0,0 +1,25 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). +# +# 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 coda +import wizard +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py new file mode 100644 index 00000000000..306098d137b --- /dev/null +++ b/addons/account_coda/__openerp__.py @@ -0,0 +1,39 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). +# +# 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":"Account CODA - import bank statements from coda file", + "version":"1.0", + "author":"Tiny", + "category":"Account CODA", + "description":"""Module provides functionality to import + bank statements from coda files. + """, + "depends":["base", "account"], + "demo_xml":["coda_demo.xml"], + "init_xml":[], + "update_xml" : ["security/ir.model.access.csv","coda_wizard.xml","coda_view.xml"], + "active":False, + "installable":True, + +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/account_coda/coda.py b/addons/account_coda/coda.py new file mode 100644 index 00000000000..f37b563c245 --- /dev/null +++ b/addons/account_coda/coda.py @@ -0,0 +1,50 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). +# +# 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 time +from osv import osv,fields + +class account_coda(osv.osv): + _name = "account.coda" + _description = "coda for an Account" + _columns = { + 'name': fields.binary('Coda file', readonly=True), + 'statement_ids': fields.one2many('account.bank.statement','coda_id','Generated Bank Statement', readonly=True), + 'note': fields.text('Import log', readonly=True), + 'journal_id': fields.many2one('account.journal','Bank Journal', readonly=True,select=True), + 'date': fields.date('Import Date', readonly=True,select=True), + 'user_id': fields.many2one('res.users','User', readonly=True, select=True), + } + _defaults = { + 'date': lambda *a: time.strftime('%Y-%m-%d'), + 'user_id': lambda self,cr,uid,context: uid, + } +account_coda() + +class account_bank_statement(osv.osv): + _inherit = "account.bank.statement" + _columns = { + 'coda_id':fields.many2one('account.coda','Coda'), + } +account_bank_statement() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/account_coda/coda_demo.xml b/addons/account_coda/coda_demo.xml new file mode 100644 index 00000000000..f91d34d4cbc --- /dev/null +++ b/addons/account_coda/coda_demo.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/addons/account_coda/coda_view.xml b/addons/account_coda/coda_view.xml new file mode 100644 index 00000000000..3813fe40bf0 --- /dev/null +++ b/addons/account_coda/coda_view.xml @@ -0,0 +1,63 @@ + + + + + + account.coda.form + account.coda + form + +
+ + + + + + + + + + + + + + +
+ + + + account.coda.tree + account.coda + tree + + + + + + + + + + + Coda import + ir.actions.act_window + account.coda + form + tree,form + + + + + + + + + + diff --git a/addons/account_coda/coda_wizard.xml b/addons/account_coda/coda_wizard.xml new file mode 100644 index 00000000000..ecd8eb65913 --- /dev/null +++ b/addons/account_coda/coda_wizard.xml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/addons/account_coda/i18n/account_coda.pot b/addons/account_coda/i18n/account_coda.pot new file mode 100644 index 00000000000..348fb035c0d --- /dev/null +++ b/addons/account_coda/i18n/account_coda.pot @@ -0,0 +1,163 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * account_coda +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 5.0.6\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2009-11-24 13:11:29+0000\n" +"PO-Revision-Date: 2009-11-24 13:11:29+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_coda +#: field:account.coda,journal_id:0 +#: wizard_field:account.coda_import,init,journal_id:0 +msgid "Bank Journal" +msgstr "" + +#. module: account_coda +#: constraint:ir.model:0 +msgid "The Object name must start with x_ and not contain any special character !" +msgstr "" + +#. module: account_coda +#: wizard_field:account.coda_import,extraction,note:0 +msgid "Log" +msgstr "" + +#. module: account_coda +#: wizard_button:account.coda_import,extraction,open:0 +msgid "_Open Statement" +msgstr "" + +#. module: account_coda +#: model:ir.module.module,shortdesc:account_coda.module_meta_information +msgid "Account CODA" +msgstr "" + +#. module: account_coda +#: field:account.coda,name:0 +msgid "Coda file" +msgstr "" + +#. module: account_coda +#: wizard_view:account.coda_import,init:0 +msgid "Clic on 'New' to select your file :" +msgstr "" + +#. module: account_coda +#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import +msgid "Import Coda File" +msgstr "" + +#. module: account_coda +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "" + +#. module: account_coda +#: field:account.coda,note:0 +msgid "Import log" +msgstr "" + +#. module: account_coda +#: wizard_field:account.coda_import,init,def_receivable:0 +msgid "Default receivable Account" +msgstr "" + +#. module: account_coda +#: model:ir.module.module,description:account_coda.module_meta_information +msgid "Module provides functionality to import\n" +" bank statements from .csv file.\n" +" Import coda file wizard is used to import bank statements." +msgstr "" + +#. module: account_coda +#: wizard_button:account.coda_import,extraction,end:0 +msgid "_Close" +msgstr "" + +#. module: account_coda +#: field:account.coda,statement_id:0 +msgid "Generated Bank Statement" +msgstr "" + +#. module: account_coda +#: view:account.coda:0 +#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement +#: model:ir.actions.act_window,name:account_coda.action_account_coda +msgid "Coda import" +msgstr "" + +#. module: account_coda +#: field:account.coda,user_id:0 +msgid "User" +msgstr "" + +#. module: account_coda +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "" + +#. module: account_coda +#: model:ir.model,name:account_coda.model_account_coda +msgid "coda for an Account" +msgstr "" + +#. module: account_coda +#: wizard_field:account.coda_import,init,def_payable:0 +msgid "Default Payable Account" +msgstr "" + +#. module: account_coda +#: model:ir.ui.menu,name:account_coda.menu_account_coda +msgid "Coda Statements" +msgstr "" + +#. module: account_coda +#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard +msgid "Import Coda Statements" +msgstr "" + +#. module: account_coda +#: wizard_button:account.coda_import,init,extraction:0 +msgid "_Ok" +msgstr "" + +#. module: account_coda +#: wizard_view:account.coda_import,extraction:0 +#: wizard_view:account.coda_import,init:0 +msgid "Import Coda Statement" +msgstr "" + +#. module: account_coda +#: field:account.bank.statement,coda_id:0 +msgid "Coda" +msgstr "" + +#. module: account_coda +#: wizard_view:account.coda_import,extraction:0 +msgid "Results :" +msgstr "" + +#. module: account_coda +#: wizard_field:account.coda_import,init,coda:0 +msgid "Coda File" +msgstr "" + +#. module: account_coda +#: field:account.coda,date:0 +msgid "Import Date" +msgstr "" + +#. module: account_coda +#: wizard_view:account.coda_import,init:0 +msgid "Select your bank journal :" +msgstr "" + diff --git a/addons/account_coda/i18n/fr_BE.po b/addons/account_coda/i18n/fr_BE.po new file mode 100644 index 00000000000..348fb035c0d --- /dev/null +++ b/addons/account_coda/i18n/fr_BE.po @@ -0,0 +1,163 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * account_coda +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 5.0.6\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2009-11-24 13:11:29+0000\n" +"PO-Revision-Date: 2009-11-24 13:11:29+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_coda +#: field:account.coda,journal_id:0 +#: wizard_field:account.coda_import,init,journal_id:0 +msgid "Bank Journal" +msgstr "" + +#. module: account_coda +#: constraint:ir.model:0 +msgid "The Object name must start with x_ and not contain any special character !" +msgstr "" + +#. module: account_coda +#: wizard_field:account.coda_import,extraction,note:0 +msgid "Log" +msgstr "" + +#. module: account_coda +#: wizard_button:account.coda_import,extraction,open:0 +msgid "_Open Statement" +msgstr "" + +#. module: account_coda +#: model:ir.module.module,shortdesc:account_coda.module_meta_information +msgid "Account CODA" +msgstr "" + +#. module: account_coda +#: field:account.coda,name:0 +msgid "Coda file" +msgstr "" + +#. module: account_coda +#: wizard_view:account.coda_import,init:0 +msgid "Clic on 'New' to select your file :" +msgstr "" + +#. module: account_coda +#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import +msgid "Import Coda File" +msgstr "" + +#. module: account_coda +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "" + +#. module: account_coda +#: field:account.coda,note:0 +msgid "Import log" +msgstr "" + +#. module: account_coda +#: wizard_field:account.coda_import,init,def_receivable:0 +msgid "Default receivable Account" +msgstr "" + +#. module: account_coda +#: model:ir.module.module,description:account_coda.module_meta_information +msgid "Module provides functionality to import\n" +" bank statements from .csv file.\n" +" Import coda file wizard is used to import bank statements." +msgstr "" + +#. module: account_coda +#: wizard_button:account.coda_import,extraction,end:0 +msgid "_Close" +msgstr "" + +#. module: account_coda +#: field:account.coda,statement_id:0 +msgid "Generated Bank Statement" +msgstr "" + +#. module: account_coda +#: view:account.coda:0 +#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement +#: model:ir.actions.act_window,name:account_coda.action_account_coda +msgid "Coda import" +msgstr "" + +#. module: account_coda +#: field:account.coda,user_id:0 +msgid "User" +msgstr "" + +#. module: account_coda +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "" + +#. module: account_coda +#: model:ir.model,name:account_coda.model_account_coda +msgid "coda for an Account" +msgstr "" + +#. module: account_coda +#: wizard_field:account.coda_import,init,def_payable:0 +msgid "Default Payable Account" +msgstr "" + +#. module: account_coda +#: model:ir.ui.menu,name:account_coda.menu_account_coda +msgid "Coda Statements" +msgstr "" + +#. module: account_coda +#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard +msgid "Import Coda Statements" +msgstr "" + +#. module: account_coda +#: wizard_button:account.coda_import,init,extraction:0 +msgid "_Ok" +msgstr "" + +#. module: account_coda +#: wizard_view:account.coda_import,extraction:0 +#: wizard_view:account.coda_import,init:0 +msgid "Import Coda Statement" +msgstr "" + +#. module: account_coda +#: field:account.bank.statement,coda_id:0 +msgid "Coda" +msgstr "" + +#. module: account_coda +#: wizard_view:account.coda_import,extraction:0 +msgid "Results :" +msgstr "" + +#. module: account_coda +#: wizard_field:account.coda_import,init,coda:0 +msgid "Coda File" +msgstr "" + +#. module: account_coda +#: field:account.coda,date:0 +msgid "Import Date" +msgstr "" + +#. module: account_coda +#: wizard_view:account.coda_import,init:0 +msgid "Select your bank journal :" +msgstr "" + diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/account_coda/security/ir.model.access.csv new file mode 100644 index 00000000000..9c1e0a486dc --- /dev/null +++ b/addons/account_coda/security/ir.model.access.csv @@ -0,0 +1,3 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_account_coda","account.coda","model_account_coda","account.group_account_user",1,0,0,0 +"access_account_coda_manager","account.coda","model_account_coda","account.group_account_manager",1,1,1,1 \ No newline at end of file diff --git a/addons/account_coda/statement_coda.txt b/addons/account_coda/statement_coda.txt new file mode 100644 index 00000000000..44fe70220ca --- /dev/null +++ b/addons/account_coda/statement_coda.txt @@ -0,0 +1,10 @@ +0000006060712505 00000CPH CODA TINY 0047747270100477472701 00000 1 +1 049126201326907 EUR0BE 0000000015632900050607TINY COMPTE COURANT ORDINAIRE 049 +2100010000 0000000001150000060607001500000INVOICE OF 2006-12-19 0606070020100 +2200010000 EUR000000001150000 100 +2300010000301915554082 PROLIBRE SARL CAROUGE GE 000 +2100020000 0000000000500000060607001500000CONTRACT PARTNER ERREUR ECART YEA 0606070030100 +2200020000RTY CONTRACT PARTNER EUR000000000500000 100 +2300020000050000000017 SEDNACOM 43 ALLEE DES FOUGERES 9522 0 HERBLAY 000 +8049126201326907 0000000017282900060607 +9 000008000000000000000000000001650000 2 diff --git a/addons/account_coda/wizard/__init__.py b/addons/account_coda/wizard/__init__.py new file mode 100644 index 00000000000..72d3b950cf7 --- /dev/null +++ b/addons/account_coda/wizard/__init__.py @@ -0,0 +1,25 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). +# +# 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 coda_import + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/account_coda/wizard/coda_import.py b/addons/account_coda/wizard/coda_import.py new file mode 100644 index 00000000000..5e1ffa365e8 --- /dev/null +++ b/addons/account_coda/wizard/coda_import.py @@ -0,0 +1,339 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). +# +# 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 pooler +import time +import datetime +import wizard +import netsvc +import base64 +from osv import osv +from tools.translate import _ + +codawiz_form = """ +
+ + + + + + + + + +""" + +codawiz_fields = { + 'journal_id' : { + 'string':'Bank Journal', + 'type':'many2one', + 'relation':'account.journal', + 'required':True, + + }, + 'coda' : { + 'string':'Coda File', + 'type':'binary', + 'required':True, + }, + 'def_payable' : { + 'string' : 'Default Payable Account', + 'type' : 'many2one', + 'relation': 'account.account', + 'required':True, + 'domain':[('type','=','payable')], + 'help': 'Set here the payable account that will be used, by default, if the partner is not found', + }, + 'def_receivable' : { + 'string' : 'Default receivable Account', + 'type' : 'many2one', + 'relation': 'account.account', + 'required':True, + 'domain':[('type','=','receivable')], + 'help': 'Set here the receivable account that will be used, by default, if the partner is not found', + }, + 'awaiting_account' : { + 'string' : 'Default Account for Unrecognized Movement', + 'type' : 'many2one', + 'relation': 'account.account', + 'required':True, + 'help': 'Set here the default account that will be used, if the partner is found but does not have the bank account , or if he is domiciled', + + } + +} + +result_form = """ +
+ + + +""" + +result_fields = { + + 'note' : {'string':'Log','type':'text'} + +} + + +def _coda_parsing(self, cr, uid, data, context): + pool = pooler.get_pool(cr.dbname) + codafile = data['form']['coda'] + journal_code = pool.get('account.journal').browse(cr, uid, data['form']['journal_id'], context).code + def_pay_acc = data['form']['def_payable'] + def_rec_acc = data['form']['def_receivable'] + + str_log = "" + err_log = "Errors:\n------\n" + nb_err=0 + std_log='' + str_log1 = "Coda File is Imported : " + str_not='' + str_not1='' + + bank_statements=[] + recordlist = base64.decodestring(codafile).split('\n') + recordlist.pop() + for line in recordlist: + if line[0] == '0': + # header data + bank_statement = {} + bank_statement["bank_statement_line"]={} + bank_statement_lines = {} + bank_statement['date'] = str2date(line[5:11]) + bank_statement['journal_id']=data['form']['journal_id'] + period_id = pool.get('account.period').search(cr,uid,[('date_start','<=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d"))),('date_stop','>=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d")))]) + bank_statement['period_id'] = period_id[0] + bank_statement['state']='draft' + elif line[0] == '1': + # old balance data + bal_start = list2float(line[43:58]) + if line[42] == '1': + bal_start = - bal_start + bank_statement["balance_start"]= bal_start + bank_statement["acc_number"]=line[5:17] + bank_statement["acc_holder"]=line[64:90] + bank_statement['name'] = journal_code + ' ' + str(line[2:5]) + + elif line[0]=='2': + # movement data record 2 + if line[1]=='1': + # movement data record 2.1 + if bank_statement_lines.has_key(line[2:6]): + continue + st_line = {} + st_line['extra_note'] = '' + st_line['statement_id']=0 + st_line['ref'] = line[2:10] + st_line['date'] = time.strftime('%Y-%m-%d',time.strptime(str2date(line[115:121]),"%y/%m/%d")), + st_line_amt = list2float(line[32:47]) + + if line[61]=='1': + st_line['toreconcile'] = True + st_line['name']=line[65:77] + else: + st_line['toreconcile'] = False + st_line['name']=line[62:115] + + st_line['free_comm'] = st_line['name'] + st_line['val_date']=time.strftime('%Y-%m-%d',time.strptime(str2date(line[47:53]),"%y/%m/%d")), + st_line['entry_date']=time.strftime('%Y-%m-%d',time.strptime(str2date(line[115:121]),"%y/%m/%d")), + st_line['partner_id']=0 + if line[31] == '1': + st_line_amt = - st_line_amt + st_line['account_id'] = def_pay_acc + else: + st_line['account_id'] = def_rec_acc + st_line['amount'] = st_line_amt + bank_statement_lines[line[2:6]]=st_line + bank_statement["bank_statement_line"]=bank_statement_lines + elif line[1] == '2': + st_line_name = line[2:6] + bank_statement_lines[st_line_name].update({'account_id': data['form']['awaiting_account']}) + + elif line[1] == '3': + # movement data record 3.1 + st_line_name = line[2:6] + st_line_partner_acc = str(line[10:47]).strip() + cntry_number=line[10:47].strip() + contry_name=line[47:125].strip() + bank_ids = pool.get('res.partner.bank').search(cr,uid,[('acc_number','=',st_line_partner_acc)]) + bank_statement_lines[st_line_name].update({'cntry_number': cntry_number, 'contry_name': contry_name}) + if bank_ids: + bank = pool.get('res.partner.bank').browse(cr,uid,bank_ids[0],context) + if line and bank.partner_id: + bank_statement_lines[st_line_name].update({'partner_id': bank.partner_id.id}) + if bank_statement_lines[st_line_name]['amount'] < 0 : + bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_payable.id}) + else : + bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_receivable.id}) + else: + nb_err += 1 + err_log += _('The bank account %s is not defined for the partner %s.\n')%(cntry_number,contry_name) + bank_statement_lines[st_line_name].update({'account_id': data['form']['awaiting_account']}) + + bank_statement["bank_statement_line"]=bank_statement_lines + elif line[0]=='3': + if line[1] == '1': + st_line_name = line[2:6] + bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[40:113] + elif line[1] == '2': + st_line_name = line[2:6] + bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[10:115] + elif line[1] == '3': + st_line_name = line[2:6] + bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[10:100] + elif line[0]=='8': + # new balance record + bal_end = list2float(line[42:57]) + if line[41] == '1': + bal_end = - bal_end + bank_statement["balance_end_real"]= bal_end + + elif line[0]=='9': + # footer record + bank_statements.append(bank_statement) + #end for + bkst_list=[] + for statement in bank_statements: + try: + bk_st_id = pool.get('account.bank.statement').create(cr,uid,{ + 'journal_id': statement['journal_id'], + 'date':time.strftime('%Y-%m-%d',time.strptime(statement['date'],"%y/%m/%d")), + 'period_id':statement['period_id'], + 'balance_start': statement["balance_start"], + 'balance_end_real': statement["balance_end_real"], + 'state': 'draft', + 'name': statement['name'], + }) + lines=statement["bank_statement_line"] + for value in lines: + line=lines[value] + reconcile_id = False + if line['toreconcile']: + rec_id = pool.get('account.move.line').search(cr, uid, [('name','=',line['name']),('reconcile_id','=',False),('account_id.reconcile','=',True)]) + if rec_id: + reconcile_id = pool.get('account.bank.statement.reconcile').create(cr, uid, { + 'line_ids': [(6, 0, rec_id)] + }, context=context) + str_not1 = '' + if line.has_key('contry_name') and line.has_key('cntry_number'): + str_not1="Partner name:%s \n Partner Account Number:%s \n Communication:%s \n Value Date:%s \n Entry Date:%s \n"%(line["contry_name"],line["cntry_number"],line["free_comm"]+line['extra_note'],line["val_date"][0],line["entry_date"][0]) + id=pool.get('account.bank.statement.line').create(cr,uid,{ + 'name':line['name'], + 'date': line['date'], + 'amount': line['amount'], + 'partner_id':line['partner_id'] or 0, + 'account_id':line['account_id'], + 'statement_id': bk_st_id, + 'reconcile_id': reconcile_id, + 'note':str_not1, + 'ref':line['ref'], + }) + + str_not= "\n \n Account Number: %s \n Account Holder Name: %s " %(statement["acc_number"],statement["acc_holder"]) + std_log += "\nStatement : %s , Date : %s, Starting Balance : %.2f , Ending Balance : %.2f \n"\ + %(statement['name'], statement['date'], float(statement["balance_start"]), float(statement["balance_end_real"])) + bkst_list.append(bk_st_id) + + except osv.except_osv, e: + cr.rollback() + nb_err+=1 + err_log += '\n Application Error : ' + str(e) + raise # REMOVEME + + except Exception, e: + cr.rollback() + nb_err+=1 + err_log += '\n System Error : '+str(e) + raise # REMOVEME + except : + cr.rollback() + nb_err+=1 + err_log += '\n Unknown Error' + raise + err_log += '\n\nNumber of statements : '+ str(len(bkst_list)) + err_log += '\nNumber of error :'+ str(nb_err) +'\n' + + pool.get('account.coda').create(cr, uid,{ + 'name':codafile, + 'statement_ids': [(6, 0, bkst_list,)], + 'note':str_log1+str_not+std_log+err_log, + 'journal_id':data['form']['journal_id'], + 'date':time.strftime("%Y-%m-%d"), + 'user_id':uid, + }) + + return {'note':str_log1 + std_log + err_log ,'journal_id': data['form']['journal_id'], 'coda': data['form']['coda'],'statment_ids':bkst_list} + + +def str2date(date_str): + return time.strftime("%y/%m/%d",time.strptime(date_str,"%d%m%y")) + +def str2float(str): + try: + return float(str) + except: + return 0.0 + +def list2float(lst): + try: + return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst)) + except: + return 0.0 + +class coda_import(wizard.interface): + def _action_open_window(self, cr, uid, data, context): + form=data['form'] + return { + 'domain':"[('id','in',%s)]"%(form['statment_ids']), + 'name': 'Statement', + 'view_type': 'form', + 'view_mode': 'tree,form', + 'res_model': 'account.bank.statement', + 'view_id': False, + 'type': 'ir.actions.act_window', + } + states = { + 'init' : { + 'actions' : [], + 'result' : {'type' : 'form', + 'arch' : codawiz_form, + 'fields' : codawiz_fields, + 'state' : [('end', '_Close'),('extraction', '_Ok') ]} + }, + 'extraction' : { + 'actions' : [_coda_parsing], + 'result' : {'type' : 'form', + 'arch' : result_form, + 'fields' : result_fields, + 'state' : [('end', '_Close'),('open', '_Open Statement')]} + }, + 'open': { + 'actions': [], + 'result': {'type': 'action', 'action': _action_open_window, 'state': 'end'} + + }, + + } +coda_import("account.coda_import") +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/audittrail/i18n/fr.po b/addons/audittrail/i18n/fr.po index 12c15bb34f4..fbe01ff7c9b 100644 --- a/addons/audittrail/i18n/fr.po +++ b/addons/audittrail/i18n/fr.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 14:56+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-05-21 17:51+0000\n" +"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n" +"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: audittrail #: model:ir.module.module,shortdesc:audittrail.module_meta_information msgid "Audit Trail" -msgstr "" +msgstr "Rapport de l' audit" #. module: audittrail #: constraint:ir.model:0 @@ -72,7 +72,7 @@ msgstr "Ancienne valeur" #. module: audittrail #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nom de modèle invalide pour la définition de l'action" #. module: audittrail #: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log @@ -143,7 +143,7 @@ msgstr "Règle AuditTrail" #. module: audittrail #: wizard_field:audittrail.view.log,init,to:0 msgid "Log To" -msgstr "" +msgstr "Connecter à" #. module: audittrail #: view:audittrail.log:0 @@ -158,6 +158,10 @@ msgid "" " Subscribe Rules for read, write, create and delete on objects and check " "logs" msgstr "" +"Autorise un administrateur à tracer toutes les manipulations des " +"utilisateurs sur tous les objets du système.\n" +" Règles d'abonnement pour la lecture, l'écriture, la création, la " +"suppression des objets et la consultation des journaux" #. module: audittrail #: field:audittrail.log,timestamp:0 diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py index 7b963ef09ee..23589fd2d6d 100644 --- a/addons/base_contact/base_contact.py +++ b/addons/base_contact/base_contact.py @@ -72,8 +72,8 @@ class res_partner_contact(osv.osv): it will allow you to hide the partner contact without removing it."), 'partner_id': fields.related('job_ids','address_id','partner_id',type='many2one',\ relation='res.partner', string='Main Employer'), - 'function_id': fields.related('job_ids','function_id',type='many2one', \ - relation='res.partner.function', string='Main Function'), + 'function': fields.related('job_ids', 'function', type='char', \ + string='Main Function'), 'job_id': fields.function(_main_job, method=True, type='many2one',\ relation='res.partner.job', string='Main Job'), 'email': fields.char('E-Mail', size=240), @@ -164,7 +164,7 @@ class res_partner_job(osv.osv): return [] res = [] for r in self.browse(cr, uid, ids): - funct = r.function_id and (", " + r.function_id.name) or "" + funct = r.function and (", " + r.function) or "" res.append((r.id, self.pool.get('res.partner.contact').name_get(cr, uid, \ [r.contact_id.id])[0][1] + funct)) return res @@ -215,8 +215,7 @@ class res_partner_job(osv.osv): 'address_id': fields.many2one('res.partner.address', 'Address', \ help='Address which is linked to the Partner'), # TO Correct: domain=[('partner_id', '=', name)] 'contact_id': fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'), - 'function_id': fields.many2one('res.partner.function','Partner Function', \ - help="Function of this contact with this partner"), + 'function': fields.char('Partner Function', size=34, help="Function of this contact with this partner"), 'sequence_contact': fields.integer('Contact Seq.',help='Order of\ importance of this address in the list of addresses of the linked contact'), 'sequence_partner': fields.integer('Partner Seq.',help='Order of importance\ diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml index 1945e1dd899..6acdd08cf14 100644 --- a/addons/base_contact/base_contact_demo.xml +++ b/addons/base_contact/base_contact_demo.xml @@ -1,11 +1,6 @@ - - - - PA - @@ -171,35 +166,35 @@ - + Salesman 2 - + Salesman - + CTO - + Salesman - + Salesman - + CEO 1 0 @@ -207,120 +202,120 @@ - + Salesman - + CTO - + CEO - + Salesman - + CTO - + Salesman - + CTO - + CTO - + CTO - + CTO - + Salesman - + CTO - + CTO - + CTO - + CTO - + CEO -1 - + Salesman - 5 + PA - + PA 5 - + CEO 1 diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml index 56905f7cd8e..05b56a39678 100644 --- a/addons/base_contact/base_contact_view.xml +++ b/addons/base_contact/base_contact_view.xml @@ -16,7 +16,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -51,7 +51,7 @@
- + @@ -69,7 +69,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -164,7 +164,7 @@ - +
@@ -337,7 +337,7 @@ - + @@ -360,7 +360,7 @@ - + diff --git a/addons/base_contact/test/base_contact00.yml b/addons/base_contact/test/base_contact00.yml index a1b112e4e2a..5a76e25c424 100644 --- a/addons/base_contact/test/base_contact00.yml +++ b/addons/base_contact/test/base_contact00.yml @@ -23,7 +23,7 @@ first_name: Laura job_ids: - email: lwilliams@mydomain.com - function_id: base_contact.res_partner_function_privateaddress0 + function: PA phone: (+32).10.45.18.77 sequence_contact: 1 state: current @@ -44,7 +44,7 @@ zip: '2324324' job_ids: - address_id: res_partner_address_1 - function_id: base.function_director + function: CEO contact_id: res_partner_contact_williams0 sequence_partner: 2 state: current @@ -66,10 +66,10 @@ first_name: Nicolas job_ids: - address_id: base.main_address - function_id: base.function_it + function: CTO state: current - address_id: base.res_partner_address_3000 - function_id: base.function_director + function: CEO state: current lang_id: res_lang_french0 mobile: (+32).23.44.32.12 @@ -84,10 +84,10 @@ first_name: Christina job_ids: - address_id: base.res_partner_address_1 - function_id: base.function_director + function: CEO state: past - address_id: base.res_partner_address_1 - function_id: base.function_it + function: CTO state: current lang_id: base_contact.res_lang_french0 mobile: (+32).10.45.18.77 diff --git a/addons/board_manufacturing/i18n/pl.po b/addons/board_manufacturing/i18n/pl.po index 26654a8a158..7f70507e0a7 100644 --- a/addons/board_manufacturing/i18n/pl.po +++ b/addons/board_manufacturing/i18n/pl.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-21 15:58+0000\n" -"Last-Translator: Andrzej MoST (Marcin Ostajewski) \n" +"PO-Revision-Date: 2010-05-23 20:02+0000\n" +"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n" +"X-Launchpad-Export-Date: 2010-05-24 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board_manufacturing #: view:board.board:0 msgid "Procurement in Exception" -msgstr "" +msgstr "Niepoprawne nabycia" #. module: board_manufacturing #: view:board.board:0 @@ -34,7 +34,7 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!" #. module: board_manufacturing #: view:board.board:0 msgid "Deliveries (Out packing)" -msgstr "" +msgstr "Dostawy do klientów" #. module: board_manufacturing #: view:board.board:0 @@ -49,7 +49,7 @@ msgstr "Produkcja" #. module: board_manufacturing #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nieprawidłowa nazwa modelu w definicji akcji." #. module: board_manufacturing #: model:ir.actions.act_window,name:board_manufacturing.open_board_manufacturing @@ -65,9 +65,9 @@ msgstr "Konsola dla produkcji" #. module: board_manufacturing #: view:board.board:0 msgid "Stock value variation" -msgstr "" +msgstr "Zmiany wartości zapasów" #. module: board_manufacturing #: view:board.board:0 msgid "Workcenter futur load" -msgstr "Przyszłe obiciążenie centrum roboczego" +msgstr "Obciążenie centrów roboczych" diff --git a/addons/board_project/i18n/pl.po b/addons/board_project/i18n/pl.po index 23bca5480cc..c001e1f8626 100644 --- a/addons/board_project/i18n/pl.po +++ b/addons/board_project/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 11:08+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-05-24 16:30+0000\n" +"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n" +"X-Launchpad-Export-Date: 2010-05-25 03:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board_project @@ -25,23 +25,23 @@ msgstr "Planowanie mojego projektu" #: view:hr_timesheet_sheet.sheet:0 #: model:ir.actions.act_window,name:board_project.act_hr_timesheet_sheet msgid "Timesheets" -msgstr "" +msgstr "Karty czasu pracy" #. module: board_project #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nieprawidłowa nazwa modelu w definicji akcji." #. module: board_project #: view:board.board:0 #: model:ir.actions.act_window,name:board_project.act_my_project msgid "My projects" -msgstr "" +msgstr "Moje projekty" #. module: board_project #: model:ir.actions.act_window,name:board_project.action_view_task_tree_deadline msgid "My Task's Deadlines" -msgstr "" +msgstr "Moje terminy" #. module: board_project #: view:project.task:0 @@ -52,40 +52,40 @@ msgstr "Moje zadania" #: view:board.board:0 #: model:ir.actions.act_window,name:board_project.action_view_board_note_tree msgid "Public Notes" -msgstr "" +msgstr "Uwagi ogólne" #. module: board_project #: model:ir.actions.act_window,name:board_project.open_board_project #: model:ir.ui.menu,name:board_project.menu_board_project msgid "Project Dashboard" -msgstr "" +msgstr "Konsola projektu" #. module: board_project #: model:ir.module.module,shortdesc:board_project.module_meta_information msgid "Board for project users" -msgstr "" +msgstr "Konsola dla użytkowników projektu" #. module: board_project #: model:ir.actions.act_window,name:board_project.action_project_pipeline_user msgid "Pipeline of tasks" -msgstr "" +msgstr "Przepływ zadań" #. module: board_project #: view:board.board:0 msgid "My Planning" -msgstr "" +msgstr "Moje planowania" #. module: board_project #: view:board.board:0 #: model:ir.actions.act_window,name:board_project.act_my_account msgid "My accounts to invoice" -msgstr "" +msgstr "Moje konta do fakturowania" #. module: board_project #: model:ir.actions.act_window,name:board_project.open_board_project_manager #: model:ir.ui.menu,name:board_project.menu_board_project_manager msgid "Project Manager Dashboard" -msgstr "" +msgstr "Konsola Menedżera projektów" #. module: board_project #: view:board.board:0 @@ -100,7 +100,7 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!" #. module: board_project #: view:board.board:0 msgid "User's timesheets" -msgstr "" +msgstr "Karty czasu pracy użytkownika" #. module: board_project #: model:ir.ui.menu,name:board_project.next_id_86 @@ -110,30 +110,30 @@ msgstr "Projekt" #. module: board_project #: view:board.board:0 msgid "Project manager board" -msgstr "" +msgstr "Konsola Menedżera projektu" #. module: board_project #: view:board.board:0 #: model:ir.actions.act_window,name:board_project.action_view_task_tree msgid "My Open Tasks" -msgstr "" +msgstr "Moje otwarte zadania" #. module: board_project #: view:board.board:0 msgid "My Board" -msgstr "" +msgstr "Moja konsola" #. module: board_project #: view:board.board:0 msgid "My tasks board" -msgstr "" +msgstr "Konsola moich zadań" #. module: board_project #: view:board.board:0 msgid "My user's pipeline" -msgstr "" +msgstr "Moje przepływy zadań" #. module: board_project #: view:board.board:0 msgid "My Timesheet" -msgstr "" +msgstr "Moja karta czasu pracy" diff --git a/addons/board_sale/i18n/pl.po b/addons/board_sale/i18n/pl.po index 17a94959895..cb1e90aac00 100644 --- a/addons/board_sale/i18n/pl.po +++ b/addons/board_sale/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-05-14 16:28+0000\n" +"PO-Revision-Date: 2010-05-21 19:22+0000\n" "Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-05-15 04:58+0000\n" +"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board_sale @@ -40,7 +40,7 @@ msgstr "Konsola szefa sprzedaży" #. module: board_sale #: view:board.board:0 msgid "Cases of the month" -msgstr "Zdarzenia miesiąca" +msgstr "Sprawy miesiąca" #. module: board_sale #: constraint:ir.ui.view:0 @@ -65,9 +65,9 @@ msgstr "Sprzedaż" #. module: board_sale #: view:board.board:0 msgid "Cases statistics" -msgstr "Statystyka zdarzeń" +msgstr "Statystyka spraw" #. module: board_sale #: view:board.board:0 msgid "Top ten sales of the month" -msgstr "Dziesięć najlepszych sprzedaży w miesiącu" +msgstr "Najlepsze sprzedaże w miesiącu" diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py index de0fac56e29..362444ccc2c 100644 --- a/addons/crm/__init__.py +++ b/addons/crm/__init__.py @@ -33,6 +33,7 @@ import crm_installer import report import wizard +import res_partner diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index afe500516d3..337ee802bee 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -96,7 +96,9 @@ between mails and Open ERP.""", 'report/crm_phonecall_report_view.xml', 'process/crm_configuration_process.xml', - 'crm_installer_view.xml' + 'crm_installer_view.xml', + + 'res_partner_view.xml' ], 'demo_xml': [ 'crm_demo.xml', diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py index 20ae1176ca6..e45ee85b31d 100644 --- a/addons/crm/crm_meeting.py +++ b/addons/crm/crm_meeting.py @@ -175,16 +175,4 @@ class res_users(osv.osv): res_users() -class res_partner(osv.osv): - """ Inherits partner and adds meetings information in the partner form """ - _inherit = 'res.partner' - - _columns = { - 'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\ - 'Meetings'), - } - -res_partner() - - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index ac61809cfad..28cf42e3a73 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -324,21 +324,5 @@ - - - - res.partner.meeting.info.inherit - res.partner - form - - - - - - - - - - diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py index 3bc9fdd6d81..98e4c6f3ded 100644 --- a/addons/crm/crm_opportunity.py +++ b/addons/crm/crm_opportunity.py @@ -163,16 +163,4 @@ class crm_opportunity(osv.osv): crm_opportunity() -class res_partner(osv.osv): - """ Inherits partner and adds Opportunities information in the partner form """ - _inherit = 'res.partner' - - _columns = { - 'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\ - 'Opportunities', domain=[('type', '=', 'opportunity')]), - } - -res_partner() - - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index 1f0c97e9b56..7853c692271 100644 --- a/addons/crm/crm_opportunity_view.xml +++ b/addons/crm/crm_opportunity_view.xml @@ -324,59 +324,5 @@ - - - - res.partner.opportunity.info.inherit - res.partner - form - - - - - - - - - - - - - - - - -