From b65090bb41bfda3e803b1919684edacacd368def Mon Sep 17 00:00:00 2001
From: vrenaville <vincent.renaville@camptocamp.com>
Date: Wed, 3 Jun 2015 14:08:23 +0200
Subject: [PATCH 01/17] [ADD] account import line currency extension module

---
 .../__init__.py                               | 20 ++++++++
 .../__openerp__.py                            | 51 +++++++++++++++++++
 .../account_statement_from_invoice_view.xml   | 50 ++++++++++++++++++
 .../payment_view.xml                          | 48 +++++++++++++++++
 4 files changed, 169 insertions(+)
 create mode 100644 account_import_line_multicurrency_extension/__init__.py
 create mode 100644 account_import_line_multicurrency_extension/__openerp__.py
 create mode 100644 account_import_line_multicurrency_extension/account_statement_from_invoice_view.xml
 create mode 100644 account_import_line_multicurrency_extension/payment_view.xml

diff --git a/account_import_line_multicurrency_extension/__init__.py b/account_import_line_multicurrency_extension/__init__.py
new file mode 100644
index 000000000..6dcc7ddba
--- /dev/null
+++ b/account_import_line_multicurrency_extension/__init__.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Vincent Renaville (Camptocamp)
+#    Copyright 2015 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_import_line_multicurrency_extension/__openerp__.py b/account_import_line_multicurrency_extension/__openerp__.py
new file mode 100644
index 000000000..6eec6852a
--- /dev/null
+++ b/account_import_line_multicurrency_extension/__openerp__.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Vincent Renaville (Camptocamp)
+#    Copyright 2015 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': 'Payment Order Extension',
+ 'summary': 'Add an improved view for payment order',
+ 'version': '1.1',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
+ 'maintainter': 'Camptocamp',
+ 'category': 'Accounting',
+ 'depends': ['account_payment'],
+ 'description': """
+Payment Order
+==================
+
+Add improved move line selection for multi-currency
+
+Contributors
+------------
+
+* Vincent revaville <vincent.renaville@camptocamp.com>
+""",
+ 'website': 'http://www.camptocamp.com',
+ 'data': ['payment_view.xml',
+          'account_statement_from_invoice_view.xml',
+          ],
+ 'tests': [],
+ 'installable': True,
+ 'auto_install': False,
+ 'license': 'AGPL-3',
+ 'conflicts': [
+     'account_banking_payment_export',
+     ],
+ 'application': False,
+ }
diff --git a/account_import_line_multicurrency_extension/account_statement_from_invoice_view.xml b/account_import_line_multicurrency_extension/account_statement_from_invoice_view.xml
new file mode 100644
index 000000000..1382d8776
--- /dev/null
+++ b/account_import_line_multicurrency_extension/account_statement_from_invoice_view.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	
+        <record id="view_move_line_tree_bank_statement" model="ir.ui.view">
+            <field name="name">account.move.line.tree.bank.statement</field>
+            <field name="model">account.move.line</field>
+            <field name="arch" type="xml">
+                <tree string="Move lines">
+                    <field name="journal_id" readonly="True"/>
+                    <field name="date" readonly="True"/>
+                    <field name="name" readonly="True"/>
+                    <field name="partner_id" readonly="True" />
+                    <field name="ref" readonly="True" />
+                    <field name="amount_residual_currency" readonly="True"/>
+                    <field name="currency_id" readonly="True"  />
+                    <field name="date_maturity" readonly="True"/>
+                    <field name="reconcile_partial_id" readonly="True"/>
+                </tree>
+            </field>
+        </record>
+
+	    <record id="view_account_statement_from_invoice_lines_over" model="ir.ui.view">
+	      <field name="name">account.statement.from.invoice.lines.form.over</field>
+	      <field name="model">account.statement.from.invoice.lines</field>
+	      <field name="inherit_id" ref="account.view_account_statement_from_invoice_lines"/>
+	      <field name="arch" type="xml">
+	          <field name="line_ids" position="replace">
+	                <field name="line_ids" 
+	                	   context="{'currency':True, 'tree_view_ref': 'account_import_line_multicurrency_extension.view_move_line_tree_bank_statement'}" 
+	                	   domain="[('account_id.type','in',['receivable','payable']), ('reconcile_id','=',False), ('state', '=', 'valid')]"> 
+	                    <tree string="Move lines">
+	                        <field name="journal_id"/>
+	                        <field name="date"/>
+	                        <field name="name"/>
+	                        <field name="partner_id" />
+	                        <field name="ref" />
+	                        <field name="amount_residual_currency"/>
+	                        <field name="currency_id"/>
+	                        <field name="date_maturity"/>
+	                        <field name="reconcile_partial_id"/>
+	                    </tree>
+
+	                </field>
+	          </field>
+	      </field>
+	    </record>
+
+    </data>
+</openerp>
diff --git a/account_import_line_multicurrency_extension/payment_view.xml b/account_import_line_multicurrency_extension/payment_view.xml
new file mode 100644
index 000000000..e149a34a0
--- /dev/null
+++ b/account_import_line_multicurrency_extension/payment_view.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data noupdate="0">
+
+        <record id="view_move_line_tree_payment" model="ir.ui.view">
+            <field name="name">account.move.line.tree.payment</field>
+            <field name="model">account.move.line</field>
+            <field name="arch" type="xml">
+                <tree string="Move lines">
+                    <field name="date" readonly="True"/>
+                    <field name="name" readonly="True"/>
+                    <field name="partner_id" readonly="True" />
+                    <field name="ref" readonly="True" />
+                    <field name="amount_residual_currency" readonly="True"/>
+                    <field name="currency_id" readonly="True"  />
+                    <field name="date_maturity" readonly="True"/>
+                    <field name="reconcile_partial_id" readonly="True"/>
+                </tree>
+            </field>
+        </record>
+
+
+
+    <record id="view_create_payment_order_lines_over" model="ir.ui.view">
+      <field name="name">payment.order.create.form.over</field>
+      <field name="model">payment.order.create</field>
+      <field name="inherit_id" ref="account_payment.view_create_payment_order_lines"/>
+      <field name="arch" type="xml">
+          <field name="entries" position="replace">
+                <field name="entries" context="{'tree_view_ref': 'account_import_line_multicurrency_extension.view_move_line_tree_payment'}">
+                    <tree string="Move lines">
+                        <field name="date"/>
+                        <field name="name"/>
+                        <field name="partner_id" />
+                        <field name="ref" />
+                        <field name="amount_residual_currency"/>
+                        <field name="currency_id"/>
+                        <field name="date_maturity"/>
+                        <field name="reconcile_partial_id"/>
+                    </tree>
+                </field>
+          </field>
+      </field>
+    </record>
+
+  </data>
+</openerp>
+

