Odoo Addons (MOVED TO GITHUB)

Merge lp:~serpent-consulting-services/openobject-addons/6.0-addons-886747-SerpentCS into lp:openobject-addons/6.0

  1. 6.0-addons-886747-SerpentCS
  2. Merge into 6.0
Proposed by Serpent Consulting Services
Status: Merged
Merged at revision: 4930
Proposed branch: lp:~serpent-consulting-services/openobject-addons/6.0-addons-886747-SerpentCS
Merge into: lp:openobject-addons/6.0
Diff against target: 24 lines (+3/-0)
2 files modified
base_setup/__init__.py (+1/-0)
base_setup/base_setup_data.xml (+2/-0)
To merge this branch: bzr merge lp:~serpent-consulting-services/openobject-addons/6.0-addons-886747-SerpentCS
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+81398@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'base_setup/__init__.py'
2--- base_setup/__init__.py 2011-01-14 09:34:28 +0000
3+++ base_setup/__init__.py 2011-11-06 12:37:24 +0000
4@@ -59,6 +59,7 @@
5 'installed_users':fields.text('Installed Users', readonly=True),
6 'config_logo' : fields.binary('Image', readonly=True),
7 }
8+ _rec_name = 'installed_users'
9
10 _defaults = {
11 'installed_users':get_users,
12
13=== modified file 'base_setup/base_setup_data.xml'
14--- base_setup/base_setup_data.xml 2011-01-14 00:11:01 +0000
15+++ base_setup/base_setup_data.xml 2011-11-06 12:37:24 +0000
16@@ -36,6 +36,8 @@
17 <field name="type">ir.actions.act_window</field>
18 <field name="view_id" ref="view_base_setup"/>
19 <field name="target">new</field>
20+ <field name="view_type">form</field>
21+ <field name="view_mode">form</field>
22 </record>
23
24 <record id="base.user_root" model="res.users">