[MERGE]

bzr revid: mra@mra-laptop-20100623110216-hipmzz62kog03i9r

addons/account/invoice.py

@@ -326,6 +326,19 @@ class account_invoice(osv.osv):
         'user_id': lambda s, cr, u, c: u,
     }
 
+    def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
+        if context.get('active_model','') in ['res.partner']:
+            partner = self.pool.get(context['active_model']).read(cr,uid,context['active_ids'],['supplier','customer'])[0]
+            if not view_type:
+                view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name','=','account.invoice.tree')])[0]
+                view_type = 'tree'
+            if view_type == 'form':
+                if partner['supplier'] and not partner['customer']:
+                    view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name','=','account.invoice.supplier.form')])[0]
+                else:
+                    view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name','=','account.invoice.form')])[0]
+        return super(account_invoice,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
+
     def create(self, cr, uid, vals, context={}):
         try:
             res = super(account_invoice, self).create(cr, uid, vals, context)

addons/base_module_record/base_module_record_wizard.xml

@@ -5,7 +5,8 @@
         <menuitem
             parent="base.menu_custom"
             name="Module Creation"
-            id="menu_wizard_base_mod_rec"/>
+            id="menu_wizard_base_mod_rec"
+            groups="base.group_extended"/>
         
         <wizard
             id="wizard_base_module_record_objects"

addons/multi_company/res_company_view.xml

@@ -68,6 +68,7 @@
         <menuitem id="menu_custom_multicompany"
             name="Multi-Companies"
             parent="base.menu_custom"
+            groups="base.group_extended"
             sequence="50"/>
 
         <menuitem id="menu_action_inventory_form" 

addons/process/process_view.xml

@@ -5,7 +5,8 @@
     <menuitem
         id="menu_process"
         name="Enterprise Processes"
-        parent="base.menu_custom"/>
+        parent="base.menu_custom"
+        groups="base.group_extended"/>
 
     <!-- Views for Process -->
     <record model="ir.ui.view" id="view_process_form">