From 1b03b4b4f1f8490e222dd1a636456a68173a3eef Mon Sep 17 00:00:00 2001
From: vrenaville <vincent.renaville@camptocamp.com>
Date: Mon, 15 Jun 2015 13:49:21 +0200
Subject: [PATCH 02/17] [FIX] change layout

---
 .../__init__.py                               |  1 +
 .../__openerp__.py                            |  7 +-
 .../models/__init__.py                        | 22 ++++++
 .../models/account_statement_from_invoice.py  | 76 +++++++++++++++++++
 .../models/bank_statement.py                  | 28 +++++++
 .../account_statement_from_invoice_view.xml   |  0
 .../view/bank_statement_view.xml              | 19 +++++
 .../{ => view}/payment_view.xml               |  0
 8 files changed, 150 insertions(+), 3 deletions(-)
 create mode 100644 account_import_line_multicurrency_extension/models/__init__.py
 create mode 100644 account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
 create mode 100644 account_import_line_multicurrency_extension/models/bank_statement.py
 rename account_import_line_multicurrency_extension/{ => view}/account_statement_from_invoice_view.xml (100%)
 create mode 100644 account_import_line_multicurrency_extension/view/bank_statement_view.xml
 rename account_import_line_multicurrency_extension/{ => view}/payment_view.xml (100%)

diff --git a/account_import_line_multicurrency_extension/__init__.py b/account_import_line_multicurrency_extension/__init__.py
index 6dcc7ddba..563ca038e 100644
--- a/account_import_line_multicurrency_extension/__init__.py
+++ b/account_import_line_multicurrency_extension/__init__.py
@@ -18,3 +18,4 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+from . import models
diff --git a/account_import_line_multicurrency_extension/__openerp__.py b/account_import_line_multicurrency_extension/__openerp__.py
index 6eec6852a..52c7dff99 100644
--- a/account_import_line_multicurrency_extension/__openerp__.py
+++ b/account_import_line_multicurrency_extension/__openerp__.py
@@ -24,7 +24,7 @@
  'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainter': 'Camptocamp',
  'category': 'Accounting',
- 'depends': ['account_payment'],
+ 'depends': ['account_payment','account'],
  'description': """
 Payment Order
 ==================
@@ -37,8 +37,9 @@ Contributors
 * Vincent revaville <vincent.renaville@camptocamp.com>
 """,
  'website': 'http://www.camptocamp.com',
- 'data': ['payment_view.xml',
-          'account_statement_from_invoice_view.xml',
+ 'data': ['view/payment_view.xml',
+          'view/account_statement_from_invoice_view.xml',
+          'view/bank_statement_view.xml',
           ],
  'tests': [],
  'installable': True,
diff --git a/account_import_line_multicurrency_extension/models/__init__.py b/account_import_line_multicurrency_extension/models/__init__.py
new file mode 100644
index 000000000..38ae6104b
--- /dev/null
+++ b/account_import_line_multicurrency_extension/models/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Vincent Renaville (Camptocamp)
+#    Copyright 2015 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/>.
+#
+##############################################################################
+from . import bank_statement
+from . import account_statement_from_invoice
diff --git a/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py b/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
new file mode 100644
index 000000000..b7ea1a23b
--- /dev/null
+++ b/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Vincent Renaville (Camptocamp)
+#    Copyright 2015 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/>.
+#
+##############################################################################
+import time
+
+from openerp.osv import fields, osv
+
+class account_statement_from_invoice_lines(osv.osv_memory):
+    """
+    Generate Entries by Statement from Invoices
+    """
+    _inherit = "account.statement.from.invoice.lines"
+
+
+    def populate_statement(self, cr, uid, ids, context=None):
+        context = dict(context or {})
+        statement_id = context.get('statement_id', False)
+        if not statement_id:
+            return {'type': 'ir.actions.act_window_close'}
+        data = self.read(cr, uid, ids, context=context)[0]
+        line_ids = data['line_ids']
+        if not line_ids:
+            return {'type': 'ir.actions.act_window_close'}
+
+        line_obj = self.pool.get('account.move.line')
+        statement_obj = self.pool.get('account.bank.statement')
+        statement_line_obj = self.pool.get('account.bank.statement.line')
+        currency_obj = self.pool.get('res.currency')
+        statement = statement_obj.browse(cr, uid, statement_id, context=context)
+        line_date = statement.date
+
+        # for each selected move lines
+        for line in line_obj.browse(cr, uid, line_ids, context=context):
+            ctx = context.copy()
+            #  take the date for computation of currency => use payment date
+            ctx['date'] = line_date
+            amount = 0.0
+            amount_currency = 0.0
+            if line.invoice and line.invoice.currency_id == statement.currency_id:
+                amount = line.amount_residual_currency
+                amount_currency = 0.0
+            else:
+                amount = 0.0
+                amount_currency = line.amount_residual_currency
+
+            context.update({'move_line_ids': [line.id],
+                            'invoice_id': line.invoice.id})
+
+            statement_line_obj.create(cr, uid, {
+                'name': line.name or '?',
+                'amount': amount,
+                'partner_id': line.partner_id.id,
+                'statement_id': statement_id,
+                'ref': line.ref,
+                'date': statement.date,
+                'amount_currency': amount_currency,
+                'currency_id': line.currency_id.id,
+            }, context=context)
+        return {'type': 'ir.actions.act_window_close'}
diff --git a/account_import_line_multicurrency_extension/models/bank_statement.py b/account_import_line_multicurrency_extension/models/bank_statement.py
new file mode 100644
index 000000000..20ecd12c8
--- /dev/null
+++ b/account_import_line_multicurrency_extension/models/bank_statement.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Vincent Renaville (Camptocamp)
+#    Copyright 2015 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/>.
+#
+##############################################################################
+from openerp import models, fields
+
+
+class AccountBankStatementLine(models.Model):
+    _inherit = "account.bank.statement.line"
+
+    currency_symbol = fields.Char(
+        related='statement_id.currency.symbol', readonly=True)
diff --git a/account_import_line_multicurrency_extension/account_statement_from_invoice_view.xml b/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml
similarity index 100%
rename from account_import_line_multicurrency_extension/account_statement_from_invoice_view.xml
rename to account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml
diff --git a/account_import_line_multicurrency_extension/view/bank_statement_view.xml b/account_import_line_multicurrency_extension/view/bank_statement_view.xml
new file mode 100644
index 000000000..e57765805
--- /dev/null
+++ b/account_import_line_multicurrency_extension/view/bank_statement_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data noupdate="0">
+
+    <record model="ir.ui.view" id="view_bank_statement_form">
+      <field name="name">account.bank.statement.form.inherit</field>
+      <field name="model">account.bank.statement</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="account.view_bank_statement_form"/>
+      <field name="arch" type="xml">
+        <field name="amount" position="after">
+            <field name="currency_symbol"/>
+        </field>
+      </field>
+    </record>
+
+  </data>
+</openerp>
+
diff --git a/account_import_line_multicurrency_extension/payment_view.xml b/account_import_line_multicurrency_extension/view/payment_view.xml
similarity index 100%
rename from account_import_line_multicurrency_extension/payment_view.xml
rename to account_import_line_multicurrency_extension/view/payment_view.xml

From eef85a693672467804ad0c15a0d831430da8a0cb Mon Sep 17 00:00:00 2001
From: vrenaville <vincent.renaville@camptocamp.com>
Date: Fri, 26 Jun 2015 10:58:37 +0200
Subject: [PATCH 03/17] [FIX] Import invoice view improvement

---
 .../models/account_statement_from_invoice.py  | 60 ++++++++++---------
 .../models/bank_statement.py                  | 29 ++++++++-
 .../account_statement_from_invoice_view.xml   |  2 +-
 .../view/bank_statement_view.xml              |  3 +
 4 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py b/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
index b7ea1a23b..0862b8884 100644
--- a/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
+++ b/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
@@ -20,57 +20,59 @@
 ##############################################################################
 import time
 
-from openerp.osv import fields, osv
+from openerp import fields, models, api, _
 
-class account_statement_from_invoice_lines(osv.osv_memory):
+class account_statement_from_invoice_lines(models.TransientModel):
     """
     Generate Entries by Statement from Invoices
     """
     _inherit = "account.statement.from.invoice.lines"
-
-
-    def populate_statement(self, cr, uid, ids, context=None):
-        context = dict(context or {})
-        statement_id = context.get('statement_id', False)
+    
+    @api.multi
+    def populate_statement(self):
+        statement_id = self.env.context.get('statement_id', False)
         if not statement_id:
             return {'type': 'ir.actions.act_window_close'}
-        data = self.read(cr, uid, ids, context=context)[0]
-        line_ids = data['line_ids']
-        if not line_ids:
+        if not self.line_ids:
             return {'type': 'ir.actions.act_window_close'}
 
-        line_obj = self.pool.get('account.move.line')
-        statement_obj = self.pool.get('account.bank.statement')
-        statement_line_obj = self.pool.get('account.bank.statement.line')
-        currency_obj = self.pool.get('res.currency')
-        statement = statement_obj.browse(cr, uid, statement_id, context=context)
+        line_obj = self.env['account.move.line']
+        statement_obj = self.env['account.bank.statement']
+        statement_line_obj = self.env['account.bank.statement.line']
+        currency_obj = self.env['res.currency']
+        statement = statement_obj.browse(statement_id)
         line_date = statement.date
+        # Get the currency on the company if not set on the journal
+        if statement.journal_id.currency:
+            from_currency_id = statement.journal_id.currency
+        else:
+            from_currency_id = self.env.user.company_id.currency_id
 
         # for each selected move lines
-        for line in line_obj.browse(cr, uid, line_ids, context=context):
-            ctx = context.copy()
-            #  take the date for computation of currency => use payment date
-            ctx['date'] = line_date
-            amount = 0.0
-            amount_currency = 0.0
-            if line.invoice and line.invoice.currency_id == statement.currency_id:
+        for line in self.line_ids:
+            if line.invoice and line.invoice.currency_id == from_currency_id:
                 amount = line.amount_residual_currency
                 amount_currency = 0.0
             else:
-                amount = 0.0
+                if statement.journal_id.currency:
+                    from_currency_id = statement.journal_id.currency
+                else:
+                    from_currency_id = self.env.user.company_id.currency_id
+                amount = from_currency_id.with_context(date=line_date).compute(line.amount_residual_currency,
+                                                                               line.invoice.currency_id)
                 amount_currency = line.amount_residual_currency
-
-            context.update({'move_line_ids': [line.id],
+            ctx = {}
+            ctx.update({'move_line_ids': [line.id],
                             'invoice_id': line.invoice.id})
 
-            statement_line_obj.create(cr, uid, {
-                'name': line.name or '?',
+            statement_line_obj.with_context(ctx).create({
+                'name': line.ref or '?',
                 'amount': amount,
                 'partner_id': line.partner_id.id,
                 'statement_id': statement_id,
-                'ref': line.ref,
+                'ref': line.name,
                 'date': statement.date,
                 'amount_currency': amount_currency,
                 'currency_id': line.currency_id.id,
-            }, context=context)
+            })
         return {'type': 'ir.actions.act_window_close'}
diff --git a/account_import_line_multicurrency_extension/models/bank_statement.py b/account_import_line_multicurrency_extension/models/bank_statement.py
index 20ecd12c8..bc03c4f4a 100644
--- a/account_import_line_multicurrency_extension/models/bank_statement.py
+++ b/account_import_line_multicurrency_extension/models/bank_statement.py
@@ -18,11 +18,38 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp import models, fields
+from openerp import models, fields, api, exceptions, _
 
 
 class AccountBankStatementLine(models.Model):
     _inherit = "account.bank.statement.line"
 
     currency_symbol = fields.Char(
+        string='Journal Currency',
         related='statement_id.currency.symbol', readonly=True)
+
+
+class AccountBankStatement(models.Model):
+    _inherit = "account.bank.statement"
+
+    @api.multi
+    def check_line_amount_zero(self):
+        self.ensure_one()
+        msg = ''
+        for line in self.line_ids:
+            if not line.amount:
+                msg += 'Amount on line %s is not set. \n' % (line.name)
+        if msg:
+            raise exceptions.Warning(
+                _("Error on bank statement: \n %s") % msg)
+        # dispatch to reconciliation interface
+        action = self.env.ref(
+            'account.action_bank_reconcile_bank_statements')
+        return {
+            'name': action.name,
+            'tag': action.tag,
+            'context': {
+                'statement_ids': self.ids,
+            },
+            'type': 'ir.actions.client',
+        }
diff --git a/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml b/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml
index 1382d8776..21f6c10fc 100644
--- a/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml
+++ b/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml
@@ -28,7 +28,7 @@
 	          <field name="line_ids" position="replace">
 	                <field name="line_ids" 
 	                	   context="{'currency':True, 'tree_view_ref': 'account_import_line_multicurrency_extension.view_move_line_tree_bank_statement'}" 
-	                	   domain="[('account_id.type','in',['receivable','payable']), ('reconcile_id','=',False), ('state', '=', 'valid')]"> 
+	                	   domain="[('account_id.type','in',['receivable','payable']),('journal_id.type','in',['sale','purchase','sale_refund','purchase_refund']), ('reconcile_id','=',False), ('state', '=', 'valid')]"> 
 	                    <tree string="Move lines">
 	                        <field name="journal_id"/>
 	                        <field name="date"/>
diff --git a/account_import_line_multicurrency_extension/view/bank_statement_view.xml b/account_import_line_multicurrency_extension/view/bank_statement_view.xml
index e57765805..8397cdc84 100644
--- a/account_import_line_multicurrency_extension/view/bank_statement_view.xml
+++ b/account_import_line_multicurrency_extension/view/bank_statement_view.xml
@@ -11,6 +11,9 @@
         <field name="amount" position="after">
             <field name="currency_symbol"/>
         </field>
+        <xpath expr="//button[@string='Reconcile']" position="replace">
+        	<button name="check_line_amount_zero" states="draft" string="Reconcile" type="object" class="oe_highlight"/>
+        </xpath>
       </field>
     </record>
 

From b7d280e7530462477c6f270a5cc3aa38ee735287 Mon Sep 17 00:00:00 2001
From: vrenaville <vincent.renaville@camptocamp.com>
Date: Fri, 26 Jun 2015 15:46:31 +0200
Subject: [PATCH 04/17] [FIX] set sign on amount / amount_currency

---
 .../models/account_statement_from_invoice.py                  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py b/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
index 0862b8884..ea7209e6a 100644
--- a/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
+++ b/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
@@ -61,6 +61,10 @@ class account_statement_from_invoice_lines(models.TransientModel):
                 amount = from_currency_id.with_context(date=line_date).compute(line.amount_residual_currency,
                                                                                line.invoice.currency_id)
                 amount_currency = line.amount_residual_currency
+            # we test how to apply sign
+            if line.journal_id.type in ['sale_refund','purchase']:
+                amount_currency = -amount_currency
+                amount = -amount
             ctx = {}
             ctx.update({'move_line_ids': [line.id],
                             'invoice_id': line.invoice.id})

From fc325a4dbcbfe61deb1a00ddca1f784b230851de Mon Sep 17 00:00:00 2001
From: vrenaville <vincent.renaville@camptocamp.com>
Date: Fri, 26 Jun 2015 16:38:58 +0200
Subject: [PATCH 05/17] [FIX] remove payment view, it will be move in an other
 module

---
 .../view/payment_view.xml                     | 48 -------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 account_import_line_multicurrency_extension/view/payment_view.xml

diff --git a/account_import_line_multicurrency_extension/view/payment_view.xml b/account_import_line_multicurrency_extension/view/payment_view.xml
deleted file mode 100644
index e149a34a0..000000000
--- a/account_import_line_multicurrency_extension/view/payment_view.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-  <data noupdate="0">
-
-        <record id="view_move_line_tree_payment" model="ir.ui.view">
-            <field name="name">account.move.line.tree.payment</field>
-            <field name="model">account.move.line</field>
-            <field name="arch" type="xml">
-                <tree string="Move lines">
-                    <field name="date" readonly="True"/>
-                    <field name="name" readonly="True"/>
-                    <field name="partner_id" readonly="True" />
-                    <field name="ref" readonly="True" />
-                    <field name="amount_residual_currency" readonly="True"/>
-                    <field name="currency_id" readonly="True"  />
-                    <field name="date_maturity" readonly="True"/>
-                    <field name="reconcile_partial_id" readonly="True"/>
-                </tree>
-            </field>
-        </record>
-
-
-
-    <record id="view_create_payment_order_lines_over" model="ir.ui.view">
-      <field name="name">payment.order.create.form.over</field>
-      <field name="model">payment.order.create</field>
-      <field name="inherit_id" ref="account_payment.view_create_payment_order_lines"/>
-      <field name="arch" type="xml">
-          <field name="entries" position="replace">
-                <field name="entries" context="{'tree_view_ref': 'account_import_line_multicurrency_extension.view_move_line_tree_payment'}">
-                    <tree string="Move lines">
-                        <field name="date"/>
-                        <field name="name"/>
-                        <field name="partner_id" />
-                        <field name="ref" />
-                        <field name="amount_residual_currency"/>
-                        <field name="currency_id"/>
-                        <field name="date_maturity"/>
-                        <field name="reconcile_partial_id"/>
-                    </tree>
-                </field>
-          </field>
-      </field>
-    </record>
-
-  </data>
-</openerp>
-

From d6e29bbfe53d1534db572144494c1a7e541d5f86 Mon Sep 17 00:00:00 2001
From: vrenaville <vincent.renaville@camptocamp.com>
Date: Mon, 29 Jun 2015 10:12:06 +0200
Subject: [PATCH 06/17] [ADD] documentation module + pep8 cleaning

---
 .../README.rst                                | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 account_import_line_multicurrency_extension/README.rst

diff --git a/account_import_line_multicurrency_extension/README.rst b/account_import_line_multicurrency_extension/README.rst
new file mode 100644
index 000000000..ecf352d9e
--- /dev/null
+++ b/account_import_line_multicurrency_extension/README.rst
@@ -0,0 +1,61 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+    :alt: License: AGPL-3
+
+Module name
+===========
+
+Account Import Line Multi Currency Extension
+
+
+Configuration
+=============
+
+Nothing
+
+
+Usage
+=====
+
+* improve the view of the import invoice wizard in the bank statement form in order to display more relevant columns especially if you work in multi-currency and handle partial payment.
+
+* A columns 'Journal currency symbol' has been added just after the amount column to avoir confusion from end-users -> When the bank journal is in foreign currency then the amount culumn must be filled in that currency.
+
+* When importing lines in currencies amount, amount currency and currency are now correctely handled 
+
+* When lines are imported the reference goes to the communication field (instead of reference of the bank statement line) in order to have a default proposal from the system during the reconciliation process. 
+
+A check has been added when pressing 'Reconcile' button : no amount at zero are accepted. (since it is obviously an user error)
+
+
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/bank-payment/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed feedback
+`here <https://github.com/OCA/bank-payment/issues/new?body=module:%20account_import_line_multicurrency_extension%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+
+Credits
+=======
+
+Contributors
+------------
+
+* Vincent renaville <vincent.renaville@camptocamp.com>
+
+Maintainer
+----------
+
+.. image:: http://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: http://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit http://odoo-community.org.
\ No newline at end of file

From 70cfd3b2258596b6fb653cd6e996268dfe6c8165 Mon Sep 17 00:00:00 2001
From: vrenaville <vincent.renaville@camptocamp.com>
Date: Mon, 29 Jun 2015 11:58:24 +0200
Subject: [PATCH 07/17] [FIX] __openerp__.py

---
 .../__openerp__.py                            | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/account_import_line_multicurrency_extension/__openerp__.py b/account_import_line_multicurrency_extension/__openerp__.py
index 52c7dff99..4c5d2e7fd 100644
--- a/account_import_line_multicurrency_extension/__openerp__.py
+++ b/account_import_line_multicurrency_extension/__openerp__.py
@@ -18,35 +18,21 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-{'name': 'Payment Order Extension',
- 'summary': 'Add an improved view for payment order',
+{'name': 'Bank Statement Multi currency Extension',
+ 'summary': 'Add an improved view for move line import in bank statement',
  'version': '1.1',
  'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainter': 'Camptocamp',
  'category': 'Accounting',
- 'depends': ['account_payment','account'],
- 'description': """
-Payment Order
-==================
-
-Add improved move line selection for multi-currency
-
-Contributors
-------------
-
-* Vincent revaville <vincent.renaville@camptocamp.com>
-""",
+ 'depends': ['account'],
  'website': 'http://www.camptocamp.com',
- 'data': ['view/payment_view.xml',
-          'view/account_statement_from_invoice_view.xml',
+ 'data': ['view/account_statement_from_invoice_view.xml',
           'view/bank_statement_view.xml',
           ],
  'tests': [],
  'installable': True,
- 'auto_install': False,
  'license': 'AGPL-3',
  'conflicts': [
      'account_banking_payment_export',
      ],
- 'application': False,
  }

From e4816c3b4f3d68a35e90e922b0b2133f3900e6b2 Mon Sep 17 00:00:00 2001
From: vrenaville <vincent.renaville@camptocamp.com>
Date: Tue, 30 Jun 2015 13:18:27 +0200
Subject: [PATCH 08/17] [FIX] Pep8 + improve test function

---
 .../models/account_statement_from_invoice.py  | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py b/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
index ea7209e6a..268198885 100644
--- a/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
+++ b/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
@@ -20,26 +20,23 @@
 ##############################################################################
 import time
 
-from openerp import fields, models, api, _
+from openerp import models, api
+
 
 class account_statement_from_invoice_lines(models.TransientModel):
     """
     Generate Entries by Statement from Invoices
     """
     _inherit = "account.statement.from.invoice.lines"
-    
+
     @api.multi
     def populate_statement(self):
         statement_id = self.env.context.get('statement_id', False)
-        if not statement_id:
-            return {'type': 'ir.actions.act_window_close'}
-        if not self.line_ids:
+        if not statement_id or not self.line_ids:
             return {'type': 'ir.actions.act_window_close'}
 
-        line_obj = self.env['account.move.line']
         statement_obj = self.env['account.bank.statement']
         statement_line_obj = self.env['account.bank.statement.line']
-        currency_obj = self.env['res.currency']
         statement = statement_obj.browse(statement_id)
         line_date = statement.date
         # Get the currency on the company if not set on the journal
@@ -58,16 +55,17 @@ class account_statement_from_invoice_lines(models.TransientModel):
                     from_currency_id = statement.journal_id.currency
                 else:
                     from_currency_id = self.env.user.company_id.currency_id
-                amount = from_currency_id.with_context(date=line_date).compute(line.amount_residual_currency,
-                                                                               line.invoice.currency_id)
+                amount = from_currency_id.with_context(date=line_date).compute(
+                    line.amount_residual_currency,
+                    line.invoice.currency_id)
                 amount_currency = line.amount_residual_currency
             # we test how to apply sign
-            if line.journal_id.type in ['sale_refund','purchase']:
+            if line.journal_id.type in ['sale_refund', 'purchase']:
                 amount_currency = -amount_currency
                 amount = -amount
             ctx = {}
             ctx.update({'move_line_ids': [line.id],
-                            'invoice_id': line.invoice.id})
+                        'invoice_id': line.invoice.id})
 
             statement_line_obj.with_context(ctx).create({
                 'name': line.ref or '?',

From 4d9f32717afe5b315c2e932f296c151ac45d61cb Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Wed, 1 Jul 2015 10:52:06 +0200
Subject: [PATCH 09/17] Improve README.rst

---
 .../README.rst                                | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/account_import_line_multicurrency_extension/README.rst b/account_import_line_multicurrency_extension/README.rst
index ecf352d9e..78e95f7f3 100644
--- a/account_import_line_multicurrency_extension/README.rst
+++ b/account_import_line_multicurrency_extension/README.rst
@@ -1,10 +1,18 @@
 .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
     :alt: License: AGPL-3
 
-Module name
-===========
-
 Account Import Line Multi Currency Extension
+============================================
+
+* Improve the view of the import invoice wizard in the bank statement form in order to display more relevant columns. Especially if you work in multi-currency and handle partial payment.
+
+* A column 'Journal currency symbol' has been added just after the amount column to avoid confusion from end-users -> When the bank journal is in foreign currency then the amount column must be filled in that currency.
+
+* When importing lines in currencies amount, amount currency and currency are now correctly handled
+
+* When lines are imported the reference goes to the communication field (instead of reference of the bank statement line) in order to have a default proposal from the system during the reconciliation process.
+
+A check has been added when pressing 'Reconcile' button: no zero amount are accepted. (since it is obviously an user error)
 
 
 Configuration
@@ -13,21 +21,6 @@ Configuration
 Nothing
 
 
-Usage
-=====
-
-* improve the view of the import invoice wizard in the bank statement form in order to display more relevant columns especially if you work in multi-currency and handle partial payment.
-
-* A columns 'Journal currency symbol' has been added just after the amount column to avoir confusion from end-users -> When the bank journal is in foreign currency then the amount culumn must be filled in that currency.
-
-* When importing lines in currencies amount, amount currency and currency are now correctely handled 
-
-* When lines are imported the reference goes to the communication field (instead of reference of the bank statement line) in order to have a default proposal from the system during the reconciliation process. 
-
-A check has been added when pressing 'Reconcile' button : no amount at zero are accepted. (since it is obviously an user error)
-
-
-
 Bug Tracker
 ===========
 
@@ -58,4 +51,4 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-To contribute to this module, please visit http://odoo-community.org.
\ No newline at end of file
+To contribute to this module, please visit http://odoo-community.org.

From 34a5b9adc7e712ed5f7ae3ed2507f12ada7655b4 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Tue, 14 Jul 2015 12:21:27 +0200
Subject: [PATCH 10/17] [FIX] xml indentation

---
 .../account_statement_from_invoice_view.xml   | 86 +++++++++----------
 .../view/bank_statement_view.xml              |  2 +-
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml b/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml
index 21f6c10fc..e5626dab1 100644
--- a/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml
+++ b/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-    	
-        <record id="view_move_line_tree_bank_statement" model="ir.ui.view">
-            <field name="name">account.move.line.tree.bank.statement</field>
-            <field name="model">account.move.line</field>
-            <field name="arch" type="xml">
-                <tree string="Move lines">
-                    <field name="journal_id" readonly="True"/>
-                    <field name="date" readonly="True"/>
-                    <field name="name" readonly="True"/>
-                    <field name="partner_id" readonly="True" />
-                    <field name="ref" readonly="True" />
-                    <field name="amount_residual_currency" readonly="True"/>
-                    <field name="currency_id" readonly="True"  />
-                    <field name="date_maturity" readonly="True"/>
-                    <field name="reconcile_partial_id" readonly="True"/>
-                </tree>
-            </field>
-        </record>
+  <data>
 
-	    <record id="view_account_statement_from_invoice_lines_over" model="ir.ui.view">
-	      <field name="name">account.statement.from.invoice.lines.form.over</field>
-	      <field name="model">account.statement.from.invoice.lines</field>
-	      <field name="inherit_id" ref="account.view_account_statement_from_invoice_lines"/>
-	      <field name="arch" type="xml">
-	          <field name="line_ids" position="replace">
-	                <field name="line_ids" 
-	                	   context="{'currency':True, 'tree_view_ref': 'account_import_line_multicurrency_extension.view_move_line_tree_bank_statement'}" 
-	                	   domain="[('account_id.type','in',['receivable','payable']),('journal_id.type','in',['sale','purchase','sale_refund','purchase_refund']), ('reconcile_id','=',False), ('state', '=', 'valid')]"> 
-	                    <tree string="Move lines">
-	                        <field name="journal_id"/>
-	                        <field name="date"/>
-	                        <field name="name"/>
-	                        <field name="partner_id" />
-	                        <field name="ref" />
-	                        <field name="amount_residual_currency"/>
-	                        <field name="currency_id"/>
-	                        <field name="date_maturity"/>
-	                        <field name="reconcile_partial_id"/>
-	                    </tree>
+    <record id="view_move_line_tree_bank_statement" model="ir.ui.view">
+      <field name="name">account.move.line.tree.bank.statement</field>
+      <field name="model">account.move.line</field>
+      <field name="arch" type="xml">
+        <tree string="Move lines">
+          <field name="journal_id" readonly="True"/>
+          <field name="date" readonly="True"/>
+          <field name="name" readonly="True"/>
+          <field name="partner_id" readonly="True" />
+          <field name="ref" readonly="True" />
+          <field name="amount_residual_currency" readonly="True"/>
+          <field name="currency_id" readonly="True"  />
+          <field name="date_maturity" readonly="True"/>
+          <field name="reconcile_partial_id" readonly="True"/>
+        </tree>
+      </field>
+    </record>
 
-	                </field>
-	          </field>
-	      </field>
-	    </record>
+    <record id="view_account_statement_from_invoice_lines_over" model="ir.ui.view">
+      <field name="name">account.statement.from.invoice.lines.form.over</field>
+      <field name="model">account.statement.from.invoice.lines</field>
+      <field name="inherit_id" ref="account.view_account_statement_from_invoice_lines"/>
+      <field name="arch" type="xml">
+        <field name="line_ids" position="replace">
+          <field name="line_ids"
+            context="{'currency':True, 'tree_view_ref': 'account_import_line_multicurrency_extension.view_move_line_tree_bank_statement'}"
+            domain="[('account_id.type','in',['receivable','payable']),('journal_id.type','in',['sale','purchase','sale_refund','purchase_refund']), ('reconcile_id','=',False), ('state', '=', 'valid')]">
+            <tree string="Move lines">
+              <field name="journal_id"/>
+              <field name="date"/>
+              <field name="name"/>
+              <field name="partner_id" />
+              <field name="ref" />
+              <field name="amount_residual_currency"/>
+              <field name="currency_id"/>
+              <field name="date_maturity"/>
+              <field name="reconcile_partial_id"/>
+            </tree>
+
+          </field>
+        </field>
+      </field>
+    </record>
 
     </data>
 </openerp>
diff --git a/account_import_line_multicurrency_extension/view/bank_statement_view.xml b/account_import_line_multicurrency_extension/view/bank_statement_view.xml
index 8397cdc84..3b50bed52 100644
--- a/account_import_line_multicurrency_extension/view/bank_statement_view.xml
+++ b/account_import_line_multicurrency_extension/view/bank_statement_view.xml
@@ -12,7 +12,7 @@
             <field name="currency_symbol"/>
         </field>
         <xpath expr="//button[@string='Reconcile']" position="replace">
-        	<button name="check_line_amount_zero" states="draft" string="Reconcile" type="object" class="oe_highlight"/>
+          <button name="check_line_amount_zero" states="draft" string="Reconcile" type="object" class="oe_highlight"/>
         </xpath>
       </field>
     </record>

From 3b7676d049fbc30ba2004a40c62c2084587ec2cd Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Tue, 14 Jul 2015 12:28:05 +0200
Subject: [PATCH 11/17] Remove uselesses readonly attributes

---
 .../account_statement_from_invoice_view.xml    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml b/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml
index e5626dab1..3e333d150 100644
--- a/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml
+++ b/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml
@@ -7,15 +7,15 @@
       <field name="model">account.move.line</field>
       <field name="arch" type="xml">
         <tree string="Move lines">
-          <field name="journal_id" readonly="True"/>
-          <field name="date" readonly="True"/>
-          <field name="name" readonly="True"/>
-          <field name="partner_id" readonly="True" />
-          <field name="ref" readonly="True" />
-          <field name="amount_residual_currency" readonly="True"/>
-          <field name="currency_id" readonly="True"  />
-          <field name="date_maturity" readonly="True"/>
-          <field name="reconcile_partial_id" readonly="True"/>
+          <field name="journal_id"/>
+          <field name="date"/>
+          <field name="name"/>
+          <field name="partner_id"/>
+          <field name="ref"/>
+          <field name="amount_residual_currency"/>
+          <field name="currency_id"/>
+          <field name="date_maturity"/>
+          <field name="reconcile_partial_id"/>
         </tree>
       </field>
     </record>

From 08552ba799f3fe41de384b64e15df41d5ddcd8cd Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Tue, 14 Jul 2015 12:32:29 +0200
Subject: [PATCH 12/17] Add group_multi_currency group on currency fields

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

diff --git a/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml b/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml
index 3e333d150..1af9547a2 100644
--- a/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml
+++ b/account_import_line_multicurrency_extension/view/account_statement_from_invoice_view.xml
@@ -13,7 +13,7 @@
           <field name="partner_id"/>
           <field name="ref"/>
           <field name="amount_residual_currency"/>
-          <field name="currency_id"/>
+          <field name="currency_id" groups="base.group_multi_currency"/>
           <field name="date_maturity"/>
           <field name="reconcile_partial_id"/>
         </tree>
@@ -36,7 +36,7 @@
               <field name="partner_id" />
               <field name="ref" />
               <field name="amount_residual_currency"/>
-              <field name="currency_id"/>
+              <field name="currency_id" groups="base.group_multi_currency"/>
               <field name="date_maturity"/>
               <field name="reconcile_partial_id"/>
             </tree>

From f4ce091bbbfefaa35c8d5bb752a75c2abbbf6f15 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Tue, 14 Jul 2015 12:35:20 +0200
Subject: [PATCH 13/17] Set message translatable

---
 .../models/bank_statement.py                                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_import_line_multicurrency_extension/models/bank_statement.py b/account_import_line_multicurrency_extension/models/bank_statement.py
index bc03c4f4a..490100a5a 100644
--- a/account_import_line_multicurrency_extension/models/bank_statement.py
+++ b/account_import_line_multicurrency_extension/models/bank_statement.py
@@ -38,7 +38,7 @@ class AccountBankStatement(models.Model):
         msg = ''
         for line in self.line_ids:
             if not line.amount:
-                msg += 'Amount on line %s is not set. \n' % (line.name)
+                msg += _('Amount on line %s is not set. \n') % (line.name)
         if msg:
             raise exceptions.Warning(
                 _("Error on bank statement: \n %s") % msg)

From 37ccb29fe9940e339b3e0a82140ae0bab37e1a42 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Tue, 14 Jul 2015 13:29:00 +0200
Subject: [PATCH 14/17] Remove unused import

---
 .../models/account_statement_from_invoice.py                    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py b/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
index 268198885..9401cca3c 100644
--- a/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
+++ b/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
@@ -18,8 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import time
-
 from openerp import models, api
 
 

From 63c4997dbe712a4260c0ebe1f2c4c82416b39901 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Tue, 14 Jul 2015 15:07:30 +0200
Subject: [PATCH 15/17] Remove list of conflicting module. Both modules can be
 installed and will work in parallele. Thought the workflow logic is
 different.

---
 account_import_line_multicurrency_extension/__openerp__.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/account_import_line_multicurrency_extension/__openerp__.py b/account_import_line_multicurrency_extension/__openerp__.py
index 4c5d2e7fd..161de8b6d 100644
--- a/account_import_line_multicurrency_extension/__openerp__.py
+++ b/account_import_line_multicurrency_extension/__openerp__.py
@@ -32,7 +32,4 @@
  'tests': [],
  'installable': True,
  'license': 'AGPL-3',
- 'conflicts': [
-     'account_banking_payment_export',
-     ],
  }

From c2eca97bbe5e18d7c0d88a7487c570713f0bf42d Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Tue, 14 Jul 2015 16:02:28 +0200
Subject: [PATCH 16/17] Remove correction of statement line and ref in order to
 let a new module take care of that. This is now fixed by
 bank_statement_import_invoices_fix

---
 account_import_line_multicurrency_extension/README.rst      | 6 ++++--
 .../models/account_statement_from_invoice.py                | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/account_import_line_multicurrency_extension/README.rst b/account_import_line_multicurrency_extension/README.rst
index 78e95f7f3..83208839e 100644
--- a/account_import_line_multicurrency_extension/README.rst
+++ b/account_import_line_multicurrency_extension/README.rst
@@ -10,11 +10,13 @@ Account Import Line Multi Currency Extension
 
 * When importing lines in currencies amount, amount currency and currency are now correctly handled
 
-* When lines are imported the reference goes to the communication field (instead of reference of the bank statement line) in order to have a default proposal from the system during the reconciliation process.
-
 A check has been added when pressing 'Reconcile' button: no zero amount are accepted. (since it is obviously an user error)
 
 
+The following feature have been moved in `bank_statement_import_invoices_fix`
+* When lines are imported the reference goes to the communication field (instead of reference of the bank statement line) in order to have a default proposal from the system during the reconciliation process.
+
+
 Configuration
 =============
 
diff --git a/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py b/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
index 9401cca3c..82daa1899 100644
--- a/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
+++ b/account_import_line_multicurrency_extension/models/account_statement_from_invoice.py
@@ -66,11 +66,11 @@ class account_statement_from_invoice_lines(models.TransientModel):
                         'invoice_id': line.invoice.id})
 
             statement_line_obj.with_context(ctx).create({
-                'name': line.ref or '?',
+                'name': line.name or '?',
                 'amount': amount,
                 'partner_id': line.partner_id.id,
                 'statement_id': statement_id,
-                'ref': line.name,
+                'ref': line.ref,
                 'date': statement.date,
                 'amount_currency': amount_currency,
                 'currency_id': line.currency_id.id,

From 555b21fd8b0f9afe2204f9b0959aec78996cec1b Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Tue, 14 Jul 2015 16:14:32 +0200
Subject: [PATCH 17/17] Add translation file

---
 ...nt_import_line_multicurrency_extension.pot | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 account_import_line_multicurrency_extension/i18n/account_import_line_multicurrency_extension.pot

diff --git a/account_import_line_multicurrency_extension/i18n/account_import_line_multicurrency_extension.pot b/account_import_line_multicurrency_extension/i18n/account_import_line_multicurrency_extension.pot
new file mode 100644
index 000000000..b8a56be51
--- /dev/null
+++ b/account_import_line_multicurrency_extension/i18n/account_import_line_multicurrency_extension.pot
@@ -0,0 +1,57 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* account_import_line_multicurrency_extension
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 14:13+0000\n"
+"PO-Revision-Date: 2015-07-14 14:13+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_import_line_multicurrency_extension
+#: code:addons/account_import_line_multicurrency_extension/models/bank_statement.py:41
+#, python-format
+msgid "Amount on line %s is not set. \n"
+""
+msgstr ""
+
+#. module: account_import_line_multicurrency_extension
+#: model:ir.model,name:account_import_line_multicurrency_extension.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_import_line_multicurrency_extension
+#: model:ir.model,name:account_import_line_multicurrency_extension.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account_import_line_multicurrency_extension
+#: model:ir.model,name:account_import_line_multicurrency_extension.model_account_statement_from_invoice_lines
+msgid "Entries by Statement from Invoices"
+msgstr ""
+
+#. module: account_import_line_multicurrency_extension
+#: code:addons/account_import_line_multicurrency_extension/models/bank_statement.py:44
+#, python-format
+msgid "Error on bank statement: \n"
+" %s"
+msgstr ""
+
+#. module: account_import_line_multicurrency_extension
+#: view:account.move.line:account_import_line_multicurrency_extension.view_move_line_tree_bank_statement
+#: view:account.statement.from.invoice.lines:account_import_line_multicurrency_extension.view_account_statement_from_invoice_lines_over
+msgid "Move lines"
+msgstr ""
+
+#. module: account_import_line_multicurrency_extension
+#: view:account.bank.statement:account_import_line_multicurrency_extension.view_bank_statement_form
+msgid "Reconcile"
+msgstr ""
+