diff --git a/.tx/config b/.tx/config
index 49e5dfff215..0455f8de589 100644
--- a/.tx/config
+++ b/.tx/config
@@ -107,9 +107,9 @@ file_filter = addons/barcodes/i18n/<lang>.po
 source_file = addons/barcodes/i18n/barcodes.pot
 source_lang = en
 
-[odoo-master.base_action_rule]
-file_filter = addons/base_action_rule/i18n/<lang>.po
-source_file = addons/base_action_rule/i18n/base_action_rule.pot
+[odoo-master.base_automation]
+file_filter = addons/base_automation/i18n/<lang>.po
+source_file = addons/base_automation/i18n/base_automation.pot
 source_lang = en
 
 [odoo-master.base_gengo]
diff --git a/addons/account_asset/data/account_asset_data.xml b/addons/account_asset/data/account_asset_data.xml
index f858fbb2237..3f9a28987df 100644
--- a/addons/account_asset/data/account_asset_data.xml
+++ b/addons/account_asset/data/account_asset_data.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding='UTF-8'?>
 <odoo>
-	<record model="ir.cron" id="account_asset_cron">
-        <field name="name">Generate Asset Entries</field>
+	<record id="account_asset_cron" model="ir.cron">
+        <field name="name">Account Asset: Generate asset entries</field>
+        <field name="model_id" ref="model_account_asset_asset"/>
+        <field name="state">code</field>
+        <field name="code">model._cron_generate_entries()</field>
         <field name="interval_number">1</field>
         <field name="interval_type">months</field>
         <field name="numbercall">-1</field>
         <field name="doall" eval="False"/>
-        <field name="model" eval="'account.asset.asset'"/>
-        <field name="function" eval="'_cron_generate_entries'"/>
-        <field name="args" eval="'()'" />
     </record>
 </odoo>
\ No newline at end of file
diff --git a/addons/base_action_rule/data/base_action_rule_demo.xml b/addons/base_action_rule/data/base_action_rule_demo.xml
deleted file mode 100644
index d59b7ba45ff..00000000000
--- a/addons/base_action_rule/data/base_action_rule_demo.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-        <record id="test_filter_draft" model="ir.filters">
-            <field name="name">Test lead in state 'draft'</field>
-            <field name="model_id">base.action.rule.lead.test</field>
-            <field name="domain">[('state', '=', 'draft')]</field>
-        </record>
-
-        <record id="test_filter_open" model="ir.filters">
-            <field name="name">Test lead in state 'open'</field>
-            <field name="model_id">base.action.rule.lead.test</field>
-            <field name="domain">[('state', '=', 'open')]</field>
-        </record>
-
-        <record id="test_filter_done" model="ir.filters">
-            <field name="name">Test lead in state 'done'</field>
-            <field name="model_id">base.action.rule.lead.test</field>
-            <field name="domain">[('state', '=', 'done')]</field>
-        </record>
-
-        <record id="test_rule_on_create" model="base.action.rule">
-            <field name="name">Test rule on create</field>
-            <field name="kind">on_create</field>
-            <field name="model_id" ref="base_action_rule.model_base_action_rule_lead_test"/>
-            <field name="act_user_id" ref="base.user_demo"/>
-            <field name="filter_id" ref="test_filter_draft"/>
-        </record>
-
-        <record id="test_rule_on_write" model="base.action.rule">
-            <field name="name">Test rule on write</field>
-            <field name="kind">on_write</field>
-            <field name="model_id" ref="base_action_rule.model_base_action_rule_lead_test"/>
-            <field name="act_user_id" ref="base.user_demo"/>
-            <field name="filter_pre_id" ref="test_filter_open"/>
-            <field name="filter_id" ref="test_filter_done"/>
-        </record>
-
-        <record id="test_rule_on_recompute" model="base.action.rule">
-            <field name="name">Test rule on recompute</field>
-            <field name="kind">on_write</field>
-            <field name="model_id" ref="base_action_rule.model_base_action_rule_lead_test"/>
-            <field name="act_user_id" ref="base.user_demo"/>
-            <field name="filter_domain">[('customer', '=', True)]</field>
-        </record>
-
-        <record id="test_rule_on_line" model="base.action.rule">
-            <field name="name">Test rule on secondary record</field>
-            <field name="kind">on_create</field>
-            <field name="model_id" ref="base_action_rule.model_base_action_rule_line_test"/>
-            <field name="act_user_id" ref="base.user_demo"/>
-        </record>
-</odoo>
diff --git a/addons/base_action_rule/security/ir.model.access.csv b/addons/base_action_rule/security/ir.model.access.csv
deleted file mode 100644
index cec3f676e0b..00000000000
--- a/addons/base_action_rule/security/ir.model.access.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_base_action_rule,base.action.rule,model_base_action_rule,,1,0,0,0
-access_base_action_rule_config,base.action.rule config,model_base_action_rule,base.group_system,1,1,1,1
-access_base_action_rule_lead_test,access_base_action_rule_lead_test,model_base_action_rule_lead_test,base.group_system,1,1,1,1
-access_base_action_rule_line_test,access_base_action_rule_line_test,model_base_action_rule_line_test,base.group_system,1,1,1,1
diff --git a/addons/base_action_rule/views/base_action_rule_view.xml b/addons/base_action_rule/views/base_action_rule_view.xml
deleted file mode 100644
index 8418c07b632..00000000000
--- a/addons/base_action_rule/views/base_action_rule_view.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-        <!-- Action Rule Form View -->
-        <record id="view_base_action_rule_form" model="ir.ui.view">
-            <field name="name">base.action.rule.form</field>
-            <field name="model">base.action.rule</field>
-            <field name="arch" type="xml">
-                <form string="Action Rule">
-                    <sheet>
-                        <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
-                        <group>
-                            <group>
-                                <field name="model_id"/>
-                                <field name="model" invisible="1"/>
-                            </group>
-                            <group>
-                                <field name="active"/>
-                                <field name="sequence"/>
-                            </group>
-                        </group>
-                        <notebook>
-                            <page string="Conditions">
-                                <group attrs="{'invisible': [('model', '!=', False)]}">
-                                    <p><b>Please choose the document type before setting the conditions.</b></p>
-                                </group>
-                                <group attrs="{'invisible': [('model', '=', False)]}">
-                                    <field name="kind"/>
-                                    <label for="filter_pre_id" attrs="{'invisible': [('kind', '!=', 'on_write')]}"/>
-                                    <div attrs="{'invisible': [('kind', '!=', 'on_write')]}">
-                                        <field name="filter_pre_domain" widget="domain" options="{'model': 'model'}"
-                                            class="o_row"/>
-                                        <div class="oe_edit_only o_row">Set selection based on a search filter:
-                                            <field name="filter_pre_id" domain="[('model_id', '=', model), '|', ('user_id', '=', uid), ('user_id', '=', False)]"
-                                                class="o_row" context="{'default_model_id': model, 'default_active': False, 'active_test': False}"/></div>
-                                    </div>
-                                    <label for="filter_id"/>
-                                    <div>
-                                        <field name="filter_domain" widget="domain" options="{'model': 'model'}"
-                                            class="o_row"/>
-                                        <div class="oe_edit_only o_row">Set selection based on a search filter:
-                                            <field name="filter_id" domain="[('model_id', '=', model), '|', ('user_id', '=', uid), ('user_id', '=', False)]"
-                                                class="o_row" context="{'default_model_id': model, 'default_active': False, 'active_test': False}"/>
-                                        </div>
-                                    </div>
-                                    <field name="on_change_fields"
-                                        attrs="{'invisible': [('kind', '!=', 'on_change')], 'required': [('kind', '=', 'on_change')]}"/>
-                                    <field name="trg_date_id"
-                                        attrs="{'invisible': [('kind', '!=', 'on_time')], 'required': [('kind', '=', 'on_time')]}"/>
-                                    <label for="trg_date_range" string="Delay After Trigger Date"
-                                        attrs="{'invisible': [('trg_date_id','=',False)]}"/>
-                                    <div attrs="{'invisible': [('trg_date_id','=',False)]}">
-                                        <field name="trg_date_range" class="o_row"/>
-                                        <field name="trg_date_range_type" class="o_row" attrs="{'required': [('trg_date_id','!=',False)]}"/>
-                                    </div>
-                                    <field name="trg_date_calendar_id" class="o_row"
-                                        attrs="{'invisible': ['|', ('trg_date_id','=',False), ('trg_date_range_type', '!=', 'day')]}"/>
-                                </group>
-                                <div attrs="{'invisible': [('model', '=', False)]}">
-                                    <p>Select when the action must be run, and choose records and/or timing conditions.</p>
-                                    <p groups="base.group_no_one">You may also use filters instead of choosing records. In order to create a new filter:</p>
-                                    <ul groups="base.group_no_one">
-                                        <li>Go to your "Related Document Model" page and set the filter parameters in the "Search" view (Example of filter based on Leads/Opportunities: Creation Date "is equal to" 01/01/2012)</li>
-                                        <li>In this same "Search" view, select the menu "Save Current Filter", enter the name (Ex: Create the 01/01/2012) and add the option "Share with all users"</li>
-                                    </ul>
-                                </div>
-                            </page>
-                            <page string="Actions">
-                                <group name="action_field" col="4" string="Fields to Change">
-                                    <field name="act_user_id"/>
-                                    <field name="act_followers" widget="many2many_tags"/>
-                                </group>
-                                <group name="action_server" string="Server actions to run">
-                                    <field name="server_action_ids" domain="[('model_id','=', model_id)]" nolabel="1" context="{'default_model_id': model_id}">
-                                        <tree string="Server Actions">
-                                            <field name="sequence"/>
-                                            <field name="name"/>
-                                            <field name="state"/>
-                                        </tree>
-                                    </field>
-                                </group>
-                           </page>
-                       </notebook>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <!-- Action Rule Tree View -->
-        <record id="view_base_action_rule_tree" model="ir.ui.view">
-            <field name="name">base.action.rule.tree</field>
-            <field name="model">base.action.rule</field>
-            <field name="arch" type="xml">
-                <tree string="Action Rule">
-                    <field name="sequence"/>
-                    <field name="name"/>
-                    <field name="kind"/>
-                    <field name="model_id"/>
-                    <field name="filter_id"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_base_action_rule_search" model="ir.ui.view">
-            <field name="name">base.action.rule.search</field>
-            <field name="model">base.action.rule</field>
-            <field name="arch" type="xml">
-                <search>
-                    <field name="name"/>
-                    <field name="model_id"/>
-                </search>
-            </field>
-        </record>
-
-        <!-- Action Rule Action -->
-        <record id="base_action_rule_act" model="ir.actions.act_window">
-            <field name="name">Automated Actions</field>
-            <field name="res_model">base.action.rule</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_base_action_rule_tree"/>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to setup a new automated action rule. 
-              </p><p>
-                Use automated actions to automatically trigger actions for
-                various screens. Example: a lead created by a specific user may
-                be automatically set to a specific sales channel, or an
-                opportunity which still has status pending after 14 days might
-                trigger an automatic reminder email.
-              </p>
-            </field>
-        </record>
-
-        <menuitem id="menu_base_action_rule_form"
-            parent="base.menu_automation" action="base_action_rule_act" sequence="1"/>
-
-</odoo>
diff --git a/addons/base_action_rule/__init__.py b/addons/base_automation/__init__.py
similarity index 100%
rename from addons/base_action_rule/__init__.py
rename to addons/base_automation/__init__.py
diff --git a/addons/base_action_rule/__manifest__.py b/addons/base_automation/__manifest__.py
similarity index 85%
rename from addons/base_action_rule/__manifest__.py
rename to addons/base_automation/__manifest__.py
index 5452547618e..82d32552ecb 100644
--- a/addons/base_action_rule/__manifest__.py
+++ b/addons/base_automation/__manifest__.py
@@ -18,10 +18,10 @@ trigger an automatic reminder email.
     'depends': ['base', 'resource', 'mail'],
     'data': [
         'security/ir.model.access.csv',
-        'data/base_action_rule_data.xml',
-        'views/base_action_rule_view.xml',
+        'data/base_automation_data.xml',
+        'views/base_automation_view.xml',
     ],
     'demo': [
-        'data/base_action_rule_demo.xml',
+        'data/base_automation_demo.xml',
     ],
 }
diff --git a/addons/base_action_rule/data/base_action_rule_data.xml b/addons/base_automation/data/base_automation_data.xml
similarity index 53%
rename from addons/base_action_rule/data/base_action_rule_data.xml
rename to addons/base_automation/data/base_automation_data.xml
index afcc01447a4..2cf13f4617e 100644
--- a/addons/base_action_rule/data/base_action_rule_data.xml
+++ b/addons/base_automation/data/base_automation_data.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-
-        <record id="ir_cron_crm_action" model="ir.cron">
-            <field name="name">Check Action Rules</field>
+        <record id="ir_cron_data_base_automation_check" model="ir.cron">
+            <field name="name">Base Action Rule: check and execute</field>
+            <field name="model_id" ref="model_base_automation"/>
+            <field name="state">code</field>
+            <field name="code">model._check(True)</field>
             <field name="interval_number">4</field>
             <field name="interval_type">hours</field>
             <field name="numbercall">-1</field>
             <field name="doall" eval="False"/>
-            <field name="model" eval="'base.action.rule'"/>
-            <field name="function" eval="'_check'"/>
-            <field name="args" eval="'(True,)'"/>
             <field name="active" eval="False" />
         </record>
-
     </data>
 </odoo>
