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

Proposed by DJ Patel (OpenERP)
Status: Merged
Merged at revision: 5455
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-877136-mdi
Merge into: lp:openobject-addons
Diff against target: 38 lines (+4/-4)
1 file modified
base_setup/base_setup.py (+4/-4)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-877136-mdi
Reviewer Review Type Date Requested Status
Purnendu Singh (OpenERP) (community) Approve
qdp (OpenERP) Pending
OpenERP Core Team Pending
Review via email: mp+80052@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Purnendu Singh (OpenERP) (purnendu-singh) wrote :

Hello,

Good work :)

Thanks,
Purnendu

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'base_setup/base_setup.py'
2--- base_setup/base_setup.py 2011-10-14 13:56:29 +0000
3+++ base_setup/base_setup.py 2011-10-21 11:46:27 +0000
4@@ -39,7 +39,7 @@
5 'Accounting & Finance' : ['account'],
6 'Purchase Management' : ['purchase'],
7 'Human Resources' : ['hr',],
8- 'Point of Sales' : ['pos',],
9+ 'Point of Sales' : ['point_of_sale',],
10 'Marketing' : ['marketing',],
11 }
12
13@@ -58,7 +58,7 @@
14 if fields is None:
15 fields = {}
16
17- fields = {}
18+ fields = {}
19 category_proxy = self.pool.get('ir.module.category')
20 domain = [('parent_id', '=', False),
21 ('name', '!=', 'Uncategorized'),
22@@ -389,14 +389,14 @@
23 ('extended','Extended')],
24 '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." ),
25 'menu_tips': fields.boolean('Display Tips', help="Check out this box if you want to always display tips on each menu action"),
26-
27+
28 }
29 _defaults={
30 'view' : lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
31 'context_lang' : 'en_US',
32 'menu_tips' : True
33 }
34-
35+
36 def default_get(self, cr, uid, fields, context=None):
37 if context is None:
38 context = {}

Subscribers

People subscribed via source and target branches

to all changes: