diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 9b18e1f3d24..1f5fcc58ccf 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -156,13 +156,13 @@ class base_action_rule(osv.osv): """ Return a wrapper around `old_create` calling both `old_create` and `_process`, in that order. """ - def create(cr, uid, vals, context=None): + def create(cr, uid, vals, context=None, **kwargs): # avoid loops or cascading actions if context and context.get('action'): return old_create(cr, uid, vals, context=context) context = dict(context or {}, action=True) - new_id = old_create(cr, uid, vals, context=context) + new_id = old_create(cr, uid, vals, context=context, **kwargs) # retrieve the action rules to run on creation action_dom = [('model', '=', model), ('kind', 'in', ['on_create', 'on_create_or_write'])] @@ -180,10 +180,10 @@ class base_action_rule(osv.osv): """ Return a wrapper around `old_write` calling both `old_write` and `_process`, in that order. """ - def write(cr, uid, ids, vals, context=None): + def write(cr, uid, ids, vals, context=None, **kwargs): # avoid loops or cascading actions if context and context.get('action'): - return old_write(cr, uid, ids, vals, context=context) + return old_write(cr, uid, ids, vals, context=context, **kwargs) context = dict(context or {}, action=True) ids = [ids] if isinstance(ids, (int, long, str)) else ids @@ -199,7 +199,7 @@ class base_action_rule(osv.osv): pre_ids[action] = self._filter(cr, uid, action, action.filter_pre_id, ids, context=context) # execute write - old_write(cr, uid, ids, vals, context=context) + old_write(cr, uid, ids, vals, context=context, **kwargs) # check postconditions, and execute actions on the records that satisfy them for action in actions: diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index 955591e8824..546513344bb 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -81,8 +81,7 @@ class base_config_settings(osv.osv_memory): return self.pool.get("res.font").font_scan(cr, uid, context=context) # Preferences wizard for Sales & CRM. -# It is defined here because it is inherited independently in modules sale, crm, -# plugin_outlook and plugin_thunderbird. +# It is defined here because it is inherited independently in modules sale, crm. class sale_config_settings(osv.osv_memory): _name = 'sale.config.settings' _inherit = 'res.config.settings' @@ -91,18 +90,6 @@ class sale_config_settings(osv.osv_memory): help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""), 'module_crm': fields.boolean('CRM'), 'module_sale' : fields.boolean('SALE'), - 'module_plugin_thunderbird': fields.boolean('Enable Thunderbird plug-in', - help='The plugin allows you archive email and its attachments to the selected ' - 'OpenERP objects. You can select a partner, or a lead and ' - 'attach the selected mail as a .eml file in ' - 'the attachment of a selected record. You can create documents for CRM Lead, ' - 'Partner from the selected emails.\n' - '-This installs the module plugin_thunderbird.'), - 'module_plugin_outlook': fields.boolean('Enable Outlook plug-in', - help='The Outlook plugin allows you to select an object that you would like to add ' - 'to your email and its attachments from MS Outlook. You can select a partner, ' - 'or a lead object and archive a selected email into an OpenERP mail message with attachments.\n' - '-This installs the module plugin_outlook.'), 'module_mass_mailing': fields.boolean( 'Manage mass mailing campaigns', help='Get access to statistics with your mass mailing, manage campaigns.'), diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 1ec7aab7d22..b5fa051a9b6 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -159,26 +159,13 @@
-

+

OpenERP allows to automatically create leads (or others documents) 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.

- -
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml index cc7bb6b2e4a..bf586c8b30e 100644 --- a/addons/crm/res_config_view.xml +++ b/addons/crm/res_config_view.xml @@ -33,7 +33,7 @@
- +