From 125c044d4534e6b1dac37dffef344a94822dcc74 Mon Sep 17 00:00:00 2001
From: Ruchir Shukla <ruchir@techreceptives.com>
Date: Thu, 31 Oct 2013 13:03:46 +0530
Subject: [PATCH 1/5] improve UI for V7

---
 account_banking/account_banking.py            |  1 +
 account_banking/account_banking_view.xml      | 16 +++++---
 account_banking/wizard/bank_import.py         |  4 +-
 account_banking/wizard/bank_import_view.xml   | 41 ++++++++++---------
 .../wizard/banking_transaction_wizard.xml     | 37 +++++++----------
 account_banking/wizard/link_partner.xml       | 25 ++++++-----
 6 files changed, 65 insertions(+), 59 deletions(-)

diff --git a/account_banking/account_banking.py b/account_banking/account_banking.py
index c24a1fc85..a0a6afac9 100644
--- a/account_banking/account_banking.py
+++ b/account_banking/account_banking.py
@@ -247,6 +247,7 @@ class account_banking_imported_file(orm.Model):
         'file': fields.binary('Raw Data', readonly=True,
                               states={'draft': [('readonly', False)]}
                              ),
+        'file_name': fields.char('File name', size=256),
         'log': fields.text('Import Log', readonly=True,
                            states={'draft': [('readonly', False)]}
                           ),
diff --git a/account_banking/account_banking_view.xml b/account_banking/account_banking_view.xml
index 6200cdfee..dcb931700 100644
--- a/account_banking/account_banking_view.xml
+++ b/account_banking/account_banking_view.xml
@@ -16,7 +16,10 @@
             id="account_banking.menu_finance_banking_settings"
             parent="account.menu_finance_configuration"
             />
-
+        <menuitem action="account.action_view_bank_statement_tree"
+            id="account.journal_cash_move_lines"
+            sequence="18"
+            parent="account.menu_finance_bank_and_cash"/>
         <!-- Add a shortcut menu for bank accounts -->
         <record model="ir.actions.act_window" id="action_account_banking_res_partner_banks">
             <field name="name">Bank Accounts</field>
@@ -105,7 +108,8 @@
                             <field name="date" />
                             <field name="user_id" />
                             <field name="state" />
-                            <field name="file"/>
+                            <field name="file" filename="file_name"/>
+                            <field name="file_name" invisible="1"/>
                             <field name="format" />
                         </page>
                         <page string="Statements">
@@ -142,17 +146,17 @@
         <!-- Add a menu item for it -->
         <menuitem name="Imported Bank Statements Files"
             id="menu_action_account_banking_imported_files"
-            parent="account_banking.menu_finance_banking_actions"
+            parent="account.menu_finance_bank_and_cash"
             action="action_account_banking_imported_files"
-            sequence="12"
+            sequence="15"
          />
 
         <!-- Add the import wizard to the menu -->
         <menuitem name="Import Bank Statements File"
             id="menu_account_banking_import_wizard"
-            parent="account_banking.menu_finance_banking_actions"
+            parent="account.menu_finance_bank_and_cash"
             action="wizard_account_banking_import_file"
-            sequence="15"/>
+            sequence="12"/>
 
         <!-- Add the import wizard to the statement's right menu -->
         <act_window name="Import Bank Statements File"
diff --git a/account_banking/wizard/bank_import.py b/account_banking/wizard/bank_import.py
index 873b439b7..c5caff7c5 100644
--- a/account_banking/wizard/bank_import.py
+++ b/account_banking/wizard/bank_import.py
@@ -140,6 +140,7 @@ class banking_import(orm.TransientModel):
         import_id = statement_file_obj.create(cr, uid, dict(
             company_id = company.id,
             file = statements_file,
+            file_name = banking_import.file_name,
             state = 'unfinished',
             format = parser.name,
         ))
@@ -353,7 +354,7 @@ class banking_import(orm.TransientModel):
             '%s: %s' % (_('Number of bank costs invoices created'),
                         results.bank_costs_invoice_cnt),
             '',
