Merge lp:~openerp-dev/openobject-addons/trunk-bug-877136-mdi into lp:openobject-addons

[DJ Patel (OpenERP)]

[Purnendu Singh (OpenERP) (purnendu-singh)]

Hello,

Good work :)

Thanks,
Purnendu

review: Approve

=== modified file 'base_setup/base_setup.py'
--- base_setup/base_setup.py	2011-10-14 13:56:29 +0000
+++ base_setup/base_setup.py	2011-10-21 11:46:27 +0000
@@ -39,7 +39,7 @@
     'Accounting & Finance' : ['account'],
     'Purchase Management' : ['purchase'],
     'Human Resources' : ['hr',],
-    'Point of Sales' : ['pos',],
+    'Point of Sales' : ['point_of_sale',],
     'Marketing' : ['marketing',],
 }
 
@@ -58,7 +58,7 @@
         if fields is None:
             fields = {}
 
-        fields = {} 
+        fields = {}
         category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
                   ('name', '!=', 'Uncategorized'),
@@ -389,14 +389,14 @@
                                   ('extended','Extended')],
                                  'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences." ),
         'menu_tips': fields.boolean('Display Tips', help="Check out this box if you want to always display tips on each menu action"),
-                                 
+
     }
     _defaults={
                'view' : lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
                'context_lang' : 'en_US',
                'menu_tips' : True
     }
-    
+
     def default_get(self, cr, uid, fields, context=None):
         if context is None:
             context = {}