diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2008-10-27 15:13:42 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2008-10-27 15:13:42 +0100 |
| commit | 447ff62862355441dc3da57cc8a90beff2712cda (patch) | |
| tree | 5d0c63749714af1ab728ae837d33802c15368b8d | |
| parent | 08933b02004cf1843e5bbf2bdde86e9806c88f0e (diff) | |
modifs
bzr revid: fp@tinyerp.com-20081027141342-loh9lurgm6ae3rvk
| -rw-r--r-- | addons/mrp/mrp_view.xml | 4 | ||||
| -rw-r--r-- | addons/profile_association/profile_association.py | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 1d93353d4bd..47f0eafe6c6 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -709,7 +709,7 @@ <menuitem action="mrp_procurement_action3" id="menu_mrp_procurement_action3" parent="mrp.menu_mrp_procurement_action"/> <record id="mrp_procurement_action5" model="ir.actions.act_window"> - <field name="name">Exceptions procurements</field> + <field name="name">Exceptions Procurements</field> <field name="type">ir.actions.act_window</field> <field name="res_model">mrp.procurement</field> <field name="view_type">form</field> @@ -719,7 +719,7 @@ <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="stock.menu_stock_root"/> <record id="mrp_procurement_action4" model="ir.actions.act_window"> - <field name="name">Exceptions procurements to fix</field> + <field name="name">Exceptions Procurements to Fix</field> <field name="type">ir.actions.act_window</field> <field name="res_model">mrp.procurement</field> <field name="view_type">form</field> diff --git a/addons/profile_association/profile_association.py b/addons/profile_association/profile_association.py index 4012fe583e2..91c1405d049 100644 --- a/addons/profile_association/profile_association.py +++ b/addons/profile_association/profile_association.py @@ -33,11 +33,9 @@ import pooler class profile_association_config_install_modules_wizard(osv.osv_memory): _name='profile.association.config.install_modules_wizard' _columns = { - 'crm_configuration':fields.boolean('CRM & Calendars', help="This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."), 'hr_expense':fields.boolean('Expenses Tracking', help="Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."), 'project':fields.boolean('Project Management'), 'event' : fields.boolean('Events Organisation'), - 'crm' : fields.boolean('Fund Raising'), } def action_cancel(self,cr,uid,ids,conect=None): return { @@ -47,8 +45,6 @@ class profile_association_config_install_modules_wizard(osv.osv_memory): 'type': 'ir.actions.act_window', 'target':'new', } - - def action_install(self, cr, uid, ids, context=None): result=self.read(cr,uid,ids) mod_obj = self.pool.get('ir.module.module') @@ -66,8 +62,6 @@ class profile_association_config_install_modules_wizard(osv.osv_memory): 'type': 'ir.actions.act_window', 'target':'new', } - - profile_association_config_install_modules_wizard() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |