savoirfairelinux-openerp team mailing list archive

["Maxime Chambreuil \(http://www.savoirfairelinux.com\)" <maxime.chambreuil@xxxxxxxxxxxxxxxxxxxx>]

Maxime Chambreuil (http://www.savoirfairelinux.com) has proposed merging lp:~savoirfairelinux-openerp/openobject-server/7.0-fix-940439 into lp:openobject-server.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #940439 in OpenERP Server: "Once we save dbfilter in configuration file, It is ignored"
  https://bugs.launchpad.net/openobject-server/+bug/940439

For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/openobject-server/7.0-fix-940439/+merge/183358
-- 
https://code.launchpad.net/~savoirfairelinux-openerp/openobject-server/7.0-fix-940439/+merge/183358
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/openobject-server/7.0-fix-940439.

=== modified file 'doc/03_module_dev_03.rst'
--- doc/03_module_dev_03.rst	2012-11-19 14:39:12 +0000
+++ doc/03_module_dev_03.rst	2013-09-01 14:28:49 +0000
@@ -1351,12 +1351,22 @@
 
 If you want to specify the views to use, you can add a *context* attribute, and
 specify a view id for each type of view supported, exactly like the action's 
-*view_id* attribute:
+*view_id* attribute, except that the provided view id must always be
+fully-qualified with the module name, even if it belongs to the same module:
 
 .. code-block:: xml
 
     <field name="order_line" colspan="4" nolabel="1"
-           context="{'form_view_ref' : 'module.view_id', 'tree_view_ref' : 'model.view_id'}"/>
+           context="{'form_view_ref': 'module.view_id',
+                     'tree_view_ref': 'module.view_id'}"/>
+
+.. note::
+
+   You *have to* put the module name in the view_id, because this
+   is evaluated when the view is displayed, and not when the XML file
+   is parsed, so the module name information is not available. Failing
+   to do so will result in the default view being selected (see
+   below).
 
 If you don't specify the views, OpenERP will choose one in this order :
 

=== modified file 'openerp/addons/base/i18n/cs.po'
--- openerp/addons/base/i18n/cs.po	2013-08-28 05:03:49 +0000
+++ openerp/addons/base/i18n/cs.po	2013-09-01 14:28:49 +0000
@@ -5,17 +5,32 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
+<<<<<<< TREE
 "Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:44+0000\n"
 "Last-Translator: Jiří Hajda <robie@xxxxxxxxxx>\n"
 "Language-Team: openerp-i18n-czech <openerp-i18n-czech@xxxxxxxxxxxxxxxxxxx>\n"
+=======
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:35+0000\n"
+"PO-Revision-Date: 2013-08-24 09:34+0000\n"
+"Last-Translator: Jan B. Krejčí <Unknown>\n"
+"Language-Team: Czech <cs@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-08-28 04:54+0000\n"
 "X-Generator: Launchpad (build 16738)\n"
 "X-Poedit-Language: Czech\n"
+=======
+"X-Launchpad-Export-Date: 2013-08-25 05:19+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+"X-Language: cs_CZ\n"
+"X-Source-Language: en\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -31,6 +46,14 @@
 "    "
 
 #. module: base
+<<<<<<< TREE
+=======
+#: view:res.partner.bank:0
+msgid "e.g. GEBABEBB"
+msgstr "např. KOMBCZPP"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:res.country,name:base.sh
 msgid "Saint Helena"
 msgstr "Svatá Helena"
@@ -754,6 +777,14 @@
 msgstr "Prodej & Nákup"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: view:res.partner:0
+msgid "Put an internal note..."
+msgstr "Zadejte interní poznámku..."
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: view:ir.translation:0
 msgid "Untranslated"
 msgstr "Nepřeložené"
@@ -1022,6 +1053,15 @@
 msgstr "Přepsat existující výrazy"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/res/res_currency.py:52
+#, python-format
+msgid "No currency rate associated for currency %d for the given period"
+msgstr "Pro dané období neexistuje směnný kurz pro měnu %d"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:ir.module.module,description:base.module_hr_holidays
 msgid ""
 "\n"
@@ -1991,6 +2031,38 @@
 "oficiálními."
 
 #. module: base
