diff options
| author | nch@tinyerp.com <> | 2010-05-06 10:02:02 +0530 |
|---|---|---|
| committer | nch@tinyerp.com <> | 2010-05-06 10:02:02 +0530 |
| commit | e0cd0d82d58b4078dc84db79307e9d4d9b45b417 (patch) | |
| tree | 5045f9b3cb93ab60795554e548da4eb6805ab506 /addons/base_setup | |
| parent | 3ea5f3c82d9279e7aff2f07764f52eef1e0d200f (diff) | |
| parent | dd19eeef1f40a86416d38554934e37467311a649 (diff) | |
[MERGE]
bzr revid: nch@tinyerp.com-20100506043202-2ttxk3mwvacmge65
Diffstat (limited to 'addons/base_setup')
| -rw-r--r-- | addons/base_setup/base_setup_installer.xml | 1 | ||||
| -rw-r--r-- | addons/base_setup/gtk_contact_form.py | 2 | ||||
| -rw-r--r-- | addons/base_setup/gtk_contact_form.xml | 4 | ||||
| -rw-r--r-- | addons/base_setup/installer.py | 4 |
4 files changed, 2 insertions, 9 deletions
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index 03d64eaa16e..155e934de5f 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -33,7 +33,6 @@ If you don't think you need any of these right now, you can easily install them <field name="report_designer" groups="base.group_extended"/> <separator string="Install Specific Business Modules" colspan="4"/> <field name="profile_association"/> - <field name="profile_training"/> <field name="profile_auction"/> <field name="profile_bookstore"/> </group> diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py index 25324050d8e..112d66d2919 100644 --- a/addons/base_setup/gtk_contact_form.py +++ b/addons/base_setup/gtk_contact_form.py @@ -69,7 +69,7 @@ class base_gtkcontactform(osv.osv_memory): 'other':fields.boolean('Other'), 'ebook':fields.boolean('ebook'), 'updates':fields.boolean('updates'), - 'note':fields.text('Note'), + #'note':fields.text('Note'), } def execute(self, cr, uid, ids, context=None): company_id = self.pool.get('base.setup.company').search(cr, uid, []) diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml index ffae67adcf5..ab0c2dfe8ab 100644 --- a/addons/base_setup/gtk_contact_form.xml +++ b/addons/base_setup/gtk_contact_form.xml @@ -18,7 +18,7 @@ <attribute name='colspan'>4</attribute> </xpath> <xpath expr='//separator[@string="vsep"]' position='attributes'> - <attribute name='rowspan'>27</attribute> + <attribute name='rowspan'>24</attribute> <attribute name='string'></attribute> </xpath> <group string="res_config_contents" position="replace"> @@ -47,8 +47,6 @@ <field name="support" colspan="1"/> <field name="training" colspan="1"/> <field name="other" colspan="1"/> - <separator colspan="4" string="Notes"/> - <field name="note" colspan="4" nolabel="1"/> </group> <group colspan="2"> <separator colspan="4" string="Do You Need Them ?"/> diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index 1fb4a971107..e38e2009e75 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -78,10 +78,6 @@ class base_setup_installer(osv.osv_memory): help="Installs a preselected set of OpenERP " "applications which will help you manage your association " "more efficiently."), - 'profile_training':fields.boolean('Training Centers', - help="Helps you manage your training sessions and " - "centers, from the conception of a training project to the " - "gathering of trainee feedback."), 'profile_auction':fields.boolean('Auction Houses', help="Installs a preselected set of OpenERP " "applications selected to help you manage your auctions " |