summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorJeremy Kersten <jke@odoo.com>2016-11-17 14:11:37 +0100
committerJeremy Kersten <jke@odoo.com>2016-11-18 10:03:48 +0100
commita55ee3858cbd8cf30a63b3a873003965f15df800 (patch)
tree6691795620f323bec581fb5e4308c022e2af66de /addons
parentf05e8655ee4ee7205c67006ca5a8cb30ed445c81 (diff)
[FIX] *: convert action server to new syntax
Use record / records instead of deprecated locals
Diffstat (limited to 'addons')
-rw-r--r--addons/account_check_printing/data/account_check_printing_data.xml4
-rw-r--r--addons/crm/data/base_action_rule_demo.xml2
-rw-r--r--addons/crm/views/crm_lead_views.xml10
-rw-r--r--addons/hr_contract/data/hr_contract_data.xml4
-rw-r--r--addons/hr_expense/views/hr_expense_views.xml4
-rw-r--r--addons/hr_timesheet_sheet/data/hr_timesheet_sheet_data.xml2
-rw-r--r--addons/lunch/data/lunch_data.xml14
-rw-r--r--addons/lunch/views/lunch_views.xml4
-rw-r--r--addons/mrp/views/mrp_production_views.xml4
-rw-r--r--addons/procurement/views/procurement_views.xml5
-rw-r--r--addons/survey/views/survey_views.xml4
-rw-r--r--addons/website/data/website_demo.xml2
-rw-r--r--addons/website/views/ir_actions_views.xml2
-rw-r--r--addons/website_crm_partner_assign/models/crm_lead.py1
-rw-r--r--addons/website_crm_partner_assign/views/crm_lead_views.xml11
15 files changed, 30 insertions, 43 deletions
diff --git a/addons/account_check_printing/data/account_check_printing_data.xml b/addons/account_check_printing/data/account_check_printing_data.xml
index 4092efd96fd..70eb2b132d3 100644
--- a/addons/account_check_printing/data/account_check_printing_data.xml
+++ b/addons/account_check_printing/data/account_check_printing_data.xml
@@ -15,8 +15,8 @@
<field name="name">Print Checks</field>
<field name="model_id" ref="account.model_account_payment"/>
<field name="code">
- if context.get('active_model') == 'account.payment' and context.get('active_ids'):
- action = env['account.payment'].browse(context['active_ids']).print_checks()
+if records:
+ action = records.print_checks()
</field>
</record>
diff --git a/addons/crm/data/base_action_rule_demo.xml b/addons/crm/data/base_action_rule_demo.xml
index a18603a34b1..6307c778996 100644
--- a/addons/crm/data/base_action_rule_demo.xml
+++ b/addons/crm/data/base_action_rule_demo.xml
@@ -41,7 +41,7 @@
<field name="condition">True</field>
<field name="type">ir.actions.server</field>
<field name="state">code</field>
- <field name="code">object.write({'team_id': env.ref('sales_team.team_sales_department').id})</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>
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 4ed46b42ec0..7a89f251420 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -670,10 +670,10 @@
<field name="model_id" ref="model_crm_lead"/>
<field name="state">code</field>
<field name="code">
- if context.get('active_model') == 'crm.lead' and context.get('active_ids'):
- action_values = env.ref('crm.crm_lead_lost_action').read()[0]
- action_values.update({'context': context})
- action = action_values
+if record:
+ action_values = env.ref('crm.crm_lead_lost_action').read()[0]
+ action_values.update({'context': context})
+ action = action_values
</field>
</record>
@@ -778,7 +778,7 @@
<field name="name">My Pipeline</field>
<field name="model_id" ref="crm.model_crm_team"/>
<field name="state">code</field>
- <field name="code">action = env['crm.team'].action_your_pipeline()</field>
+ <field name="code">action = model.action_your_pipeline()</field>
<field eval="True" name="condition"/>
</record>
diff --git a/addons/hr_contract/data/hr_contract_data.xml b/addons/hr_contract/data/hr_contract_data.xml
index edaa93b16c0..699e7160b6b 100644
--- a/addons/hr_contract/data/hr_contract_data.xml
+++ b/addons/hr_contract/data/hr_contract_data.xml
@@ -54,7 +54,7 @@
<field name="condition">True</field>
<field name="type">ir.actions.server</field>
<field name="state">code</field>
- <field name="code">object.set_as_pending()</field>
+ <field name="code">record.set_as_pending()</field>
</record>
<record id="rule_contract_1_set_as_pending" model="base.action.rule">
<field name="name">HR Contract: check for pending</field>
@@ -85,7 +85,7 @@
<field name="condition">True</field>
<field name="type">ir.actions.server</field>
<field name="state">code</field>
- <field name="code">object.set_as_close()</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>
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index ad601c6e57b..0bd44377764 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -735,8 +735,8 @@
<field name="model_id" ref="model_hr_expense"/>
<field name="state">code</field>
<field name="code">
- if context.get('active_model') == 'hr.expense' and context.get('active_ids'):
- action = env['hr.expense'].browse(context['active_ids']).submit_expenses()
+if records:
+ action = records.submit_expenses()
</field>
</record>
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 8b1ad0f9307..ccd9b5e2498 100644
--- a/addons/hr_timesheet_sheet/data/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/data/hr_timesheet_sheet_data.xml
@@ -7,7 +7,7 @@
<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 = env.get('hr.timesheet.current.open').open_timesheet()</field>
+ <field name="code">action = model.open_timesheet()</field>
<field name="condition">True</field>
<field name="name">My Timesheet</field>
</record>
diff --git a/addons/lunch/data/lunch_data.xml b/addons/lunch/data/lunch_data.xml
index 3c1518df68a..d9b1294617a 100644
--- a/addons/lunch/data/lunch_data.xml
+++ b/addons/lunch/data/lunch_data.xml
@@ -5,8 +5,8 @@
<field name="model_id" ref="model_lunch_order_line"/>
<field name="state">code</field>
<field name="code">
-if env.context.get('active_ids'):
- model.browse(context['active_ids']).order()
+if records:
+ records.order()
</field>
</record>
@@ -23,10 +23,7 @@ if env.context.get('active_ids'):
<field name="name">Receive meals</field>
<field name="model_id" ref="model_lunch_order_line"/>
<field name="state">code</field>
- <field name="code">
-if env.context.get('active_ids'):
- model.browse(context['active_ids']).confirm()
- </field>
+ <field name="code">records.confirm()</field>
</record>
<record id="ir_lunch_order_line_action_confirm" model="ir.values">
@@ -42,10 +39,7 @@ if env.context.get('active_ids'):
<field name="name">Cancel meals</field>
<field name="model_id" ref="model_lunch_order_line"/>
<field name="state">code</field>
- <field name="code">
-if env.context.get('active_ids'):
- model.browse(context['active_ids']).cancel()
- </field>
+ <field name="code">records.cancel()</field>
</record>
<record id="ir_lunch_order_line_action_cancel" model="ir.values">
diff --git a/addons/lunch/views/lunch_views.xml b/addons/lunch/views/lunch_views.xml
index 609e4212ecc..0977b92b44a 100644
--- a/addons/lunch/views/lunch_views.xml
+++ b/addons/lunch/views/lunch_views.xml
@@ -419,9 +419,7 @@
<field name="type">ir.actions.server</field>
<field name="model_id" ref="model_lunch_product" />
<field name="state">code</field>
- <field name="code">
-if env.context.get('active_ids'):
- model.browse(context['active_ids']).toggle_active()</field>
+ <field name="code">records.toggle_active()</field>
</record>
<record id="ir_values_lunch_archive_product" model="ir.values">
diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index 993b8b8fb32..7fb736f2933 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -25,9 +25,7 @@
<field name="name">Plan Orders</field>
<field name="model_id" ref="mrp.model_mrp_production"/>
<field name="state">code</field>
- <field name="code">
- object.browse(object.env.context['active_ids']).button_plan()
- </field>
+ <field name="code">records.button_plan()</field>
</record>
<record id="run_procurement_order_action" model="ir.values">
diff --git a/addons/procurement/views/procurement_views.xml b/addons/procurement/views/procurement_views.xml
index 1d4595b0fa8..de51247c957 100644
--- a/addons/procurement/views/procurement_views.xml
+++ b/addons/procurement/views/procurement_views.xml
@@ -296,8 +296,9 @@
<field name="model_id" ref="model_procurement_order"/>
<field name="state">code</field>
<field name="code">
-if env.context.get('active_model') == 'procurement.order' and env.context.get('active_ids'):
- model.browse(context['active_ids']).run()</field>
+if records:
+ records.run()
+ </field>
</record>
<record id="run_procurement_order_action" model="ir.values">
diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml
index b57b5be66c0..ede9f5ac37f 100644
--- a/addons/survey/views/survey_views.xml
+++ b/addons/survey/views/survey_views.xml
@@ -622,8 +622,8 @@
<field name="model_id" ref="model_survey_survey" />
<field name="state">code</field>
<field name="code">
- if context.get('active_ids'):
- test_answers = env['survey.user_input'].search([('survey_id', 'in', context['active_ids']), ('test_entry', '=', 'True')]).unlink()
+if records:
+ env['survey.user_input'].search([('survey_id', 'in', records.ids), ('test_entry', '=', 'True')]).unlink()
</field>
</record>
diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index 14d88295ab4..b74588b31a8 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -59,7 +59,7 @@ if partner and post_body:
values = {
'partner': partner,
}
-response = request.website.render("website.template_partner_post", values)
+response = request.website.render("website.template_partner_post", {'partner': partner})
</field>
<field name="state">code</field>
<field name="type">ir.actions.server</field>
diff --git a/addons/website/views/ir_actions_views.xml b/addons/website/views/ir_actions_views.xml
index 460cb9f4687..d692ce845cd 100644
--- a/addons/website/views/ir_actions_views.xml
+++ b/addons/website/views/ir_actions_views.xml
@@ -28,7 +28,7 @@
<field name="model">ir.actions.server</field>
<field name="inherit_id" ref="base.view_server_action_tree"/>
<field name="arch" type="xml">
- <xpath expr="//field[@name='sequence']" position="after">
+ <xpath expr="//field[@name='model_id']" position="after">
<field name="website_url"/>
</xpath>
</field>
diff --git a/addons/website_crm_partner_assign/models/crm_lead.py b/addons/website_crm_partner_assign/models/crm_lead.py
index 1b74a50c3b4..cc4c108b48c 100644
--- a/addons/website_crm_partner_assign/models/crm_lead.py
+++ b/addons/website_crm_partner_assign/models/crm_lead.py
@@ -40,6 +40,7 @@ class CrmLead(models.Model):
@api.multi
def assign_salesman_of_assigned_partner(self):
+ # TODO: fix it
salesmans_leads = {}
for lead in self:
if (lead.stage_id.probability > 0 and lead.stage_id.probability < 100) or lead.stage_id.sequence == 1:
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 38c3528a516..b7241939df6 100644
--- a/addons/website_crm_partner_assign/views/crm_lead_views.xml
+++ b/addons/website_crm_partner_assign/views/crm_lead_views.xml
@@ -126,14 +126,9 @@
<field name="model_id" ref="model_crm_lead"/>
<field name="state">code</field>
<field name="code">
- if object.env.context.get('active_model') == 'crm.lead':
- leads = model
- if object.env.context.get('active_domain'):
- leads = model.search(object.env.context['active_domain'])
- elif object.env.context.get('active_ids'):
- leads = model.browse(object.env.context['active_ids'])
- if leads:
- leads.assign_salesman_of_assigned_partner()
+if env.context.get('active_domain'):
+ records = model.search(env.context['active_domain'])
+records.assign_salesman_of_assigned_partner()
</field>
</record>