-            '%s:' % ('Error report'),
+            '%s:' % (_('Error report')),
             '',
         ]
         text_log = '\n'.join(report + results.log)
@@ -390,6 +391,7 @@ class banking_import(orm.TransientModel):
                 'error': [('readonly', True)],
                 },
             ),
+        'file_name': fields.char('File name', size=256),
         'file': fields.binary(
             'Statements File', required=True,
             help = ('The Transactions File to import. Please note that while it is '
diff --git a/account_banking/wizard/bank_import_view.xml b/account_banking/wizard/bank_import_view.xml
index 0aca85c30..295b4db70 100644
--- a/account_banking/wizard/bank_import_view.xml
+++ b/account_banking/wizard/bank_import_view.xml
@@ -5,15 +5,16 @@
             <field name="name">account.banking.bank.import</field>
             <field name="model">account.banking.bank.import</field>
             <field name="arch" type="xml">
-		<form string="Import Bank Transactions File">
-		    <group colspan="4" states="init,ready,error">
-			<separator colspan="4" string="Select the processing details:"/>
-			<field name="company" colspan="1"/>
-			<field name="file"/>
-			<newline />
-			<field name="parser"/>
-			<field name="state" invisible="1"/>
-		    </group>
+		        <form string="Import Bank Transactions File"  version="7.0">
+		            <group colspan="4" states="init,ready,error">
+			            <separator colspan="4" string="Select the processing details:"/>
+			            <field name="company" colspan="1"/>
+			            <field name="file" filename="file_name"/>
+			            <field name="file_name" invisible="1"/>
+			            <newline />
+			            <field name="parser"/>
+			            <field name="state" invisible="1"/>
+		            </group>
                     <notebook colspan="4">
                         <page attrs="{'invisible': [('state', '!=', 'review')]}" string="Transactions">
                             <field name="line_ids" colspan="4" nolabel="1">
@@ -37,16 +38,16 @@
                                    attrs="{'invisible': [('state', '!=', 'ready')]}" />
                         </page>
                     </notebook>
-		    <group colspan="2" >
-			<button icon="gtk-cancel"
-				special="cancel"
-                                states="init"
-				string="Cancel"/>
-			<button icon="gtk-ok"
-				string="Import"
-                                states="init" 
-				name="import_statements_file"
-				type="object"/>
+                    <footer>
+                        <div attrs="{'invisible': [('state', '!=', 'init')]}">
+                            <button string="Import" class="oe_highlight"
+                                states="init" name="import_statements_file"
+				                type="object"/>
+				             or
+			                <button class="oe_link" special="cancel"
+                                states="init" string="Cancel"/>
+                        </div>
+                        
                         <button icon="gtk-close"
                                 special="cancel"
                                 string="Close"
@@ -61,7 +62,7 @@
                                 type="object" 
                                 string="Confirm"
                                 states="review"/>
-		    </group>
+                    </footer>
 		</form>
 	    </field>
         </record>
diff --git a/account_banking/wizard/banking_transaction_wizard.xml b/account_banking/wizard/banking_transaction_wizard.xml
index 018b87210..35ca0106a 100644
--- a/account_banking/wizard/banking_transaction_wizard.xml
+++ b/account_banking/wizard/banking_transaction_wizard.xml
@@ -5,7 +5,7 @@
             <field name="name">transaction.wizard.first</field>
             <field name="model">banking.transaction.wizard</field>
             <field name="arch" type="xml">
-                <form string="Match transaction">
+                <form string="Match transaction"  version="7.0">
                     <!-- fields used for form logic -->
                     <field name="statement_line_parent_id" invisible="True"/>
                     <field name="invoice_ids" invisible="True"/>
@@ -52,12 +52,6 @@
                                        />
                                 <field name='analytic_account_id' />
                             </group>
-                            <button colspan="1"
-                                    name="trigger_write"
-                                    type="object"
-                                    attrs="{'invisible': [('match_multi', '=', False)]}"
-                                    string="Select"/>
-                            <newline/>
 
                             <!-- residual and write off -->
                             
@@ -78,10 +72,7 @@
                             <page string="Match again">
                                 <label string="You can let the system try to match this bank statement line again after you have made any changes in the database (for instance, add an invoice or a bank account)."  colspan="2"/>
                                 <newline/>                           
-                                <button colspan="1"
-                                        name="trigger_match"
-                                        type="object"
-                                        string="Match again"/>
+                                
                             </page>
                             <!-- Manual selection -->
                             <page string="Manual match">
@@ -91,9 +82,6 @@
                                 <field name="manual_move_line_ids" colspan="4"
                                        context="{'search_default_partner_id': partner_id}"
                                        />
-                                <button name="trigger_write"
-                                        type="object"
-                                        string="Match" />
                             </page>
                             <page string="Write-Off" attrs="{'invisible': [('match_type', '=', False)]}">
                                 <group colspan="2" col="2">
@@ -101,10 +89,6 @@
                                     <field name="payment_option" />
                                     <field name="writeoff_account_id" attrs="{'required':[('payment_option','=','with_writeoff')],'invisible':[('payment_option','=','without_writeoff')]}" />
                                     <field name="writeoff_analytic_id" attrs="{'required':[('payment_option','=','with_writeoff')],'invisible':[('payment_option','=','without_writeoff')]}" />
-                                    <button colspan="1"
-                                            name="trigger_write"
-                                            type="object"
-                                            string="Set write-off account"/>
                                 </group>                                
                             </page>
                             <page string="Disable reconciliation" attrs="{'invisible': [('match_type', '==', False)]}">
@@ -118,10 +102,19 @@
                                 </group>
                             </page>
                         </notebook>
-                        <group colspan="2">
-                            <separator/>
-                            <button icon="gtk-ok" string="Close" special="cancel"/>
-                        </group>
+                        
+                        <footer>
+                            <button colspan="1"
+                                name="trigger_match"
+                                type="object"
+                                string="Match again"/>
+                            <button name="trigger_write"
+                                type="object"
+                                class="oe_highlight"
+                                string="Match" />
+                            or
+                            <button string="Close" special="cancel" class="oe_link"/>
+                        </footer>
                     </group>
                 </form>
             </field>
diff --git a/account_banking/wizard/link_partner.xml b/account_banking/wizard/link_partner.xml
index bf0c46a67..d9fceb1ac 100644
--- a/account_banking/wizard/link_partner.xml
+++ b/account_banking/wizard/link_partner.xml
@@ -6,7 +6,7 @@
             <field name="type">form</field>
             <field name="model">banking.link_partner</field>
             <field name="arch" type="xml">
-                <form string="Link partner">
+                <form string="Link partner" version="7.0" >
                     <group colspan="4" col="6" string="Transaction data">
                         <field name="ref" />
                         <field name="amount" />
@@ -40,15 +40,20 @@
                             <field name="email" widget="email"/>
                         </group>
                     </group>
-                    <button icon="gtk-cancel" string="Cancel" special="cancel" />
-                    <button icon="gtk-ok" string="Create partner"
-                            name="link_partner" type="object"
-                            attrs="{'invisible': [('partner_id', '!=', False)]}"
-                            />
-                    <button icon="gtk-ok" string="Link existing partner"
-                            name="link_partner" type="object"
-                            attrs="{'invisible': [('partner_id', '==', False)]}"
-                            />
+                    <footer>
+                        <button string="Create partner"
+                                name="link_partner" type="object"
+                                class="oe_highlight"
+                                attrs="{'invisible': [('partner_id', '!=', False)]}"
+                                />
+                        <button string="Link existing partner"
+                                class="oe_highlight"
+                                name="link_partner" type="object"
+                                attrs="{'invisible': [('partner_id', '==', False)]}"
+                                />
+                         or
+                        <button class="oe_link" string="Cancel" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>

From c2d3cc147d689018c09e70f60314574009f675fa Mon Sep 17 00:00:00 2001
From: Ruchir Shukla <ruchir@techreceptives.com>
Date: Sat, 9 Nov 2013 16:26:39 +0530
Subject: [PATCH 2/5] restore the buttons and change fields caption

---
 .../wizard/banking_transaction_wizard.xml     | 32 ++++++++++++-------
 .../view/banking_transaction_wizard.xml       | 29 +++++++++--------
 2 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/account_banking/wizard/banking_transaction_wizard.xml b/account_banking/wizard/banking_transaction_wizard.xml
index 35ca0106a..b85626443 100644
--- a/account_banking/wizard/banking_transaction_wizard.xml
+++ b/account_banking/wizard/banking_transaction_wizard.xml
@@ -52,6 +52,12 @@
                                        />
                                 <field name='analytic_account_id' />
                             </group>
+                            <button colspan="1"
+                                    name="trigger_write"
+                                    type="object"
+                                    attrs="{'invisible': [('match_multi', '=', False)]}"
+                                    string="Select"/>
+                            <newline/>
 
                             <!-- residual and write off -->
                             
@@ -72,16 +78,24 @@
                             <page string="Match again">
                                 <label string="You can let the system try to match this bank statement line again after you have made any changes in the database (for instance, add an invoice or a bank account)."  colspan="2"/>
                                 <newline/>                           
-                                
+                                <button colspan="1"
+                                        name="trigger_match"
+                                        type="object"
+                                        string="Match again"/>
                             </page>
                             <!-- Manual selection -->
                             <page string="Manual match">
+                                <separator string="Match one or more invoices" colspan="4"/>
                                 <field name="manual_invoice_ids" colspan="4"
                                        context="{'search_default_partner_id': partner_id}"
                                        />
+                                <separator string="Or match one or more entries" colspan="4"/>
                                 <field name="manual_move_line_ids" colspan="4"
                                        context="{'search_default_partner_id': partner_id}"
                                        />
+                                <button name="trigger_write"
+                                        type="object"
+                                        string="Match" />
                             </page>
                             <page string="Write-Off" attrs="{'invisible': [('match_type', '=', False)]}">
                                 <group colspan="2" col="2">
@@ -89,6 +103,10 @@
                                     <field name="payment_option" />
                                     <field name="writeoff_account_id" attrs="{'required':[('payment_option','=','with_writeoff')],'invisible':[('payment_option','=','without_writeoff')]}" />
                                     <field name="writeoff_analytic_id" attrs="{'required':[('payment_option','=','with_writeoff')],'invisible':[('payment_option','=','without_writeoff')]}" />
+                                    <button colspan="1"
+                                            name="trigger_write"
+                                            type="object"
+                                            string="Set write-off account"/>
                                 </group>                                
                             </page>
                             <page string="Disable reconciliation" attrs="{'invisible': [('match_type', '==', False)]}">
@@ -102,18 +120,8 @@
                                 </group>
                             </page>
                         </notebook>
-                        
                         <footer>
-                            <button colspan="1"
-                                name="trigger_match"
-                                type="object"
-                                string="Match again"/>
-                            <button name="trigger_write"
-                                type="object"
-                                class="oe_highlight"
-                                string="Match" />
-                            or
-                            <button string="Close" special="cancel" class="oe_link"/>
+                            <button icon="gtk-ok" string="Close" special="cancel"/>
                         </footer>
                     </group>
                 </form>
diff --git a/account_banking_payment/view/banking_transaction_wizard.xml b/account_banking_payment/view/banking_transaction_wizard.xml
index f9c376493..3392ded97 100644
--- a/account_banking_payment/view/banking_transaction_wizard.xml
+++ b/account_banking_payment/view/banking_transaction_wizard.xml
@@ -12,23 +12,26 @@
                 </field>
                 <xpath expr="//group/separator[@string='Multiple matches']/.."
                        position="after">
-                    <field name='payment_line_id'
-                           attrs="{'invisible': [('match_type', 'not in', 
-                                       ('storno', 'payment', 'payment_manual'))]}"
-                           />
+                       <group>
+                           <field name='payment_line_id'
+                               attrs="{'invisible': [('match_type', 'not in',
+                               ('storno', 'payment', 'payment_manual'))]}" />
+                       </group>
                 </xpath>
                 <field name="move_line_id" position="after">
