diff options
| author | DBR (OpenERP) <dbr@tinyerp.com> | 2012-07-02 15:19:00 +0530 |
|---|---|---|
| committer | DBR (OpenERP) <dbr@tinyerp.com> | 2012-07-02 15:19:00 +0530 |
| commit | 3c162d0575e9ee1da88e4bb8e4c500aed0a3c27a (patch) | |
| tree | 45f1925c2eac86da0904823a761a644bf77fc0cb /addons/base_setup | |
| parent | 34636c3d4b27f7ba4923a3895f5d7aa5565ce256 (diff) | |
| parent | 9c9141cc65892d2fc28f0b26bbd2acd40fff69c4 (diff) | |
[Merge]with: lp:openobject-addons
bzr revid: dbr@tinyerp.com-20120702094900-x21fcj4p1yn2tjs8
Diffstat (limited to 'addons/base_setup')
| -rw-r--r-- | addons/base_setup/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/base_setup/base_setup_views.xml | 4 | ||||
| -rw-r--r-- | addons/base_setup/res_config.py | 3 | ||||
| -rw-r--r-- | addons/base_setup/res_config_view.xml | 10 |
4 files changed, 11 insertions, 8 deletions
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py index 9e2be5976f6..35505ea853f 100644 --- a/addons/base_setup/__openerp__.py +++ b/addons/base_setup/__openerp__.py @@ -38,7 +38,7 @@ Shows you a list of applications features to install from. 'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml', 'res_config_view.xml'], 'demo_xml': [], 'installable': True, - 'auto_install': True, + 'auto_install': False, 'certificate': '0086711085869', 'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',], } diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml index eb59d918681..8be9aa0e2e3 100644 --- a/addons/base_setup/base_setup_views.xml +++ b/addons/base_setup/base_setup_views.xml @@ -24,8 +24,8 @@ <attribute name="string">Specify Your Terminology</attribute> </form> <group string="res_config_contents" position="replace"> - <label string="You can use this wizard to change the terminologies for customers in the whole application."/> - <separator string="Specify Your Terminology"/> + <label string="You can use this wizard to change the terminologies for customers in the whole application."/> + <separator string="Specify Your Terminology"/> <group colspan="4"> <field colspan="4" name="partner"/> </group> diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index f6fdcefe8fe..6a73eb786ea 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -43,7 +43,8 @@ class base_config_settings(osv.osv_memory): 'view_mode': 'form', 'res_model': 'res.company', 'res_id': user.company_id.id, - } + 'target': 'current', + } # Preferences wizard for Sales & CRM. # It is defined here because it is inherited independently in modules sale, crm, diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 93523f06746..85a20bddf52 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -8,8 +8,9 @@ <field name="arch" type="xml"> <form string="General Settings" version="7.0"> <header> - <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/> - <button string="Cancel" type="object" name="cancel"/> + <button string="Apply" type="object" name="execute" class="oe_highlight"/> + or + <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> <sheet> <group string="Company Settings"> @@ -55,8 +56,9 @@ <field name="arch" type="xml"> <form string="Configure Sales" version="7.0"> <header> - <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/> - <button string="Cancel" type="object" name="cancel"/> + <button string="Apply" type="object" name="execute" class="oe_highlight"/> + or + <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> <sheet> <field name="module_crm" invisible="1"/> |