+<<<<<<< TREE
+=======
+#: model:ir.actions.act_window,help:base.action_res_partner_bank_account_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a bank account.\n"
+"              </p><p>\n"
+"                Configure your company's bank accounts and select those that "
+"must appear on the report footer.\n"
+"                You can reorder bank accounts from the list view.\n"
+"              </p>\n"
+"              <p>\n"
+"                If you use the accounting application of OpenERP, journals "
+"and accounts will be created automatically based on these data.\n"
+"              </p>  \n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klikněte pro vytvoření bankovního účtu.\n"
+"              </p><p>\n"
+"                Zadejte bankovní účty vaší firmy a vyberte ty, které se mají "
+"objevovat v zápatí sestav.\n"
+"                V seznamu můžete změnit pořadí účtů.\n"
+"              </p>\n"
+"              <p>\n"
+"                Pokud používáte účetní modul OpenERP, automaticky se vytvoří "
+"příslušné účty a knihy výpisů.\n"
+"              </p>  \n"
+"            "
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.act_window,name:base.ir_action_report_xml
 #: field:ir.module.module,reports_by_module:0
 #: model:ir.ui.menu,name:base.menu_ir_action_report_xml
@@ -2023,6 +2095,15 @@
 "jsou použity pro odkazování na data jiných modulů, jako module.reference_id"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/ir/ir_model.py:85
+#, python-format
+msgid "Invalid Search Criteria"
+msgstr "Neplatné parametry hledání"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: field:res.users,login:0
 msgid "Login"
 msgstr "Přihlášovací jméno"
@@ -3999,6 +4080,15 @@
 msgstr "Mapování polí"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/module/wizard/base_module_upgrade.py:84
+#, python-format
+msgid "Unmet Dependency!"
+msgstr "Nesplněná závislost!"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:res.partner.title,name:base.res_partner_title_sir
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
 msgid "Sir"
@@ -4253,6 +4343,15 @@
 msgstr "Filtry"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/module/wizard/base_module_import.py:67
+#, python-format
+msgid "Can not create the module file: %s!"
+msgstr "Nelze vytvořit soubor modulu: %s!"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.act_window,name:base.ir_cron_act
 #: view:ir.cron:0
 #: model:ir.ui.menu,name:base.menu_ir_cron_act
@@ -5009,6 +5108,15 @@
 msgstr "`code` musí být unikátní."
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/ir/workflow/workflow.py:99
+#, python-format
+msgid "Operation Forbidden"
+msgstr "Nepovolená operace"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:ir.module.module,shortdesc:base.module_knowledge
 msgid "Knowledge Management System"
 msgstr "Systém správy znalostí"
@@ -5391,6 +5499,15 @@
 msgstr "Směr"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/orm.py:4815
+#, python-format
+msgid "Sorting field %s not found on model %s"
+msgstr "Pole řazení %s nebylo v modelu %s nalezeno"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: view:ir.actions.act_window:0
 #: model:ir.actions.act_window,name:base.action_ui_view
 #: field:ir.actions.act_window,view_ids:0

=== modified file 'openerp/addons/base/i18n/fr.po'
--- openerp/addons/base/i18n/fr.po	2013-08-28 05:03:49 +0000
+++ openerp/addons/base/i18n/fr.po	2013-09-01 14:28:49 +0000
@@ -4,17 +4,31 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-06 10:07+0000\n"
 "Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:35+0000\n"
+"PO-Revision-Date: 2013-08-23 14:45+0000\n"
+"Last-Translator: Florian Hatat <Unknown>\n"
+"Language-Team: French <fr@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-08-28 04:54+0000\n"
 "X-Generator: Launchpad (build 16738)\n"
+=======
+"X-Launchpad-Export-Date: 2013-08-24 05:34+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -2079,6 +2093,38 @@
 "remplacées par les traductions officielles."
 
 #. module: base
+<<<<<<< TREE
+=======
+#: model:ir.actions.act_window,help:base.action_res_partner_bank_account_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a bank account.\n"
+"              </p><p>\n"
+"                Configure your company's bank accounts and select those that "
+"must appear on the report footer.\n"
+"                You can reorder bank accounts from the list view.\n"
+"              </p>\n"
+"              <p>\n"
+"                If you use the accounting application of OpenERP, journals "
+"and accounts will be created automatically based on these data.\n"
+"              </p>  \n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Cliquez pour créer un compte bancaire.\n"
+"              </p><p>\n"
+"Configurer les comptes bancaires de votre société, et sélectionnez ceux qui "
+"doivent apparaître en pied des rapports. Vous pouvez changer l'ordre des "
+"comptes sur la vue liste.\n"
+"              </p>\n"
+"              <p>\n"
+"Si vous utilisez l'application Comptabilité d'OpenERP, les journaux et les "
+"comptes seront créés automatiquement à partir de ces données.\n"
+"              </p>  \n"
+"            "
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.act_window,name:base.ir_action_report_xml
 #: field:ir.module.module,reports_by_module:0
 #: model:ir.ui.menu,name:base.menu_ir_action_report_xml
