From f9bde4af355ee102146303d0459f7f144d431c57 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Tue, 24 Nov 2015 21:38:13 +0100
Subject: [PATCH] Add bank_line_count field and display it in view

Display date_sent field in view
---
 .../models/account_payment.py                   |  8 ++++++++
 .../views/account_payment.xml                   | 13 ++++++++++++-
 .../view/account_payment.xml                    | 17 ++++++++++++++++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/account_banking_payment_export/models/account_payment.py b/account_banking_payment_export/models/account_payment.py
index 74ea5108c..13a7c1a9d 100644
--- a/account_banking_payment_export/models/account_payment.py
+++ b/account_banking_payment_export/models/account_payment.py
@@ -47,12 +47,20 @@ class PaymentOrder(models.Model):
         'bank.payment.line', 'order_id', string="Bank Payment Lines",
         readonly=True)
     total = fields.Float(compute='_compute_total', store=True)
+    bank_line_count = fields.Integer(
+        compute='_bank_line_count', string='Number of Bank Lines')
 
     @api.depends('line_ids', 'line_ids.amount')
     @api.one
     def _compute_total(self):
         self.total = sum(self.mapped('line_ids.amount') or [0.0])
 
+    @api.multi
+    @api.depends('bank_line_ids')
+    def _bank_line_count(self):
+        for order in self:
+            order.bank_line_count = len(order.bank_line_ids)
+
     @api.multi
     def launch_wizard(self):
         """Search for a wizard to launch according to the type.
diff --git a/account_banking_payment_export/views/account_payment.xml b/account_banking_payment_export/views/account_payment.xml
index 0e9340e1e..8884061a8 100644
--- a/account_banking_payment_export/views/account_payment.xml
+++ b/account_banking_payment_export/views/account_payment.xml
@@ -14,7 +14,8 @@
         </xpath>
         <field name="mode" position="after">
             <field name="mode_type" invisible="1"/>
-            <field name="payment_order_type" invisible="0"/>
+            <field name="payment_order_type" invisible="1"/>
+            <field name="bank_line_count" attrs="{'invisible': [('state', 'in', ('draft', 'cancel'))]}"/>
         </field>
         <xpath expr="//button[@string='Invoices']" position="attributes">
             <attribute name="attrs">{
@@ -91,6 +92,16 @@
     </field>
 </record>
 
+<record id="view_payment_order_tree" model="ir.ui.view">
+    <field name="name">account_banking_payment_export.payment.order.tree</field>
+    <field name="inherit_id" ref="account_payment.view_payment_order_tree" />
+    <field name="model">payment.order</field>
+    <field name="arch" type="xml">
+        <field name="date_done" position="after">
+            <field name="bank_line_count"/>
+        </field>
+    </field>
+</record>
 
 </data>
 </openerp>
diff --git a/account_banking_payment_transfer/view/account_payment.xml b/account_banking_payment_transfer/view/account_payment.xml
index 8bb537622..4ed6b9c62 100644
--- a/account_banking_payment_transfer/view/account_payment.xml
+++ b/account_banking_payment_transfer/view/account_payment.xml
@@ -4,7 +4,7 @@
         <record id="view_payment_order_form_inherit" model="ir.ui.view">
             <field name="name">account.payment.order.form (account_banking_payment_transfer)</field>
             <field name="model">payment.order</field>
-            <field name="inherit_id" ref="account_payment.view_payment_order_form" />
+            <field name="inherit_id" ref="account_banking_payment_export.view_payment_order_form" />
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='%(account_payment.action_create_payment_order)d']" position="after">
                     <button class="oe_inline oe_stat_button"
@@ -14,7 +14,22 @@
                     <field name="partial_reconcile_count" widget="statinfo"/>
                     </button>
                 </xpath>
+                <field name="mode" position="after">
+                    <field name="date_sent"/>
+                </field>
             </field>
         </record>
+
+        <record id="view_payment_order_tree" model="ir.ui.view">
+            <field name="name">account_banking_payment_transfer.payment.order.tree</field>
+            <field name="model">payment.order</field>
+            <field name="inherit_id" ref="account_banking_payment_export.view_payment_order_tree" />
+            <field name="arch" type="xml">
+                <field name="date_done" position="before">
+                    <field name="date_sent"/>
+                </field>
+            </field>
+        </record>
+
     </data>
 </openerp>