-                    <field name='payment_order_id'
-                           attrs="{'readonly': [('match_multi', '=', False)],
-                                   'invisible': [('match_type', 'not in', 
-                                       ('payment_order', 'payment_order_manual'))]
-                                  }"
-                           domain="[('id', 'in', payment_order_ids[0][2])]"
-                           />
+                    <group>
+                        <field name='payment_order_id'
+                            attrs="{'readonly': [('match_multi', '=', False)],
+                            'invisible': [('match_type', 'not in',
+                            ('payment_order', 'payment_order_manual'))]}"
+                            domain="[('id', 'in', payment_order_ids[0][2])]" />
+                    </group>
                 </field>
                 <field name="manual_move_line_ids" position="after">
-                    <field name="manual_payment_line_id"/>
-                    <field name="manual_payment_order_id"/>
+                    <group>
+                        <field name="manual_payment_line_id"/>
+                        <field name="manual_payment_order_id"/>
+                    </group>
                 </field>
             </field>
         </record>

From 40d834c117a4f3ec574fcc7fe080c9431e8f9755 Mon Sep 17 00:00:00 2001
From: Ruchir Shukla <ruchir@bizzappdev.com>
Date: Tue, 10 Dec 2013 12:36:28 +0530
Subject: [PATCH 3/5] change ui for analytic account and invoice

