From c37d02babfc79fe5ac4abd8889c32615461f2cf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 9 Mar 2015 19:41:16 +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
---
 account.xml                   |  4 +++-
 party.xml                     |  3 ++-
 payment.xml                   | 16 ++++++++++------
 view/payment_journal_form.xml |  3 +--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/account.xml b/account.xml
index ec6a1d9bf8..035654e5aa 100644
--- a/account.xml
+++ b/account.xml
@@ -8,7 +8,9 @@ this repository contains the full copyright notices and license terms. -->
             id="act_move_line_form_domain_receivable_mandate">
             <field name="name">Receivable with Mandate</field>
             <field name="sequence" eval="25"/>
-            <field name="domain">['AND', ['OR', ('debit', '&gt;', 0), ('credit', '&lt;', 0)], ('party.sepa_mandates', '!=', None)]</field>
+            <field name="domain"
+                eval="['AND', ['OR', ('debit', '&gt;', 0), ('credit', '&lt;', 0)], ('party.sepa_mandates', '!=', None)]"
+                pyson="1"/>
             <field name="act_window" ref="account_payment.act_move_line_form"/>
         </record>
 
diff --git a/party.xml b/party.xml
index 8783a35e5a..688d00c85b 100644
--- a/party.xml
+++ b/party.xml
@@ -11,7 +11,8 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_mandate_form2">
             <field name="name">Mandates</field>
             <field name="res_model">account.payment.sepa.mandate</field>
-            <field name="domain">[("party", "=", Eval('active_id'))]</field>
+            <field name="domain"
+                eval="[('party', '=', Eval('active_id'))]" pyson="1"/>
         </record>
         <record model="ir.action.act_window.view" id="act_mandate_form2_view1">
             <field name="sequence" eval="10"/>
diff --git a/payment.xml b/payment.xml
index 8a627eb3e8..87b796c639 100644
--- a/payment.xml
+++ b/payment.xml
@@ -55,7 +55,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_payment1">
-            <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_mandate"/>
         </record>
 
@@ -128,25 +130,25 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window.domain" id="act_message_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_message_form"/>
         </record>
         <record model="ir.action.act_window.domain" id="act_message_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_message_form"/>
         </record>
         <record model="ir.action.act_window.domain" id="act_message_form_domain_done">
             <field name="name">Done</field>
             <field name="sequence" eval="30"/>
-            <field name="domain">[('state', '=', 'done')]</field>
+            <field name="domain" eval="[('state', '=', 'done')]" pyson="1"/>
             <field name="act_window" ref="act_message_form"/>
         </record>
         <record model="ir.action.act_window.domain" id="act_message_form_domain_canceled">
             <field name="name">Canceled</field>
             <field name="sequence" eval="40"/>
-            <field name="domain">[('state', '=', 'canceled')]</field>
+            <field name="domain" eval="[('state', '=', 'canceled')]" pyson="1"/>
             <field name="act_window" ref="act_message_form"/>
         </record>
         <record model="ir.action.act_window.domain" id="act_message_form_domain_all">
@@ -164,7 +166,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_message1">
-            <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_message"/>
         </record>
 
diff --git a/view/payment_journal_form.xml b/view/payment_journal_form.xml
index 0f2e1b1416..c14b08cf05 100644
--- a/view/payment_journal_form.xml
+++ b/view/payment_journal_form.xml
@@ -3,8 +3,7 @@
 this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath expr="/form/field[@name='process_method']" position="after">
-        <separator id="sepa" string="SEPA" colspan="4"
-            states="{'invisible': Eval('process_method') != 'sepa'}"/>
+        <separator name="sepa_bank_account_number" string="SEPA" colspan="4"/>
         <label name="sepa_bank_account_number"/>
         <field name="sepa_bank_account_number"/>
         <newline/>