@@ -2112,6 +2158,15 @@
 "modules, tel que module.reference_id"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/ir/ir_model.py:85
+#, python-format
+msgid "Invalid Search Criteria"
+msgstr "Critère de recherche invalide"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: field:res.users,login:0
 msgid "Login"
 msgstr "Connexion"
@@ -3956,6 +4011,15 @@
 "    "
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/ir/ir_mail_server.py:222
+#, python-format
+msgid "Connection Test Succeeded!"
+msgstr "Test de connexion réussi !"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: field:ir.actions.client,params_store:0
 msgid "Params storage"
 msgstr "Paramètre de stockage"
@@ -4355,6 +4419,15 @@
 msgstr "Correspondance de champs"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/module/wizard/base_module_upgrade.py:84
+#, python-format
+msgid "Unmet Dependency!"
+msgstr "Dépendance non satisfaite !"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:res.partner.title,name:base.res_partner_title_sir
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
 msgid "Sir"
@@ -4621,6 +4694,15 @@
 msgstr "Filtres"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/module/wizard/base_module_import.py:67
+#, python-format
+msgid "Can not create the module file: %s!"
+msgstr "Impossible de créer le fichier du module: %s !"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.act_window,name:base.ir_cron_act
 #: view:ir.cron:0
 #: model:ir.ui.menu,name:base.menu_ir_cron_act
@@ -5492,6 +5574,15 @@
 msgstr "`code` doit être unique."
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/ir/workflow/workflow.py:99
+#, python-format
+msgid "Operation Forbidden"
+msgstr "Opération interdite"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:ir.module.module,shortdesc:base.module_knowledge
 msgid "Knowledge Management System"
 msgstr "Base de connaissances"
@@ -5960,6 +6051,18 @@
 "Cliquez sur 'Continuer' et profitez de l'expérience OpenERP..."
 
 #. module: base
+<<<<<<< TREE
+=======
+#: help:ir.sequence,number_next_actual:0
+msgid ""
+"Next number that will be used. This number can be incremented frequently so "
+"the displayed value might already be obsolete"
+msgstr ""
+"Numéro suivant à utiliser. Ce numéro peut augmenter fréquemment, donc la "
+"valeur indiquée ici est peut-être déjà obsolète."
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:ir.module.category,description:base.module_category_marketing
 msgid "Helps you manage your marketing campaigns step by step."
 msgstr "Vous aide à gérer vos campagnes marketing pas à pas"
@@ -8208,6 +8311,19 @@
 msgstr "Type de taux de devise"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/res/res_lang.py:189
+#, python-format
+msgid ""
+"You cannot delete the language which is Active!\n"
+"Please de-activate the language first."
+msgstr ""
+"Vous ne pouvez pas supprimer une langue qui est active !\n"
+"Désactivez d'abord cette langue."
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:ir.module.module,description:base.module_l10n_fr
 msgid ""
 "\n"
@@ -9119,6 +9235,15 @@
 msgstr "Erreur"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/res/res_partner.py:566
+#, python-format
+msgid "Couldn't create contact without email address!"
+msgstr "Impossible de créer un contact sans adresse électronique !"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: help:res.partner,tz:0
 msgid ""
 "The partner's timezone, used to output proper date and time values inside "
@@ -9567,6 +9692,15 @@
 msgstr ""
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/ir/ir_mail_server.py:215
+#, python-format
+msgid "Connection Test Failed!"
+msgstr "Échec du test de connexion !"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: selection:base.language.install,lang:0
 msgid "Dutch / Nederlands"
 msgstr "Hollandais / Nederlands"
@@ -11586,6 +11720,19 @@
 msgstr ""
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/module/module.py:670
+#, python-format
+msgid ""
+"The `%s` module appears to be unavailable at the moment, please try again "
+"later."
+msgstr ""
+"Le module '%s' semble être indisponible pour l'instant, merci de réessayer "
+"plus tard."
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: view:ir.attachment:0
 #: view:ir.cron:0
 #: view:ir.filters:0