---
 account_banking/__openerp__.py                    |  1 +
 .../wizard/banking_transaction_wizard.xml         | 15 +++++++++------
 .../view/banking_transaction_wizard.xml           |  8 ++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/account_banking/__openerp__.py b/account_banking/__openerp__.py
index bce225cd4..27a346d6c 100644
--- a/account_banking/__openerp__.py
+++ b/account_banking/__openerp__.py
@@ -106,4 +106,5 @@
         recognized and made available at server (re)start.
     ''',
     'installable': True,
+    'auto_install': False,
 }
diff --git a/account_banking/wizard/banking_transaction_wizard.xml b/account_banking/wizard/banking_transaction_wizard.xml
index b85626443..dc00d7d45 100644
--- a/account_banking/wizard/banking_transaction_wizard.xml
+++ b/account_banking/wizard/banking_transaction_wizard.xml
@@ -36,22 +36,25 @@
                                 <separator string="Multiple matches" colspan="2"/>
                                 <label colspan="2" string="Multiple matches were found for this bank transfer. You must pick one of the matches or select a match manually below." />
                             </group>
-                            <group attrs="{'readonly': [('match_multi', '!=', True)]}" col="8">
+                            </group>
+                            </group>
+                            <group>
+                            <newline/>
                                 <!-- show if we have an invoice type match (but the user may need to select from multiple options)
                                      or whenever there is an invoice_id (e.g. in case of a manual match) 
                                 -->
                                 <field name='invoice_id'
-                                       attrs="{'readonly': [('match_multi', '=', False)], 'invisible': [('match_type', '!=', 'invoice'),('invoice_id', '=', False)]}"
+                                       attrs="{'readonly': [('match_multi', '=', False)], 'invisible': [('match_type', '!=', 'invoice'),('invoice_id', '=', False)]}" colspan="2"
                                        domain="[('id', 'in', invoice_ids[0][2])]"
                                        />
                                 <!-- show if we have a move type match or a manual match without an invoice_id
                                 -->
                                 <field name='move_line_id'
-                                       attrs="{'readonly': [('match_multi', '=', False)], 'invisible': [('match_type', '!=', 'move'),('invoice_id', '=', False)]}"
+                                       attrs="{'readonly': [('match_multi', '=', False)], 'invisible': [('match_type', '!=', 'move'),('invoice_id', '=', False)]}" colspan="2"
                                        domain="[('id', 'in', move_line_ids[0][2])]"
                                        />
-                                <field name='analytic_account_id' />
-                            </group>
+                             <newline/>
+                            <field colspan="2" name='analytic_account_id' />
                             <button colspan="1"
                                     name="trigger_write"
                                     type="object"
@@ -123,7 +126,7 @@
                         <footer>
                             <button icon="gtk-ok" string="Close" special="cancel"/>
                         </footer>
-                    </group>
+                    
                 </form>
             </field>
         </record>
diff --git a/account_banking_payment/view/banking_transaction_wizard.xml b/account_banking_payment/view/banking_transaction_wizard.xml
index 3392ded97..a17f1a4b3 100644
--- a/account_banking_payment/view/banking_transaction_wizard.xml
+++ b/account_banking_payment/view/banking_transaction_wizard.xml
@@ -28,10 +28,10 @@
                     </group>
                 </field>
                 <field name="manual_move_line_ids" position="after">
-                    <group>
-                        <field name="manual_payment_line_id"/>
-                        <field name="manual_payment_order_id"/>
-                    </group>
+                    <separator string="Match this payment line" colspan="4"/>
+                    <field name="manual_payment_line_id"/>
+                    <separator string="Match this payment order" colspan="4"/>
+                    <field name="manual_payment_order_id"/>
                 </field>
             </field>
         </record>

From 0cc04a859bd8653d0476af1407d872d220ec675e Mon Sep 17 00:00:00 2001
From: Ruchir Shukla <ruchir@bizzappdev.com>
Date: Fri, 13 Dec 2013 14:06:23 +0530
Subject: [PATCH 4/5] move payemnt fields in page

---
 .../view/banking_transaction_wizard.xml            | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/account_banking_payment/view/banking_transaction_wizard.xml b/account_banking_payment/view/banking_transaction_wizard.xml
index a17f1a4b3..b058143f1 100644
--- a/account_banking_payment/view/banking_transaction_wizard.xml
+++ b/account_banking_payment/view/banking_transaction_wizard.xml
@@ -27,12 +27,14 @@
                             domain="[('id', 'in', payment_order_ids[0][2])]" />
                     </group>
                 </field>
-                <field name="manual_move_line_ids" position="after">
-                    <separator string="Match this payment line" colspan="4"/>
-                    <field name="manual_payment_line_id"/>
-                    <separator string="Match this payment order" colspan="4"/>
-                    <field name="manual_payment_order_id"/>
-                </field>
+                <notebook position="inside">
+                    <page string="Match Payments">
+                        <separator string="Match this payment line" colspan="4"/>
+                        <field name="manual_payment_line_id"/>
+                        <separator string="Match this payment order" colspan="4"/>
+                        <field name="manual_payment_order_id"/>
+                    </page>
+                </notebook>
             </field>
         </record>
     </data>

From 27805f96bbfe0ade452b2a89e29a48a4db5302f2 Mon Sep 17 00:00:00 2001
From: Ruchir Shukla <ruchir@bizzappdev.com>
Date: Fri, 13 Dec 2013 18:38:59 +0530
Subject: [PATCH 5/5] move page position

---
 account_banking_payment/view/banking_transaction_wizard.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/account_banking_payment/view/banking_transaction_wizard.xml b/account_banking_payment/view/banking_transaction_wizard.xml
index b058143f1..f8b37cde9 100644
--- a/account_banking_payment/view/banking_transaction_wizard.xml
+++ b/account_banking_payment/view/banking_transaction_wizard.xml
@@ -27,14 +27,14 @@
                             domain="[('id', 'in', payment_order_ids[0][2])]" />
                     </group>
                 </field>
-                <notebook position="inside">
+                <page string="Manual match" position="after">
                     <page string="Match Payments">
                         <separator string="Match this payment line" colspan="4"/>
                         <field name="manual_payment_line_id"/>
                         <separator string="Match this payment order" colspan="4"/>
                         <field name="manual_payment_order_id"/>
                     </page>
-                </notebook>
+                </page>
             </field>
         </record>
     </data>