diff options
Diffstat (limited to 'addons/base_setup')
| -rw-r--r-- | addons/base_setup/base_setup.py | 2 | ||||
| -rw-r--r-- | addons/base_setup/base_setup_views.xml | 4 | ||||
| -rw-r--r-- | addons/base_setup/res_config_view.xml | 9 |
3 files changed, 5 insertions, 10 deletions
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py index 9c1d7d9fa8e..e8e24969f2a 100644 --- a/addons/base_setup/base_setup.py +++ b/addons/base_setup/base_setup.py @@ -50,7 +50,7 @@ class specify_partner_terminology(osv.osv_memory): def make_translations(self, cr, uid, ids, name, type, src, value, res_id=0, context=None): trans_obj = self.pool.get('ir.translation') user_obj = self.pool.get('res.users') - context_lang = user_obj.browse(cr, uid, uid, context=context).context_lang + context_lang = user_obj.browse(cr, uid, uid, context=context).lang existing_trans_ids = trans_obj.search(cr, uid, [('name','=',name), ('lang','=',context_lang), ('type','=',type), ('src','=',src), ('res_id','=',res_id)]) if existing_trans_ids: trans_obj.write(cr, uid, existing_trans_ids, {'value': value}, context=context) diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml index 0db6c173d9b..e07f576aa41 100644 --- a/addons/base_setup/base_setup_views.xml +++ b/addons/base_setup/base_setup_views.xml @@ -6,9 +6,6 @@ <record id="base.menu_res_company_global" model="ir.ui.menu"> <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/> </record> - <record id="base.menu_users" model="ir.ui.menu"> - <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/> - </record> <record id="base.menu_publisher_warranty" model="ir.ui.menu"> <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/> </record> @@ -17,7 +14,6 @@ <record id="base_setup_terminology_form" model="ir.ui.view"> <field name="name">Specify Your Terminology</field> <field name="model">base.setup.terminology</field> - <field name="type">form</field> <field name="inherit_id" ref="base.res_config_view_base"/> <field name="arch" type="xml"> <data> diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 59841b6988e..fe0fc7d1254 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -5,7 +5,6 @@ <record id="view_general_configuration" model="ir.ui.view"> <field name="name">General Settings</field> <field name="model">base.config.settings</field> - <field name="type">form</field> <field name="arch" type="xml"> <form string="General Settings" version="7.0" class="oe_form_configuration"> <header> @@ -63,7 +62,6 @@ <record id="view_sale_config_settings" model="ir.ui.view"> <field name="name">sale settings</field> <field name="model">sale.config.settings</field> - <field name="type">form</field> <field name="arch" type="xml"> <form string="Configure Sales" version="7.0" class="oe_form_configuration"> <header> @@ -99,9 +97,10 @@ <separator string="Emails Integration" attrs="{'invisible': [('module_crm','=',False)]}"/> <p attrs="{'invisible': [('module_crm','=',False)]}"> OpenERP allows to automatically create leads (or others documents) - from incoming emails. You can synchronize emails with OpenERP - by connecting the mail gateway to your mail server or by manually - pressing buttons in our mail clients. + from incoming emails. You can automatically synchronize emails with OpenERP + using regular POP/IMAP accounts, using a direct email integration script for your + email server, or by manually pushing emails to OpenERP using specific + plugins for your preferred email application. </p> <group name="On Mail Client" attrs="{'invisible': [('module_crm','=',False)]}"> <label for="id" string="On Mail Client"/> |