[MERGE] forward port of branch saas-3 up to fe8106f

[odoo/odoo.git] / addons / payment / views / payment_acquirer.xml

diff --git a/addons/payment/views/payment_acquirer.xml b/addons/payment/views/payment_acquirer.xml
index ac17fe1..8ff6ed5 100644 (file)
--- a/addons/payment/views/payment_acquirer.xml
+++ b/addons/payment/views/payment_acquirer.xml
@@ -8,17 +8,18 @@
             parent='base.menu_administration'/>
 
         <record id="acquirer_form" model="ir.ui.view">
-            <field name="name">acquirer.form</field>
+            <field name="name">payment.acquirer.form</field>
             <field name="model">payment.acquirer</field>
             <field name="arch" type="xml">
-                <form string="Payment Acquirer" version="7.0">
+                <form string="Payment Acquirer">
                     <sheet>
                         <group name="acquirer_base">
                             <group>
                                 <field name="name"/>
+                                <field name="provider"/>
                                 <field name="company_id"/>
                                 <field name="website_published"/>
-                                <field name="env"/>
+                                <field name="environment"/>
                             </group>
                             <group>
                                 <field name="fees_active"/>
@@ -62,21 +63,28 @@
         </record>
 
         <record id="acquirer_list" model="ir.ui.view">
+            <field name="name">payment.acquirer.list</field>
             <field name="model">payment.acquirer</field>
             <field name="arch" type="xml">
                 <tree string="Payment Acquirers">
                     <field name="name"/>
+                    <field name="provider"/>
                     <field name="website_published"/>
-                    <field name="env"/>
+                    <field name="environment"/>
                 </tree>
             </field>
         </record>
 
         <record id="acquirer_search" model="ir.ui.view">
+            <field name="name">payment.acquirer.search</field>
             <field name="model">payment.acquirer</field>
             <field name="arch" type="xml">
                 <search>
                     <field name="name"/>
+                    <field name="provider"/>
+                    <group expand="0" string="Group By">
+                        <filter string="Provider" name="provider" domain="[]" context="{'group_by': 'provider'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -95,9 +103,10 @@
             sequence='10' />
 
         <record id="transaction_form" model="ir.ui.view">
+            <field name="name">payment.transaction.form</field>
             <field name="model">payment.transaction</field>
             <field name="arch" type="xml">
-                <form string="Payment Transactions" version="7.0">
+                <form string="Payment Transactions">
                     <sheet>
                         <group>
                             <group>
@@ -138,6 +147,7 @@
         </record>
 
         <record id="transaction_list" model="ir.ui.view">
+            <field name="name">payment.transaction.list</field>
             <field name="model">payment.transaction</field>
             <field name="arch" type="xml">
                 <tree string="Payment Transactions">
@@ -151,6 +161,7 @@
         </record>
 
         <record id="transaction" model="ir.ui.view">
+            <field name="name">payment.transaction.search</field>
             <field name="model">payment.transaction</field>
             <field name="arch" type="xml">
                 <search>