diff --git a/addons/multi_company/i18n/fr.po b/addons/multi_company/i18n/fr.po
index a7a622549ca..868649dba08 100644
--- a/addons/multi_company/i18n/fr.po
+++ b/addons/multi_company/i18n/fr.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-12-07 22:08:12+0000\n"
-"PO-Revision-Date: 2009-12-07 23:14+0100\n"
+"POT-Creation-Date: 2009-12-08 09:51:18+0000\n"
+"PO-Revision-Date: 2009-12-08 10:52+0100\n"
 "Last-Translator: Christophe Chauvet <christophe.chauvet@syleam.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -82,6 +82,11 @@ msgstr ""
 msgid "Main Company"
 msgstr "Société principale"
 
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Condition"
+msgstr "Condition"
+
 #. module: multi_company
 #: help:multi_company.default,company_dest_id:0
 msgid "Company to store the current record"
@@ -157,3 +162,8 @@ msgstr "Erreur: code EAN invalide"
 msgid "Expression, must be True to match"
 msgstr "L'expression doit être à True pour correspondre"
 
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Matching"
+msgstr "Critère de correspondance"
+
diff --git a/addons/multi_company/i18n/multi_company.pot b/addons/multi_company/i18n/multi_company.pot
index 008821e0ea5..0764bafa15e 100644
--- a/addons/multi_company/i18n/multi_company.pot
+++ b/addons/multi_company/i18n/multi_company.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-12-07 22:08:12+0000\n"
-"PO-Revision-Date: 2009-12-07 22:08:12+0000\n"
+"POT-Creation-Date: 2009-12-08 09:51:18+0000\n"
+"PO-Revision-Date: 2009-12-08 09:51:18+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -79,6 +79,11 @@ msgstr ""
 msgid "Main Company"
 msgstr ""
 
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Condition"
+msgstr ""
+
 #. module: multi_company
 #: help:multi_company.default,company_dest_id:0
 msgid "Company to store the current record"
@@ -154,3 +159,8 @@ msgstr ""
 msgid "Expression, must be True to match"
 msgstr ""
 
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Matching"
+msgstr ""
+
diff --git a/addons/multi_company/multi_company.py b/addons/multi_company/multi_company.py
index ff52408df60..2c56935c394 100644
--- a/addons/multi_company/multi_company.py
+++ b/addons/multi_company/multi_company.py
@@ -33,7 +33,7 @@ class multi_company_default(osv.osv):
     """
     _name = 'multi_company.default'
     _description = 'Default multi company'
-    _order = 'company_id,company_dest_id,sequence,id'
+    _order = 'company_id,sequence,id'
 
     _columns = {
         'sequence': fields.integer('Sequence'),
diff --git a/addons/multi_company/multi_company_view.xml b/addons/multi_company/multi_company_view.xml
index ad16a33f0f3..1644e2e4f05 100644
--- a/addons/multi_company/multi_company_view.xml
+++ b/addons/multi_company/multi_company_view.xml
@@ -8,12 +8,12 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <tree string="Multi Company">
-                    <field name="sequence"/>
-                    <field name="name"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="company_dest_id"/>
                     <field name="object_id"/>
                     <field name="expression" />
+                    <field name="sequence"/>
+                    <field name="company_dest_id"/>
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
@@ -24,12 +24,16 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <form string="Multi Company">
-                    <field name="sequence"/>
-                    <field name="name"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="company_dest_id"/>
-                    <field name="object_id"/>
-                    <field name="expression" />
+                    <group col="6" colspan="4">
+                        <field name="name" colspan="6"/>
+                        <separator string="Matching" colspan="6"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="object_id"/>
+                        <field name="company_dest_id"/>
+                        <separator string="Condition" colspan="6"/>
+                        <field name="expression" colspan="4"/>
+                        <field name="sequence"/>
+                    </group>
                 </form>
             </field>
         </record>