@@ -11976,6 +12123,17 @@
 "cette transition."
 
 #. module: base
+<<<<<<< TREE
+=======
+#: view:res.bank:0
+#: view:res.company:0
+#: view:res.partner:0
+#: view:res.users:0
+msgid "Street..."
+msgstr "Rue..."
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr "La société choisie n'est pas autorisée pour cet utilisateur."
@@ -13898,6 +14056,7 @@
 #: model:ir.actions.act_window,name:base.change_password_wizard_action
 #: view:res.users:0
 msgid "Change Password"
+<<<<<<< TREE
 msgstr "Modifier le mot de passe"
 
 #. module: base
@@ -13918,6 +14077,9 @@
 "yearly\n"
 "      account reporting (balance, profit & losses).\n"
 msgstr ""
+=======
+msgstr "Modifier le mot de passe"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: field:ir.actions.act_url,type:0
@@ -14371,6 +14533,15 @@
 msgstr ""
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/ir/ir_model.py:295
+#, python-format
+msgid "Size of the field can never be less than 0 !"
+msgstr "La taille du champ ne peut jamais être inférieure à 0 !"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: help:ir.actions.server,sequence:0
 msgid ""
 "Important when you deal with multiple actions, the execution order will be "
@@ -15770,6 +15941,14 @@
 msgstr "Luxembourg"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: view:res.partner:0
+msgid "(edit company address)"
+msgstr "(modifier l'adresse de la société)"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:ir.module.module,summary:base.module_base_calendar
 msgid "Personal & Shared Calendar"
 msgstr "Calendrier personnel et partagé"
@@ -16768,6 +16947,14 @@
 msgstr "Installation automatisée"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: view:base.language.import:0
+msgid "e.g. en_US"
+msgstr "ex: en_US"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:ir.module.module,description:base.module_l10n_hn
 msgid ""
 "\n"
@@ -16943,10 +17130,17 @@
 msgstr "Condition"
 
 #. module: base
+<<<<<<< TREE
 #: model:ir.actions.client,name:base.modules_updates_act_cl
 #: model:ir.ui.menu,name:base.menu_module_updates
 msgid "Updates"
 msgstr "Mises à jour"
+=======
+#: code:addons/base/module/module.py:669
+#, python-format
+msgid "Module not found"
+msgstr "Module introuvable"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: help:res.currency,rate:0
@@ -17068,6 +17262,15 @@
 msgstr "Comptes bancaires"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/res/res_lang.py:185
+#, python-format
+msgid "Base Language 'en_US' can not be deleted!"
+msgstr "La langue de base 'en_US' ne peut pas être supprimée !"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:res.country,name:base.sl
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
@@ -17343,6 +17546,15 @@
 msgstr "Nom de l'export"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: code:addons/base/ir/ir_sequence.py:259
+#, python-format
+msgid "Invalid prefix or suffix for sequence '%s'"
+msgstr "Préfixe ou suffixe invalide pour la séquence '%s'"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: help:res.partner,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "

=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2013-08-20 16:03:46 +0000
+++ openerp/addons/base/res/res_partner.py	2013-09-01 14:28:49 +0000
@@ -481,7 +481,11 @@
         if partner.child_ids:
             # 2a. Commercial Fields: sync if commercial entity
             if partner.commercial_partner_id == partner:
-                self._commercial_sync_to_children(cr, uid, partner, context=context)
+                commercial_fields = self._commercial_fields(cr, uid,
+                                                            context=context)
+                if any(field in update_values for field in commercial_fields):
+                    self._commercial_sync_to_children(cr, uid, partner,
+                                                      context=context)
             # 2b. Address fields: sync if address changed
             address_fields = self._address_fields(cr, uid, context=context)
             if any(field in update_values for field in address_fields):

=== modified file 'openerp/tools/config.py'
--- openerp/tools/config.py	2013-03-28 09:50:06 +0000
+++ openerp/tools/config.py	2013-09-01 14:28:49 +0000
@@ -144,7 +144,7 @@
         # WEB
         # TODO move to web addons after MetaOption merge
         group = optparse.OptionGroup(parser, "Web interface Configuration")
-        group.add_option("--db-filter", dest="dbfilter", default='.*',
+        group.add_option("--db-filter", dest="dbfilter", my_default='.*',
                          help="Filter listed database", metavar="REGEXP")
         parser.add_option_group(group)