From b587cb45eb533a0c8d6bcce888171959a8197ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?=
 <joel.grandguillaume@camptocamp.com>
Date: Tue, 26 Jun 2012 17:27:25 +0200
Subject: [PATCH] [ADD] account_statement_completion_voucher to better adapt
 the views of bank statement (lp:c2c-financial-addons/6.1 rev 24.1.38)

---
 .../statement_view.xml                        | 16 +++++--
 .../__init__.py                               | 21 +++++++++
 .../__openerp__.py                            | 44 +++++++++++++++++++
 .../statement_view.xml                        | 21 +++++++++
 account_statement_ext/statement_view.xml      |  5 +--
 5 files changed, 101 insertions(+), 6 deletions(-)
 create mode 100644 account_statement_completion_voucher/__init__.py
 create mode 100644 account_statement_completion_voucher/__openerp__.py
 create mode 100644 account_statement_completion_voucher/statement_view.xml

diff --git a/account_statement_base_completion/statement_view.xml b/account_statement_base_completion/statement_view.xml
index 5101a0b0..5153a40b 100644
--- a/account_statement_base_completion/statement_view.xml
+++ b/account_statement_base_completion/statement_view.xml
@@ -10,9 +10,6 @@
          <field name="type">form</field>
          <field name="arch" type="xml">
              <data>
-                 <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='sequence']" position="before">
-                    <field name="already_completed" />
-                 </xpath>
                  <xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='sequence']" position="after">
                      <separator colspan="4" string="Importation related infos"/>
                     <field name="label" />
@@ -36,6 +33,19 @@
              </data>
          </field>
      </record>
+    <record id="bank_statement_view_form2" model="ir.ui.view">
+         <field name="name">account_bank_statement_import_base.bank_statement.auto_cmpl</field>
+         <field name="model">account.bank.statement</field>
+         <field name="inherit_id" ref="account.view_bank_statement_form" />
+         <field name="type">form</field>
+         <field name="arch" type="xml">
+             <data>
+                 <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+                    <field name="already_completed" />
+                 </xpath>
+             </data>
+         </field>
+     </record>
 
      <record id="statement_rules_view_form" model="ir.ui.view">
          <field name="name">account.statement.profil.view</field>
diff --git a/account_statement_completion_voucher/__init__.py b/account_statement_completion_voucher/__init__.py
new file mode 100644
index 00000000..e5cfb78c
--- /dev/null
+++ b/account_statement_completion_voucher/__init__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Joel Grand-Guillaume
+#    Copyright 2011-2012 Camptocamp SA
+#
+#    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/>.
+#
+##############################################################################
+
diff --git a/account_statement_completion_voucher/__openerp__.py b/account_statement_completion_voucher/__openerp__.py
new file mode 100644
index 00000000..d01c2037
--- /dev/null
+++ b/account_statement_completion_voucher/__openerp__.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Joel Grand-Guillaume
+#    Copyright 2011-2012 Camptocamp SA
+#
+#    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': "Bank statement extension with voucher",
+ 'version': '1.0',
+ 'author': 'Camptocamp',
+ 'maintainer': 'Camptocamp',
+ 'category': 'Finance',
+ 'complexity': 'normal', #easy, normal, expert
+ 'depends': ['account_statement_base_completion','account_voucher'],
+ 'description': """
+ This module is only needed when using account_statement_base_completion with voucher in order adapt the view correctly.
+ """,
+ 'website': 'http://www.camptocamp.com',
+ 'init_xml': [],
+ 'update_xml': [
+    "statement_view.xml",
+ ],
+ 'demo_xml': [],
+ 'test': [],
+ 'installable': True,
+ 'images': [],
+ 'auto_install': True,
+ 'license': 'AGPL-3',
+ 'active': False,
+}
diff --git a/account_statement_completion_voucher/statement_view.xml b/account_statement_completion_voucher/statement_view.xml
new file mode 100644
index 00000000..5ed68ffd
--- /dev/null
+++ b/account_statement_completion_voucher/statement_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <!-- Override what we have in account_statement_base_completion to replace the one in the voucher -->
+    <record id="account_statement_base_completion.bank_statement_view_form2" model="ir.ui.view">
+         <field name="name">account_bank_statement_import_base.bank_statement.auto_cmpl</field>
+         <field name="model">account.bank.statement</field>
+         <field name="inherit_id" ref="account_voucher.view_bank_statement_tree_voucher" />
+         <field name="type">form</field>
+         <field name="arch" type="xml">
+             <data>
+                 <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='voucher_id']" position="after">
+                    <field name="already_completed" />
+                 </xpath>
+             </data>
+         </field>
+     </record>
+    
+</data>
+</openerp>
diff --git a/account_statement_ext/statement_view.xml b/account_statement_ext/statement_view.xml
index 1639c30f..0c492cc9 100644
--- a/account_statement_ext/statement_view.xml
+++ b/account_statement_ext/statement_view.xml
@@ -137,12 +137,11 @@
             <!-- Add a new group before the first one with name, profil and date -->
             <xpath expr="/form/group[@col='7']" position="before">
                 <group col="8" colspan="4">
-                    <field name="id" select="1" readonly="1"/>
-                    <field name="name" select="1"/>
                     <field name="profile_id" select="1" required="1" on_change="onchange_imp_config_id(profile_id)" widget="selection"/>
                     <field name="date" select="1" on_change="onchange_date(date, company_id)"/>
+                    <field name="name" select="1"/>
                 </group>
-                <separator string="Details" colspan="4"/>
+                <separator string="Profile Details" colspan="4"/>
             </xpath>
             <!-- Make balance visible or not depending on profil -->
             <xpath expr="/form/group/field[@name='balance_start']" position="replace">