merges

bzr revid: nch@tinyerp.com-20081104054645-pqtvoho3hiyjb2yf

5 files changed, 90 insertions, 160 deletions

diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index c932f0ef915..b888eb373fc 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -1,30 +1,22 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
-# $Id$
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+#    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 General Public License for more details.
 #
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/base_setup/__terp__.py b/addons/base_setup/__terp__.py
index d85fe582726..6d299e2d08c 100644
--- a/addons/base_setup/__terp__.py
+++ b/addons/base_setup/__terp__.py
@@ -1,31 +1,24 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
-# $Id$
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+#    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 General Public License for more details.
 #
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-###############################################################################
+##############################################################################
 {
     "name" : "Base Setup",
     "version" : "1.0",
diff --git a/addons/base_setup/i18n/fr_FR.po b/addons/base_setup/i18n/fr_FR.po
index 369ea72ca38..2025186eabe 100644
--- a/addons/base_setup/i18n/fr_FR.po
+++ b/addons/base_setup/i18n/fr_FR.po
@@ -1,37 +1,31 @@
-# Translation of OpenERP Server.
+# Translation of OpenERP Server.
 # This file containt the translation of the following modules:
 #	* base_setup
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0\n"
-Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2008-09-10 15:05:35+0000\n"
-"PO-Revision-Date: 2008-09-10 15:05:35+0000\n"
-"Last-Translator: Olivier Laurent <Unknown>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Project-Id-Version: OpenERP Server 4.3.99\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
+"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
+"Last-Translator: <>\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: 2008-10-09 09:20+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,city:0
 #: wizard_field:base_setup.base_setup,update,city:0
-#: wizard_field:base_setup.base_setup,charts,city:0
 #: wizard_field:base_setup.base_setup,init,city:0
 msgid "City"
 msgstr "Ville"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
-msgid ""
-"You can start configuring the system or connect directly to the database "
-"using the default setup."
-msgstr ""
-"Vous pouvez commencer à configurer le système ou vous connecter directement "
-"à la base de données en utilisant la configuration par défaut."
+msgid "You can start configuring the system or connect directly to the database using the default setup."
+msgstr "Vous pouvez commencer à configurer le système ou vous connecter directement à la base de données en utilisant la configuration par défaut."
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
@@ -50,35 +44,23 @@ msgstr "Commencer la configuration"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
-msgid ""
-"You'll be able to install more modules later through the Administration menu."
-msgstr ""
-"Vous pourrez installer d'autres modules plus tard via le menu "
-"d'Administration."
+msgid "You'll be able to install more modules later through the Administration menu."
+msgstr "Vous pourrez installer d'autres modules plus tard via le menu d'Administration."
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
-msgid ""
-"A profile sets a pre-selection of modules for specific needs. These profiles "
-"have been setup to help you discover the different aspects of OpenERP. This "
-"is just an overview, we have 300+ available modules."
-msgstr ""
-"Un profile défini une présélection de modules pour des besoins spécifiques. "
-"Ces profiles ont été configurés pour vous aider à découvrir les différents "
-"aspects d'OpenERP. C'est juste un apperçu, nous avons plus de 300 modules "
-"disponibles."
+msgid "A profile sets a pre-selection of modules for specific needs. These profiles have been setup to help you discover the different aspects of OpenERP. This is just an overview, we have 300+ available modules."
+msgstr "Un profile défini une présélection de modules pour des besoins spécifiques. Ces profiles ont été configurés pour vous aider à découvrir les différents aspects d'OpenERP. C'est juste un apperçu, nous avons plus de 300 modules disponibles."
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,update:0
-#: wizard_button:base_setup.base_setup,charts,company:0
-#: wizard_button:base_setup.base_setup,init,next:0
+#: wizard_button:base_setup.base_setup,init,company:0
 msgid "Next"
 msgstr "Suivant"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,email:0
 #: wizard_field:base_setup.base_setup,update,email:0
-#: wizard_field:base_setup.base_setup,charts,email:0
 #: wizard_field:base_setup.base_setup,init,email:0
 msgid "E-mail"
 msgstr "E-mail"
@@ -86,7 +68,6 @@ msgstr "E-mail"
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,state_id:0
 #: wizard_field:base_setup.base_setup,update,state_id:0
-#: wizard_field:base_setup.base_setup,charts,state_id:0
 #: wizard_field:base_setup.base_setup,init,state_id:0
 msgid "State"
 msgstr "Etat"
@@ -99,7 +80,6 @@ msgstr "Votre nouvelle base de données est maintenant totalement installée"
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,profile:0
 #: wizard_field:base_setup.base_setup,update,profile:0
-#: wizard_field:base_setup.base_setup,charts,profile:0
 #: wizard_field:base_setup.base_setup,init,profile:0
 msgid "Profile"
 msgstr "Profil"
@@ -107,7 +87,6 @@ msgstr "Profil"
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_footer1:0
 #: wizard_field:base_setup.base_setup,update,rml_footer1:0
-#: wizard_field:base_setup.base_setup,charts,rml_footer1:0
 #: wizard_field:base_setup.base_setup,init,rml_footer1:0
 msgid "Report Footer 1"
 msgstr "Pied de page 1 de rapport"
@@ -115,23 +94,30 @@ msgstr "Pied de page 1 de rapport"
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_footer2:0
 #: wizard_field:base_setup.base_setup,update,rml_footer2:0
-#: wizard_field:base_setup.base_setup,charts,rml_footer2:0
 #: wizard_field:base_setup.base_setup,init,rml_footer2:0
 msgid "Report Footer 2"
 msgstr "Pied de page 2 de rapport"
 
 #. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "General Information"
+msgstr ""
+
+#. module: base_setup
 #: wizard_field:base_setup.base_setup,company,street2:0
 #: wizard_field:base_setup.base_setup,update,street2:0
-#: wizard_field:base_setup.base_setup,charts,street2:0
 #: wizard_field:base_setup.base_setup,init,street2:0
 msgid "Street2"
 msgstr "Rue (suite)"
 
 #. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Report Information"
+msgstr ""
+
+#. module: base_setup
 #: wizard_field:base_setup.base_setup,company,phone:0
 #: wizard_field:base_setup.base_setup,update,phone:0
-#: wizard_field:base_setup.base_setup,charts,phone:0
 #: wizard_field:base_setup.base_setup,init,phone:0
 msgid "Phone"
 msgstr "Téléphone"
@@ -142,26 +128,8 @@ msgid "Define Main Company"
 msgstr "Définir la société principale"
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,charts:0
-msgid ""
-"If you don't select one now, you'll be able to install another one through "
-"the Administration menu."
-msgstr ""
-"Si vous n'en sélectionnez pas un maintenant, vous pourrez en installer un "
-"autre via le menu d'Administration."
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,charts:0
-#: wizard_field:base_setup.base_setup,update,charts:0
-#: wizard_field:base_setup.base_setup,charts,charts:0
-#: wizard_field:base_setup.base_setup,init,charts:0
-msgid "Chart of accounts"
-msgstr "Plan de comptes"
-
-#. module: base_setup
 #: wizard_field:base_setup.base_setup,company,name:0
 #: wizard_field:base_setup.base_setup,update,name:0
-#: wizard_field:base_setup.base_setup,charts,name:0
 #: wizard_field:base_setup.base_setup,init,name:0
 msgid "Company Name"
 msgstr "Nom de la société"
@@ -169,7 +137,6 @@ msgstr "Nom de la société"
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,country_id:0
 #: wizard_field:base_setup.base_setup,update,country_id:0
-#: wizard_field:base_setup.base_setup,charts,country_id:0
 #: wizard_field:base_setup.base_setup,init,country_id:0
 msgid "Country"
 msgstr "Pays"
@@ -177,7 +144,6 @@ msgstr "Pays"
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 #: wizard_view:base_setup.base_setup,update:0
-#: wizard_view:base_setup.base_setup,charts:0
 #: wizard_view:base_setup.base_setup,init:0
 #: model:ir.actions.wizard,name:base_setup.action_wizard_setup
 #: model:ir.actions.wizard,name:base_setup.wizard_base_setup
@@ -187,17 +153,11 @@ msgstr "Installation"
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,zip:0
 #: wizard_field:base_setup.base_setup,update,zip:0
-#: wizard_field:base_setup.base_setup,charts,zip:0
 #: wizard_field:base_setup.base_setup,init,zip:0
 msgid "Zip code"
 msgstr "Code postal"
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,charts:0
-msgid "Select a Chart of Accounts"
-msgstr "Sélectionnez le Plan Comptable"
-
-#. module: base_setup
 #: wizard_view:base_setup.base_setup,update:0
 msgid "Summary"
 msgstr "Résumé"
@@ -213,25 +173,27 @@ msgid "Installation Done"
 msgstr "Installation terminée"
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,charts:0
-msgid ""
-"There are much more charts of accounts available on the OpenERP website."
+#: wizard_field:base_setup.base_setup,company,logo:0
+#: wizard_field:base_setup.base_setup,update,logo:0
+#: wizard_field:base_setup.base_setup,init,logo:0
+msgid "Logo"
 msgstr ""
-"Il existe beaucoup plus de Plan Comptable disponibles sur le site Web "
-"d'OpenERP."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_header1:0
 #: wizard_field:base_setup.base_setup,update,rml_header1:0
-#: wizard_field:base_setup.base_setup,charts,rml_header1:0
 #: wizard_field:base_setup.base_setup,init,rml_header1:0
 msgid "Report Header"
 msgstr "En-tête de rapport"
 
 #. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Your Logo - Use a size of about 450x150 pixels."
+msgstr ""
+
+#. module: base_setup
 #: wizard_field:base_setup.base_setup,company,currency:0
 #: wizard_field:base_setup.base_setup,update,currency:0
-#: wizard_field:base_setup.base_setup,charts,currency:0
 #: wizard_field:base_setup.base_setup,init,currency:0
 msgid "Currency"
 msgstr "Devise"
@@ -239,7 +201,6 @@ msgstr "Devise"
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,street:0
 #: wizard_field:base_setup.base_setup,update,street:0
-#: wizard_field:base_setup.base_setup,charts,street:0
 #: wizard_field:base_setup.base_setup,init,street:0
 msgid "Street"
 msgstr "Rue"
@@ -255,8 +216,8 @@ msgid "Use Directly"
 msgstr "Utiliser directement"
 
 #. module: base_setup
-#: wizard_button:base_setup.base_setup,company,previous:0
+#: wizard_button:base_setup.base_setup,company,init:0
 #: wizard_button:base_setup.base_setup,update,company:0
-#: wizard_button:base_setup.base_setup,charts,init:0
 msgid "Previous"
 msgstr "Précédent"
+
diff --git a/addons/base_setup/wizard/__init__.py b/addons/base_setup/wizard/__init__.py
index 7ee48ee3c4b..6ff07fc42ee 100644
--- a/addons/base_setup/wizard/__init__.py
+++ b/addons/base_setup/wizard/__init__.py
@@ -1,30 +1,22 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
-# $Id$
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+#    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 General Public License for more details.
 #
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index d469ef9d072..ed22d513b19 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -1,30 +1,22 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
-# $Id$
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+#    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 General Public License for more details.
 #
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################