[MERGE]

bzr revid: uco@tinyerp.com-20100622043758-lskl5zqv907c1w09

12 files changed, 20 insertions, 22 deletions

diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py
index e595436d63f..82b092d973c 100644
--- a/bin/addons/base/__openerp__.py
+++ b/bin/addons/base/__openerp__.py
@@ -51,7 +51,6 @@
         'res/res_request_view.xml',
         'res/res_lang_view.xml',
         'res/res_log_view.xml',
-        'res/res_company_view.xml',
         'res/partner/partner_report.xml',
         'res/partner/partner_view.xml',
         'res/partner/partner_wizard.xml',
diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index f3f58f29cc5..e3f13580bd5 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -5,7 +5,6 @@
         <menuitem id="next_id_4" name="Low Level Objects"
             parent="base.menu_administration" sequence="3"
             groups="base.group_extended"/>
-
         <menuitem id="menu_low_workflow" name="Workflow Items" parent="base.next_id_4"/>
         <menuitem id="menu_custom" name="Customization"
             parent="base.menu_administration" sequence="2"
diff --git a/bin/addons/base/i18n/gl.po b/bin/addons/base/i18n/gl.po
index fdd3b2a7707..97bbaea774c 100644
--- a/bin/addons/base/i18n/gl.po
+++ b/bin/addons/base/i18n/gl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-06-20 14:33+0000\n"
+"PO-Revision-Date: 2010-06-21 04:04+0000\n"
 "Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-21 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 057659d69d4..30cc488e07e 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.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-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-06-20 03:58+0000\n"
+"PO-Revision-Date: 2010-06-21 04:07+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-21 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 30704728d7f..4789b08761c 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-06-20 03:57+0000\n"
+"PO-Revision-Date: 2010-06-21 04:06+0000\n"
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-21 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 1999c0d2b4e..0bdc38c3060 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.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-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-06-20 03:54+0000\n"
+"PO-Revision-Date: 2010-06-21 04:07+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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-06-21 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 130d226850c..a329fec7a4c 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.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-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-06-20 03:59+0000\n"
+"PO-Revision-Date: 2010-06-21 04:03+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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-06-21 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 03987aec694..6cde85c8624 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.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-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-06-20 03:56+0000\n"
+"PO-Revision-Date: 2010-06-21 04:05+0000\n"
 "Last-Translator: Eleanor Chen <chenyueg@gmail.com>\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-06-21 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py
index 3a83badd97e..da1fb703880 100644
--- a/bin/addons/base/ir/ir_ui_menu.py
+++ b/bin/addons/base/ir/ir_ui_menu.py
@@ -77,8 +77,8 @@ class ir_ui_menu(osv.osv):
         ids = super(ir_ui_menu, self).search(cr, uid, args, super_offset,
             super_limit, order, context=context, count=super_count)
 
-        if uid == 1:
-            return ids
+        #if uid == 1:
+        #    return ids
 
         if not ids:
             if count:
diff --git a/bin/addons/base/res/ir_property.py b/bin/addons/base/res/ir_property.py
index 462cb433998..8dcd01c4897 100644
--- a/bin/addons/base/res/ir_property.py
+++ b/bin/addons/base/res/ir_property.py
@@ -165,7 +165,7 @@ class ir_property(osv.osv):
 
         return False
 
-    def get(self, cr, uid, name, model, res_id=False, context=None):
+    def get(self, cr, uid, name, model, res_id=False, context={}):
         domain = self._get_domain(cr, uid, name, model, context=context)
         if domain is not None:
             domain = [('res_id', '=', res_id)] + domain
@@ -180,6 +180,7 @@ class ir_property(osv.osv):
         return ['&', ('res_id', '=', False)] + domain
 
     def _get_domain(self, cr, uid, prop_name, model, context=None):
+        context = context or {}
         cr.execute('select id from ir_model_fields where name=%s and model=%s', (prop_name, model))
         res = cr.fetchone()
         if not res:
@@ -189,8 +190,7 @@ class ir_property(osv.osv):
             cid = context['force_company']
         else:
             company = self.pool.get('res.company')
-            cid = company._company_default_get(cr, uid, model, res[0],
-                                           context=context)
+            cid = company._company_default_get(cr, uid, model, res[0], context=context)
 
         domain = ['&', ('fields_id', '=', res[0]),
                   '|', ('company_id', '=', cid), ('company_id', '=', False)]
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 6cad8d1aa81..cc786ac526a 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -393,8 +393,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
-            <field name="domain">[('supplier','=',1)]</field>
-            <field name="context">{'default_customer':0, 'default_supplier':1}</field>
+            <field name="domain">[]</field>
+            <field name="context">{'default_customer':0, 'search_default_supplier': 1, 'default_supplier':1}</field>
             <field name="filter" eval="True"/>
         </record>
 
diff --git a/bin/addons/base/res/res_company_view.xml b/bin/addons/base/res/res_company_view.xml
index 34e58b75b6c..31cb145caa8 100644
--- a/bin/addons/base/res/res_company_view.xml
+++ b/bin/addons/base/res/res_company_view.xml
@@ -66,7 +66,7 @@
         </record>
 
         <menuitem id="menu_custom_multicompany"
-            name="Multi company"
+            name="Multi-Companies"
             parent="base.menu_custom"
             sequence="50"/>