From 7c49c1fa17f7911cef5b67a7ef43e4cb30ea585c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 15 Nov 2013 16:22:40 +0100
Subject: [PATCH] [IMP] payment_acquirer: improved classic views of
 payment.acquirer and payment.transaction models

bzr revid: tde@openerp.com-20131115152240-pat403pflcnffba5
---
 .../models/payment_acquirer.py                |  2 +-
 .../views/payment_acquirer.xml                | 72 ++++++++++---------
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/addons/payment_acquirer/models/payment_acquirer.py b/addons/payment_acquirer/models/payment_acquirer.py
index 3b0f0626202..0a946e60f4e 100644
--- a/addons/payment_acquirer/models/payment_acquirer.py
+++ b/addons/payment_acquirer/models/payment_acquirer.py
@@ -36,7 +36,7 @@ class PaymentAcquirer(osv.Model):
 
     _columns = {
         'name': fields.char('Name', required=True),
-        'view_template_id': fields.many2one('ir.ui.view', required=True),
+        'view_template_id': fields.many2one('ir.ui.view', 'Form Button Template', required=True),
         'env': fields.selection(
             [('test', 'Test'), ('prod', 'Production')],
             string='Environment'),
diff --git a/addons/payment_acquirer/views/payment_acquirer.xml b/addons/payment_acquirer/views/payment_acquirer.xml
index ada65487783..61b8711b675 100644
--- a/addons/payment_acquirer/views/payment_acquirer.xml
+++ b/addons/payment_acquirer/views/payment_acquirer.xml
@@ -11,32 +11,30 @@
             <field name="model">payment.acquirer</field>
             <field name="arch" type="xml">
                 <form string="Payment Acquirer" version="7.0">
-                    <group col="1">
-                        <div class="oe_title">
-                            <label for="name" class="oe_edit_only"/><h1><field name="name"/></h1>
-                            <div class="oe_edit_only"><field name="portal_published"/><label for="portal_published"/></div>
-                            <field name="env"/>
-                        </div>
-                        <group string="Form Template">
+                    <group>
+                        <field name="name"/>
+                        <field name="portal_published"/>
+                        <field name="env"/>
+                        <label for="view_template_id"/>
+                        <div>
+                            <field name="view_template_id" nolabel="1"/>
                             <div>
-                                <p>
                                 This is an HTML form template to submit a payment through this acquirer.
                                 The template will be rendered with qWeb, so it may use qWeb expressions.
                                 The qWeb evaluation context provides:
                                 <ul>
-                                    <li>reference: the reference number of the document to pay</li>
-                                    <li>currency: the currency record in which the document is issued (e.g. currency.name could be EUR)</li>
-                                    <li>amount: the total amount to pay, as a float</li>
-                                    <li>amount_str: the total amount to pay, as a string with the account precision</li>
-                                    <li>object: the browse record on which the payment form is rendered (usually an invoice or sales order record)</li>
-                                    <li>user_id: the current user browse record</li>
+                                    <li>acquirer: payment.acquirer browse record</li>
+                                    <li>user: current user browse record</li>
+                                    <li>reference: the transaction reference number</li>
+                                    <li>currency: the transaction currency browse record</li>
+                                    <li>amount: the transaction amount, a float</li>
+                                    <li>partner: the buyer partner browse record, not necessarily set</li>
+                                    <li>partner_values: specific values about the buyer, for example coming from a shipping form</li>
+                                    <li>tx_values: specific transaction values</li>
                                     <li>context: the current context dictionary</li>
                                 </ul>
-                                If the template renders to an empty result in a certain context it will be ignored, as if it was inactive.
-                                </p>
                             </div>
-                            <field name="view_template_id" nolabel="1" colspan="2"/>
-                        </group>
+                        </div>
                     </group>
                 </form>
             </field>
@@ -79,20 +77,30 @@
             <field name="model">payment.transaction</field>
             <field name="arch" type="xml">
                 <form string="Payment Transactions" version="7.0">
-                    <group>
-                        <field name="date_create"/>
-                        <field name="date_validate"/>
-                        <field name="acquirer_id"/>
-                        <field name="state"/>
-                        <field name="state_message"/>
-                        <field name="amount"/>
-                        <field name="currency_id"/>
-                        <field name="reference"/>
-                        <field name="name"/>
-                        <field name="partner_id"/>
-                        <field name="partner_name"/>
-                        <field name="partner_email"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="reference"/>
+                                <field name="amount"/>
+                                <field name="currency_id"/>
+                                <field name="partner_id"/>
+                                <field name="partner_name"/>
+                                <field name="partner_email"/>
+                            </group>
+                            <group>
+                                <field name="date_create"/>
+                                <field name="date_validate"/>
+                                <field name="acquirer_id"/>
+                                <field name="state"/>
+                                <field name="state_message"/>
+                            </group>
+                        </group>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
+                        <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}' placeholder="Send a message to the group"/>
+                    </div>
                 </form>
             </field>
         </record>