From d37b814c2a1d5ef2106ea9f38c08697ade47a8c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 9 Mar 2015 19:42:14 +0100
Subject: [PATCH] Remove safe_eval

We convert all the fields that were storing python code into PYSON.
We add a pyson attribute on field tag to store PYSON value.

issue4416
review6971002
---
 purchase.xml | 4 +++-
 sale.xml     | 3 ++-
 stock.xml    | 8 +++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/purchase.xml b/purchase.xml
index b645bb48b3..7f8eda9c6a 100644
--- a/purchase.xml
+++ b/purchase.xml
@@ -12,7 +12,9 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_purchase_drop_shipment_form">
             <field name="name">Drop Shipments</field>
             <field name="res_model">stock.shipment.drop</field>
-            <field name="domain">[('moves.purchase', 'in', Eval('active_ids'))]</field>
+            <field name="domain"
+                eval="[('moves.purchase', 'in', Eval('active_ids'))]"
+                pyson="1"/>
         </record>
         <record model="ir.action.keyword"
                 id="act_open_purchase_drop_shipment_keyword1">
diff --git a/sale.xml b/sale.xml
index 538c611098..8728d0b373 100644
--- a/sale.xml
+++ b/sale.xml
@@ -12,7 +12,8 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_sale_drop_shipment_form">
             <field name="name">Drop Shipments</field>
             <field name="res_model">stock.shipment.drop</field>
-            <field name="domain">[('moves.sale', 'in', Eval('active_ids'))]</field>
+            <field name="domain"
+                eval="[('moves.sale', 'in', Eval('active_ids'))]" pyson="1"/>
         </record>
         <record model="ir.action.keyword"
                 id="act_open_sale_drop_shipment_keyword1">
diff --git a/stock.xml b/stock.xml
index 6415b9bd01..1bfdb64701 100644
--- a/stock.xml
+++ b/stock.xml
@@ -68,13 +68,13 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window.domain" id="act_shipment_drop_form_domain_draft">
             <field name="name">Draft</field>
             <field name="sequence" eval="10"/>
-            <field name="domain">[('state', '=', 'draft')]</field>
+            <field name="domain" eval="[('state', '=', 'draft')]" pyson="1"/>
             <field name="act_window" ref="act_shipment_drop_form"/>
         </record>
         <record model="ir.action.act_window.domain" id="act_shipment_drop_form_domain_waiting">
             <field name="name">Waiting</field>
             <field name="sequence" eval="20"/>
-            <field name="domain">[('state', '=', 'waiting')]</field>
+            <field name="domain" eval="[('state', '=', 'waiting')]" pyson="1"/>
             <field name="act_window" ref="act_shipment_drop_form"/>
         </record>
         <record model="ir.action.act_window.domain" id="act_shipment_drop_form_domain_all">
@@ -181,7 +181,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_shipment_drop">
-            <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
+            <field name="domain"
+                eval="[('company', '=', Eval('user', {}).get('company', None))]"
+                pyson="1"/>
             <field name="rule_group" ref="rule_group_shipment_drop"/>
         </record>