From b5d142e08a7ffbb4e83d7371abf6c8df49ac0001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 18 Nov 2013 17:11:02 +0100
Subject: [PATCH] =?UTF-8?q?[IMP]=20payment=5Facquirer,=20paypal,=20ogone:?=
 =?UTF-8?q?=20improved=20back-end=20form=20views=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: tde@openerp.com-20131118161102-4kw3xewd1czbyrdb
---
 addons/payment_acquirer/__openerp__.py        | 23 +----------
 .../models/payment_acquirer.py                |  3 +-
 .../views/payment_acquirer.xml                | 15 ++++---
 addons/payment_acquirer_ogone/__openerp__.py  | 22 +---------
 addons/payment_acquirer_ogone/models/ogone.py |  2 +-
 .../views/payment_acquirer.xml                | 41 +++++++++++++++++++
 addons/payment_acquirer_paypal/__openerp__.py | 22 +---------
 .../views/payment_acquirer.xml                | 40 ++++++++++++++++++
 8 files changed, 99 insertions(+), 69 deletions(-)
 create mode 100644 addons/payment_acquirer_ogone/views/payment_acquirer.xml
 create mode 100644 addons/payment_acquirer_paypal/views/payment_acquirer.xml

diff --git a/addons/payment_acquirer/__openerp__.py b/addons/payment_acquirer/__openerp__.py
index 66cefcd128c..4102c4fe276 100644
--- a/addons/payment_acquirer/__openerp__.py
+++ b/addons/payment_acquirer/__openerp__.py
@@ -1,32 +1,13 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
 {
     'name': 'Payment Acquirer',
     'category': 'Hidden',
     'summary': 'Payment Acquirer Base Module',
-    'version': '0.1',
+    'version': '1.0',
     'description': """Payment Acquirer Base Module""",
     'author': 'OpenERP SA',
-    'depends': ['decimal_precision', 'mail'],
+    'depends': ['mail'],
     'data': [
         'views/payment_acquirer.xml',
         'security/ir.model.access.csv',
diff --git a/addons/payment_acquirer/models/payment_acquirer.py b/addons/payment_acquirer/models/payment_acquirer.py
index f7ad17b14c0..811b2dec04b 100644
--- a/addons/payment_acquirer/models/payment_acquirer.py
+++ b/addons/payment_acquirer/models/payment_acquirer.py
@@ -32,7 +32,7 @@ class ValidationError(ValueError):
 
 class PaymentAcquirer(osv.Model):
     _name = 'payment.acquirer'
-    _description = 'Online Payment Acquirer'
+    _description = 'Payment Acquirer'
 
     _columns = {
         'name': fields.char('Name', required=True),
@@ -133,6 +133,7 @@ class PaymentAcquirer(osv.Model):
 
 class PaymentTransaction(osv.Model):
     _name = 'payment.transaction'
+    _description = 'Payment Transaction'
     _inherit = ['mail.thread']
     _order = 'id desc'
 
diff --git a/addons/payment_acquirer/views/payment_acquirer.xml b/addons/payment_acquirer/views/payment_acquirer.xml
index 61b8711b675..c27ae138f63 100644
--- a/addons/payment_acquirer/views/payment_acquirer.xml
+++ b/addons/payment_acquirer/views/payment_acquirer.xml
@@ -8,10 +8,11 @@
             parent='base.menu_administration'/>
 
         <record id="acquirer_form" model="ir.ui.view">
+            <field name="name">acquirer.form</field>
             <field name="model">payment.acquirer</field>
             <field name="arch" type="xml">
                 <form string="Payment Acquirer" version="7.0">
-                    <group>
+                    <group name="acquirer_base">
                         <field name="name"/>
                         <field name="portal_published"/>
                         <field name="env"/>
@@ -60,7 +61,7 @@
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="action_payment_acquirer">
+        <record id="action_payment_acquirer" model="ir.actions.act_window">
             <field name="name">Payment Acquirers</field>
             <field name="res_model">payment.acquirer</field>
             <field name='view_type'>form</field>
@@ -73,7 +74,7 @@
             parent='root_payment_menu'
             sequence='10' />
 
-        <record model="ir.ui.view" id="transaction_form">
+        <record id="transaction_form" model="ir.ui.view">
             <field name="model">payment.transaction</field>
             <field name="arch" type="xml">
                 <form string="Payment Transactions" version="7.0">
@@ -96,6 +97,8 @@
                                 <field name="state_message"/>
                             </group>
                         </group>
+                        <notebook>
+                        </notebook>
                     </sheet>
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
@@ -105,7 +108,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="transaction_list">
+        <record id="transaction_list" model="ir.ui.view">
             <field name="model">payment.transaction</field>
             <field name="arch" type="xml">
                 <tree string="Payment Transactions">
@@ -119,7 +122,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="transaction">
+        <record id="transaction" model="ir.ui.view">
             <field name="model">payment.transaction</field>
             <field name="arch" type="xml">
                 <search>
@@ -131,7 +134,7 @@
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="action_payment_transaction">
+        <record id="action_payment_transaction" model="ir.actions.act_window">
             <field name="name">Payment Transactions</field>
             <field name="res_model">payment.transaction</field>
             <field name='view_type'>form</field>
diff --git a/addons/payment_acquirer_ogone/__openerp__.py b/addons/payment_acquirer_ogone/__openerp__.py
index b04e29496a9..2c7b5076981 100644
--- a/addons/payment_acquirer_ogone/__openerp__.py
+++ b/addons/payment_acquirer_ogone/__openerp__.py
@@ -1,34 +1,16 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
 {
     'name': 'Ogone Payment Acquirer',
     'category': 'Hidden',
     'summary': 'Payment Acquirer: Ogone Implementation',
-    'version': '0.1',
+    'version': '1.0',
     'description': """Ogone Payment Acquirer""",
     'author': 'OpenERP SA',
     'depends': ['payment_acquirer'],
     'data': [
         'views/ogone.xml',
+        'views/payment_acquirer.xml',
         'data/ogone.xml',
     ],
     'installable': True,
diff --git a/addons/payment_acquirer_ogone/models/ogone.py b/addons/payment_acquirer_ogone/models/ogone.py
index 08f898c64cc..eae4b4ae1ec 100644
--- a/addons/payment_acquirer_ogone/models/ogone.py
+++ b/addons/payment_acquirer_ogone/models/ogone.py
@@ -161,7 +161,7 @@ class PaymentTxOgone(osv.Model):
         'ogone_feedback_model': fields.char(),
         'ogone_feedback_eval': fields.char(),
         'ogone_complus': fields.char('Complus'),
-        'ogone_payid': fields.char()
+        'ogone_payid': fields.char('PayID', help='Payment ID, generated by Ogone')
     }
 
     # --------------------------------------------------
diff --git a/addons/payment_acquirer_ogone/views/payment_acquirer.xml b/addons/payment_acquirer_ogone/views/payment_acquirer.xml
new file mode 100644
index 00000000000..8ec958a5351
--- /dev/null
+++ b/addons/payment_acquirer_ogone/views/payment_acquirer.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="acquirer_form_ogone" model="ir.ui.view">
+            <field name="name">acquirer.form.ogone</field>
+            <field name="model">payment.acquirer</field>
+            <field name="inherit_id" ref="payment_acquirer.acquirer_form"/>
+            <field name="arch" type="xml">
+                <xpath expr='//group[@name="acquirer_base"]' position='after'>
+                    <group string="Ogone Details"
+                            attrs="{'invisible': [('name', '!=', 'ogone')]}">
+                        <field name="ogone_pspid"/>
+                        <field name="ogone_userid"/>
+                        <field name="ogone_password"/>
+                        <field name="ogone_shakey_in"/>
+                        <field name="ogone_shakey_out"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="transaction_form_ogone" model="ir.ui.view">
+            <field name="name">acquirer.transaction.form.ogone</field>
+            <field name="model">payment.transaction</field>
+            <field name="inherit_id" ref="payment_acquirer.transaction_form"/>
+            <field name="arch" type="xml">
+                <xpath expr='//notebook' position='inside'>
+                    <page string="Ogone TX Details">
+                        <group>
+                            <field name="ogone_payid"/>
+                            <!-- <field name="ogone_3ds"/>
+                            <field name="ogone_3ds_html"/> -->
+                        </group>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/payment_acquirer_paypal/__openerp__.py b/addons/payment_acquirer_paypal/__openerp__.py
index a3193bdb105..d7ba75d0a7b 100644
--- a/addons/payment_acquirer_paypal/__openerp__.py
+++ b/addons/payment_acquirer_paypal/__openerp__.py
@@ -1,34 +1,16 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
 {
     'name': 'Paypal Payment Acquirer',
     'category': 'Hidden',
     'summary': 'Payment Acquirer: Paypal Implementation',
-    'version': '0.1',
+    'version': '1.0',
     'description': """Paypal Payment Acquirer""",
     'author': 'OpenERP SA',
     'depends': ['payment_acquirer'],
     'data': [
         'views/paypal.xml',
+        'views/payment_acquirer.xml',
         'data/paypal.xml',
     ],
     'installable': True,
diff --git a/addons/payment_acquirer_paypal/views/payment_acquirer.xml b/addons/payment_acquirer_paypal/views/payment_acquirer.xml
new file mode 100644
index 00000000000..ae89253545c
--- /dev/null
+++ b/addons/payment_acquirer_paypal/views/payment_acquirer.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="acquirer_form_paypal" model="ir.ui.view">
+            <field name="name">acquirer.form.paypal</field>
+            <field name="model">payment.acquirer</field>
+            <field name="inherit_id" ref="payment_acquirer.acquirer_form"/>
+            <field name="arch" type="xml">
+                <xpath expr='//group[@name="acquirer_base"]' position='after'>
+                    <group string="Paypal Details"
+                            attrs="{'invisible': [('name', '!=', 'paypal')]}">
+                        <field name="paypal_email_id"/>
+                        <field name="paypal_username"/>
+                        <field name="paypal_password"/>
+                        <field name="paypal_signature"/>
+                        <field name="paypal_use_ipn"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="transaction_form_paypal" model="ir.ui.view">
+            <field name="name">acquirer.transaction.form.paypal</field>
+            <field name="model">payment.transaction</field>
+            <field name="inherit_id" ref="payment_acquirer.transaction_form"/>
+            <field name="arch" type="xml">
+                <xpath expr='//notebook' position='inside'>
+                    <page string="Paypal TX Details">
+                        <group>
+                            <field name="paypal_txn_id"/>
+                            <field name="paypal_txn_type"/>
+                        </group>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>