diff --git a/addons/base_automation/data/base_automation_demo.xml b/addons/base_automation/data/base_automation_demo.xml
new file mode 100644
index 00000000000..a4014a64c3e
--- /dev/null
+++ b/addons/base_automation/data/base_automation_demo.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+        <record id="test_filter_draft" model="ir.filters">
+            <field name="name">Test lead in state 'draft'</field>
+            <field name="model_id">base.automation.lead.test</field>
+            <field name="domain">[('state', '=', 'draft')]</field>
+        </record>
+
+        <record id="test_filter_open" model="ir.filters">
+            <field name="name">Test lead in state 'open'</field>
+            <field name="model_id">base.automation.lead.test</field>
+            <field name="domain">[('state', '=', 'open')]</field>
+        </record>
+
+        <record id="test_filter_done" model="ir.filters">
+            <field name="name">Test lead in state 'done'</field>
+            <field name="model_id">base.automation.lead.test</field>
+            <field name="domain">[('state', '=', 'done')]</field>
+        </record>
+
+        <record id="test_rule_on_create" model="base.automation">
+            <field name="name">Base Automation: test rule on create</field>
+            <field name="model_id" ref="base_automation.model_base_automation_lead_test"/>
+            <field name="state">code</field>
+            <field name="code" eval="'records.write({\'user_id\': %s})' % ref('base.user_demo')"/>
+            <field name="trigger">on_create</field>
+            <field name="active" eval="True"/>
+            <field name="model_id" ref="base_automation.model_base_automation_lead_test"/>
+            <field name="filter_id" ref="test_filter_draft"/>
+        </record>
+
+        <record id="test_rule_on_write" model="base.automation">
+            <field name="name">Base Automation: test rule on write</field>
+            <field name="model_id" ref="base_automation.model_base_automation_lead_test"/>
+            <field name="state">code</field>
+            <field name="code" eval="'records.write({\'user_id\': %s})' % ref('base.user_demo')"/>
+            <field name="trigger">on_write</field>
+            <field name="active" eval="True"/>
+            <field name="model_id" ref="base_automation.model_base_automation_lead_test"/>
+            <field name="filter_pre_id" ref="test_filter_open"/>
+            <field name="filter_id" ref="test_filter_done"/>
+        </record>
+
+        <record id="test_rule_on_recompute" model="base.automation">
+            <field name="name">Base Automation: test rule on recompute</field>
+            <field name="model_id" ref="base_automation.model_base_automation_lead_test"/>
+            <field name="state">code</field>
+            <field name="code" eval="'records.write({\'user_id\': %s})' % ref('base.user_demo')"/>
+            <field name="trigger">on_write</field>
+            <field name="active" eval="True"/>
+            <field name="model_id" ref="base_automation.model_base_automation_lead_test"/>
+            <field name="filter_domain">[('customer', '=', True)]</field>
+        </record>
+
+        <record id="test_rule_on_line" model="base.automation">
+            <field name="name">Base Automation: test rule on secondary model</field>
+            <field name="model_id" ref="base_automation.model_base_automation_line_test"/>
+            <field name="state">code</field>
+            <field name="code" eval="'records.write({\'user_id\': %s})' % ref('base.user_demo')"/>
+            <field name="trigger">on_create</field>
+            <field name="active" eval="True"/>
+            <field name="model_id" ref="base_automation.model_base_automation_line_test"/>
+        </record>
+</odoo>
diff --git a/addons/base_action_rule/i18n/af.po b/addons/base_automation/i18n/af.po
similarity index 100%
rename from addons/base_action_rule/i18n/af.po
rename to addons/base_automation/i18n/af.po
diff --git a/addons/base_action_rule/i18n/ar.po b/addons/base_automation/i18n/ar.po
similarity index 100%
rename from addons/base_action_rule/i18n/ar.po
rename to addons/base_automation/i18n/ar.po
diff --git a/addons/base_action_rule/i18n/base_action_rule.pot b/addons/base_automation/i18n/base_automation.pot
similarity index 100%
rename from addons/base_action_rule/i18n/base_action_rule.pot
rename to addons/base_automation/i18n/base_automation.pot
diff --git a/addons/base_action_rule/i18n/bg.po b/addons/base_automation/i18n/bg.po
similarity index 100%
rename from addons/base_action_rule/i18n/bg.po
rename to addons/base_automation/i18n/bg.po
diff --git a/addons/base_action_rule/i18n/bs.po b/addons/base_automation/i18n/bs.po
similarity index 100%
rename from addons/base_action_rule/i18n/bs.po
rename to addons/base_automation/i18n/bs.po
diff --git a/addons/base_action_rule/i18n/ca.po b/addons/base_automation/i18n/ca.po
similarity index 100%
rename from addons/base_action_rule/i18n/ca.po
rename to addons/base_automation/i18n/ca.po
diff --git a/addons/base_action_rule/i18n/cs.po b/addons/base_automation/i18n/cs.po
similarity index 100%
rename from addons/base_action_rule/i18n/cs.po
rename to addons/base_automation/i18n/cs.po
diff --git a/addons/base_action_rule/i18n/da.po b/addons/base_automation/i18n/da.po
similarity index 100%
rename from addons/base_action_rule/i18n/da.po
rename to addons/base_automation/i18n/da.po
diff --git a/addons/base_action_rule/i18n/de.po b/addons/base_automation/i18n/de.po
similarity index 100%
rename from addons/base_action_rule/i18n/de.po
rename to addons/base_automation/i18n/de.po
diff --git a/addons/base_action_rule/i18n/el.po b/addons/base_automation/i18n/el.po
similarity index 100%
rename from addons/base_action_rule/i18n/el.po
rename to addons/base_automation/i18n/el.po
diff --git a/addons/base_action_rule/i18n/en_AU.po b/addons/base_automation/i18n/en_AU.po
similarity index 100%
rename from addons/base_action_rule/i18n/en_AU.po
rename to addons/base_automation/i18n/en_AU.po
diff --git a/addons/base_action_rule/i18n/en_GB.po b/addons/base_automation/i18n/en_GB.po
similarity index 100%
rename from addons/base_action_rule/i18n/en_GB.po
rename to addons/base_automation/i18n/en_GB.po
diff --git a/addons/base_action_rule/i18n/es.po b/addons/base_automation/i18n/es.po
similarity index 100%
rename from addons/base_action_rule/i18n/es.po
rename to addons/base_automation/i18n/es.po
diff --git a/addons/base_action_rule/i18n/es_AR.po b/addons/base_automation/i18n/es_AR.po
similarity index 100%
rename from addons/base_action_rule/i18n/es_AR.po
rename to addons/base_automation/i18n/es_AR.po
diff --git a/addons/base_action_rule/i18n/es_BO.po b/addons/base_automation/i18n/es_BO.po
similarity index 100%
rename from addons/base_action_rule/i18n/es_BO.po
rename to addons/base_automation/i18n/es_BO.po
diff --git a/addons/base_action_rule/i18n/es_CL.po b/addons/base_automation/i18n/es_CL.po
similarity index 100%
rename from addons/base_action_rule/i18n/es_CL.po
rename to addons/base_automation/i18n/es_CL.po
diff --git a/addons/base_action_rule/i18n/es_CO.po b/addons/base_automation/i18n/es_CO.po
similarity index 100%
rename from addons/base_action_rule/i18n/es_CO.po
rename to addons/base_automation/i18n/es_CO.po
diff --git a/addons/base_action_rule/i18n/es_CR.po b/addons/base_automation/i18n/es_CR.po
similarity index 100%
rename from addons/base_action_rule/i18n/es_CR.po
rename to addons/base_automation/i18n/es_CR.po
diff --git a/addons/base_action_rule/i18n/es_DO.po b/addons/base_automation/i18n/es_DO.po
similarity index 100%
rename from addons/base_action_rule/i18n/es_DO.po
rename to addons/base_automation/i18n/es_DO.po
diff --git a/addons/base_action_rule/i18n/es_EC.po b/addons/base_automation/i18n/es_EC.po
similarity index 100%
rename from addons/base_action_rule/i18n/es_EC.po
rename to addons/base_automation/i18n/es_EC.po
diff --git a/addons/base_action_rule/i18n/es_PE.po b/addons/base_automation/i18n/es_PE.po
similarity index 100%
rename from addons/base_action_rule/i18n/es_PE.po
rename to addons/base_automation/i18n/es_PE.po
diff --git a/addons/base_action_rule/i18n/es_PY.po b/addons/base_automation/i18n/es_PY.po
similarity index 100%
rename from addons/base_action_rule/i18n/es_PY.po
rename to addons/base_automation/i18n/es_PY.po
diff --git a/addons/base_action_rule/i18n/es_VE.po b/addons/base_automation/i18n/es_VE.po
similarity index 100%
rename from addons/base_action_rule/i18n/es_VE.po
rename to addons/base_automation/i18n/es_VE.po
diff --git a/addons/base_action_rule/i18n/et.po b/addons/base_automation/i18n/et.po
similarity index 100%
rename from addons/base_action_rule/i18n/et.po
rename to addons/base_automation/i18n/et.po
diff --git a/addons/base_action_rule/i18n/eu.po b/addons/base_automation/i18n/eu.po
similarity index 100%
rename from addons/base_action_rule/i18n/eu.po
rename to addons/base_automation/i18n/eu.po
diff --git a/addons/base_action_rule/i18n/fa.po b/addons/base_automation/i18n/fa.po
similarity index 100%
rename from addons/base_action_rule/i18n/fa.po
rename to addons/base_automation/i18n/fa.po
diff --git a/addons/base_action_rule/i18n/fi.po b/addons/base_automation/i18n/fi.po
similarity index 100%
rename from addons/base_action_rule/i18n/fi.po
rename to addons/base_automation/i18n/fi.po
diff --git a/addons/base_action_rule/i18n/fo.po b/addons/base_automation/i18n/fo.po
similarity index 100%
rename from addons/base_action_rule/i18n/fo.po
rename to addons/base_automation/i18n/fo.po
diff --git a/addons/base_action_rule/i18n/fr.po b/addons/base_automation/i18n/fr.po
similarity index 100%
rename from addons/base_action_rule/i18n/fr.po
rename to addons/base_automation/i18n/fr.po
diff --git a/addons/base_action_rule/i18n/fr_BE.po b/addons/base_automation/i18n/fr_BE.po
similarity index 100%
rename from addons/base_action_rule/i18n/fr_BE.po
rename to addons/base_automation/i18n/fr_BE.po
diff --git a/addons/base_action_rule/i18n/fr_CA.po b/addons/base_automation/i18n/fr_CA.po
similarity index 100%
rename from addons/base_action_rule/i18n/fr_CA.po
rename to addons/base_automation/i18n/fr_CA.po
diff --git a/addons/base_action_rule/i18n/gl.po b/addons/base_automation/i18n/gl.po
similarity index 100%
rename from addons/base_action_rule/i18n/gl.po
rename to addons/base_automation/i18n/gl.po
diff --git a/addons/base_action_rule/i18n/gu.po b/addons/base_automation/i18n/gu.po
similarity index 100%
rename from addons/base_action_rule/i18n/gu.po
rename to addons/base_automation/i18n/gu.po
diff --git a/addons/base_action_rule/i18n/he.po b/addons/base_automation/i18n/he.po
similarity index 100%
rename from addons/base_action_rule/i18n/he.po
rename to addons/base_automation/i18n/he.po
diff --git a/addons/base_action_rule/i18n/hi.po b/addons/base_automation/i18n/hi.po
similarity index 100%
rename from addons/base_action_rule/i18n/hi.po
rename to addons/base_automation/i18n/hi.po
diff --git a/addons/base_action_rule/i18n/hr.po b/addons/base_automation/i18n/hr.po
similarity index 100%
rename from addons/base_action_rule/i18n/hr.po
rename to addons/base_automation/i18n/hr.po
diff --git a/addons/base_action_rule/i18n/hu.po b/addons/base_automation/i18n/hu.po
similarity index 100%
rename from addons/base_action_rule/i18n/hu.po
rename to addons/base_automation/i18n/hu.po
diff --git a/addons/base_action_rule/i18n/id.po b/addons/base_automation/i18n/id.po
similarity index 100%
rename from addons/base_action_rule/i18n/id.po
rename to addons/base_automation/i18n/id.po
diff --git a/addons/base_action_rule/i18n/it.po b/addons/base_automation/i18n/it.po
similarity index 100%
rename from addons/base_action_rule/i18n/it.po
rename to addons/base_automation/i18n/it.po
diff --git a/addons/base_action_rule/i18n/ja.po b/addons/base_automation/i18n/ja.po
similarity index 100%
rename from addons/base_action_rule/i18n/ja.po
rename to addons/base_automation/i18n/ja.po
diff --git a/addons/base_action_rule/i18n/ka.po b/addons/base_automation/i18n/ka.po
similarity index 100%
rename from addons/base_action_rule/i18n/ka.po
rename to addons/base_automation/i18n/ka.po
diff --git a/addons/base_action_rule/i18n/kab.po b/addons/base_automation/i18n/kab.po
similarity index 100%
rename from addons/base_action_rule/i18n/kab.po
rename to addons/base_automation/i18n/kab.po
diff --git a/addons/base_action_rule/i18n/kk.po b/addons/base_automation/i18n/kk.po
similarity index 100%
rename from addons/base_action_rule/i18n/kk.po
rename to addons/base_automation/i18n/kk.po
diff --git a/addons/base_action_rule/i18n/ko.po b/addons/base_automation/i18n/ko.po
similarity index 100%
rename from addons/base_action_rule/i18n/ko.po
rename to addons/base_automation/i18n/ko.po
diff --git a/addons/base_action_rule/i18n/lt.po b/addons/base_automation/i18n/lt.po
similarity index 100%
rename from addons/base_action_rule/i18n/lt.po
rename to addons/base_automation/i18n/lt.po
diff --git a/addons/base_action_rule/i18n/lv.po b/addons/base_automation/i18n/lv.po
similarity index 100%
rename from addons/base_action_rule/i18n/lv.po
rename to addons/base_automation/i18n/lv.po
diff --git a/addons/base_action_rule/i18n/mk.po b/addons/base_automation/i18n/mk.po
similarity index 100%
rename from addons/base_action_rule/i18n/mk.po
rename to addons/base_automation/i18n/mk.po
diff --git a/addons/base_action_rule/i18n/mn.po b/addons/base_automation/i18n/mn.po
similarity index 100%
rename from addons/base_action_rule/i18n/mn.po
rename to addons/base_automation/i18n/mn.po
diff --git a/addons/base_action_rule/i18n/nb.po b/addons/base_automation/i18n/nb.po
similarity index 100%
rename from addons/base_action_rule/i18n/nb.po
rename to addons/base_automation/i18n/nb.po
diff --git a/addons/base_action_rule/i18n/nl.po b/addons/base_automation/i18n/nl.po
similarity index 100%
rename from addons/base_action_rule/i18n/nl.po
rename to addons/base_automation/i18n/nl.po
diff --git a/addons/base_action_rule/i18n/nl_BE.po b/addons/base_automation/i18n/nl_BE.po
similarity index 100%
rename from addons/base_action_rule/i18n/nl_BE.po
rename to addons/base_automation/i18n/nl_BE.po
diff --git a/addons/base_action_rule/i18n/pl.po b/addons/base_automation/i18n/pl.po
similarity index 100%
rename from addons/base_action_rule/i18n/pl.po
rename to addons/base_automation/i18n/pl.po
diff --git a/addons/base_action_rule/i18n/pt.po b/addons/base_automation/i18n/pt.po
similarity index 100%
rename from addons/base_action_rule/i18n/pt.po
rename to addons/base_automation/i18n/pt.po
diff --git a/addons/base_action_rule/i18n/pt_BR.po b/addons/base_automation/i18n/pt_BR.po
similarity index 100%
rename from addons/base_action_rule/i18n/pt_BR.po
rename to addons/base_automation/i18n/pt_BR.po
diff --git a/addons/base_action_rule/i18n/ro.po b/addons/base_automation/i18n/ro.po
similarity index 100%
rename from addons/base_action_rule/i18n/ro.po
rename to addons/base_automation/i18n/ro.po
diff --git a/addons/base_action_rule/i18n/ru.po b/addons/base_automation/i18n/ru.po
similarity index 100%
rename from addons/base_action_rule/i18n/ru.po
rename to addons/base_automation/i18n/ru.po
diff --git a/addons/base_action_rule/i18n/sk.po b/addons/base_automation/i18n/sk.po
similarity index 100%
rename from addons/base_action_rule/i18n/sk.po
rename to addons/base_automation/i18n/sk.po
diff --git a/addons/base_action_rule/i18n/sl.po b/addons/base_automation/i18n/sl.po
similarity index 100%
rename from addons/base_action_rule/i18n/sl.po
rename to addons/base_automation/i18n/sl.po
diff --git a/addons/base_action_rule/i18n/sq.po b/addons/base_automation/i18n/sq.po
similarity index 100%
rename from addons/base_action_rule/i18n/sq.po
rename to addons/base_automation/i18n/sq.po
diff --git a/addons/base_action_rule/i18n/sr.po b/addons/base_automation/i18n/sr.po
similarity index 100%
rename from addons/base_action_rule/i18n/sr.po
rename to addons/base_automation/i18n/sr.po
diff --git a/addons/base_action_rule/i18n/sr@latin.po b/addons/base_automation/i18n/sr@latin.po
similarity index 100%
rename from addons/base_action_rule/i18n/sr@latin.po
rename to addons/base_automation/i18n/sr@latin.po
diff --git a/addons/base_action_rule/i18n/sv.po b/addons/base_automation/i18n/sv.po
similarity index 100%
rename from addons/base_action_rule/i18n/sv.po
rename to addons/base_automation/i18n/sv.po
diff --git a/addons/base_action_rule/i18n/ta.po b/addons/base_automation/i18n/ta.po
similarity index 100%
rename from addons/base_action_rule/i18n/ta.po
rename to addons/base_automation/i18n/ta.po
diff --git a/addons/base_action_rule/i18n/th.po b/addons/base_automation/i18n/th.po
similarity index 100%
rename from addons/base_action_rule/i18n/th.po
rename to addons/base_automation/i18n/th.po
diff --git a/addons/base_action_rule/i18n/tr.po b/addons/base_automation/i18n/tr.po
similarity index 100%
rename from addons/base_action_rule/i18n/tr.po
rename to addons/base_automation/i18n/tr.po
diff --git a/addons/base_action_rule/i18n/uk.po b/addons/base_automation/i18n/uk.po
similarity index 100%
rename from addons/base_action_rule/i18n/uk.po
rename to addons/base_automation/i18n/uk.po
diff --git a/addons/base_action_rule/i18n/vi.po b/addons/base_automation/i18n/vi.po
similarity index 100%
rename from addons/base_action_rule/i18n/vi.po
rename to addons/base_automation/i18n/vi.po
diff --git a/addons/base_action_rule/i18n/zh_CN.po b/addons/base_automation/i18n/zh_CN.po
similarity index 100%
rename from addons/base_action_rule/i18n/zh_CN.po
rename to addons/base_automation/i18n/zh_CN.po
diff --git a/addons/base_action_rule/i18n/zh_TW.po b/addons/base_automation/i18n/zh_TW.po
similarity index 100%
rename from addons/base_action_rule/i18n/zh_TW.po
rename to addons/base_automation/i18n/zh_TW.po
diff --git a/addons/base_action_rule/models/__init__.py b/addons/base_automation/models/__init__.py
similarity index 70%
rename from addons/base_action_rule/models/__init__.py
rename to addons/base_automation/models/__init__.py
index 1f1a8086873..ef96b3be347 100644
--- a/addons/base_action_rule/models/__init__.py
+++ b/addons/base_automation/models/__init__.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import base_action_rule
+import base_automation
+import ir_actions
diff --git a/addons/base_action_rule/models/base_action_rule.py b/addons/base_automation/models/base_automation.py
similarity index 76%
rename from addons/base_action_rule/models/base_action_rule.py
rename to addons/base_automation/models/base_automation.py
index 7f13bf9f3ef..051198edc17 100644
--- a/addons/base_action_rule/models/base_action_rule.py
+++ b/addons/base_automation/models/base_automation.py
@@ -25,24 +25,24 @@ DATE_RANGE_FUNCTION = {
 }
 
 
-class BaseActionRule(models.Model):
-    """ Base Action Rules """
-
-    _name = 'base.action.rule'
-    _description = 'Action Rules'
+class BaseAutomation(models.Model):
+    _name = 'base.automation'
+    _description = 'Automated Action'
     _order = 'sequence'
 
-    name = fields.Char(string='Rule Name', required=True)
-    model_id = fields.Many2one('ir.model', string='Related Document Model', required=True, domain=[('transient', '=', False)])
-    model = fields.Char(related='model_id.model', readonly=True)
+    action_server_id = fields.Many2one(
+        'ir.actions.server', 'Server Actions',
+        domain="[('model_id', '=', model_id)]",
+        delegate=True, required=True, ondelete='restrict')
     active = fields.Boolean(default=True, help="When unchecked, the rule is hidden and will not be executed.")
-    sequence = fields.Integer(help="Gives the sequence order when displaying a list of rules.")
-    kind = fields.Selection([('on_create', 'On Creation'),
-                             ('on_write', 'On Update'),
-                             ('on_create_or_write', 'On Creation & Update'),
-                             ('on_unlink', 'On Deletion'),
-                             ('on_change', 'Based on Form Modification'),
-                             ('on_time', 'Based on Timed Condition')], string='When to Run', required=True)
+    trigger = fields.Selection([
+        ('on_create', 'On Creation'),
+        ('on_write', 'On Update'),
+        ('on_create_or_write', 'On Creation & Update'),
+        ('on_unlink', 'On Deletion'),
+        ('on_change', 'Based on Form Modification'),
+        ('on_time', 'Based on Timed Condition')
+        ], string='Trigger condition', required=True, oldname="kind")
     trg_date_id = fields.Many2one('ir.model.fields', string='Trigger Date',
                                   help="""When should the condition be triggered.
                                   If present, will be checked by the scheduler. If empty, will be checked at creation and update.""",
@@ -55,34 +55,33 @@ class BaseActionRule(models.Model):
                                            string='Delay type', default='day')
     trg_date_calendar_id = fields.Many2one("resource.calendar", string='Use Calendar',
                                             help="When calculating a day-based timed condition, it is possible to use a calendar to compute the date based on working days.")
-    act_user_id = fields.Many2one('res.users', string='Set Responsible')
-    act_followers = fields.Many2many("res.partner", string="Add Followers")
-    server_action_ids = fields.Many2many('ir.actions.server', string='Server Actions', domain="[('model_id', '=', model_id)]",
-                                         help="Examples: email reminders, call object service, etc.")
-    filter_pre_id = fields.Many2one("ir.filters", string='Before Update Filter', ondelete='restrict', domain="[('model_id', '=', model_id.model)]",
+    filter_pre_id = fields.Many2one("ir.filters", string='Before Update Filter', ondelete='restrict',
+                                    domain="[('model_id', '=', model_name)]",
                                     help="If present, this condition must be satisfied before the update of the record.")
     filter_pre_domain = fields.Char(string='Before Update Domain',
                                     help="If present, this condition must be satisfied before the update of the record.")
-    filter_id = fields.Many2one("ir.filters", string='Filter', ondelete='restrict', domain="[('model_id', '=', model_id.model)]",
+    filter_id = fields.Many2one("ir.filters", string='Filter', ondelete='restrict',
+                                domain="[('model_id', '=', model_name)]",
                                 help="If present, this condition must be satisfied before executing the action rule.")
     filter_domain = fields.Char(string='Domain', help="If present, this condition must be satisfied before executing the action rule.")
     last_run = fields.Datetime(readonly=True, copy=False)
     on_change_fields = fields.Char(string="On Change Fields Trigger", help="Comma-separated list of field names that triggers the onchange.")
 
     # which fields have an impact on the registry
-    CRITICAL_FIELDS = ['model_id', 'active', 'kind', 'on_change_fields']
+    CRITICAL_FIELDS = ['model_id', 'active', 'trigger', 'on_change_fields']
 
     @api.onchange('model_id')
     def onchange_model_id(self):
         self.filter_pre_id = self.filter_id = False
+        self.model_name = self.model_id.model
 
-    @api.onchange('kind')
-    def onchange_kind(self):
-        if self.kind in ['on_create', 'on_create_or_write', 'on_unlink']:
+    @api.onchange('trigger')
+    def onchange_trigger(self):
+        if self.trigger in ['on_create', 'on_create_or_write', 'on_unlink']:
             self.filter_pre_id = self.filter_pre_domain = self.trg_date_id = self.trg_date_range = self.trg_date_range_type = False
-        elif self.kind in ['on_write', 'on_create_or_write']:
+        elif self.trigger in ['on_write', 'on_create_or_write']:
             self.trg_date_id = self.trg_date_range = self.trg_date_range_type = False
-        elif self.kind == 'on_time':
+        elif self.trigger == 'on_time':
             self.filter_pre_id = self.filter_pre_domain = False
 
     @api.onchange('filter_pre_id')
@@ -95,14 +94,15 @@ class BaseActionRule(models.Model):
 
     @api.model
     def create(self, vals):
-        base_action_rule = super(BaseActionRule, self).create(vals)
+        vals['usage'] = 'base_automation'
+        base_automation = super(BaseAutomation, self).create(vals)
         self._update_cron()
         self._update_registry()
-        return base_action_rule
+        return base_automation
 
     @api.multi
     def write(self, vals):
-        res = super(BaseActionRule, self).write(vals)
+        res = super(BaseAutomation, self).write(vals)
         if set(vals).intersection(self.CRITICAL_FIELDS):
             self._update_cron()
             self._update_registry()
@@ -110,7 +110,7 @@ class BaseActionRule(models.Model):
 
     @api.multi
     def unlink(self):
-        res = super(BaseActionRule, self).unlink()
+        res = super(BaseAutomation, self).unlink()
         self._update_cron()
         self._update_registry()
         return res
@@ -119,8 +119,8 @@ class BaseActionRule(models.Model):
         """ Activate the cron job depending on whether there exists action rules
             based on time conditions.
         """
-        cron = self.env.ref('base_action_rule.ir_cron_crm_action', raise_if_not_found=False)
-        return cron and cron.toggle(model=self._name, domain=[('kind', '=', 'on_time')])
+        cron = self.env.ref('base_automation.ir_cron_data_base_automation_check', raise_if_not_found=False)
+        return cron and cron.toggle(model=self._name, domain=[('trigger', '=', 'on_time')])
 
     def _update_registry(self):
         """ Update the registry after a modification on action rules. """
@@ -131,13 +131,13 @@ class BaseActionRule(models.Model):
             registry = Registry.new(self._cr.dbname)
             registry.signal_registry_change()
 
-    def _get_actions(self, records, kinds):
-        """ Return the actions of the given kinds for records' model. The
+    def _get_actions(self, records, triggers):
+        """ Return the actions of the given triggers for records' model. The
             returned actions' context contain an object to manage processing.
         """
         if '__action_done' not in self._context:
             self = self.with_context(__action_done={})
-        domain = [('model', '=', records._name), ('kind', 'in', kinds)]
+        domain = [('model_name', '=', records._name), ('trigger', 'in', triggers)]
         actions = self.with_context(active_test=True).search(domain)
         return actions.with_env(self.env)
 
@@ -191,27 +191,14 @@ class BaseActionRule(models.Model):
         values = {}
         if 'date_action_last' in records._fields:
             values['date_action_last'] = fields.Datetime.now()
-        if self.act_user_id and 'user_id' in records._fields:
-            values['user_id'] = self.act_user_id.id
         if values:
             records.write(values)
 
-        # subscribe followers
-        if self.act_followers and hasattr(records, 'message_subscribe'):
-            followers = self.env['mail.followers'].sudo().search(
-                [('res_model', '=', records._name),
-                 ('res_id', 'in', records.ids),
-                 ('partner_id', 'in', self.act_followers.ids),
-                 ]
-            )
-            if not len(followers) == len(self.act_followers):
-                records.message_subscribe(self.act_followers.ids)
-
         # execute server actions
-        if self.server_action_ids:
+        if self.action_server_id:
             for record in records:
                 ctx = {'active_model': record._name, 'active_ids': record.ids, 'active_id': record.id}
-                self.server_action_ids.with_context(**ctx).run()
+                self.action_server_id.with_context(**ctx).run()
 
     @api.model_cr
     def _register_hook(self):
@@ -232,7 +219,7 @@ class BaseActionRule(models.Model):
             @api.model
             def create(self, vals, **kw):
                 # retrieve the action rules to possibly execute
-                actions = self.env['base.action.rule']._get_actions(self, ['on_create', 'on_create_or_write'])
+                actions = self.env['base.automation']._get_actions(self, ['on_create', 'on_create_or_write'])
                 # call original method
                 record = create.origin(self.with_env(actions.env), vals, **kw)
                 # check postconditions, and execute actions on the records that satisfy them
@@ -251,7 +238,7 @@ class BaseActionRule(models.Model):
             @api.multi
             def _write(self, vals, **kw):
                 # retrieve the action rules to possibly execute
-                actions = self.env['base.action.rule']._get_actions(self, ['on_write', 'on_create_or_write'])
+                actions = self.env['base.automation']._get_actions(self, ['on_write', 'on_create_or_write'])
                 records = self.with_env(actions.env)
                 # check preconditions on records
                 pre = {action: action._filter_pre(records) for action in actions}
@@ -274,7 +261,7 @@ class BaseActionRule(models.Model):
             @api.multi
             def unlink(self, **kwargs):
                 # retrieve the action rules to possibly execute
-                actions = self.env['base.action.rule']._get_actions(self, ['on_unlink'])
+                actions = self.env['base.automation']._get_actions(self, ['on_unlink'])
                 records = self.with_env(actions.env)
                 # check conditions, and execute actions on the records that satisfy them
                 for action in actions:
@@ -286,22 +273,22 @@ class BaseActionRule(models.Model):
 
         def make_onchange(action_rule_id):
             """ Instanciate an onchange method for the given action rule. """
-            def base_action_rule_onchange(self):
-                action_rule = self.env['base.action.rule'].browse(action_rule_id)
+            def base_automation_onchange(self):
+                action_rule = self.env['base.automation'].browse(action_rule_id)
                 result = {}
-                for server_action in action_rule.server_action_ids.with_context(active_model=self._name, onchange_self=self):
-                    res = server_action.run()
-                    if res:
-                        if 'value' in res:
-                            res['value'].pop('id', None)
-                            self.update({key: val for key, val in res['value'].iteritems() if key in self._fields})
-                        if 'domain' in res:
-                            result.setdefault('domain', {}).update(res['domain'])
-                        if 'warning' in res:
-                            result['warning'] = res['warning']
+                server_action = action_rule.action_server_id.with_context(active_model=self._name, onchange_self=self)
+                res = server_action.run()
+                if res:
+                    if 'value' in res:
+                        res['value'].pop('id', None)
+                        self.update({key: val for key, val in res['value'].iteritems() if key in self._fields})
+                    if 'domain' in res:
+                        result.setdefault('domain', {}).update(res['domain'])
+                    if 'warning' in res:
+                        result['warning'] = res['warning']
                 return result
 
-            return base_action_rule_onchange
+            return base_automation_onchange
 
         patched_models = defaultdict(set)
         def patch(model, name, method):
@@ -312,21 +299,21 @@ class BaseActionRule(models.Model):
 
         # retrieve all actions, and patch their corresponding model
         for action_rule in self.with_context({}).search([]):
-            Model = self.env[action_rule.model]
-            if action_rule.kind == 'on_create':
+            Model = self.env[action_rule.model_name]
+            if action_rule.trigger == 'on_create':
                 patch(Model, 'create', make_create())
 
-            elif action_rule.kind == 'on_create_or_write':
+            elif action_rule.trigger == 'on_create_or_write':
                 patch(Model, 'create', make_create())
                 patch(Model, '_write', make_write())
 
-            elif action_rule.kind == 'on_write':
+            elif action_rule.trigger == 'on_write':
                 patch(Model, '_write', make_write())
 
-            elif action_rule.kind == 'on_unlink':
+            elif action_rule.trigger == 'on_unlink':
                 patch(Model, 'unlink', make_unlink())
 
-            elif action_rule.kind == 'on_change':
+            elif action_rule.trigger == 'on_change':
                 # register an onchange method for the action_rule
                 method = make_onchange(action_rule.id)
                 for field_name in action_rule.on_change_fields.split(","):
@@ -352,7 +339,7 @@ class BaseActionRule(models.Model):
 
         # retrieve all the action rules to run based on a timed condition
         eval_context = self._get_eval_context()
-        for action in self.with_context(active_test=True).search([('kind', '=', 'on_time')]):
+        for action in self.with_context(active_test=True).search([('trigger', '=', 'on_time')]):
             last_run = fields.Datetime.from_string(action.last_run) or datetime.datetime.utcfromtimestamp(0)
 
             # retrieve all the records that satisfy the action's condition
@@ -369,7 +356,7 @@ class BaseActionRule(models.Model):
                     filter_meta = action.filter_id.get_metadata()[0]
                     user_id = (filter_meta['write_uid'] or filter_meta['create_uid'])[0]
                     context['lang'] = self.env['res.users'].browse(user_id).lang
-            records = self.env[action.model].with_context(context).search(domain)
+            records = self.env[action.model_name].with_context(context).search(domain)
 
             # determine when action should occur for the records
             if action.trg_date_id.name == 'date_action_last' and 'create_date' in records._fields:
diff --git a/addons/base_automation/models/ir_actions.py b/addons/base_automation/models/ir_actions.py
new file mode 100644
index 00000000000..67e75872873
--- /dev/null
+++ b/addons/base_automation/models/ir_actions.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class ServerAction(models.Model):
+    _inherit = "ir.actions.server"
+
+    usage = fields.Selection(selection_add=[('base_automation', 'Automated Action')])
diff --git a/addons/base_automation/security/ir.model.access.csv b/addons/base_automation/security/ir.model.access.csv
new file mode 100644
index 00000000000..2dc7103a91b
--- /dev/null
+++ b/addons/base_automation/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_base_automation,base.automation,model_base_automation,,1,0,0,0
+access_base_automation_config,base.automation config,model_base_automation,base.group_system,1,1,1,1
+access_base_automation_lead_test,access_base_automation_lead_test,model_base_automation_lead_test,base.group_system,1,1,1,1
+access_base_automation_line_test,access_base_automation_line_test,model_base_automation_line_test,base.group_system,1,1,1,1
\ No newline at end of file
diff --git a/addons/base_action_rule/tests/__init__.py b/addons/base_automation/tests/__init__.py
similarity index 80%
rename from addons/base_action_rule/tests/__init__.py
rename to addons/base_automation/tests/__init__.py
index f4257911f95..4232ef4d2e7 100644
--- a/addons/base_action_rule/tests/__init__.py
+++ b/addons/base_automation/tests/__init__.py
@@ -2,4 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import test_models
-import test_base_action_rule
+import test_base_automation
diff --git a/addons/base_action_rule/tests/test_base_action_rule.py b/addons/base_automation/tests/test_base_automation.py
similarity index 95%
rename from addons/base_action_rule/tests/test_base_action_rule.py
rename to addons/base_automation/tests/test_base_automation.py
index 49acc7239a1..9fddfad983d 100644
--- a/addons/base_action_rule/tests/test_base_action_rule.py
+++ b/addons/base_automation/tests/test_base_automation.py
@@ -6,10 +6,10 @@ from odoo.tests import common
 
 @common.at_install(False)
 @common.post_install(True)
-class base_action_rule_test(common.TransactionCase):
+class base_automation_test(common.TransactionCase):
 
     def setUp(self):
-        super(base_action_rule_test, self).setUp()
+        super(base_automation_test, self).setUp()
         self.user_admin = self.env.ref('base.user_root')
         self.user_demo = self.env.ref('base.user_demo')
 
@@ -19,7 +19,7 @@ class base_action_rule_test(common.TransactionCase):
             'user_id': self.user_admin.id,
         }
         vals.update(kwargs)
-        return self.env['base.action.rule.lead.test'].create(vals)
+        return self.env['base.automation.lead.test'].create(vals)
 
     def test_00_check_to_state_open_pre(self):
         """
@@ -96,7 +96,7 @@ class base_action_rule_test(common.TransactionCase):
         """
         Check that a rule is executed after creating a line record.
         """
-        line = self.env['base.action.rule.line.test'].create({'name': "Line"})
+        line = self.env['base.automation.line.test'].create({'name': "Line"})
         self.assertEqual(line.user_id, self.user_demo)
 
     def test_20_indirect_line(self):
diff --git a/addons/base_action_rule/tests/test_models.py b/addons/base_automation/tests/test_models.py
similarity index 81%
rename from addons/base_action_rule/tests/test_models.py
rename to addons/base_automation/tests/test_models.py
index f88d61ccd2d..36893e37447 100644
--- a/addons/base_action_rule/tests/test_models.py
+++ b/addons/base_automation/tests/test_models.py
@@ -5,7 +5,7 @@ from odoo import fields, models
 
 
 class LeadTest(models.Model):
-    _name = "base.action.rule.lead.test"
+    _name = "base.automation.lead.test"
     _description = "Action Rule Test"
 
     name = fields.Char(string='Subject', required=True, index=True)
@@ -17,13 +17,13 @@ class LeadTest(models.Model):
     partner_id = fields.Many2one('res.partner', string='Partner')
     date_action_last = fields.Datetime(string='Last Action', readonly=True)
     customer = fields.Boolean(related='partner_id.customer', readonly=True, store=True)
-    line_ids = fields.One2many('base.action.rule.line.test', 'lead_id')
+    line_ids = fields.One2many('base.automation.line.test', 'lead_id')
 
 
 class LineTest(models.Model):
-    _name = "base.action.rule.line.test"
+    _name = "base.automation.line.test"
     _description = "Action Rule Line Test"
 
     name = fields.Char()
-    lead_id = fields.Many2one('base.action.rule.lead.test', ondelete='cascade')
+    lead_id = fields.Many2one('base.automation.lead.test', ondelete='cascade')
     user_id = fields.Many2one('res.users')
diff --git a/addons/base_automation/views/base_automation_view.xml b/addons/base_automation/views/base_automation_view.xml
new file mode 100644
index 00000000000..838b1a62ccb
--- /dev/null
+++ b/addons/base_automation/views/base_automation_view.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+        <!-- Automation Form View -->
+        <record id="view_base_automation_form" model="ir.ui.view">
+            <field name="name">Automations</field>
+            <field name="model">base.automation</field>
+            <field name="mode">primary</field>
+            <field name="inherit_id" ref="base.view_server_action_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//button[@name='create_action']" position="replace">
+                    <button name="create_action_for_menu" string="Create Action" type="object"
+                        class="btn-primary"
+                        attrs="{'invisible':[('menu_ir_values_id','!=',False)]}"
+                        help="Display an option in the 'More' top-menu or related document, to run this action."/>
+                </xpath>
+                <xpath expr="//button[@name='unlink_action']" position="replace">
+                    <button name="unlink_action_for_menu" string="Remove Action" type="object"
+                        attrs="{'invisible':[('menu_ir_values_id','=',False)]}"
+                        help="Remove the contextual action related to this server action"/>
+                </xpath>
+                <xpath expr="//group[@name='action_wrapper']" position="inside">
+                    <group>
+                        <field name="trigger"/>
+
+                        <label for="filter_pre_id" attrs="{'invisible': [('trigger', 'not in', ['on_write','on_create_or_write'])]}"/>
+                        <div attrs="{'invisible': [('trigger', 'not in', ['on_write','on_create_or_write'])]}">
+                            <field name="filter_pre_domain" widget="domain" options="{'model': 'model_name'}"
+                                class="o_row"/>
+                            <div class="oe_edit_only o_row">Set selection based on a search filter:
+                                <field name="filter_pre_id" domain="[('model_id', '=', model_name), '|', ('user_id', '=', uid), ('user_id', '=', False)]"
+                                    class="o_row" context="{'default_model_id': model_name, 'default_active': False, 'active_test': False}"/></div>
+                        </div>
+
+                        <label for="filter_id"/>
+                        <div>
+                            <field name="filter_domain" widget="domain" options="{'model': 'model_name'}"
+                                class="o_row"/>
+                            <div class="oe_edit_only o_row">Set selection based on a search filter:
+                                <field name="filter_id" domain="[('model_id', '=', model_name), '|', ('user_id', '=', uid), ('user_id', '=', False)]"
+                                    class="o_row" context="{'default_model_id': model_name, 'default_active': False, 'active_test': False}"/>
+                            </div>
+                        </div>
+                        <field name="on_change_fields"
+                            attrs="{'invisible': [('trigger', '!=', 'on_change')], 'required': [('trigger', '=', 'on_change')]}"/>
+                        <field name="trg_date_id"
+                            attrs="{'invisible': [('trigger', '!=', 'on_time')], 'required': [('trigger', '=', 'on_time')]}"/>
+                        <label for="trg_date_range"
+                            attrs="{'invisible': [('trigger', '!=', 'on_time')]}"/>
+                        <div class="o_row" attrs="{'invisible': [('trigger', '!=', 'on_time')]}">
+                            <field name="trg_date_range" attrs="{'required': [('trigger','=','on_time')]}"/>
+                            <field name="trg_date_range_type" attrs="{'required': [('trigger','=','on_time')]}"/>
+                        </div>
+                        <field name="trg_date_calendar_id" 
+                            attrs="{'invisible': ['|', ('trg_date_id','=',False), ('trg_date_range_type', '!=', 'day')]}"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+
+        <!-- automation Tree View -->
+        <record id="view_base_automation_tree" model="ir.ui.view">
+            <field name="name">base.automation.tree</field>
+            <field name="model">base.automation</field>
+            <field name="arch" type="xml">
+                <tree string="Automation">
+                    <field name="sequence" widget="handle"/>
+                    <field name="name"/>
+                    <field name="trigger"/>
+                    <field name="model_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- automation Action -->
+        <record id="base_automation_act" model="ir.actions.act_window">
+            <field name="name">Automated Actions</field>
+            <field name="res_model">base.automation</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_base_automation_tree"/>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to setup a new automated automation. 
+              </p><p>
+                Use automated actions to automatically trigger actions for
+                various screens. Example: a lead created by a specific user may
+                be automatically set to a specific sales channel, or an
+                opportunity which still has status pending after 14 days might
+                trigger an automatic reminder email.
+              </p>
+            </field>
+        </record>
+
+        <menuitem id="menu_base_automation_form"
+            parent="base.menu_automation" action="base_automation_act" sequence="1"/>
+
+</odoo>
\ No newline at end of file
diff --git a/addons/base_gengo/data/ir_cron_data.xml b/addons/base_gengo/data/ir_cron_data.xml
index a88cc78910e..20d62c5db57 100644
--- a/addons/base_gengo/data/ir_cron_data.xml
+++ b/addons/base_gengo/data/ir_cron_data.xml
@@ -3,28 +3,26 @@
     <data noupdate="1">
         <!--Scheduler sync Receive Request-->
         <record id="gengo_sync_receive_request_scheduler" model="ir.cron">
-            <field name="name" >Gengo Sync Translation (Response)</field>
-            <field eval="True" name="active"/>
+            <field name="name">Gengo: Sync translation (Response)</field>
+            <field name="model_id" ref="base_gengo.model_base_gengo_translations"/>
+            <field name="state">code</field>
+            <field name="code">model._sync_response(20)</field>
             <field name="interval_number">6</field>
             <field name="interval_type">hours</field>
             <field name="numbercall">-1</field>
             <field name="doall" eval="False" />
-            <field name="model" eval="'base.gengo.translations'"></field>
-            <field name="function" eval="'_sync_response'"/>
-            <field name="args" eval="'(20,)'"/>
         </record>
 
         <!--Scheduler Sync Send Request-->
         <record id="gengo_sync_send_request_scheduler" model="ir.cron">
-            <field name="name" >Gengo Sync Translation (Request)</field>
-            <field eval="True" name="active"/>
+            <field name="name">Gengo: Sync translation (Request)</field>
+            <field name="model_id" ref="base_gengo.model_base_gengo_translations"/>
+            <field name="state">code</field>
+            <field name="code">model._sync_request(20)</field>
             <field name="interval_number">6</field>
             <field name="interval_type">hours</field>
             <field name="numbercall">-1</field>
             <field name="doall" eval="False"/>
-            <field name="model" eval="'base.gengo.translations'"></field>
-            <field name="function" eval="'_sync_request'"/>
-            <field name="args" eval="'(20,)'"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/calendar/__manifest__.py b/addons/calendar/__manifest__.py
index b7879f3e908..e7c75f9cb87 100644
--- a/addons/calendar/__manifest__.py
+++ b/addons/calendar/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Calendar',
     'version': '1.0',
     'sequence': 130,
-    'depends': ['base', 'mail', 'base_action_rule', 'web_calendar'],
+    'depends': ['base', 'mail', 'web_calendar'],
     'summary': 'Personal & Shared Calendar',
     'description': """
 This is a full-featured calendar system.
diff --git a/addons/calendar/data/calendar_cron.xml b/addons/calendar/data/calendar_cron.xml
index 09cda419a54..f195dce4d1e 100644
--- a/addons/calendar/data/calendar_cron.xml
+++ b/addons/calendar/data/calendar_cron.xml
@@ -3,16 +3,16 @@
     <data noupdate="1">
         <!-- Scheduler for Event Alarm-->
         <record forcecreate="True" id="ir_cron_scheduler_alarm" model="ir.cron">
-            <field name="name">Run Event Reminder</field>
+            <field name="name">Calendar: Event Reminder</field>
+            <field name="model_id" ref="model_calendar_alarm_manager"/>
+            <field name="state">code</field>
+            <field name="code">model.get_next_mail()</field>
             <field eval="False" name="active" />
             <field name="user_id" ref="base.user_root" />
             <field name="interval_number">30</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall" />
-            <field eval="'calendar.alarm_manager'" name="model" />
-            <field eval="'get_next_mail'" name="function" />
-            <!--<field eval="'(False,)'" name="args" />-->
         </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/addons/crm/__manifest__.py b/addons/crm/__manifest__.py
index ff62e0ca2a0..dff59a6481b 100644
--- a/addons/crm/__manifest__.py
+++ b/addons/crm/__manifest__.py
@@ -29,7 +29,6 @@ Dashboard for CRM will include:
 """,
     'website': 'https://www.odoo.com/page/crm',
     'depends': [
-        'base_action_rule',
         'base_setup',
         'sales_team',
         'mail',
@@ -73,7 +72,6 @@ Dashboard for CRM will include:
         'data/crm_demo.xml',
         'data/mail_activity_demo.xml',
         'data/crm_lead_demo.xml',
-        'data/base_action_rule_demo.xml',
     ],
     'css': ['static/src/css/crm.css'],
     'installable': True,
diff --git a/addons/crm/data/base_action_rule_demo.xml b/addons/crm/data/base_action_rule_demo.xml
deleted file mode 100644
index 6307c778996..00000000000
--- a/addons/crm/data/base_action_rule_demo.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <data noupdate="1">
-        <!-- demo automated actions add messge on new lead after 5 days -->
-        <record id="filter_draft_lead" model="ir.filters">
-            <field name="name">Draft Leads</field>
-            <field name="model_id">crm.lead</field>
-            <field name="domain">[('stage_id.sequence', '=', 1)]</field>
-            <field name="user_id" eval="False"/>
-        </record>
-        <record id="action_email_reminder_lead" model="ir.actions.server">
-            <field name="name">Reminder to User</field>
-            <field name="model_id" ref="model_crm_lead"/>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="state">email</field>
-            <field name="template_id" ref="email_template_opportunity_reminder_mail"/>
-        </record>
-        <record id="rule_set_reminder_lead" model="base.action.rule">
-            <field name="name">Set Auto Reminder on leads which are not open since 5 days.</field>
-            <field name="model_id" ref="model_crm_lead"/>
-            <field name="sequence">1</field>
-            <field name="kind">on_time</field>
-            <field name="filter_domain">[('stage_id.sequence', '=', 1)]</field>
-            <field name="trg_date_id" search="[('model','=','crm.lead'),('name','=','create_date')]"/>
-            <field name="trg_date_range">5</field>
-            <field name="trg_date_range_type">day</field>
-            <field name="server_action_ids" eval="[(6,0,[ref('action_email_reminder_lead')])]"/>
-        </record>
-
-        <!-- demo automated actions add a followers on urgent USA leads -->
-        <record id="filter_usa_lead" model="ir.filters">
-            <field name="name">Leads from USA</field>
-            <field name="model_id">crm.lead</field>
-            <field name="domain">[('country_id','=','United States')]</field>
-            <field name="user_id" eval="False"/>
-        </record>
-        <record id="action_set_team_sales_department" model="ir.actions.server">
-            <field name="name">Set team to Sales Department</field>
-            <field name="model_id" ref="model_crm_lead"/>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="state">code</field>
-            <field name="code">record.write({'team_id': env.ref('sales_team.team_sales_department').id})</field>
-        </record>
-        <record id="rule_set_followers_lead" model="base.action.rule">
-            <field name="name">Set Auto Followers on leads which are urgent and come from USA.</field>
-            <field name="model_id" ref="model_crm_lead"/>
-            <field name="sequence">2</field>
-            <field name="kind">on_create</field>
-            <field name="filter_id" ref="filter_usa_lead"/>
-            <field name="act_user_id" ref="base.user_root"/>
-            <field name="act_followers" eval="[(6,0,[ref('base.res_partner_4'), ref('base.res_partner_3'), ref('base.res_partner_1')])]"/>
-            <field name="server_action_ids" eval="[(6,0,[ref('action_set_team_sales_department')])]"/>
-        </record>
-    </data>
-</odoo>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index b1490fb08e2..e30ef0ae827 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -10,7 +10,6 @@ access_res_partner_category_manager,res.partner.category.crm.manager,base.model_
 access_res_partner,res.partner.crm.user,base.model_res_partner,sales_team.group_sale_salesman,1,1,1,0
 access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,sales_team.group_sale_salesman,1,1,1,0
 mail_mailgate_thread,mail.thread,mail.model_mail_thread,sales_team.group_sale_salesman,1,1,1,1
-access_base_action_rule_manager,base.action.rule manager,base_action_rule.model_base_action_rule,sales_team.group_sale_manager,1,1,1,1
 access_crm_lead_partner_manager,crm.lead.partner.manager,model_crm_lead,base.group_partner_manager,1,0,0,0
 access_crm_lead_tag,crm_lead_tag,model_crm_lead_tag,base.group_user,1,0,0,0
 access_crm_lead_tag_salesman,crm_lead_tag salesman,model_crm_lead_tag,sales_team.group_sale_salesman,1,1,1,0
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index c76e4154f3e..d11d2f90dca 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -661,7 +661,7 @@
             'Mark as Lost' in action dropdown
         -->
         <record id="action_mark_as_lost" model="ir.actions.server">
-            <field name="name">Mark as lost</field>
+            <field name="name">Crm: Mark Leads as lost</field>
             <field name="model_id" ref="model_crm_lead"/>
             <field name="state">code</field>
             <field name="code">
@@ -770,11 +770,10 @@ if record:
         </record>
 
         <record id="action_your_pipeline" model="ir.actions.server">
-            <field name="name">My Pipeline</field>
+            <field name="name">Crm: My Pipeline</field>
             <field name="model_id" ref="crm.model_crm_team"/>
             <field name="state">code</field>
             <field name="code">action = model.action_your_pipeline()</field>
-            <field eval="True" name="condition"/>
         </record>
 
         <record model="ir.actions.act_window" id="crm_lead_opportunities_tree_view">
diff --git a/addons/event/data/event_data.xml b/addons/event/data/event_data.xml
index 3232b5514a4..b4c1070bf0d 100644
--- a/addons/event/data/event_data.xml
+++ b/addons/event/data/event_data.xml
@@ -13,16 +13,15 @@
 
         <!-- Event Mail Scheduler-->
         <record model="ir.cron" forcecreate="True" id="event_mail_scheduler">
-            <field name="name">[event] mail scheduler</field>
-            <field name="active">True</field>
+            <field name="name">Event: Mail Scheduler</field>
+            <field name="model_id" ref="model_event_mail"/>
+            <field name="state">code</field>
+            <field name="code">model.run(True)</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
             <field name="interval_type">hours</field>
             <field name="numbercall">-1</field>
             <field name="doall" eval="False" />
-            <field eval="'(True,)'" name="args"/>
-            <field name="model">event.mail</field>
-            <field name="function">run</field>
         </record>
 
     </data>
diff --git a/addons/fetchmail/data/fetchmail_data.xml b/addons/fetchmail/data/fetchmail_data.xml
index 34469793c6e..d98c3d1f92f 100644
--- a/addons/fetchmail/data/fetchmail_data.xml
+++ b/addons/fetchmail/data/fetchmail_data.xml
@@ -2,14 +2,14 @@
 <odoo>
     <data noupdate="1">
         <record id="ir_cron_mail_gateway_action" model="ir.cron">
-            <field name="name">Fetchmail Service</field>
+            <field name="name">Mail: Fetchmail Service</field>
+            <field name="model_id" ref="model_fetchmail_server"/>
+            <field name="state">code</field>
+            <field name="code">model._fetch_mails()</field>
             <field name="interval_number">5</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
             <field name="doall" eval="False"/>
-            <field name="model">fetchmail.server</field>
-            <field name="function">_fetch_mails</field>
-            <field name="args">()</field>
             <!-- Active flag is set on fetchmail_server.create/write -->
             <field name="active" eval="False"/>
         </record>
diff --git a/addons/fleet/data/fleet_data.xml b/addons/fleet/data/fleet_data.xml
index 0d9a4640f2b..3ba311c878e 100644
--- a/addons/fleet/data/fleet_data.xml
+++ b/addons/fleet/data/fleet_data.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
       <record forcecreate="True" id="ir_cron_contract_costs_generator" model="ir.cron">
-        <field name="name">Generation of contracts costs based on the costs frequency</field>
-        <field eval="True" name="active" />
+        <field name="name">Fleet: Generate contracts costs based on costs frequency</field>
+        <field name="model_id" ref="model_fleet_vehicle_log_contract"/>
+        <field name="state">code</field>
+        <field name="code">model.run_scheduler()</field>
         <field name="user_id" ref="base.user_root" />
         <field name="interval_number">1</field>
         <field name="interval_type">days</field>
         <field name="numbercall">-1</field>
         <field eval="False" name="doall" />
-        <field eval="'fleet.vehicle.log.contract'" name="model" />
-        <field eval="'run_scheduler'" name="function" />
-        <field eval="'()'" name="args" />
       </record>
 
       <record id="type_service_service_1" model="fleet.service.type">
diff --git a/addons/gamification/data/cron.xml b/addons/gamification/data/cron.xml
index 6e273ef4405..0ed59d39e11 100644
--- a/addons/gamification/data/cron.xml
+++ b/addons/gamification/data/cron.xml
@@ -1,15 +1,14 @@
 <odoo>
     <data noupdate="1">
-        <record forcecreate="True" id="ir_cron_check_challenge"
-            model="ir.cron">
-            <field name="name">Run Goal Challenge Checker</field>
+        <record forcecreate="True" id="ir_cron_check_challenge" model="ir.cron">
+            <field name="name">Gamification: Goal Challenge Check</field>
+            <field name="model_id" ref="model_gamification_challenge"/>
+            <field name="state">code</field>
+            <field name="code">model._cron_update()</field>
             <field name="interval_number">1</field>
             <field name="interval_type">days</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall" />
-            <field name="model">gamification.challenge</field>
-            <field name="function">_cron_update</field>
-            <field name="args">()</field>
         </record>
     </data>
 </odoo>
diff --git a/addons/google_calendar/data/google_calendar_data.xml b/addons/google_calendar/data/google_calendar_data.xml
index 3fc26e25351..42b583cf7da 100644
--- a/addons/google_calendar/data/google_calendar_data.xml
+++ b/addons/google_calendar/data/google_calendar_data.xml
@@ -2,15 +2,15 @@
 <odoo>
     <data>
         <record forcecreate="True" id="ir_cron_sync_all_cals" model="ir.cron">
-            <field name="name">Calendar synchronization</field>
-            <field eval="True" name="active" />
+            <field name="name">Google Calendar: synchronization</field>
+            <field name="model_id" ref="model_google_calendar"/>
+            <field name="state">code</field>
+            <field name="code">model.synchronize_events_cron()</field>
             <field name="user_id" ref="base.user_root" />
             <field name="interval_number">12</field>
             <field name="interval_type">hours</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall" />
-            <field eval="'google.calendar'" name="model" />
-            <field eval="'synchronize_events_cron'" name="function" />
         </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/addons/hr_contract/__manifest__.py b/addons/hr_contract/__manifest__.py
index 41bf3eed728..47046f4c9e1 100644
--- a/addons/hr_contract/__manifest__.py
+++ b/addons/hr_contract/__manifest__.py
@@ -17,11 +17,10 @@ Add all information on the employee form to manage contracts.
 You can assign several contracts per employee.
     """,
     'website': 'https://www.odoo.com/page/employees',
-    'depends': ['base_action_rule', 'hr'],
+    'depends': ['hr'],
     'data': [
         'security/ir.model.access.csv',
         'data/hr_contract_data.xml',
-        'views/base_action_rule_views.xml',
         'views/hr_contract_views.xml',
     ],
     'demo': [],
diff --git a/addons/hr_contract/data/hr_contract_data.xml b/addons/hr_contract/data/hr_contract_data.xml
index 699e7160b6b..f7af55c5a52 100644
--- a/addons/hr_contract/data/hr_contract_data.xml
+++ b/addons/hr_contract/data/hr_contract_data.xml
@@ -41,71 +41,28 @@
             <field name="description">Contract about to expire</field>
         </record>
 
-        <!-- base action rule about "Expiring Soon" contracts -->
-        <record id="contract_open" model="ir.filters">
-            <field name="name">Open Contracts</field>
-            <field name="model_id">hr.contract</field>
-            <field name="domain">[('state', '=', 'open')]</field>
-            <field name="user_id" eval="False"/>
-        </record>
-        <record id="contract_set_as_pending" model="ir.actions.server">
-            <field name="name">HR Contract: set as pending</field>
+        <!-- Expired Soon -->
+        <record id="ir_cron_data_contract_update_to_pending" model="ir.cron">
+            <field name="name">HR Contract: update to pending</field>
             <field name="model_id" ref="model_hr_contract"/>
-            <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="state">code</field>
-            <field name="code">record.set_as_pending()</field>
+            <field name="code">model.update_to_pending()</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
         </record>
-        <record id="rule_contract_1_set_as_pending" model="base.action.rule">
-            <field name="name">HR Contract: check for pending</field>
+
+        <!-- Expired -->
+        <record id="ir_cron_data_contract_update_to_close" model="ir.cron">
+            <field name="name">HR Contract: update to closed</field>
             <field name="model_id" ref="model_hr_contract"/>
-            <field name="sequence">50</field>
-            <field name="kind">on_time</field>
-            <field name="filter_id" ref="contract_open"/>
-            <field name="trg_date_id" ref="hr_contract.field_hr_contract_date_end"/>
-            <field name="trg_date_range">-7</field>
-            <field name="trg_date_range_type">day</field>
-            <field name="server_action_ids" eval="[(6, 0, [ref('contract_set_as_pending')])]"/>
-        </record>
-         <record id="rule_contract_2_set_as_pending" model="base.action.rule">
-            <field name="name">HR Contract: check for pending</field>
-            <field name="model_id" ref="model_hr_contract"/>
-            <field name="sequence">51</field>
-            <field name="kind">on_time</field>
-            <field name="filter_id" ref="contract_open"/>
-            <field name="trg_date_id" ref="hr_contract.field_hr_contract_visa_expire"/>
-            <field name="trg_date_range">-60</field>
-            <field name="trg_date_range_type">day</field>
-            <field name="server_action_ids" eval="[(6, 0, [ref('contract_set_as_pending')])]"/>
-        </record>
-        <!-- base action rule about "Expired" contracts -->
-        <record id="contract_set_as_close" model="ir.actions.server">
-            <field name="name">HR Contract: set as close</field>
-            <field name="model_id" ref="model_hr_contract"/>
-            <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="state">code</field>
-            <field name="code">record.set_as_close()</field>
-        </record>
-        <record id="rule_contract_3_set_as_close" model="base.action.rule">
-            <field name="name">HR Contract: check for close</field>
-            <field name="model_id" ref="model_hr_contract"/>
-            <field name="sequence">52</field>
-            <field name="kind">on_time</field>
-            <field name="trg_date_id" ref="hr_contract.field_hr_contract_date_end"/>
-            <field name="trg_date_range">1</field>
-            <field name="trg_date_range_type">day</field>
-            <field name="server_action_ids" eval="[(6, 0, [ref('contract_set_as_close')])]"/>
-        </record>
-        <record id="rule_contract_4_set_as_close" model="base.action.rule">
-            <field name="name">HR Contract: check for close</field>
-            <field name="model_id" ref="model_hr_contract"/>
-            <field name="sequence">53</field>
-            <field name="kind">on_time</field>
-            <field name="trg_date_id" ref="hr_contract.field_hr_contract_visa_expire"/>
-            <field name="trg_date_range">1</field>
-            <field name="trg_date_range_type">day</field>
-            <field name="server_action_ids" eval="[(6, 0, [ref('contract_set_as_close')])]"/>
+            <field name="code">model.update_to_close()</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
         </record>
 
     </data>
diff --git a/addons/hr_contract/models/__init__.py b/addons/hr_contract/models/__init__.py
index 06e596009c3..2c0ec79912e 100644
--- a/addons/hr_contract/models/__init__.py
+++ b/addons/hr_contract/models/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import base_action_rule
 import hr_contract
diff --git a/addons/hr_contract/models/base_action_rule.py b/addons/hr_contract/models/base_action_rule.py
deleted file mode 100644
index 8998c9d2288..00000000000
--- a/addons/hr_contract/models/base_action_rule.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import api, fields, models
-from odoo.fields import Datetime
-
-
-class BaseActionRule(models.Model):
-    """ Add resource and calendar for time-based conditions """
-
-    _inherit = 'base.action.rule'
-
-    trg_date_resource_field_id = fields.Many2one('ir.model.fields', string='Use employee work schedule', help='Use the user\'s working schedule.')
-
-    @api.model
-    def _check_delay(self, action, record, record_dt):
-        """ Override the check of delay to try to use a user-related calendar.
-            If no calendar is found, fallback on the default behavior.
-        """
-        if action.trg_date_calendar_id and action.trg_date_range_type == 'day' and action.trg_date_resource_field_id:
-            user = record[action.trg_date_resource_field_id.name]
-            if user.employee_ids and user.employee_ids[0].contract_id and user.employee_ids[0].contract_id.working_hours:
-                calendar = user.employee_ids[0].contract_id.working_hours
-                start_dt = Datetime.from_string(record_dt)
-                resource_id = user.employee_ids[0].resource_id.id
-                return calendar.schedule_days_get_date(action.trg_date_range, day_date=start_dt, compute_leaves=True, resource_id=resource_id)
-        return super(BaseActionRule, self)._check_delay(action, record, record_dt)
diff --git a/addons/hr_contract/models/hr_contract.py b/addons/hr_contract/models/hr_contract.py
index 6a09f26fa4a..07b2f380fac 100644
--- a/addons/hr_contract/models/hr_contract.py
+++ b/addons/hr_contract/models/hr_contract.py
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+from datetime import date
+from dateutil.relativedelta import relativedelta
+
 from odoo import api, fields, models, _
 from odoo.exceptions import ValidationError
 
@@ -83,13 +86,28 @@ class Contract(models.Model):
         if self.filtered(lambda c: c.date_end and c.date_start > c.date_end):
             raise ValidationError(_('Contract start date must be less than contract end date.'))
 
-    @api.multi
-    def set_as_pending(self):
-        return self.write({'state': 'pending'})
+    @api.model
+    def update_to_pending(self):
+        soon_expired_contracts = self.search([
+            ('state', '=', 'open'),
+            '|',
+            ('date_end', '>=', fields.Date.to_string(date.today() + relativedelta(days=-7))),
+            ('visa_expire', '>=', fields.Date.to_string(date.today() + relativedelta(days=-60)))
+        ])
+        return soon_expired_contracts.write({
+            'state': 'pending'
+        })
 
-    @api.multi
-    def set_as_close(self):
-        return self.write({'state': 'close'})
+    @api.model
+    def update_to_close(self):
+        expired_contracts = self.search([
+            '|',
+            ('date_end', '>=', fields.Date.to_string(date.today() + relativedelta(days=1))),
+            ('visa_expire', '>=', fields.Date.to_string(date.today() + relativedelta(days=1)))
+        ])
+        return expired_contracts.write({
+            'state': 'close'
+        })
 
     @api.multi
     def _track_subtype(self, init_values):
diff --git a/addons/hr_contract/views/base_action_rule_views.xml b/addons/hr_contract/views/base_action_rule_views.xml
deleted file mode 100644
index 6f9a2f3414e..00000000000
--- a/addons/hr_contract/views/base_action_rule_views.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-        <record model="ir.ui.view" id="view_base_action_rule_form_resource">
-            <field name="name">base.action.rule.form</field>
-            <field name="model">base.action.rule</field>
-            <field name="inherit_id" ref="base_action_rule.view_base_action_rule_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='trg_date_calendar_id']" position="before">
-                    <field name="trg_date_resource_field_id"
-                        domain="[('model_id', '=', model_id), ('relation', '=', 'res.users'), ('ttype', 'in', ['many2one'])]"
-                        attrs="{'invisible': ['|', ('trg_date_id','=',False), ('trg_date_range_type', '!=', 'day')]}"/>
-                </xpath>
-            </field>
-        </record>
-</odoo>
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index 8f08a9ce787..03623c29fbf 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -730,7 +730,7 @@
         </record>
 
         <record id="hr_expense_submit_action_server" model="ir.actions.server">
-            <field name="name">Submit To Manager</field>
+            <field name="name">Expense: Submit To Manager</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_hr_expense"/>
             <field name="state">code</field>
diff --git a/addons/hr_timesheet_sheet/data/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/data/hr_timesheet_sheet_data.xml
index ccd9b5e2498..483045ab85c 100644
--- a/addons/hr_timesheet_sheet/data/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/data/hr_timesheet_sheet_data.xml
@@ -3,13 +3,12 @@
     <data noupdate="1">
 
         <record id="ir_actions_server_timesheet_sheet" model="ir.actions.server">
+            <field name="name">Timesheet Sheet: My Timesheet</field>
             <field name="sequence" eval="5"/>
             <field name="state">code</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_hr_timesheet_current_open"/>
             <field name="code">action = model.open_timesheet()</field>
-            <field name="condition">True</field>
-            <field name="name">My Timesheet</field>
         </record>
 
         <!-- Timesheet sheet related subtypes for messaging / Chatter -->
diff --git a/addons/lunch/data/lunch_data.xml b/addons/lunch/data/lunch_data.xml
index d9b1294617a..d8531ddb752 100644
--- a/addons/lunch/data/lunch_data.xml
+++ b/addons/lunch/data/lunch_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <record id="lunch_order_line_action_order" model="ir.actions.server">
-        <field name="name">Order meals</field>
+        <field name="name">Lunch: Order meals</field>
         <field name="model_id" ref="model_lunch_order_line"/>
         <field name="state">code</field>
         <field name="code">
@@ -20,7 +20,7 @@ if records:
     </record>
 
     <record id="lunch_order_line_action_confirm" model="ir.actions.server">
-        <field name="name">Receive meals</field>
+        <field name="name">Lunch: Receive meals</field>
         <field name="model_id" ref="model_lunch_order_line"/>
         <field name="state">code</field>
         <field name="code">records.confirm()</field>
@@ -36,7 +36,7 @@ if records:
     </record>
 
     <record id="lunch_order_line_action_cancel" model="ir.actions.server">
-        <field name="name">Cancel meals</field>
+        <field name="name">Lunch: Cancel meals</field>
         <field name="model_id" ref="model_lunch_order_line"/>
         <field name="state">code</field>
         <field name="code">records.cancel()</field>
diff --git a/addons/lunch/views/lunch_views.xml b/addons/lunch/views/lunch_views.xml
index 849a3237054..32828e4842e 100644
--- a/addons/lunch/views/lunch_views.xml
+++ b/addons/lunch/views/lunch_views.xml
@@ -414,8 +414,7 @@
         </record>
 
         <record id="action_server_lunch_archive_product" model="ir.actions.server">
-            <field name="name">Archive/Restore</field>
-            <field name="condition">True</field>
+            <field name="name">Lunch: Archive/Restore products</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_lunch_product" />
             <field name="state">code</field>
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index aa4cae02f30..6db20b0f592 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -2,29 +2,28 @@
 <odoo>
     <data noupdate="1">
         <record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
-            <field name="name">Email Queue Manager</field>
+            <field name="name">Mail: Email Queue Manager</field>
+            <field name="model_id" ref="model_mail_mail"/>
+            <field name="state">code</field>
+            <field name="code">model.process_email_queue()</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
             <field name="interval_type">hours</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall"/>
-            <field eval="'mail.mail'" name="model"/>
-            <field eval="'process_email_queue'" name="function"/>
-            <field eval="'()'" name="args"/>
         </record>
 
         <record id="ir_cron_module_update_notification" model="ir.cron">
-            <field name="name">Update Notification</field>
-            <field eval="True" name="active" />
+            <field name="name">Publisher: Update Notification</field>
+            <field name="model_id" ref="model_publisher_warranty_contract"/>
+            <field name="state">code</field>
+            <field name="code">model.update_notification(None)</field>
             <field name="user_id" ref="base.user_root" />
             <field name="interval_number">1</field>
             <field name="interval_type">weeks</field>
             <field name="numbercall">-1</field>
             <field name="nextcall" eval="(DateTime.now() + timedelta(days=7)).strftime('%Y-%m-%d %H:%M:%S')" />
             <field eval="False" name="doall" />
-            <field eval="'publisher_warranty.contract'" name="model" />
-            <field eval="'update_notification'" name="function" />
-            <field eval="'(None,)'" name="args" />
             <field name="priority">1000</field>
         </record>
 
diff --git a/addons/mail/models/ir_actions.py b/addons/mail/models/ir_actions.py
index 015e3f02b92..12c3ae85172 100644
--- a/addons/mail/models/ir_actions.py
+++ b/addons/mail/models/ir_actions.py
@@ -10,17 +10,14 @@ class ServerActions(models.Model):
     _name = 'ir.actions.server'
     _inherit = ['ir.actions.server']
 
-    @api.model
-    def _get_states(self):
-        res = super(ServerActions, self)._get_states()
-        res.insert(0, ('email', 'Send Email'))
-        return res
-
-    email_from = fields.Char('From', related='template_id.email_from', readonly=True)
-    email_to = fields.Char('To (Emails)', related='template_id.email_to', readonly=True)
-    partner_to = fields.Char('To (Partners)', related='template_id.partner_to', readonly=True)
-    subject = fields.Char('Subject', related='template_id.subject', readonly=True)
-    body_html = fields.Html('Body', related='template_id.body_html', readonly=True)
+    state = fields.Selection(selection_add=[
+        ('email', 'Send Email'),
+        ('followers', 'Add Followers')
+    ])
+    # Followers
+    partner_ids = fields.Many2many('res.partner', string='Add Followers')
+    channel_ids = fields.Many2many('mail.channel', string='Add Channels')
+    # Template
     template_id = fields.Many2one(
         'mail.template', 'Email Template', ondelete='set null',
         domain="[('model_id', '=', model_id)]",
@@ -32,6 +29,14 @@ class ServerActions(models.Model):
         if self.template_id and not self.template_id.email_from:
             raise UserError(_('Your template should define email_from'))
 
+    @api.model
+    def run_action_followers_multi(self, action, eval_context=None):
+        Model = self.env[action.model_id.model]
+        if self.partner_ids or self.channel_ids and hasattr(Model, 'message_subscribe'):
+            records = Model.browse(self._context.get('active_ids', self._context.get('active_id')))
+            records.message_subscribe(self.partner_ids.ids, self.channel_ids.ids, force=False)
+        return False
+
     @api.model
     def run_action_email(self, action, eval_context=None):
         # TDE CLEANME: when going to new api with server action, remove action
@@ -52,4 +57,3 @@ class ServerActions(models.Model):
         ctx['mail_notify_force_send'] = False
         eval_context['env'].context = ctx
         return eval_context
-
diff --git a/addons/mail/tests/test_ir_actions.py b/addons/mail/tests/test_ir_actions.py
index 5c482c1aacb..074f603a43f 100644
--- a/addons/mail/tests/test_ir_actions.py
+++ b/addons/mail/tests/test_ir_actions.py
@@ -6,7 +6,7 @@ from odoo.addons.base.tests.test_ir_actions import TestServerActionsBase
 
 class TestServerActionsEmail(TestServerActionsBase):
 
-    def test_00_state_email(self):
+    def test_email_action(self):
         """ Test ir.actions.server email type """
         # create email_template
         email_template = self.env['mail.template'].create({
@@ -27,3 +27,15 @@ class TestServerActionsEmail(TestServerActionsBase):
         # check email content
         self.assertEqual(mail.body, '<p>Dear TestingPartner, your parent is False</p>',
                          'ir_actions_server: TODO')
+
+    def test_followers_action(self):
+        """ Test ir.actions.server email type """
+        self.test_partner.message_unsubscribe(self.test_partner.message_partner_ids.ids)
+        self.action.write({
+            'state': 'followers',
+            'partner_ids': [(4, self.env.ref('base.partner_root').id), (4, self.env.ref('base.partner_demo').id)],
+            'channel_ids': [(4, self.env.ref('mail.channel_all_employees').id)]
+        })
+        self.action.with_context(self.context).run()
+        self.assertEqual(self.test_partner.message_partner_ids, self.env.ref('base.partner_root') | self.env.ref('base.partner_demo'))
+        self.assertEqual(self.test_partner.message_channel_ids, self.env.ref('mail.channel_all_employees'))
diff --git a/addons/mail/views/ir_actions_views.xml b/addons/mail/views/ir_actions_views.xml
index 2167449417f..381310bf69c 100644
--- a/addons/mail/views/ir_actions_views.xml
+++ b/addons/mail/views/ir_actions_views.xml
@@ -7,39 +7,15 @@
             <field name="model">ir.actions.server</field>
             <field name="inherit_id" ref="base.view_server_action_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@name='code']" position="after">
-                    <page string="Email" autofocus="autofocus"
-                            attrs="{'invisible': [('state', '!=', 'email')]}">
-                        <p attrs="{'invisible': [('model_id', '!=', False)]}">
-                            Please set the Base Model before setting the action details.
-                        </p>
-                        <group attrs="{'invisible': [('model_id', '=', False)]}">
-                            <field name="template_id"
-                                    attrs="{'required': [('state', '=', 'email')]}"/>
-                            <p colspan="2" attrs="{'invisible': [('template_id', '!=', False)]}">
-                                Choose a template to display its values.
-                            </p>
-                            <p colspan="2" attrs="{'invisible': [('template_id', '=', False)]}">
-                                The values displayed hereunder are informative. When sending the email, the values
-                                will be taken from the email template.
-                            </p>
-                        </group>
-                        <group attrs="{'invisible': ['|', ('model_id', '=', False), ('template_id', '=', False)]}">
-                            <label for="email_from"/>
-                            <div>
-                                <field name="email_from" nolabel="1'" readonly="1"
-                                        attrs="{'required': [('state', '=', 'email')]}"/>
-                                <p attrs="{'invisible': [('email_from', '!=', False)]}">
-                                    Your template does not defined the email address of the sender. Please update your template.
-                                </p>
-                            </div>
-                            <field name="email_to" readonly="1"/>
-                            <field name="partner_to" readonly="1"/>
-                            <field name="subject" readonly="1" attrs="{'required': [('state', '=', 'email')]}"/>
-                            <field name="body_html" readonly="1" attrs="{'required': [('state', '=', 'email')]}"/>
-                        </group>
-                    </page>
-                </xpath>
+                <field name="link_field_id" position="after">
+                    <field name="partner_ids" widget="many2many_tags"
+                        attrs="{'invisible': [('state', '!=', 'followers')]}"/>
+                    <field name="channel_ids" widget="many2many_tags"
+                        attrs="{'invisible': [('state', '!=', 'followers')]}"/>
+                    <field name="template_id"
+                        attrs="{'invisible': [('state', '!=', 'email')],
+                                'required': [('state', '=', 'email')]}"/>
+                </field>
             </field>
         </record>
 
diff --git a/addons/maintenance/data/maintenance_cron.xml b/addons/maintenance/data/maintenance_cron.xml
index 141ae9757c3..4345cca6216 100644
--- a/addons/maintenance/data/maintenance_cron.xml
+++ b/addons/maintenance/data/maintenance_cron.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding='UTF-8'?>
 <odoo>
 	<record model="ir.cron" id="maintenance_requests_cron">
-        <field name="name">Generate preventive maintenance requests</field>
+        <field name="name">Maintenance: generate preventive maintenance requests</field>
+        <field name="model_id" ref="model_maintenance_equipment"/>
+        <field name="state">code</field>
+        <field name="code">model._cron_generate_requests()</field>
         <field name="interval_number">1</field>
         <field name="interval_type">days</field>
         <field name="numbercall">-1</field>
         <field name="doall" eval="False"/>
-        <field name="model" eval="'maintenance.equipment'"/>
-        <field name="function" eval="'_cron_generate_requests'"/>
-        <field name="args" eval="'()'" />
     </record>
 </odoo>
\ No newline at end of file
diff --git a/addons/marketing_campaign/data/marketing_campaign_data.xml b/addons/marketing_campaign/data/marketing_campaign_data.xml
index 986b58508c9..6e92b7ab1e7 100644
--- a/addons/marketing_campaign/data/marketing_campaign_data.xml
+++ b/addons/marketing_campaign/data/marketing_campaign_data.xml
@@ -3,27 +3,26 @@
     <data noupdate="1">
 
     <!-- Cron -->
-
         <record model="ir.cron" id="ir_cron_marketing_campaign_every_hour">
             <field name="name">Marketing Campaign: Campaign workitems processing</field>
+            <field name="model_id" ref="model_marketing_campaign_workitem"/>
+            <field name="state">code</field>
+            <field name="code">model.process_all()</field>
             <field name="interval_number">1</field>
             <field name="interval_type">hours</field>
             <field name="numbercall">-1</field>
             <field name="doall" eval="False"/>
-            <field name="model" eval="'marketing.campaign.workitem'"/>
-            <field name="function" eval="'process_all'"/>
-            <field name="args" eval="'()'"/>
         </record>
 
         <record model="ir.cron" id="ir_cron_marketing_campaign_every_day">
             <field name="name">Marketing Campaign: Segment Sync</field>
+            <field name="model_id" ref="model_marketing_campaign_segment"/>
+            <field name="state">code</field>
+            <field name="code">model.process_segment()</field>
             <field name="interval_number">1</field>
             <field name="interval_type">days</field><!-- it s every day -->
             <field name="numbercall">-1</field>
             <field name="doall" eval="False"/>
-            <field name="model" eval="'marketing.campaign.segment'"/>
-            <field name="function" eval="'process_segment'"/>
-            <field name="args" eval="'()'"/>
         </record>
 
     </data>
diff --git a/addons/marketing_campaign_crm_demo/data/marketing_campaign_crm_demo.xml b/addons/marketing_campaign_crm_demo/data/marketing_campaign_crm_demo.xml
index b959aefac4d..dc2c70ba513 100644
--- a/addons/marketing_campaign_crm_demo/data/marketing_campaign_crm_demo.xml
+++ b/addons/marketing_campaign_crm_demo/data/marketing_campaign_crm_demo.xml
@@ -5,7 +5,6 @@
         <field name="state">code</field>
         <field name="code">True</field>
         <field name="sequence" eval="5"/>
-        <field name="condition" eval="True"/>
     </record>
 
     <!-- Email template -->
diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml
index 3c15424e9f7..36748205c52 100644
--- a/addons/mass_mailing/views/mass_mailing_views.xml
+++ b/addons/mass_mailing/views/mass_mailing_views.xml
@@ -794,17 +794,16 @@
         </record>
 
         <!-- Cron that process the mass mailing queue -->
-         <record id="ir_cron_mass_mailing_queue" model="ir.cron">
-            <field name="name">Process Mass Mailing Queue</field>
-            <field eval="True" name="active" />
+        <record id="ir_cron_mass_mailing_queue" model="ir.cron">
+            <field name="name">Mass Mailing: Process queue</field>
+            <field name="model_id" ref="model_mail_mass_mailing"/>
+            <field name="state">code</field>
+            <field name="code">model._process_mass_mailing_queue()</field>
             <field name="user_id" ref="base.user_root" />
             <field name="interval_number">60</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall" />
-            <field name="model">mail.mass_mailing</field>
-            <field name="function">_process_mass_mailing_queue</field>
-            <field name="args">()</field>
         </record>
 
         <menuitem name="Campaigns" id="menu_email_campaigns"
diff --git a/addons/membership/data/membership_data.xml b/addons/membership/data/membership_data.xml
index fea953d32d1..363ea3fea9e 100644
--- a/addons/membership/data/membership_data.xml
+++ b/addons/membership/data/membership_data.xml
@@ -2,11 +2,12 @@
 <odoo>
     <data noupdate="1">
         <record id="ir_cron_update_membership" model="ir.cron">
-            <field name="name">Check membership payment</field>
+            <field name="name">Membership: update memberships</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="state">code</field>
+            <field name="code">model._cron_update_membership()</field>
             <field name="interval_type">days</field>
             <field name="numbercall">-1</field>
-            <field name="model">res.partner</field>
-            <field name="function">_cron_update_membership</field>
         </record>
     </data>
 </odoo>
diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index efce8b3cebb..7d03462504b 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -22,7 +22,7 @@
         </record>
 
         <record id="production_order_server_action" model="ir.actions.server">
-            <field name="name">Plan Orders</field>
+            <field name="name">Mrp: Plan Production Orders</field>
             <field name="model_id" ref="mrp.model_mrp_production"/>
             <field name="state">code</field>
             <field name="code">records.button_plan()</field>
diff --git a/addons/pos_cache/data/pos_cache_data.xml b/addons/pos_cache/data/pos_cache_data.xml
index 709e6edea35..8bb58b41a4a 100644
--- a/addons/pos_cache/data/pos_cache_data.xml
+++ b/addons/pos_cache/data/pos_cache_data.xml
@@ -2,15 +2,15 @@
 <odoo>
     <data>
         <record model="ir.cron" id="refresh_pos_cache_cron">
-            <field name="name">Refresh POS Cache</field>
+            <field name="name">PoS: refresh cache</field>
+            <field name="model_id" ref="model_pos_cache"/>
+            <field name="state">code</field>
+            <field name="code">model.refresh_all_caches()</field>
             <field name="active" eval="False"/>
             <field name="interval_number">1</field>
             <field name="interval_type">hours</field>
             <field name="numbercall">-1</field>
             <field name="doall" eval="False"/>
-            <field name="model" eval="'pos.cache'"/>
-            <field name="function" eval="'refresh_all_caches'"/>
-            <field name="args" eval="'()'"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/procurement/data/procurement_data.xml b/addons/procurement/data/procurement_data.xml
index 9003b860efd..3538b404f7d 100644
--- a/addons/procurement/data/procurement_data.xml
+++ b/addons/procurement/data/procurement_data.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-        
+
         <record forcecreate="True" id="ir_cron_scheduler_action" model="ir.cron">
-            <field name="name">Run mrp scheduler</field>
+            <field name="name">Procurement: run MRP scheduler</field>
+            <field name="model_id" ref="model_procurement_order"/>
+            <field name="state">code</field>
+            <field name="code">model.run_scheduler(True)</field>
             <field eval="False" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
             <field name="interval_type">days</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall"/>
-            <field eval="'procurement.order'" name="model"/>
-            <field eval="'run_scheduler'" name="function"/>
-            <field eval="'(True,)'" name="args"/>
         </record>
 
         <record id="sequence_proc_group" model="ir.sequence">
diff --git a/addons/procurement/views/procurement_views.xml b/addons/procurement/views/procurement_views.xml
index ee136ba6171..275e935ebcf 100644
--- a/addons/procurement/views/procurement_views.xml
+++ b/addons/procurement/views/procurement_views.xml
@@ -293,7 +293,7 @@
         </record>
 
         <record id="procurement_order_server_action" model="ir.actions.server">
-            <field name="name">Run Procurements</field>
+            <field name="name">Procurement: Run Procurements</field>
             <field name="model_id" ref="model_procurement_order"/>
             <field name="state">code</field>
             <field name="code">
diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index 56b0035e025..05eace8edc0 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -342,7 +342,7 @@ class Task(models.Model):
              " * Red indicates something is preventing the progress of this task\n"
              " * Green indicates the task is ready to be pulled to the next stage")
     create_date = fields.Datetime(index=True)
-    write_date = fields.Datetime(index=True)  #not displayed in the view but it might be useful with base_action_rule module (and it needs to be defined first for that)
+    write_date = fields.Datetime(index=True)  #not displayed in the view but it might be useful with base_automation module (and it needs to be defined first for that)
     date_start = fields.Datetime(string='Starting Date',
     default=fields.Datetime.now,
     index=True, copy=False)
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 15aa57b0ee4..2569283bb45 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -306,8 +306,8 @@
             </field>
         </record>
 
-        <record id="activate_sample_project" model="ir.actions.server">
-            <field name="name">Activate Sample Project</field>
+        <record id="ir_actions_server_project_sample" model="ir.actions.server">
+            <field name="name">Project: Activate Sample Project</field>
             <field name="model_id" ref="project.model_project_project"/>
             <field name="code">
 action = model.activate_sample_project()
@@ -325,7 +325,7 @@ action = model.activate_sample_project()
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to create a new project.<br/>
-                    <i>Or <a type="action" name="%(project.activate_sample_project)d">activate a sample project</a> to play with.</i>
+                    <i>Or <a type="action" name="%(project.ir_actions_server_project_sample)d">activate a sample project</a> to play with.</i>
                 </p>
             </field>
         </record>
diff --git a/addons/rating_project/data/project_data.xml b/addons/rating_project/data/project_data.xml
index d60e24ef33c..3a6146b229c 100644
--- a/addons/rating_project/data/project_data.xml
+++ b/addons/rating_project/data/project_data.xml
@@ -2,11 +2,12 @@
 <odoo>
     <data>
         <record id="ir_cron_rating_project" model="ir.cron">
-            <field name="name">Send Customer Rating Forms</field>
+            <field name="name">Project: Send rating</field>
+            <field name="model_id" ref="project.model_project_project"/>
+            <field name="state">code</field>
+            <field name="code">model._send_rating_all()</field>
             <field name="interval_type">days</field>
             <field name="numbercall">-1</field>
-            <field name="model">project.project</field>
-            <field name="function">_send_rating_all</field>
         </record>
 
         <record id="mt_task_rating" model="mail.message.subtype">
diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml
index c84aaa3879c..9fc6f534343 100644
--- a/addons/survey/views/survey_views.xml
+++ b/addons/survey/views/survey_views.xml
@@ -634,8 +634,7 @@
         </record>
 
         <record id="survey_action_server_clean_test_answers" model="ir.actions.server">
-            <field name="name">Clean test answers</field>
-            <field name="condition">True</field>
+            <field name="name">Survey: Clean test answers</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_survey_survey" />
             <field name="state">code</field>
diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index bd75e56363c..7de5f2c3a8d 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -35,8 +35,7 @@
         </template>
 
         <record id="action_partner_post" model="ir.actions.server">
-            <field name="name">Website Partner Post and Thanks Demo</field>
-            <field name="condition">True</field>
+            <field name="name">Website: Partner Post and Thanks Demo</field>
             <field name="website_published" eval="True"/>
             <field name="website_path">partner_thanks</field>
             <field name="model_id" ref="base.model_res_partner"/>
@@ -111,8 +110,7 @@ response = request.website.render("website.template_partner_post", {'partner': p
         </template>
 
         <record id="action_partner_comment" model="ir.actions.server">
-            <field name="name">Website Partners Comment Form</field>
-            <field name="condition">True</field>
+            <field name="name">Website: Partners Comment Form</field>
             <field name="website_published" eval="True"/>
             <field name="website_path">partner_comment</field>
             <field name="model_id" ref="base.model_res_partner"/>
diff --git a/addons/website/views/ir_actions_views.xml b/addons/website/views/ir_actions_views.xml
index d692ce845cd..9f06b0448f7 100644
--- a/addons/website/views/ir_actions_views.xml
+++ b/addons/website/views/ir_actions_views.xml
@@ -11,8 +11,6 @@
                     <xpath expr="//field[@name='state']" position="after">
                         <field name="website_published"
                             attrs="{'invisible': [('state', '!=', 'code')]}"/>
-                    </xpath>
-                    <xpath expr="//field[@name='sequence']" position="after">
                         <field name="xml_id" invisible="1"/>
                         <field name="website_path"
                             attrs="{'invisible': ['|', ('website_published', '!=', True), ('state', '!=', 'code')]}"/>
diff --git a/addons/website_crm_partner_assign/views/crm_lead_views.xml b/addons/website_crm_partner_assign/views/crm_lead_views.xml
index b7241939df6..9f81738a80f 100644
--- a/addons/website_crm_partner_assign/views/crm_lead_views.xml
+++ b/addons/website_crm_partner_assign/views/crm_lead_views.xml
@@ -122,7 +122,7 @@
         </record>
 
         <record id="action_assign_salesman_according_assigned_partner" model="ir.actions.server">
-            <field name="name">Assign salesman of assigned partner</field>
+            <field name="name">Crm Assignation: Assign salesman of assigned partner</field>
             <field name="model_id" ref="model_crm_lead"/>
             <field name="state">code</field>
             <field name="code">
diff --git a/addons/website_theme_install/views/views.xml b/addons/website_theme_install/views/views.xml
index be322738349..6128d5b2d51 100644
--- a/addons/website_theme_install/views/views.xml
+++ b/addons/website_theme_install/views/views.xml
@@ -54,7 +54,7 @@
         ]"/>
     </record>
     <record id="theme_install_todo_action" model="ir.actions.server">
-        <field name="name">Choose Your Theme Todo Action</field>
+        <field name="name">Config: Choose Your Theme</field>
         <field name="model_id" ref="model_ir_module_module"/>
         <field name="code">
 model.update_list()
diff --git a/addons/website_twitter/data/website_twitter_data.xml b/addons/website_twitter/data/website_twitter_data.xml
index 470fdddc6a2..fca63620cda 100644
--- a/addons/website_twitter/data/website_twitter_data.xml
+++ b/addons/website_twitter/data/website_twitter_data.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-
-        <record id="ir_cron_twitter_actions" model="ir.cron">
-            <field name="name">Fetch new Twitter favorites</field>
-            <field name="interval_number">2</field>
-            <field name="interval_type">hours</field>
-            <field name="numbercall">-1</field>
-            <field name="doall" eval="False"/>
-            <field name="model">website</field>
-            <field name="function">_refresh_favorite_tweets</field>
-            <field name="args">()</field>
-        </record>
-
+    <record id="ir_cron_twitter_actions" model="ir.cron">
+        <field name="name">Twitter: Fetch new favorites</field>
+        <field name="model_id" ref="model_website"/>
+        <field name="state">code</field>
+        <field name="code">model._refresh_favorite_tweets()</field>
+        <field name="interval_number">2</field>
+        <field name="interval_type">hours</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
+    </record>
 </odoo>
 
diff --git a/odoo/addons/base/ir/ir_actions.py b/odoo/addons/base/ir/ir_actions.py
index b0ee6d981d2..d66abd39c67 100644
--- a/odoo/addons/base/ir/ir_actions.py
+++ b/odoo/addons/base/ir/ir_actions.py
@@ -24,7 +24,6 @@ class IrActions(models.Model):
 
     name = fields.Char(required=True)
     type = fields.Char(string='Action Type', required=True)
-    usage = fields.Char(string='Action Usage')
     xml_id = fields.Char(compute='_compute_xml_id', string="External ID")
     help = fields.Html(string='Action Description',
                        help='Optional help text for the users with a description of the target view, such as its usage and purpose.',
@@ -444,9 +443,9 @@ class IrActionsServer(models.Model):
     DEFAULT_PYTHON_CODE = """# Available variables:
 #  - time, datetime, dateutil, timezone: Python libraries
 #  - env: Odoo Environement
-#  - model: Model of the record on which the action is triggered
-#  - record: Record on which the action is triggered if there is one, otherwise None
-#  - records: Records on which the action is triggered if there is one, otherwise None
+#  - model: Odoo Model of the record on which the action is triggered; is a void recordset
+#  - record: record set of the current record on which the action is triggered; may be be void
+#  - records: record set of all records on which the action is triggered; may be void
 #  - log : log(message), function to log debug information in logging table
 #  - Warning: Warning Exception to use with raise
 # To return an action, assign: action = {...}\n\n\n\n"""
@@ -456,47 +455,35 @@ class IrActionsServer(models.Model):
         records = self.env['ir.model'].search([])
         return [(record.model, record.name) for record in records] + [('', '')]
 
-    @api.model
-    def _get_states(self):
-        """ Override me in order to add new states in the server action. Please
-        note that the added key length should not be higher than already-existing
-        ones. """
-        return [('code', 'Execute Python Code'),
-                ('client_action', 'Run a Client Action'),
-                ('object_create', 'Create or Copy a new Record'),
-                ('object_write', 'Write on a Record'),
-                ('multi', 'Execute several actions')]
-
     name = fields.Char(string='Action Name', translate=True)
     type = fields.Char(default='ir.actions.server')
-
-    condition = fields.Char(default="True", groups='base.group_system',
-                            help="Condition verified before executing the server action. If it "
-                                 "is not verified, the action will not be executed. The condition is "
-                                 "a Python expression, like 'record.list_price > 5000'. A void "
-                                 "condition is considered as always True. Help about python expression "
-                                 "is given in the help tab.")
-    state = fields.Selection(selection=lambda self: self._get_states(),
-                             string='Action To Do', default='code', required=True,
-                             help="Type of server action. The following values are available:\n"
-                                  "- 'Execute Python Code': a block of python code that will be executed\n"
-                                  "- 'Run a Client Action': choose a client action to launch\n"
-                                  "- 'Create or Copy a new Record': create a new record with new values, or copy an existing record in your database\n"
-                                  "- 'Write on a Record': update the values of a record\n"
-                                  "- 'Execute several actions': define an action that triggers several other server actions\n"
-                                  "- 'Send Email': automatically send an email (available in email_template)")
+    usage = fields.Selection([
+        ('ir_actions_server', 'Server Action'),
+        ('ir_cron', 'Scheduled Action')], string='Usage',
+        default='ir_actions_server', required=True)
+    state = fields.Selection([
+        ('code', 'Execute Python Code'),
+        ('object_create', 'Create a new Record'),
+        ('object_write', 'Update the Record'),
+        ('multi', 'Execute several actions')], string='Action To Do',
+        default='code', required=True,  # set default to write ?
+        help="Type of server action. The following values are available:\n"
+             "- 'Execute Python Code': a block of python code that will be executed\n"
+             "- 'Create or Copy a new Record': create a new record with new values, or copy an existing record in your database\n"
+             "- 'Write on a Record': update the values of a record\n"
+             "- 'Execute several actions': define an action that triggers several other server actions\n"
+             "- 'Add Followers': add followers to a record (available in Discuss)\n"
+             "- 'Send Email': automatically send an email (available in email_template)")
     # Generic
     sequence = fields.Integer(default=5,
                               help="When dealing with multiple actions, the execution order is "
                                    "based on the sequence. Low number means high priority.")
     model_id = fields.Many2one('ir.model', string='Base Model', required=True, ondelete='cascade',
                                help="Base model on which the server action runs.")
-    model_name = fields.Char(related='model_id.model', readonly=True)
-    menu_ir_values_id = fields.Many2one('ir.values', string='More Menu entry', readonly=True,
-                                        help='More menu entry.', copy=False)
-    # Client Action
-    action_id = fields.Many2one('ir.actions.actions', string='Client Action',
-                                help="Select the client action that has to be executed.")
+    model_name = fields.Char(related='model_id.model', readonly=True, store=True)
+    menu_ir_values_id = fields.Many2one('ir.values', string='Action on Object',
+                                        copy=False, readonly=True,
+                                        help='IrValues entry of the related more menu entry action')
     # Python code
     code = fields.Text(string='Python Code', groups='base.group_system',
                        default=DEFAULT_PYTHON_CODE,
@@ -505,79 +492,15 @@ class IrActionsServer(models.Model):
     # Multi
     child_ids = fields.Many2many('ir.actions.server', 'rel_server_actions', 'server_id', 'action_id',
                                  string='Child Actions', help='Child server actions that will be executed. Note that the last return returned action value will be used as global return value.')
-    # Create/Copy/Write
-    use_create = fields.Selection([('new', 'Create a new record in the Base Model'),
-                                   ('new_other', 'Create a new record in another model'),
-                                   ('copy_current', 'Copy the current record'),
-                                   ('copy_other', 'Choose and copy a record in the database')],
-                                  string="Creation Policy", default='new', required=True)
+    # Create
     crud_model_id = fields.Many2one('ir.model', string='Create/Write Target Model',
                                     oldname='srcmodel_id', help="Model for record creation / update. Set this field only to specify a different model than the base model.")
-    crud_model_name = fields.Char(string='Create/Write Target Model Name', related='crud_model_id.model', store=True, readonly=True)
-    ref_object = fields.Reference(string='Reference record', selection='_select_objects', oldname='copy_object')
-    link_new_record = fields.Boolean(string='Attach the new record',
-                                     help="Check this if you want to link the newly-created record "
-                                          "to the current record on which the server action runs.")
+    crud_model_name = fields.Char(related='crud_model_id.name', readonly=True)
     link_field_id = fields.Many2one('ir.model.fields', string='Link using field',
-                                    oldname='record_id', help="Provide the field where the record id is stored after the operations.")
-    use_write = fields.Selection([('current', 'Update the current record'),
-                                  ('expression', 'Update a record linked to the current record using python'),
-                                  ('other', 'Choose and Update a record in the database')],
-                                 string='Update Policy', default='current', required=True)
-    write_expression = fields.Char(string='Expression', oldname='write_id',
-                                   help="Provide an expression that, applied on the current record, gives the field to update.")
+                                    help="Provide the field used to link the newly created record"
+                                         "on the record on used by the server action.")
     fields_lines = fields.One2many('ir.server.object.lines', 'server_id', string='Value Mapping', copy=True)
 
-    # Fake fields used to implement the placeholder assistant
-    model_object_field = fields.Many2one('ir.model.fields', string="Field",
-                                         help="Select target field from the related document model.\n"
-                                              "If it is a relationship field you will be able to select "
-                                              "a target field at the destination of the relationship.")
-    sub_object = fields.Many2one('ir.model', string='Sub-model', readonly=True,
-                                 help="fWhen a relationship field is selected as first field, "
-                                      "this field shows the document model the relationship goes to.")
-    sub_model_object_field = fields.Many2one('ir.model.fields', string='Sub-field',
-                                             help="When a relationship field is selected as first field, "
-                                                  "this field lets you select the target field within the "
-                                                  "destination document model (sub-model).")
-    copyvalue = fields.Char(string='Placeholder Expression', help="Final placeholder expression, to be copy-pasted in the desired template field.")
-    # Fake fields used to implement the ID finding assistant
-    id_object = fields.Reference(string='Record', selection='_select_objects')
-    id_value = fields.Char(string='Record ID')
-
-    def _check_expression(self, expression, model):
-        """ Check python expression (condition, write_expression). Each step of
-        the path must be a valid many2one field, or an integer field for the last
-        step.
-
-        :param str expression: a python expression, beginning by 'obj' or 'object'
-        :param model: a record of the model 'ir.model'
-        :returns tuple: (is_valid, target_model_name, error_msg)
-        """
-        if not model:
-            return (False, None, 'Your expression cannot be validated because the Base Model is not set.')
-        # fetch current model
-        model_name = model.model
-        # transform expression into a path that should look like 'object.many2onefield.many2onefield'
-        path = expression.split('.')
-        initial = path.pop(0)
-        if initial not in ['obj', 'object', 'record']:
-            return (False, None, 'Your expression should begin with obj, object, record.\nAn expression builder is available in the help tab.')
-        # analyze path
-        while path:
-            step = path.pop(0)
-            field = self.env[model_name]._fields.get(step)
-            if not field:
-                return (False, None, 'Part of the expression (%s) is not recognized as a column in the model %s.' % (step, model_name))
-            ftype = field.type
-            if ftype not in ['many2one', 'int']:
-                return (False, None, 'Part of the expression (%s) is not a valid column type (is %s, should be a many2one or an int)' % (step, ftype))
-            if ftype == 'int' and path:
-                return (False, None, 'Part of the expression (%s) is an integer field that is only allowed at the end of an expression' % (step))
-            if ftype == 'many2one':
-                model_name = field.comodel_name
-        return (True, model_name, None)
-
     @api.constrains('code')
     def _check_python_code(self):
         for action in self.sudo().filtered('code'):
@@ -585,142 +508,19 @@ class IrActionsServer(models.Model):
             if msg:
                 raise ValidationError(msg)
 
-    @api.constrains('write_expression', 'model_id')
-    def _check_write_expression(self):
-        for record in self:
-            if record.write_expression and record.model_id:
-                correct, model_name, message = self._check_expression(record.write_expression, record.model_id)
-                if not correct:
-                    _logger.warning('Invalid expression: %s' % message)
-                    raise ValidationError(_('Incorrect Write Record Expression'))
-
     @api.constrains('child_ids')
     def _check_recursion(self):
         if not self._check_m2m_recursion('child_ids'):
             raise ValidationError(_('Recursion found in child server actions'))
 
-    @api.onchange('model_id')
-    def _onchange_model_id(self):
-        """ When changing the action base model, reset crud config
-        to ease value coherence. """
-        self.use_create = 'new'
-        self.use_write = 'current'
-        self.crud_model_id = self.model_id
-
-    @api.onchange('use_create', 'use_write', 'ref_object')
-    def _onchange_crud_config(self):
-        """ Wrapper on CRUD-type (create or write) on_change """
-        if self.state == 'object_create':
-            self._onchange_create_config()
-        elif self.state == 'object_write':
-            self._onchange_write_config()
-
-    def _onchange_create_config(self):
-        """ When changing the object_create type configuration:
-
-         - `new` and `copy_current`: crud_model_id is the same as base model
-         - `new_other`: user choose crud_model_id
-         - `copy_other`: disassemble the reference object to have its model
-         - if the target model has changed, then reset the link field that is
-           probably not correct anymore
-        """
-        crud_model_id = self.crud_model_id
-
-        if self.use_create == 'new':
-            self.crud_model_id = self.model_id
-        elif self.use_create == 'new_other':
-            pass
-        elif self.use_create == 'copy_current':
-            self.crud_model_id = self.model_id
-        elif self.use_create == 'copy_other' and self.ref_object:
-            ref_model = self.ref_object._name
-            self.crud_model_id = self.env['ir.model'].search([('model', '=', ref_model)])
-
-        if self.crud_model_id != crud_model_id:
-            self.link_field_id = False
-
-    def _onchange_write_config(self):
-        """ When changing the object_write type configuration:
-
-         - `current`: crud_model_id is the same as base model
-         - `other`: disassemble the reference object to have its model
-         - `expression`: has its own on_change, nothing special here
-        """
-        crud_model_id = self.crud_model_id
-
-        if self.use_write == 'current':
-            self.crud_model_id = self.model_id
-        elif self.use_write == 'other' and self.ref_object:
-            ref_model = self.ref_object._name
-            self.crud_model_id = self.env['ir.model'].search([('model', '=', ref_model)])
-        elif self.use_write == 'expression':
-            pass
-
-        if self.crud_model_id != crud_model_id:
-            self.link_field_id = False
-
     @api.onchange('crud_model_id')
     def _onchange_crud_model_id(self):
-        """ When changing the CRUD model, update its stored name also """
         self.link_field_id = False
+        self.crud_model_name = self.crud_model_id.model
 
-    @api.onchange('write_expression')
-    def _onchange_write_expression(self):
-        """ Check the write_expression and update crud_model_id accordingly """
-        values = {}
-        if self.write_expression:
-            valid, model_name, message = self._check_expression(self.write_expression, self.model_id)
-        else:
-            valid, model_name, message = True, None, False
-            if self.model_id:
-                model_name = self.model_id.model
-        if not valid:
-            return {
-                'warning': {
-                    'title': _('Incorrect expression'),
-                    'message': message or _('Invalid expression'),
-                }
-            }
-        if model_name:
-            self.crud_model_id = self.env['ir.model'].search([('model', '=', model_name)])
-
-    def _build_expression(self, field_name, sub_field_name):
-        """ Returns a placeholder expression for use in a template field,
-        based on the values provided in the placeholder assistant.
-
-        :param field_name: main field name
-        :param sub_field_name: sub field name (M2O)
-        :return: final placeholder expression
-        """
-        expression = ''
-        if field_name:
-            expression = "object." + field_name
-            if sub_field_name:
-                expression += "." + sub_field_name
-        return expression
-
-    @api.onchange('model_object_field', 'sub_model_object_field')
-    def _onchange_model_object_field(self):
-        field = self.model_object_field
-        sub_field = self.sub_model_object_field
-
-        self.sub_object = False
-        self.sub_model_object_field = False
-        self.copyvalue = False
-
-        if field:
-            if field.ttype in ['many2one', 'one2many', 'many2many']:
-                comodel = self.env['ir.model'].search([('model', '=', field.relation)])
-                if comodel:
-                    self.sub_object = comodel
-                    self.copyvalue = self._build_expression(field.name, sub_field.name)
-                    self.sub_model_object_field = sub_field
-            else:
-                self.copyvalue = self._build_expression(field.name, False)
-
-    @api.onchange('id_object')
-    def _onchange_id_object(self):
-        self.id_value = self.id_object.id if self.id_object else False
+    @api.onchange('model_id')
+    def _onchange_model_id(self):
+        self.model_name = self.model_id.model
 
     @api.multi
     def create_action(self):
@@ -747,13 +547,6 @@ class IrActionsServer(models.Model):
                     raise UserError(_('Deletion of the action record failed.'))
         return True
 
-    @api.model
-    def run_action_client_action(self, action, eval_context=None):
-        if not action.action_id:
-            raise UserError(_("Please specify an action to launch!"))
-        record = self.env[action.action_id.type].browse(action.action_id.id)
-        return record.read()[0]
-
     @api.model
     def run_action_code_multi(self, action, eval_context=None):
         safe_eval(action.sudo().code.strip(), eval_context, mode="exec", nocopy=True)  # nocopy allows to return 'action'
@@ -784,21 +577,7 @@ class IrActionsServer(models.Model):
         for exp in action.fields_lines:
             res[exp.col1.name] = exp.eval_value(eval_context=eval_context)[exp.id]
 
-        if action.use_write == 'current':
-            model = action.model_id.model
-            ref_id = self._context.get('active_id')
-        elif action.use_write == 'other':
-            model = action.crud_model_id.model
-            ref_id = action.ref_object.id
-        elif action.use_write == 'expression':
-            model = action.crud_model_id.model
-            ref = safe_eval(action.write_expression, eval_context)
-            if isinstance(ref, models.BaseModel):
-                ref_id = ref.id
-            else:
-                ref_id = int(ref)
-
-        self.env[model].browse(ref_id).write(res)
+        self.env[action.model_id.model].browse(self._context.get('active_id')).write(res)
 
     @api.model
     def run_action_object_create(self, action, eval_context=None):
@@ -817,27 +596,16 @@ class IrActionsServer(models.Model):
         for exp in action.fields_lines:
             res[exp.col1.name] = exp.eval_value(eval_context=eval_context)[exp.id]
 
-        if action.use_create in ['new', 'copy_current']:
-            model = action.model_id.model
-        elif action.use_create in ['new_other', 'copy_other']:
-            model = action.crud_model_id.model
+        res = self.env[action.crud_model_id.model].create(res)
 
-        if action.use_create == 'copy_current':
-            ref_id = self._context.get('active_id')
-            res = self.env[model].browse(ref_id).copy(res)
-        elif action.use_create == 'copy_other':
-            res = action.ref_object.copy(res)
-        else:
-            res = self.env[model].create(res)
-
-        if action.link_new_record and action.link_field_id:
+        if action.link_field_id:
             record = self.env[action.model_id.model].browse(self._context.get('active_id'))
             record.write({action.link_field_id.name: res.id})
 
     @api.model
     def _get_eval_context(self, action=None):
         """ Prepare the context used when evaluating python code, like the
-        condition or code server actions.
+        python formulas or code server actions.
 
         :param action: the current server action
         :type action: browse record
@@ -874,10 +642,9 @@ class IrActionsServer(models.Model):
 
     @api.multi
     def run(self):
-        """ Runs the server action. For each server action, the condition is
-        checked. Note that a void (``False``) condition is considered as always
-        valid. If it is verified, the run_action_<STATE> method is called. This
-        allows easy overriding of the server actions.
+        """ Runs the server action. For each server action, the
+        run_action_<STATE> method is called. This allows easy overriding
+        of the server actions.
 
         :param dict context: context should contain following keys
 
@@ -894,14 +661,7 @@ class IrActionsServer(models.Model):
         """
         for action in self:
             eval_context = self._get_eval_context(action)
-            condition = action.sudo().condition
-            if condition is False:
-                # Void (aka False) conditions are considered as True
-                condition = True
             if hasattr(self, 'run_action_%s_multi' % action.state):
-                expr = safe_eval(str(condition), eval_context)
-                if not expr:
-                    continue
                 # call the multi method
                 run_self = self.with_context(eval_context['env'].context)
                 func = getattr(run_self, 'run_action_%s_multi' % action.state)
@@ -914,9 +674,6 @@ class IrActionsServer(models.Model):
                     # run context dedicated to a particular active_id
                     run_self = self.with_context(active_ids=[active_id], active_id=active_id)
                     eval_context["env"].context = run_self._context
-                    expr = safe_eval(str(condition), eval_context)
-                    if not expr:
-                        continue
                     # call the single method related to the action: run_action_<STATE>
                     func = getattr(run_self, 'run_action_%s' % action.state)
                     res = func(action, eval_context=eval_context)
@@ -940,7 +697,7 @@ class IrServerObjectLines(models.Model):
     col1 = fields.Many2one('ir.model.fields', string='Field', required=True)
     value = fields.Text(required=True, help="Expression containing a value specification. \n"
                                             "When Formula type is selected, this field may be a Python expression "
-                                            " that can use the same values as for the condition field on the server action.\n"
+                                            " that can use the same values as for the code field on the server action.\n"
                                             "If Value type is selected, the value will be used directly without evaluation.")
     type = fields.Selection([('value', 'Value'), ('equation', 'Python expression')], 'Evaluation Type', default='value', required=True, change_default=True)
 
diff --git a/odoo/addons/base/ir/ir_actions.xml b/odoo/addons/base/ir/ir_actions.xml
index 0560e95dd59..1f414b305b9 100644
--- a/odoo/addons/base/ir/ir_actions.xml
+++ b/odoo/addons/base/ir/ir_actions.xml
@@ -11,7 +11,6 @@
                     <group>
                         <field name="name"/>
                         <field name="type"/>
-                        <field name="usage"/>
                     </group>
                 </form>
             </field>
@@ -85,7 +84,6 @@
                                         <field name="report_file"/>
                                         <field name="auto"/>
                                         <field name="parser"/>
-                                        <field name="usage"/>
                                     </group>
                                     <group string="XML Report">
                                         <field name="report_xsl"/>
@@ -264,128 +262,66 @@
             <field name="model">ir.actions.server</field>
             <field name="arch" type="xml">
                 <form string="Server Action">
+                    <header>
+                        <field name="menu_ir_values_id" invisible="1"/>
+                        <button name="create_action" string="Create Action" type="object"
+                                class="btn-primary"
+                                attrs="{'invisible':[('menu_ir_values_id','!=',False)]}"
+                                help="Display an option in the 'More' top-menu or related document, to run this action."/>
+                        <button name="unlink_action" string="Remove Action" type="object" 
+                                attrs="{'invisible':[('menu_ir_values_id','=',False)]}"
+                                help="Remove the contextual action related to this server action"/>
+                    </header>
                     <sheet>
-                        <div class="oe_button_box" name="button_box">
-                            <field name="menu_ir_values_id" invisible="1"/>
-                            <button name="create_action" string="Add in the 'More' menu" type="object"
-                                    attrs="{'invisible':[('menu_ir_values_id','!=',False)]}"
-                                    help="Display an option on related documents to run this sever action"/>
-                            <button name="unlink_action" string="Remove from the 'More' menu" type="object" 
-                                    attrs="{'invisible':[('menu_ir_values_id','=',False)]}"
-                                    help="Remove the contextual action related to this server action"/>
-                        </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name" placeholder="e.g. Update order quantity"/></h1>
                         </div>
-                        <group>
-                            <group>
-                                <field name="type" invisible="1"/>
+                        <group name="action_wrapper">
+                            <group name="action_content">
                                 <field name="model_id"/>
+                                <field name="model_name" invisible="1"/>
                                 <field name="state"/>
-                            </group>
-                            <group>
-                                <field name="condition"/>
-                                <field name="sequence"/>
+                                <field name="type" invisible="1"/>
+                                <field name="crud_model_id"
+                                    attrs="{'invisible': [('state', '!=', 'object_create')], 'required': [('state', '=', 'object_create')]}"/>
+                                <field name="crud_model_name" invisible="1"/>
+                                <field name="link_field_id"
+                                    domain="[('model_id', '=', model_id), ('relation', '=', crud_model_name), ('ttype', 'in', ['many2one'])]"
+                                    attrs="{'invisible': [('state', '!=', 'object_create')]}"/>
                             </group>
                         </group>
-                        <notebook colspan="4">
+                        <notebook>
                             <page string="Python Code" name='code' autofocus="autofocus"
                                     attrs="{'invisible': [('state', '!=', 'code')]}">
                                 <field name="code" widget="ace" options="{'mode': 'python'}" placeholder="Enter Python code here. Help about Python expression is available in the help tab of this document."/>
                             </page>
 
-                            <page string="Client" autofocus="autofocus"
-                                    attrs="{'invisible': [('state', '!=', 'client_action')]}">
-                                <group>
-                                    <field name="action_id" attrs="{'required':[('state', '=', 'client_action')]}"/>
-                                </group>
-                            </page>
-
-
-                            <page string="Create / Write / Copy" autofocus="autofocus"
+                            <page string="Data to Write" autofocus="autofocus"
                                     attrs="{'invisible':[('state', 'not in', ['object_create', 'object_write'])]}">
                                 <p attrs="{'invisible': [('model_id', '!=', False)]}">
-                                    Please set the Base Model before setting the action details.
+                                    Please set the Model to Create before choosing values
                                 </p>
-                                <group attrs="{'invisible': [('model_id', '=', False)]}">
-                                    <field name="use_create" widget="radio"
-                                            attrs="{'invisible': [('state', '!=', 'object_create')]}"/>
-
-                                    <field name="use_write" widget="radio"
-                                            attrs="{'invisible': [('state', '!=', 'object_write')]}"/>
-
-                                    <label for="ref_object" string=" "
-                                            attrs="{'invisible': ['&amp;', 
-                                                                    '|', ('state', '!=', 'object_write'), ('use_write', '!=', 'other'),
-                                                                    '|', ('state', '!=', 'object_create'), ('use_create', '!=', 'copy_other')]}"/>
-                                    <div style="margin-left: 24px;" 
-                                            attrs="{'invisible': ['&amp;', 
-                                                                    '|', ('state', '!=', 'object_write'), ('use_write', '!=', 'other'),
-                                                                    '|', ('state', '!=', 'object_create'), ('use_create', '!=', 'copy_other')]}">
-                                        <field name="ref_object" nolabel="1"/>
-                                    </div>
-
-                                    <field name="crud_model_id"
-                                            attrs="{'invisible': ['|', ('state', '!=', 'object_create'), ('use_create', '!=', 'new_other')]}"/>
-                                    <field name="crud_model_name" invisible="1"/>
-
-                                    <label for="link_new_record" attrs="{'invisible': [('state', '!=', 'object_create')]}"/>
-                                    <div attrs="{'invisible': [('state', '!=', 'object_create')]}">
-                                        <field name="link_new_record" nolabel="1" style="display: inline-block;"/>
-                                        <p class="oe_grey oe_edit_only" style="display: inline-block; margin: 0px 0px 0px 8px;">
-                                            Check to attach the newly created record to the record on which the server action runs.
-                                        </p>
-                                        <group>
-                                            <field name="model_name" invisible="1"/>
-                                            <field name="link_field_id"
-                                                    domain="[('model_id', '=', crud_model_id), ('relation', '=', model_name), ('ttype', 'in', ['many2one'])]"
-                                                    attrs="{'required': [('state', '=', 'object_create'), ('link_new_record', '=', True)],
-                                                            'invisible': ['|', ('state', '!=', 'object_create'), ('link_new_record', '=', False)]}"/>
-                                        </group>
-                                    </div>
-
-                                    <label for="link_new_record" attrs="{'invisible': ['|', ('state', '!=', 'object_write'), ('use_write', '!=', 'expression')]}"/>
-                                    <div attrs="{'invisible': ['|', ('state', '!=', 'object_write'), ('use_write', '!=', 'expression')]}">
-                                        <p class="oe_grey oe_edit_only" style="margin: 0px;">
-                                            Write a python expression, beginning with record, that gives the record to update. An expression builder is available in the help tab. Examples:
-                                        </p>
-                                        <ul class="oe_grey oe_edit_only">
-                                            <li>record.partner_id</li>
-                                            <li>record.partner_id.currency_id</li>
-                                        </ul>
-                                        <field name="write_expression"
-                                                attrs="{'required': [('state', '=', 'object_write'), ('use_write', '=', 'expression')]}"/>
-                                    </div>
-
-                                    <field name="fields_lines">
-                                        <tree string="Field Mappings" editable="top">
-                                            <field name="col1" domain="[('model_id', '=', parent.crud_model_id)]"/>
-                                            <field name="type"/>
-                                            <field name="value"/>
-                                        </tree>
-                                        <form string="Field Mapping">
-                                            <group >
-                                                <field name="col1" domain="[('model_id', '=', parent.crud_model_id)]"/>
-                                                <field name="type"/>
-                                                <field name="value"/>
-                                            </group>
-                                        </form>
-                                    </field>
-                                </group>
+                                <field name="fields_lines">
+                                     <tree string="Field Mappings" editable="bottom">
+                                        <field name="col1" domain="['|', ('model_id', '=', parent.crud_model_id), ('model_id', '=', parent.model_id)]"/>
+                                        <field name="type"/>
+                                        <field name="value"/>
+                                    </tree>
+                                </field>
                             </page>
 
-                            <page string="Execute several actions" autofocus="autofocus"
+                            <page string="Actions" autofocus="autofocus"
                                     attrs="{'invisible': [('state', '!=', 'multi')]}">
                                 <p class="oe_grey">
                                     If several child actions return an action, only the last one will be executed.
                                     This may happen when having server actions executing code that returns an action, or server actions returning a client action.
                                 </p>
-                                <field name="child_ids"
-                                        domain="[('model_id', '=', model_id)]"/>
+                                <field name="child_ids" domain="[('model_id', '=', model_id)]"/>
                             </page>
 
-                            <page string="Help">
+                            <page string="Help"
+                                    attrs="{'invisible': [('state', '!=', 'code')]}">
                                 <group>
                                     <div style="margin-top: 4px;">
                                         <h3>Help with Python expressions.</h3>
@@ -396,13 +332,6 @@
                                             <li>time, datetime, timezone: Python module</li>
                                             <li>log(message, level='info'): a logging function to create ir_logging records</li>
                                         </ul>
-                                        <div>
-                                            <p>Example of condition expression using Python</p>
-                                            <ul>
-                                                <li>condition: True</li>
-                                                <li>condition: record.list_price > 5000</li>
-                                            </ul>
-                                        </div>
                                         <div attrs="{'invisible': [('state', '!=', 'code')]}">
                                             <p>Example of python code</p>
 <code style='white-space: pre-wrap'>
@@ -411,25 +340,6 @@ env["res.partner"].create({"name": partner_name})
 </code>
                                         </div>
                                     </div>
-                                    <group>
-                                        <h3 colspan="2">Dynamic expression builder</h3>
-                                        <p colspan="2" attrs="{'invisible': [('model_id', '!=', False)]}">
-                                            Please set the Base Model of the action to enable the dynamic expression buidler.
-                                        </p>
-                                        <field name="model_object_field"
-                                                attrs="{'invisible': [('model_id', '=', False)]}"
-                                                domain="[('model_id', '=', model_id), ('ttype', '!=', 'one2many'), ('ttype', '!=', 'many2many')]"/>
-                                        <field name="sub_object" readonly="1" attrs="{'invisible': [('model_id', '=', False)]}"/>
-                                        <field name="sub_model_object_field"
-                                                domain="[('model_id', '=', sub_object), ('ttype', '!=', 'one2many'), ('ttype', '!=', 'many2many')]"
-                                                attrs="{'readonly':[('sub_object','=',False)],
-                                                        'required':[('sub_object','!=',False)],
-                                                        'invisible': [('model_id', '=', False)]}"/>
-                                        <field name="copyvalue" attrs="{'invisible': [('model_id', '=', False)]}"/>
-                                        <h3 colspan="2">Find the ID of a record in the database</h3>
-                                        <field name="id_object"/>
-                                        <field name="id_value" />
-                                    </group>
                                 </group>
                             </page>
                         </notebook>
@@ -442,9 +352,11 @@ env["res.partner"].create({"name": partner_name})
             <field name="model">ir.actions.server</field>
             <field name="arch" type="xml">
                 <tree string="Server Actions">
+                    <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="state"/>
                     <field name="model_id"/>
+                    <field name="usage"/>
                 </tree>
             </field>
         </record>
@@ -459,6 +371,7 @@ env["res.partner"].create({"name": partner_name})
                     <group expand="0" string="Group By" colspan="4" col="4">
                         <filter string="Action Type" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Model" domain="[]" context="{'group_by':'model_id'}"/>
+                        <filter string="Usage" domain="[]" context="{'group_by':'usage'}"/>
                     </group>
                 </search>
             </field>
@@ -541,8 +454,7 @@ env["res.partner"].create({"name": partner_name})
         </record>
         <menuitem id="menu_ir_actions_todo_form" action="act_ir_actions_todo_form" parent="base.next_id_6"/>
         <record id="action_run_ir_action_todo" model="ir.actions.server">
-            <field name="name">Run Remaining Action Todo</field>
-            <field name="condition">True</field>
+            <field name="name">Config: Run Remaining Action Todo</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_res_config"/>
             <field name="state">code</field>
diff --git a/odoo/addons/base/ir/ir_autovacuum.xml b/odoo/addons/base/ir/ir_autovacuum.xml
index 1e015c89395..52e07855b63 100644
--- a/odoo/addons/base/ir/ir_autovacuum.xml
+++ b/odoo/addons/base/ir/ir_autovacuum.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-        <record model="ir.cron" id="autovacuum_job">
-            <field name='name'>Auto-vacuum internal data</field>
-            <field name='interval_number'>1</field>
-            <field name='interval_type'>days</field>
-            <field name="numbercall">-1</field>
-            <field name="active">True</field>
-            <field name="model">ir.autovacuum</field>
-            <field name="function">power_on</field>
-            <field name="args">()</field>
-        </record>
+    <record id="autovacuum_job" model="ir.cron">
+        <field name="name">Base: Auto-vacuum internal data</field>
+        <field name="model_id" ref="model_ir_autovacuum"/>
+        <field name="state">code</field>
+        <field name="code">model.power_on()</field>
+        <field name='interval_number'>1</field>
+        <field name='interval_type'>days</field>
+        <field name="numbercall">-1</field>
+    </record>
 </odoo>
diff --git a/odoo/addons/base/ir/ir_cron.py b/odoo/addons/base/ir/ir_cron.py
index 12927e93bdb..a3c48a66826 100644
--- a/odoo/addons/base/ir/ir_cron.py
+++ b/odoo/addons/base/ir/ir_cron.py
@@ -10,17 +10,13 @@ from dateutil.relativedelta import relativedelta
 
 import odoo
 from odoo import api, fields, models, _
-from odoo.exceptions import UserError, ValidationError
-from odoo.tools.safe_eval import safe_eval
+from odoo.exceptions import UserError
 
 _logger = logging.getLogger(__name__)
 
 BASE_VERSION = odoo.modules.load_information_from_description_file('base')['version']
 
 
-def str2tuple(s):
-    return safe_eval('tuple(%s)' % (s or ''))
-
 _intervalTypes = {
     'days': lambda interval: relativedelta(days=interval),
     'hours': lambda interval: relativedelta(hours=interval),
@@ -40,9 +36,12 @@ class ir_cron(models.Model):
     # See also odoo.cron
 
     _name = "ir.cron"
-    _order = 'name'
+    _order = 'cron_name'
 
-    name = fields.Char(required=True)
+    ir_actions_server_id = fields.Many2one(
+        'ir.actions.server', 'Server action',
+        delegate=True, ondelete='restrict', required=True)
+    cron_name = fields.Char('Name', related='ir_actions_server_id.name', store=True)
     user_id = fields.Many2one('res.users', string='User', default=lambda self: self.env.user, required=True)
     active = fields.Boolean(default=True)
     interval_number = fields.Integer(default=1, help="Repeat every x.")
@@ -54,77 +53,50 @@ class ir_cron(models.Model):
     numbercall = fields.Integer(string='Number of Calls', default=1, help='How many times the method is called,\na negative number indicates no limit.')
     doall = fields.Boolean(string='Repeat Missed', help="Specify if missed occurrences should be executed when the server restarts.")
     nextcall = fields.Datetime(string='Next Execution Date', required=True, default=fields.Datetime.now, help="Next planned execution date for this job.")
-    model = fields.Char(string='Object', help="Model name on which the method to be called is located, e.g. 'res.partner'.")
-    function = fields.Char(string='Method', help="Name of the method to be called when this job is processed.")
-    args = fields.Text(string='Arguments', help="Arguments to be passed to the method, e.g. (uid,).")
     priority = fields.Integer(default=5, help='The priority of the job, as an integer: 0 means higher priority, 10 means lower priority.')
 
-    @api.constrains('args')
-    def _check_args(self):
-        try:
-            for this in self:
-                str2tuple(this.args)
-        except Exception:
-            raise ValidationError(_('Invalid arguments'))
+    @api.model
+    def create(self, values):
+        values['usage'] = 'ir_cron'
+        return super(ir_cron, self).create(values)
 
     @api.multi
     def method_direct_trigger(self):
         for cron in self:
-            self.sudo(user=cron.user_id.id)._callback(cron.model, cron.function, cron.args, cron.id)
+            self.sudo(user=cron.user_id.id).ir_actions_server_id.run()
         return True
 
     @api.model
-    def _handle_callback_exception(self, model_name, method_name, args, job_id, job_exception):
+    def _handle_callback_exception(self, cron_name, server_action_id, job_id, job_exception):
         """ Method called when an exception is raised by a job.
 
-        Simply logs the exception and rollback the transaction.
-
-        :param model_name: model name on which the job method is located.
-        :param method_name: name of the method to call when this job is processed.
-        :param args: arguments of the method (without the usual self, cr, uid).
-        :param job_id: job id.
-        :param job_exception: exception raised by the job.
-
-        """
+        Simply logs the exception and rollback the transaction. """
         self._cr.rollback()
-        _logger.exception("Call of self.env[%r].%s(*%r) failed in Job %s",
-                          model_name, method_name, args, job_id)
+        _logger.exception("Call from cron %s for server action %d failed in Job %s",
+                          cron_name, server_action_id, job_id)
 
     @api.model
-    def _callback(self, model_name, method_name, args, job_id):
-        """ Run the method associated to a given job
-
-        It takes care of logging and exception handling.
-
-        :param model_name: model name on which the job method is located.
-        :param method_name: name of the method to call when this job is processed.
-        :param args: arguments of the method (without the usual self, cr, uid).
-        :param job_id: job id.
-        """
+    def _callback(self, cron_name, server_action_id, job_id):
+        """ Run the method associated to a given job. It takes care of logging
+        and exception handling. Note that the user running the server action
+        is the user calling this method. """
         try:
-            args = str2tuple(args)
             if self.pool != self.pool.check_signaling():
                 # the registry has changed, reload self in the new registry
                 self.env.reset()
                 self = self.env()[self._name]
-            if model_name in self.env:
-                model = self.env[model_name]
-                if hasattr(model, method_name):
-                    log_depth = (None if _logger.isEnabledFor(logging.DEBUG) else 1)
-                    odoo.netsvc.log(_logger, logging.DEBUG, 'cron.object.execute', (self._cr.dbname, self._uid, '*', model_name, method_name)+tuple(args), depth=log_depth)
-                    if _logger.isEnabledFor(logging.DEBUG):
-                        start_time = time.time()
-                    getattr(model, method_name)(*args)
-                    if _logger.isEnabledFor(logging.DEBUG):
-                        end_time = time.time()
-                        _logger.debug('%.3fs (%s, %s)', end_time - start_time, model_name, method_name)
-                    self.pool.signal_caches_change()
-                else:
-                    _logger.warning("Method '%s.%s' does not exist.", model_name, method_name)
-            else:
-                _logger.warning("Model %r does not exist.", model_name)
+
+            log_depth = (None if _logger.isEnabledFor(logging.DEBUG) else 1)
+            odoo.netsvc.log(_logger, logging.DEBUG, 'cron.object.execute', (self._cr.dbname, self._uid, '*', cron_name, server_action_id), depth=log_depth)
+            if _logger.isEnabledFor(logging.DEBUG):
+                start_time = time.time()
+            self.env['ir.actions.server'].browse(server_action_id).run()
+            if _logger.isEnabledFor(logging.DEBUG):
+                end_time = time.time()
+                _logger.debug('%.3fs (cron %s, server action %d with uid %d)', end_time - start_time, cron_name, server_action_id, self.env.uid)
+            self.pool.signal_caches_change()
         except Exception, e:
-            self._handle_callback_exception(model_name, method_name, args, job_id, e)
+            self._handle_callback_exception(cron_name, server_action_id, job_id, e)
 
     @classmethod
     def _process_job(cls, job_cr, job, cron_cr):
@@ -151,7 +123,7 @@ class ir_cron(models.Model):
                     if numbercall > 0:
                         numbercall -= 1
                     if not ok or job['doall']:
-                        cron._callback(job['model'], job['function'], job['args'], job['id'])
+                        cron._callback(job['cron_name'], job['ir_actions_server_id'], job['id'])
                     if numbercall:
                         nextcall += _intervalTypes[job['interval_type']](job['interval_number'])
                     ok = True
@@ -168,7 +140,7 @@ class ir_cron(models.Model):
 
     @classmethod
     def _acquire_job(cls, db_name):
-        # TODO remove 'check' argument from addons/base_action_rule/base_action_rule.py
+        # TODO remove 'check' argument from addons/base_automation/base_automation.py
         """ Try to process one cron job.
 
         This selects in database all the jobs that should be processed. It then
@@ -223,10 +195,10 @@ class ir_cron(models.Model):
 
                 locked_job = lock_cr.fetchone()
                 if not locked_job:
-                    _logger.debug("Job `%s` already executed by another process/thread. skipping it", job['name'])
+                    _logger.debug("Job `%s` already executed by another process/thread. skipping it", job['cron_name'])
                     continue
                 # Got the lock on the job row, run its code
-                _logger.debug('Starting job `%s`.', job['name'])
+                _logger.debug('Starting job `%s`.', job['cron_name'])
                 job_cr = db.cursor()
                 try:
                     registry = odoo.registry(db_name)
@@ -239,7 +211,7 @@ class ir_cron(models.Model):
             except psycopg2.OperationalError, e:
                 if e.pgcode == '55P03':
                     # Class 55: Object not in prerequisite state; 55P03: lock_not_available
-                    _logger.debug('Another process/thread is already busy executing job `%s`, skipping it.', job['name'])
+                    _logger.debug('Another process/thread is already busy executing job `%s`, skipping it.', job['cron_name'])
                     continue
                 else:
                     # Unexpected OperationalError
diff --git a/odoo/addons/base/ir/ir_cron_view.xml b/odoo/addons/base/ir/ir_cron_view.xml
index 57232252696..045fa688ef3 100644
--- a/odoo/addons/base/ir/ir_cron_view.xml
+++ b/odoo/addons/base/ir/ir_cron_view.xml
@@ -1,42 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
         <!-- ir.cron -->
-        <record id="ir_cron_view" model="ir.ui.view">
+        <record id="ir_cron_view_form" model="ir.ui.view">
+            <field name="name">ir.cron.view.form</field>
             <field name="model">ir.cron</field>
+            <field name="mode">primary</field>
+            <field name="inherit_id" ref="base.view_server_action_form"/>
             <field name="arch" type="xml">
-                <form string="Scheduled Actions">
-                    <header>
-                        <button name="method_direct_trigger" type="object" string="Run Manually" class="oe_highlight"/> 
-                    </header>
-                   <sheet>
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="active"/>
-                        <field name="user_id" />
-                        <field name="priority" />
+                <xpath expr="//button[@name='create_action']" position="replace">
+                    <button name="method_direct_trigger" type="object" string="Run Manually" class="oe_highlight"/>
+                </xpath>
+                <xpath expr="//button[@name='unlink_action']" position="replace">
+                </xpath>
+                <xpath expr="//group[@name='action_wrapper']" position="inside">
+                    <group>
+                        <field name="user_id"/>
+                        <field name="priority"/>
+                        <field name="interval_number"/>
+                        <field name="interval_type"/>
+                        <field name="nextcall"/>
+                        <field name="numbercall"/>
+                        <field name="doall"/>
                     </group>
-                    <notebook>
-                    <page string="Information">
-                        <group col="4">
-                            <field name="interval_number"/>
-                            <field name="interval_type"/>
-                            <newline/>
-                            <field name="nextcall"/>
-                            <field name="numbercall"/>
-                            <field name="doall"/>
-                        </group>
-                    </page>
-                    <page string="Technical Data" groups="base.group_no_one">
-                        <group string="Action to Trigger">
-                            <field name="model"/>
-                            <field name="function"/>
-                        </group>
-                        <label for="args"/>
-                        <field name="args"/>
-                    </page>
-                    </notebook>
-                   </sheet> 
-                </form>
+                </xpath>
             </field>
         </record>
         <record id="ir_cron_view_tree" model="ir.ui.view">
diff --git a/odoo/addons/base/module/wizard/base_module_immediate_install.xml b/odoo/addons/base/module/wizard/base_module_immediate_install.xml
index 70a79f26c31..dc5668b247b 100644
--- a/odoo/addons/base/module/wizard/base_module_immediate_install.xml
+++ b/odoo/addons/base/module/wizard/base_module_immediate_install.xml
@@ -2,8 +2,7 @@
 <odoo>
     <data>
         <record id="action_server_module_immediate_install" model="ir.actions.server">
-            <field name="name">Module Immediate Install</field>
-            <field name="condition">True</field>
+            <field name="name">Base: Module Immediate Install</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_ir_module_module" />
             <field name="state">code</field>
diff --git a/odoo/addons/base/tests/test_ir_actions.py b/odoo/addons/base/tests/test_ir_actions.py
index 0d5174b179c..74d220b05bb 100644
--- a/odoo/addons/base/tests/test_ir_actions.py
+++ b/odoo/addons/base/tests/test_ir_actions.py
@@ -42,7 +42,6 @@ class TestServerActionsBase(common.TransactionCase):
         # create server action to
         self.action = self.env['ir.actions.server'].create({
             'name': 'TestAction',
-            'condition': 'True',
             'model_id': self.res_partner_model.id,
             'state': 'code',
             'code': 'record.write({"comment": "MyComment"})',
@@ -52,16 +51,10 @@ class TestServerActionsBase(common.TransactionCase):
 class TestServerActions(TestServerActionsBase):
 
     def test_00_action(self):
-        # Do: eval 'True' condition
         self.action.with_context(self.context).run()
         self.assertEqual(self.test_partner.comment, 'MyComment', 'ir_actions_server: invalid condition check')
         self.test_partner.write({'comment': False})
 
-        # Do: eval False condition, that should be considered as True (void = True)
-        self.action.write({'condition': False})
-        self.action.with_context(self.context).run()
-        self.assertEqual(self.test_partner.comment, 'MyComment', 'ir_actions_server: invalid condition check')
-
         # Do: create contextual action
         self.action.create_action()
 
@@ -90,27 +83,14 @@ class TestServerActions(TestServerActionsBase):
         partners = self.test_partner.search([('name', 'ilike', 'TestingPartner_code')])
         self.assertEqual(len(partners), 1, 'ir_actions_server: 1 new partner should have been created')
 
-    def test_30_client(self):
-        client_action = self.env['ir.actions.client'].create({
-            'name': 'TestAction2',
-            'tag': 'Test',
-        })
-        self.action.write({
-            'state': 'client_action',
-            'action_id': client_action.id,
-        })
-        res = self.action.with_context(self.context).run()
-        self.assertEqual(res['name'], 'TestAction2', 'ir_actions_server: incorrect return result for a client action')
-
-    def test_40_crud_create(self):
+    def test_20_crud_create(self):
         _city = 'TestCity'
         _name = 'TestNew'
 
         # Do: create a new record in the same model and link it
         self.action.write({
             'state': 'object_create',
-            'use_create': 'new',
-            'link_new_record': True,
+            'crud_model_id': self.action.model_id.id,
             'link_field_id': self.res_partner_parent_field.id,
             'fields_lines': [(0, 0, {'col1': self.res_partner_name_field.id, 'value': _name}),
                              (0, 0, {'col1': self.res_partner_city_field.id, 'value': _city})],
@@ -124,29 +104,11 @@ class TestServerActions(TestServerActionsBase):
         # Test: new partner linked
         self.assertEqual(self.test_partner.parent_id, partner, 'ir_actions_server: TODO')
 
-        # Do: copy current record
-        self.action.write({
-            'state': 'object_create',
-            'use_create': 'copy_current',
-            'link_new_record': False,
-            'fields_lines': [(5,),
-                             (0, 0, {'col1': self.res_partner_name_field.id, 'value': 'TestCopyCurrent'}),
-                             (0, 0, {'col1': self.res_partner_city_field.id, 'value': 'TestCity'})],
-        })
-        run_res = self.action.with_context(self.context).run()
-        self.assertFalse(run_res, 'ir_actions_server: create record action correctly finished should return False')
-        # Test: new partner created
-        partner = self.test_partner.search([('name', 'ilike', 'TestingPartner (copy)')])  # currently res_partner overrides default['name'] whatever its value
-        self.assertEqual(len(partner), 1, 'ir_actions_server: TODO')
-        self.assertEqual(partner.city, 'TestCity', 'ir_actions_server: TODO')
-        self.assertEqual(partner.country_id, self.test_partner.country_id, 'ir_actions_server: TODO')
-
         # Do: create a new record in another model
         self.action.write({
             'state': 'object_create',
-            'use_create': 'new_other',
             'crud_model_id': self.res_country_model.id,
-            'link_new_record': False,
+            'link_field_id': False,
             'fields_lines': [(5,),
                              (0, 0, {'col1': self.res_country_name_field.id, 'value': 'record.name', 'type': 'equation'}),
                              (0, 0, {'col1': self.res_country_code_field.id, 'value': 'record.name[0:2]', 'type': 'equation'})],
@@ -158,69 +120,23 @@ class TestServerActions(TestServerActionsBase):
         self.assertEqual(len(country), 1, 'ir_actions_server: TODO')
         self.assertEqual(country.code, 'TE', 'ir_actions_server: TODO')
 
-        # Do: copy a record in another model
-        self.action.write({
-            'state': 'object_create',
-            'use_create': 'copy_other',
-            'crud_model_id': self.res_country_model.id,
-            'link_new_record': False,
-            'ref_object': 'res.country,%s' % self.test_country.id,
-            'fields_lines': [(5,),
-                             (0, 0, {'col1': self.res_country_name_field.id, 'value': 'NewCountry', 'type': 'value'}),
-                             (0, 0, {'col1': self.res_country_code_field.id, 'value': 'NY', 'type': 'value'})],
-        })
-        run_res = self.action.with_context(self.context).run()
-        self.assertFalse(run_res, 'ir_actions_server: create record action correctly finished should return False')
-        # Test: new country created
-        country = self.test_country.search([('name', 'ilike', 'NewCountry')])
-        self.assertEqual(len(country), 1, 'ir_actions_server: TODO')
-        self.assertEqual(country.code, 'NY', 'ir_actions_server: TODO')
-        self.assertEqual(country.address_format, 'SuperFormat', 'ir_actions_server: TODO')
-
-    def test_50_crud_write(self):
+    def test_30_crud_write(self):
         _name = 'TestNew'
 
-        # Do: create a new record in the same model and link it
+        # Do: update partner name
         self.action.write({
             'state': 'object_write',
-            'use_write': 'current',
             'fields_lines': [(0, 0, {'col1': self.res_partner_name_field.id, 'value': _name})],
         })
         run_res = self.action.with_context(self.context).run()
         self.assertFalse(run_res, 'ir_actions_server: create record action correctly finished should return False')
-        # Test: new partner created
+        # Test: partner updated
         partner = self.test_partner.search([('name', 'ilike', _name)])
         self.assertEqual(len(partner), 1, 'ir_actions_server: TODO')
         self.assertEqual(partner.city, 'OrigCity', 'ir_actions_server: TODO')
 
-        # Do: copy current record
-        self.action.write({
-            'use_write': 'other',
-            'crud_model_id': self.res_country_model.id,
-            'ref_object': 'res.country,%s' % self.test_country.id,
-            'fields_lines': [(5,), (0, 0, {'col1': self.res_country_name_field.id, 'value': 'record.name', 'type': 'equation'})],
-        })
-        run_res = self.action.with_context(self.context).run()
-        self.assertFalse(run_res, 'ir_actions_server: create record action correctly finished should return False')
-        # Test: new country created
-        country = self.test_country.search([('name', 'ilike', 'TestNew')])
-        self.assertEqual(len(country), 1, 'ir_actions_server: TODO')
-
-        # Do: copy a record in another model
-        self.action.write({
-            'use_write': 'expression',
-            'crud_model_id': self.res_country_model.id,
-            'write_expression': 'record.country_id',
-            'fields_lines': [(5,), (0, 0, {'col1': self.res_country_name_field.id, 'value': 'NewCountry', 'type': 'value'})],
-        })
-        run_res = self.action.with_context(self.context).run()
-        self.assertFalse(run_res, 'ir_actions_server: create record action correctly finished should return False')
-        # Test: new country created
-        country = self.test_country.search([('name', 'ilike', 'NewCountry')])
-        self.assertEqual(len(country), 1, 'ir_actions_server: TODO')
-
     @mute_logger('odoo.addons.base.ir.ir_model', 'odoo.models')
-    def test_60_multi(self):
+    def test_40_multi(self):
         # Data: 2 server actions that will be nested
         action1 = self.action.create({
             'name': 'Subaction1',
@@ -233,8 +149,10 @@ class TestServerActions(TestServerActionsBase):
             'name': 'Subaction2',
             'sequence': 2,
             'model_id': self.res_partner_model.id,
+            'crud_model_id': self.res_partner_model.id,
             'state': 'object_create',
-            'use_create': 'copy_current',
+            'fields_lines': [(0, 0, {'col1': self.res_partner_name_field.id, 'value': 'RaoulettePoiluchette'}),
+                             (0, 0, {'col1': self.res_partner_city_field.id, 'value': 'TestingCity'})],
         })
         action3 = self.action.create({
             'name': 'Subaction3',
@@ -253,8 +171,8 @@ class TestServerActions(TestServerActionsBase):
 
         # Test: new partner created
         # currently res_partner overrides default['name'] whatever its value
-        partner = self.test_partner.search([('name', 'ilike', 'TestingPartner (copy)')])
-        self.assertEqual(len(partner), 1, 'ir_actions_server: TODO')
+        partner = self.test_partner.search([('name', 'ilike', 'RaoulettePoiluchette')])
+        self.assertEqual(len(partner), 1)
         # Test: action returned
         self.assertEqual(res.get('type'), 'ir.actions.act_url')
 
diff --git a/odoo/addons/base/tests/test_search.py b/odoo/addons/base/tests/test_search.py
index 8fba34ca025..d52cd9db9c4 100644
--- a/odoo/addons/base/tests/test_search.py
+++ b/odoo/addons/base/tests/test_search.py
@@ -105,7 +105,7 @@ class test_search(TransactionCase):
         cron_ids = {}
         for u in 'BAC':
             user_ids[u] = Users.create({'name': u, 'login': u}).id
-            cron_ids[u] = Cron.create({'name': u, 'user_id': user_ids[u]}).id
+            cron_ids[u] = Cron.create({'name': u, 'model_id': self.env.ref('base.model_res_partner').id, 'user_id': user_ids[u]}).id
 
         ids = Cron.search([('id', 'in', cron_ids.values())], order='user_id').ids
         expected_ids = [cron_ids[l] for l in 'ABC']