diff --git a/account_banking/account_banking.py b/account_banking/account_banking.py
index ed1b1e495..039e8e062 100644
--- a/account_banking/account_banking.py
+++ b/account_banking/account_banking.py
@@ -410,13 +410,19 @@ class account_bank_statement(osv.osv):
             'account.bank.statement.line')
         st_line = account_bank_statement_line_obj.browse(
             cr, uid, st_line_id, context=context)
+        period_id = self._get_period(
+            cr, uid, st_line.date, context=context)    # AB
         # Start account voucher
         # Post the voucher and update links between statement and moves
         if st_line.voucher_id:
             voucher_pool = self.pool.get('account.voucher')
             wf_service = netsvc.LocalService("workflow")
             voucher_pool.write(
-                cr, uid, [st_line.voucher_id.id], {'number': st_line_number}, context=context)
+                cr, uid, [st_line.voucher_id.id], {
+                    'number': st_line_number,
+                    'date': st_line.date,
+                    'period_id': period_id, # AB
+                }, context=context)
             if st_line.voucher_id.state == 'cancel':
                 voucher_pool.action_cancel_draft(
                     cr, uid, [st_line.voucher_id.id], context=context)
@@ -443,8 +449,6 @@ class account_bank_statement(osv.osv):
         context.update({'date': st_line.date})
         ctxt = context.copy()                       # AB
         ctxt['company_id'] = st_line.company_id.id  # AB
-        period_id = self._get_period(
-            cr, uid, st_line.date, context=ctxt)    # AB
 
         move_id = account_move_obj.create(cr, uid, {
             'journal_id': st.journal_id.id,
diff --git a/account_banking/banking_import_transaction.py b/account_banking/banking_import_transaction.py
index 330a0710d..45bbaa6b0 100644
--- a/account_banking/banking_import_transaction.py
+++ b/account_banking/banking_import_transaction.py
@@ -25,7 +25,6 @@
 ##############################################################################
 
 from osv import osv, fields
-import time
 import netsvc
 import base64
 import datetime
@@ -494,7 +493,7 @@ class banking_import_transaction(osv.osv):
         if from_curr_id != to_curr_id:
             amount_currency = statement_line_pool._convert_currency(
                 cr, uid, from_curr_id, to_curr_id, move_line_amount,
-                round=True, date=time.strftime('%Y-%m-%d'),
+                round=True, date=transaction.move_line_id.date,
                 context=context)
         else:
             amount_currency = move_line_amount
@@ -606,7 +605,7 @@ class banking_import_transaction(osv.osv):
         payment_line_obj.write(
             cr, uid, transaction.payment_line_id.id, {
                 'export_state': 'done',
-                'date_done': transaction.effective_date,
+                'date_done': transaction.statement_line_id.date,
                 }
             )
         self._confirm_move(cr, uid, transaction_id, context=context)
@@ -961,9 +960,14 @@ class banking_import_transaction(osv.osv):
         ]
 
     def create(self, cr, uid, vals, context=None):
+        """
+        Search for duplicates of the newly created transaction
+        and mark them as such unless a context key
+        'transaction_no_duplicate_search' is defined and true.
+        """
         res = super(banking_import_transaction, self).create(
             cr, uid, vals, context)
-        if res:
+        if res and not context.get('transaction_no_duplicate_search'):
             me = self.browse(cr, uid, res, context)
             search_vals = [(key, '=', me[key]) 
                            for key in self.signal_duplicate_keys]
@@ -1319,7 +1323,8 @@ class banking_import_transaction(osv.osv):
                             transaction.remote_owner, 
                             transaction.remote_owner_address,
                             transaction.remote_owner_city,
-                            country_code, results['log']
+                            country_code, results['log'],
+                            bic=transaction.remote_bank_bic
                             )
                         partner_banks = partner_bank_obj.browse(
                             cr, uid, [partner_bank_id]
@@ -1556,11 +1561,19 @@ class banking_import_transaction(osv.osv):
 
             if transaction.move_line_id:
                 move_line_amount = transaction.move_line_id.amount_residual_currency
-                to_curr_id = transaction.statement_id.journal_id.currency and transaction.statement_id.journal_id.currency.id or transaction.statement_line_id.statement_id.company_id.currency_id.id
-                from_curr_id = transaction.move_line_id.currency_id and transaction.move_line_id.currency_id.id or transaction.statement_id.company_id.currency_id.id
+                to_curr_id = (
+                    transaction.statement_line_id.statement_id.journal_id.currency
+                    and transaction.statement_line_id.statement_id.journal_id.currency.id
+                    or transaction.statement_line_id.statement_id.company_id.currency_id.id
+                    )
+                from_curr_id = (
+                    transaction.move_line_id.currency_id
+                    and transaction.move_line_id.currency_id.id
+                    or transaction.statement_line_id.statement_id.company_id.currency_id.id
+                    )
                 if from_curr_id != to_curr_id:
                     amount_currency = stline_pool._convert_currency(cr, uid, from_curr_id, to_curr_id, move_line_amount, round=True,
-                                                             date=time.strftime('%Y-%m-%d'), context=context)
+                                                             date=transaction.statement_line_id.date, context=context)
                 else:
                     amount_currency = move_line_amount
                 sign = 1
@@ -1871,6 +1884,42 @@ class account_bank_statement_line(osv.osv):
         return super(account_bank_statement_line, self).unlink(
             cr, uid, ids, context=context)
 
+    def create_instant_transaction(
+        self, cr, uid, ids, context=None):
+        """
+        Check for existance of import transaction on the
+        bank statement lines. Create instant items if appropriate.
+
+        This way, the matching wizard works on manually
+        encoded statements.
+
+        The transaction is only filled with the most basic
+        information. The use of the transaction at this point
+        is rather to store matching data rather than to 
+        provide data about the transaction which have all been
+        transferred to the bank statement line.
+        """
+        import_transaction_pool = self.pool.get('banking.import.transaction')
+        if ids and isinstance(ids, (int, long)):
+            ids = [ids]
+        if context is None:
+            context = {}
+        localcontext = context.copy()
+        localcontext['transaction_no_duplicate_search'] = True
+        for line in self.browse(
+            cr, uid, ids, context=context):
+            if line.state != 'confirmed' and not line.import_transaction_id:
+                res = import_transaction_pool.create(
+                    cr, uid, {
+                        'company_id': line.statement_id.company_id.id,
+                        'statement_line_id': line.id,
+                        },
+                    context=localcontext)
+                self.write(
+                    cr, uid, line.id, {
+                        'import_transaction_id': res},
+                    context=context)
+
 account_bank_statement_line()
 
 class account_bank_statement(osv.osv):
@@ -1919,6 +1968,7 @@ class account_bank_statement(osv.osv):
                             _('The account entries lines are not in valid state.'))
 
             line_obj.confirm(cr, uid, [line.id for line in st.line_ids], context)
+            st.refresh()
             self.log(cr, uid, st.id, _('Statement %s is confirmed, journal '
                                        'items are created.') % (st.name,))
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
diff --git a/account_banking/wizard/account_payment_order.py b/account_banking/wizard/account_payment_order.py
index 686c8bdfe..f85b556ba 100644
--- a/account_banking/wizard/account_payment_order.py
+++ b/account_banking/wizard/account_payment_order.py
@@ -112,7 +112,7 @@ class payment_order_create(osv.osv_memory):
                 'state': state,
                 ### end account banking
                 'date': date_to_pay,
-                'currency': line.invoice and line.invoice.currency_id.id or False,
+                'currency': line.invoice and line.invoice.currency_id.id or line.journal_id.currency.id or line.journal_id.company_id.currency_id.id,
                 }, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
diff --git a/account_banking/wizard/bank_import.py b/account_banking/wizard/bank_import.py
index 6e2139341..9dc222272 100644
--- a/account_banking/wizard/bank_import.py
+++ b/account_banking/wizard/bank_import.py
@@ -263,6 +263,16 @@ class banking_import(osv.osv_memory):
                                                          ('date_stop','>=',statement.date),
                                                          ('special', '=', False)])
 
+            if not period_ids:
+                results.log.append(
+                    _('No period found covering statement date %(date)s, '
+                      'statement %(id)s skipped') % {
+                        'date': statement.date,
+                        'id': statement.id,
+                    }
+                )
+                continue
+
             # Create the bank statement record
             statement_id = statement_obj.create(cursor, uid, dict(
                 name = statement.id,
diff --git a/account_banking/wizard/banking_transaction_wizard.py b/account_banking/wizard/banking_transaction_wizard.py
index 8171cb776..53d2158d3 100644
--- a/account_banking/wizard/banking_transaction_wizard.py
+++ b/account_banking/wizard/banking_transaction_wizard.py
@@ -35,6 +35,18 @@ class banking_transaction_wizard(osv.osv_memory):
     _name = 'banking.transaction.wizard'
     _description = 'Match transaction'
 
+    def create(self, cr, uid, vals, context=None):
+        """
+        Make sure that the statement line has an import transaction
+        """
+        res = super(banking_transaction_wizard, self).create(
+            cr, uid, vals, context=context)
+        if res and vals.get('statement_line_id'):
+            line_pool = self.pool.get('account.bank.statement.line')
+            line_pool.create_instant_transaction(
+                cr, uid, vals['statement_line_id'], context=context)
+        return res
+
     def create_act_window(self, cr, uid, ids, nodestroy=True, context=None):
         """ 
         Return a popup window for this model
diff --git a/account_banking/wizard/banking_transaction_wizard.xml b/account_banking/wizard/banking_transaction_wizard.xml
index 59a697570..1d76fd29c 100644
--- a/account_banking/wizard/banking_transaction_wizard.xml
+++ b/account_banking/wizard/banking_transaction_wizard.xml
@@ -93,7 +93,21 @@
                             </page>
                             <page string="Manual match">
                                 <field name="manual_invoice_id"/>
-                                <field name="manual_move_line_id"/>
+                                <!-- 
+                                     Specify alternative tree_view_ref as a
+                                     workaround for lp:1073521 in OpenERP 6.1
+                                     Need to also define 'view_mode' to prevent
+                                     an instant editable tree view
+                                     reconstruction by account.move.line's
+                                     fields_view_get().
+                                     Both are not needed in OpenERP 6.0 or 7.0.
+                                -->
+                                <field name="manual_move_line_id"
+                                       context="{
+                                                'tree_view_ref': 'account.view_move_line_tax_tree',
+                                                'view_mode': 'yes'
+                                                }"
+                                       />
                                 <newline/>
                                 <button colspan="1"
                                         name="trigger_write"
diff --git a/account_banking/wizard/banktools.py b/account_banking/wizard/banktools.py
index cebf60259..80d3e83ce 100644
--- a/account_banking/wizard/banktools.py
+++ b/account_banking/wizard/banktools.py
@@ -125,6 +125,9 @@ def get_or_create_partner(pool, cursor, uid, name, address, postal_code, city,
                           country_code, log):
     '''
     Get or create the partner belonging to the account holders name <name>
+
+    If multiple partners are found with the same name, select the first and
+    add a warning to the import log.
     '''
     partner_obj = pool.get('res.partner')
     partner_ids = partner_obj.search(cursor, uid, [('name', 'ilike', name)])
@@ -177,13 +180,12 @@ def get_or_create_partner(pool, cursor, uid, name, address, postal_code, city,
                 'country_id': country_id,
             })],
         ))
-    elif len(partner_ids) > 1:
-        log.append(
-            _('More then one possible match found for partner with name %(name)s')
-            % {'name': name}
-        )
-        return False
     else:
+        if len(partner_ids) > 1:
+            log.append(
+                _('More than one possible match found for partner with name %(name)s')
+                % {'name': name}
+                )
         partner_id = partner_ids[0]
     return partner_id
 
@@ -318,7 +320,7 @@ def get_or_create_bank(pool, cursor, uid, bic, online=False, code=None,
 
 def create_bank_account(pool, cursor, uid, partner_id,
                         account_number, holder_name, address, city,
-                        country_code, log
+                        country_code, log, bic=False,
                         ):
     '''
     Create a matching bank account with this holder for this partner.
@@ -328,7 +330,6 @@ def create_bank_account(pool, cursor, uid, partner_id,
         owner_name = holder_name,
     )
     bankcode = None
-    bic = None
     country_obj = pool.get('res.country')
 
     # Are we dealing with IBAN?
diff --git a/account_banking_nl_abnamro/abnamro.py b/account_banking_nl_abnamro/abnamro.py
index 8ae4e5824..8e951f22f 100644
--- a/account_banking_nl_abnamro/abnamro.py
+++ b/account_banking_nl_abnamro/abnamro.py
@@ -88,6 +88,7 @@ class transaction(models.mem_bank_transaction):
         'GIRO': bt.ORDER,
         'INTL': bt.ORDER, # international order
         'UNKN': bt.ORDER, # everything else
+        'SEPA': bt.ORDER,
     }
 
     def __init__(self, line, *args, **kwargs):
@@ -134,24 +135,70 @@ class transaction(models.mem_bank_transaction):
             size = 33
             res = []
             while(len(line) > col * size):
-                if line[col * size : (col + 1) * size - 1].strip():
-                    res.append(line[col * size : (col + 1) * size - 1])
+                separation = (col + 1) * size - 1
+                if line[col * size : separation].strip():
+                    part = line[col * size : separation]
+                    # If the separation character is not a space, add it anyway
+                    # presumably for sepa feedback strings only
+                    if (len(line) > separation
+                        and line[separation] != ' '):
+                        part += line[separation]
+                    res.append(part)
                 col += 1
             return res
 
+        def get_sepa_dict(field):
+            """
+            Parses a subset of SEPA feedback strings as occur
+            in this non-SEPA csv format.
+
+            The string consists of slash separated KEY/VALUE pairs,
+            but the slash is allowed to and known to occur in VALUE as well!
+            """
+            items = field[1:].split('/') # skip leading slash
+            sepa_dict = {}
+            prev_key = False
+            known_keys = ['TRTP', 'IBAN', 'BIC', 'NAME', 'RTRN', 'EREF',
+                          'SWOC', 'REMI', ]
+            while items:
+                if len(items) == 1:
+                    raise osv.except_osv(
+                        _('Error !'),
+                        _("unable to parse SEPA string: %s") % field)
+                key = items.pop(0)
+                if key not in known_keys:
+                    # either an unknown key or a value containing a slash
+                    if prev_key:
+                        sepa_dict[prev_key] = sepa_dict[prev_key] + '/' + key
+                    else:
+                        raise osv.except_osv(
+                            _('Error !'),
+                            _("unable to parse SEPA string: %s") % field)
+                else:
+                    sepa_dict[key] = items.pop(0).strip()
+                    prev_key = key
+            return sepa_dict
+
         def parse_type(field):
             # here we process the first field, which identifies the statement type
             # and in case of certain types contains additional information
             transfer_type = 'UNKN'
             remote_account = False
             remote_owner = False
-            if field.startswith('GIRO '):
+            if field.startswith('/TRTP/'):
+                transfer_type = 'SEPA'
+            elif field.startswith('GIRO '):
                 transfer_type = 'GIRO'
-                # columns 6 to 14 contain the left or right aligned account number
-                remote_account = field[:15].strip().zfill(10)
-                # column 15 contains a space
-                # columns 16 to 31 contain remote owner
-                remote_owner = field[16:32].strip() or False
+                # field has markup 'GIRO ACCOUNT OWNER'
+                # separated by clusters of space of varying size
+                account_match = re.match('\s*([0-9]+)\s(.*)$', field[5:])
+                if account_match:
+                    remote_account = account_match.group(1).zfill(10)
+                    remote_owner = account_match.group(2).strip() or ''
+                else:
+                    raise osv.except_osv(
+                        _('Error !'),
+                        _('unable to parse GIRO string: %s') % field)
             elif field.startswith('BEA '):
                 transfer_type = 'BEA'
                 # columns 6 to 16 contain the terminal identifier
@@ -176,8 +223,22 @@ class transaction(models.mem_bank_transaction):
         fields = split_blob(self.blob)
         (self.transfer_type, self.remote_account, self.remote_owner) = parse_type(fields[0])
 
+        if self.transfer_type == 'SEPA':
+            sepa_dict = get_sepa_dict(''.join(fields))
+            sepa_type = sepa_dict.get('TRTP')
+            if sepa_type != 'SEPA OVERBOEKING':
+                raise ValueError,_('Sepa transaction type %s not handled yet')
+            self.remote_account = sepa_dict.get('IBAN',False)
+            self.remote_bank_bic = sepa_dict.get('BIC', False)
+            self.remote_owner = sepa_dict.get('NAME', False)
+            self.reference = sepa_dict.get('REMI', '')
+
         # extract other information depending on type
-        if self.transfer_type == 'GIRO':
+        elif self.transfer_type == 'GIRO':
+            if not self.remote_owner and len(fields) > 1:
+                # OWNER is listed in the second field if not in the first
+                self.remote_owner = fields[1].strip() or False
+                fields = [fields[0]] + fields[2:]
             self.message = ' '.join(field.strip() for field in fields[1:])
 
         elif self.transfer_type == 'BEA':
@@ -219,11 +280,12 @@ class transaction(models.mem_bank_transaction):
         if not self.reference:
             # the reference is sometimes flagged by the prefix "BETALINGSKENM."
             # but can be any numeric line really
-            refexpr = re.compile("^\s*(BETALINGSKENM\.)?\s*([0-9]+ ?)+\s*$")
             for field in fields[1:]:
-                m = refexpr.match(field)
+                m = re.match(
+                    "^\s*((BETALINGSKENM\.)|(ACCEPTGIRO))?\s*([0-9]+([ /][0-9]+)*)\s*$",
+                    field)
                 if m:
-                    self.reference = m.group(2)
+                    self.reference = m.group(4)
                     break
 
 class statement(models.mem_bank_statement):
diff --git a/account_banking_nl_clieop/account_banking_nl_clieop.py b/account_banking_nl_clieop/account_banking_nl_clieop.py
index 69fc306db..0fe28ba14 100644
--- a/account_banking_nl_clieop/account_banking_nl_clieop.py
+++ b/account_banking_nl_clieop/account_banking_nl_clieop.py
@@ -61,7 +61,10 @@ class clieop_export(osv.osv):
         'date_generated':
             fields.date('Generation Date', readonly=True, select=True),
         'file':
-            fields.binary('ClieOp File', readonly=True),
+            fields.binary('ClieOp File', readonly=True,),
+        'filename': fields.char(
+            'File Name', size=32,
+        ),
         'state':
             fields.selection([
                 ('draft', 'Draft'),
@@ -69,6 +72,7 @@ class clieop_export(osv.osv):
                 ('done', 'Reconciled'),
             ], 'State', readonly=True),
     }
+
     def get_daynr(self, cr, uid, context=None):
         '''
         Return highest day number
diff --git a/account_banking_nl_clieop/account_banking_nl_clieop.xml b/account_banking_nl_clieop/account_banking_nl_clieop.xml
index 0c0a01fe5..f40861f8a 100644
--- a/account_banking_nl_clieop/account_banking_nl_clieop.xml
+++ b/account_banking_nl_clieop/account_banking_nl_clieop.xml
@@ -14,33 +14,34 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Client Opdrachten Export">
-		    <notebook>
-			<page string="General Information">
-			    <field name="filetype" />
-			    <field name="identification" />
-			    <separator string="ClieOp Information" colspan="4" />
-			    <field name="total_amount" />
-			    <field name="check_no_accounts" />
-			    <field name="no_transactions" />
-			    <separator string="Processing Information" colspan="4" />
-			    <field name="prefered_date" />
-			    <field name="date_generated" />
-			    <field name="testcode" />
-			    <newline />
-			    <field name="file" colspan="4" />
-			</page>
-			<page string="Payment Orders">
-			    <field name="payment_order_ids" colspan="4" nolabel="1">
-				<tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" string="Payment order">
-				    <field name="reference"/>
-				    <field name="date_created"/>
-				    <field name="date_done"/>
-				    <field name="total"/>
-				    <field name="state"/>
-				</tree>
-			    </field>
-			</page>
-		    </notebook>
+                    <notebook>
+                        <page string="General Information">
+                            <field name="filetype" />
+                            <field name="identification" />
+                            <separator string="ClieOp Information" colspan="4" />
+                            <field name="total_amount" />
+                            <field name="check_no_accounts" />
+                            <field name="no_transactions" />
+                            <separator string="Processing Information" colspan="4" />
+                            <field name="prefered_date" />
+                            <field name="date_generated" />
+                            <field name="testcode" />
+                            <newline />
+                            <field name="filename" invisible="True"/>
+                            <field name="file" colspan="4" filename="filename"/>
+                        </page>
+                        <page string="Payment Orders">
+                            <field name="payment_order_ids" colspan="4" nolabel="1">
+                                <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" string="Payment order">
+                                    <field name="reference"/>
+                                    <field name="date_created"/>
+                                    <field name="date_done"/>
+                                    <field name="total"/>
+                                    <field name="state"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/account_banking_nl_clieop/i18n/nl.po b/account_banking_nl_clieop/i18n/nl.po
new file mode 100644
index 000000000..fba6a514a
--- /dev/null
+++ b/account_banking_nl_clieop/i18n/nl.po
@@ -0,0 +1,345 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* account_banking_nl_clieop
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-11-01 16:23+0000\n"
+"PO-Revision-Date: 2012-11-01 18:11+0100\n"
+"Last-Translator: Erwin van der Ploeg | Endian Solutions "
+"<erwin@endiansolutions.nl>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: account_banking_nl_clieop
+#: selection:banking.export.clieop.wizard,batchtype:0
+msgid "Direct Debits"
+msgstr "Incasso opdrachten"
+
+#. module: account_banking_nl_clieop
+#: code:addons\account_banking_nl_clieop\account_banking_nl_clieop.py:39
+#: code:addons\account_banking_nl_clieop\wizard\export_clieop.py:94
+#: selection:banking.export.clieop,testcode:0
+#: selection:banking.export.clieop.wizard,testcode:0
+#, python-format
+msgid "No"
+msgstr "Nee"
+
+#. module: account_banking_nl_clieop
+#: code:addons\account_banking_nl_clieop\wizard\export_clieop.py:290
+#, python-format
+msgid "There is insufficient information"
+msgstr "Er is onvoldoende informatie"
+
+#. module: account_banking_nl_clieop
+#: view:banking.export.clieop.wizard:0
+#: selection:banking.export.clieop.wizard,state:0
+msgid "Create"
+msgstr "Aanmaken"
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop,no_transactions:0
+#: field:banking.export.clieop.wizard,no_transactions:0
+msgid "Number of Transactions"
+msgstr "Aantal transacties"
+
+#. module: account_banking_nl_clieop
+#: code:addons\account_banking_nl_clieop\wizard\export_clieop.py:211
+#, python-format
+msgid "You can't create ClieOp orders more than 30 days in advance."
+msgstr ""
+"Het is niet mogelijk een ClieOp betaalopdracht te maken, 30 dagen van te "
+"voren."
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop,state:0
+#: field:banking.export.clieop.wizard,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: account_banking_nl_clieop
+#: help:banking.export.clieop.wizard,test:0
+msgid ""
+"Select this if you want your bank to run a test process rather then execute "
+"your orders for real."
+msgstr ""
+"Selecteer dit indien u wilt dat uw bank een test uitvoert in plaats van een "
+"werkelijke verwerking."
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop,identification:0
+#: field:banking.export.clieop.wizard,identification:0
+msgid "Identification"
+msgstr "Identificatie"
+
+#. module: account_banking_nl_clieop
+#: view:banking.export.clieop:0
+msgid "Processing Information"
+msgstr "Verwerkingsinformatie"
+
+#. module: account_banking_nl_clieop
+#: help:banking.export.clieop.wizard,fixed_message:0
+msgid ""
+"A fixed message to apply to all transactions in addition to the individual "
+"messages."
+msgstr ""
+"Een vast bericht dat alle transacties betreft, als toevoeging op de "
+"Individuele berichten."
+
+#. module: account_banking_nl_clieop
+#: model:ir.model,name:account_banking_nl_clieop.model_banking_export_clieop
+msgid "banking.export.clieop"
+msgstr "banking.export.clieop"
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop,check_no_accounts:0
+#: field:banking.export.clieop.wizard,check_no_accounts:0
+msgid "Check Number Accounts"
+msgstr "Controlegetal rekeningen"
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop.wizard,batchtype:0
+msgid "Type"
+msgstr "Type"
+
+#. module: account_banking_nl_clieop
+#: selection:banking.export.clieop,state:0
+msgid "Sent"
+msgstr "Verzonden"
+
+#. module: account_banking_nl_clieop
+#: view:banking.export.clieop:0
+msgid "ClieOp Information"
+msgstr "ClieOp-informatie"
+
+#. module: account_banking_nl_clieop
+#: view:banking.export.clieop.wizard:0
+#: selection:banking.export.clieop.wizard,state:0
+msgid "Finish"
+msgstr "Gereed"
+
+#. module: account_banking_nl_clieop
+#: code:addons\account_banking_nl_clieop\wizard\export_clieop.py:216
+#, python-format
+msgid "You can only combine payment orders of the same type"
+msgstr "U kunt alleen maar betaalopdrachten van hetzelfde type combineren."
+
+#. module: account_banking_nl_clieop
+#: selection:banking.export.clieop,filetype:0
+#: selection:banking.export.clieop.wizard,filetype:0
+msgid "Salary Payment Batch"
+msgstr "Salarisbetalingsbatch"
+
+#. module: account_banking_nl_clieop
+#: selection:banking.export.clieop,state:0
+msgid "Reconciled"
+msgstr "Afgeletterd"
+
+#. module: account_banking_nl_clieop
+#: code:addons\account_banking_nl_clieop\wizard\export_clieop.py:252
+#, python-format
+msgid "Your bank account has to have a valid account number"
+msgstr "Uw bankrekening moet een geldig rekeningnummer hebben."
+
+#. module: account_banking_nl_clieop
+#: view:banking.export.clieop.wizard:0
+msgid "Reference for further communication"
+msgstr "Referentie voor verdere communicatie"
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop,duplicates:0
+msgid "Number of Duplicates"
+msgstr "Aantal duplicaten"
+
+#. module: account_banking_nl_clieop
+#: help:banking.export.clieop.wizard,reference:0
+msgid ""
+"The bank will use this reference in feedback communication to refer to this "
+"run. Only five characters are available."
+msgstr ""
+"De bank zal deze referentie gebruiken in de teruggekoppelde communicatie "
+"betreffende deze batch. Er zijn maar 5 karakters beschikbaar."
+
+#. module: account_banking_nl_clieop
+#: view:banking.export.clieop.wizard:0
+msgid "Processing Details"
+msgstr "Verwerking details"
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop,testcode:0
+#: field:banking.export.clieop.wizard,test:0
+#: field:banking.export.clieop.wizard,testcode:0
+msgid "Test Run"
+msgstr "Testverwerking"
+
+#. module: account_banking_nl_clieop
+#: selection:banking.export.clieop,filetype:0
+#: selection:banking.export.clieop.wizard,filetype:0
+msgid "Direct Debit Batch"
+msgstr "Incassobatch"
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop,prefered_date:0
+#: field:banking.export.clieop.wizard,prefered_date:0
+msgid "Prefered Processing Date"
+msgstr "Gewenste verwerkingsdatum"
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop,file:0
+#: field:banking.export.clieop.wizard,file_id:0
+msgid "ClieOp File"
+msgstr "ClieOp-bestand"
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop.wizard,file:0
+msgid "File"
+msgstr "Bestand"
+
+#. module: account_banking_nl_clieop
+#: code:addons\account_banking_nl_clieop\wizard\export_clieop.py:312
+#, python-format
+msgid "You cannot send international bank transfers through ClieOp3!"
+msgstr ""
+"Het is niet mogelijk om een internationale betaling te doen met behulp van "
+"ClieOp3!"
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop.wizard,execution_date:0
+msgid "Execution Date"
+msgstr "Uitvoeringsdatum"
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop.wizard,fixed_message:0
+msgid "Fixed Message"
+msgstr "Vast bericht"
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop,filetype:0
+#: field:banking.export.clieop.wizard,filetype:0
+msgid "File Type"
+msgstr "Bestandsformaat"
+
+#. module: account_banking_nl_clieop
+#: model:ir.actions.act_window,name:account_banking_nl_clieop.act_banking_export_clieop_payment_order
+#: model:ir.actions.act_window,name:account_banking_nl_clieop.action_account_banking_clieops
+#: model:ir.ui.menu,name:account_banking_nl_clieop.menu_action_account_banking_exported_clieop_files
+msgid "Generated ClieOp3 Files"
+msgstr "Gegenereerde ClieOp3-bestanden"
+
+#. module: account_banking_nl_clieop
+#: selection:banking.export.clieop.wizard,batchtype:0
+msgid "Payments"
+msgstr "Betalingen"
+
+#. module: account_banking_nl_clieop
+#: code:addons\account_banking_nl_clieop\wizard\export_clieop.py:210
+#: code:addons\account_banking_nl_clieop\wizard\export_clieop.py:215
+#: code:addons\account_banking_nl_clieop\wizard\export_clieop.py:251
+#: code:addons\account_banking_nl_clieop\wizard\export_clieop.py:289
+#: code:addons\account_banking_nl_clieop\wizard\export_clieop.py:311
+#, python-format
+msgid "Error"
+msgstr "Fout"
+
+#. module: account_banking_nl_clieop
+#: selection:banking.export.clieop.wizard,batchtype:0
+msgid "Salary Payments"
+msgstr "Salaris betalingen"
+
+#. module: account_banking_nl_clieop
+#: code:addons\account_banking_nl_clieop\wizard\export_clieop.py:348
+#: view:banking.export.clieop:0 view:banking.export.clieop.wizard:0
+#: model:ir.model,name:account_banking_nl_clieop.model_banking_export_clieop_wizard
+#, python-format
+msgid "Client Opdrachten Export"
+msgstr "Betaalopdrachten export"
+
+#. module: account_banking_nl_clieop
+#: view:banking.export.clieop.wizard:0
+msgid "Additional message for all transactions"
+msgstr "Additionele berichten voor alle transacties"
+
+#. module: account_banking_nl_clieop
+#: help:banking.export.clieop.wizard,execution_date:0
+msgid ""
+"This is the date the file should be processed by the bank. Don't choose a "
+"date beyond the nearest date in your payments. The latest allowed date is 30 "
+"days from now.\n"
+"Please keep in mind that banks only execute on working days and typically "
+"use a delay of two days between execution date and effective transfer date."
+msgstr ""
+"Dit si de datum waarop het bestand moet worden verwerkt door de bank. Kies "
+"geen datum verder dan de dichtsbijzijnde datum in uw betalingen. De laatst "
+"toegestane datum is 30 fagen vanaf nu. \n"
+"Houd u er rekening mee dat banken alleen bestanden verwerken op werkdagen en "
+"normaliter een vertraging hanteren van twee dagen tussen de uitvoeringsdatum "
+"en de effectieve overboekingsdatum."
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop,total_amount:0
+#: field:banking.export.clieop.wizard,total_amount:0
+msgid "Total Amount"
+msgstr "Totaalbedrag"
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop.wizard,reference:0
+msgid "Reference"
+msgstr "Referentie"
+
+#. module: account_banking_nl_clieop
+#: view:banking.export.clieop:0
+msgid "Payment order"
+msgstr "Betaalopdracht"
+
+#. module: account_banking_nl_clieop
+#: view:banking.export.clieop:0
+#: field:banking.export.clieop,payment_order_ids:0
+#: field:banking.export.clieop.wizard,payment_order_ids:0
+msgid "Payment Orders"
+msgstr "Betalingsopdrachten"
+
+#. module: account_banking_nl_clieop
+#: view:banking.export.clieop:0
+msgid "General Information"
+msgstr "Algemene informatie"
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop,daynumber:0
+msgid "ClieOp Transaction nr of the Day"
+msgstr "ClieOp dagtransactienummer"
+
+#. module: account_banking_nl_clieop
+#: view:banking.export.clieop.wizard:0
+msgid "Cancel"
+msgstr "Annuleren"
+
+#. module: account_banking_nl_clieop
+#: selection:banking.export.clieop,state:0
+msgid "Draft"
+msgstr "Concept"
+
+#. module: account_banking_nl_clieop
+#: code:addons\account_banking_nl_clieop\account_banking_nl_clieop.py:39
+#: code:addons\account_banking_nl_clieop\wizard\export_clieop.py:94
+#: selection:banking.export.clieop,testcode:0
+#: selection:banking.export.clieop.wizard,testcode:0
+#, python-format
+msgid "Yes"
+msgstr "Ja"
+
+#. module: account_banking_nl_clieop
+#: selection:banking.export.clieop,filetype:0
+#: selection:banking.export.clieop.wizard,filetype:0
+msgid "Payment Batch"
+msgstr "Betalingsbatch"
+
+#. module: account_banking_nl_clieop
+#: field:banking.export.clieop,date_generated:0
+msgid "Generation Date"
+msgstr "Aanmaakdatum"
diff --git a/account_banking_nl_clieop/i18n/nl_NL.po b/account_banking_nl_clieop/i18n/nl_NL.po
deleted file mode 100644
index 56d088ae8..000000000
--- a/account_banking_nl_clieop/i18n/nl_NL.po
+++ /dev/null
@@ -1,395 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* account_banking_nl_clieop
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.7\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-02-12 13:29:33+0000\n"
-"PO-Revision-Date: 2010-01-07 22:22:23+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_banking_nl_clieop
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
-
-#. module: account_banking_nl_clieop
-#: selection:account_banking_nl_clieop.banking_export_clieop,init,batchtype:0
-msgid "Direct Debits"
-msgstr "Incasso-batch"
-
-#. module: account_banking_nl_clieop
-#: code:addons/account_banking_nl_clieop/wizard/export_clieop.py:0
-#, python-format
-msgid ""
-"There is insufficient information.\r\n"
-"'\n"
-"                          'Both destination address and account '\n"
-"                          'number must be provided"
-msgstr ""
-"Er is onvoldoende informatie.\r\n"
-"'\n"
-"                          'Zowel begunstigde als extern rekeningnummer '\n"
-"                          'dienen bekende te zijn"
-
-#. module: account_banking_nl_clieop
-#: selection:account_banking_nl_clieop.banking_export_clieop,create,testcode:0
-#: code:addons/account_banking_nl_clieop/account_banking_nl_clieop.py:0
-#: code:addons/account_banking_nl_clieop/wizard/export_clieop.py:0
-#: selection:banking.export.clieop,testcode:0
-#, python-format
-msgid "No"
-msgstr "Nee"
-
-#. module: account_banking_nl_clieop
-#: model:ir.module.module,shortdesc:account_banking_nl_clieop.module_meta_information
-msgid "Account Banking NL ClieOp"
-msgstr "Account Banking NL ClieOp"
-
-#. module: account_banking_nl_clieop
-#: wizard_field:account_banking_nl_clieop.banking_export_clieop,create,no_transactions:0
-#: field:banking.export.clieop,no_transactions:0
-msgid "Number of Transactions"
-msgstr "Aantal transacties"
-
-#. module: account_banking_nl_clieop
-#: model:ir.actions.wizard,name:account_banking_nl_clieop.wizard_account_banking_export_clieop
-msgid "Export ClieOp File"
-msgstr "Exporteer ClieOp-bestand"
-
-#. module: account_banking_nl_clieop
-#: wizard_field:account_banking_nl_clieop.banking_export_clieop,create,prefered_date:0
-#: field:banking.export.clieop,prefered_date:0
-msgid "Prefered Processing Date"
-msgstr "Gewenste verwerkingsdatum"
-
-#. module: account_banking_nl_clieop
-#: model:payment.type,name:account_banking_nl_clieop.export_clieop_pay
-msgid "ClieOp3 Payment Batch"
-msgstr "ClieOp3 betalingsbatch"
-
-#. module: account_banking_nl_clieop
-#: field:banking.export.clieop,state:0
-msgid "State"
-msgstr "Status"
-
-#. module: account_banking_nl_clieop
-#: help:account_banking_nl_clieop.banking_export_clieop,init,test:0
-msgid ""
-"Select this if you want your bank to run a test process rather then execute "
-"your orders for real."
-msgstr ""
-"Kies dit als u wilt dat de bank een testrun draait in plaats van uw "
-"opdrachten te verwerken."
-
-#. module: account_banking_nl_clieop
-#: selection:banking.export.clieop,state:0
-msgid "Draft"
-msgstr "Concept"
-
-#. module: account_banking_nl_clieop
-#: view:banking.export.clieop:0
-msgid "Processing Information"
-msgstr "Verwerkingsinformatie"
-
-#. module: account_banking_nl_clieop
-#: help:account_banking_nl_clieop.banking_export_clieop,init,fixed_message:0
-msgid ""
-"A fixed message to apply to all transactions in addition to the individual "
-"messages."
-msgstr ""
-"Een vast bericht om toe te voegen aan alle transacties in toevoeging op de "
-"individuele berichten."
-
-#. module: account_banking_nl_clieop
-#: wizard_field:account_banking_nl_clieop.banking_export_clieop,create,check_no_accounts:0
-#: field:banking.export.clieop,check_no_accounts:0
-msgid "Check Number Accounts"
-msgstr "Controlegetal rekeningen"
-
-#. module: account_banking_nl_clieop
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige naam in actie-definitie."
-
-#. module: account_banking_nl_clieop
-#: wizard_button:account_banking_nl_clieop.banking_export_clieop,create,save:0
-msgid "Save"
-msgstr "Opslaan"
-
-#. module: account_banking_nl_clieop
-#: wizard_field:account_banking_nl_clieop.banking_export_clieop,init,batchtype:0
-msgid "Type"
-msgstr "Soort"
-
-#. module: account_banking_nl_clieop
-#: selection:banking.export.clieop,state:0
-msgid "Sent"
-msgstr "Verzonden"
-
-#. module: account_banking_nl_clieop
-#: wizard_field:account_banking_nl_clieop.banking_export_clieop,create,log:0
-msgid "Log"
-msgstr "Log"
-
-#. module: account_banking_nl_clieop
-#: view:banking.export.clieop:0
-msgid "ClieOp Information"
-msgstr "ClieOp-informatie"
-
-#. module: account_banking_nl_clieop
-#: model:ir.model,name:account_banking_nl_clieop.model_banking_export_clieop
-msgid "ClieOp3 Export"
-msgstr "ClieOp3-export"
-
-#. module: account_banking_nl_clieop
-#: code:addons/account_banking_nl_clieop/wizard/export_clieop.py:0
-#, python-format
-msgid "You can only combine payment orders of the same type"
-msgstr "U kunt alleen betalingsopdrachten van dezelfde soort combineren"
-
-#. module: account_banking_nl_clieop
-#: selection:account_banking_nl_clieop.banking_export_clieop,create,filetype:0
-#: selection:banking.export.clieop,filetype:0
-msgid "Salary Payment Batch"
-msgstr "Salarisbetalingsbatch"
-
-#. module: account_banking_nl_clieop
-#: selection:banking.export.clieop,state:0
-msgid "Reconciled"
-msgstr "Afgeletterd"
-
-#. module: account_banking_nl_clieop
-#: code:addons/account_banking_nl_clieop/wizard/export_clieop.py:0
-#, python-format
-msgid "Your bank account has to have a valid account number"
-msgstr "Uw bankrekening dient een geldig rekeningnummer te hebben"
-
-#. module: account_banking_nl_clieop
-#: wizard_view:account_banking_nl_clieop.banking_export_clieop,init:0
-msgid "Reference for further communication"
-msgstr "Referentie voor verdere communicatie"
-
-#. module: account_banking_nl_clieop
-#: field:banking.export.clieop,duplicates:0
-msgid "Number of Duplicates"
-msgstr "Aantal duplicaten"
-
-#. module: account_banking_nl_clieop
-#: help:account_banking_nl_clieop.banking_export_clieop,init,reference:0
-msgid ""
-"The bank will use this reference in feedback communication to refer to this "
-"run. Only five characters are available."
-msgstr ""
-"De bank zal dit gebruiken in terugkoppelingsberichten om te referen aan deze "
-"verwerking. Slechts vijf tekens zijn beschikbaar."
-
-#. module: account_banking_nl_clieop
-#: wizard_view:account_banking_nl_clieop.banking_export_clieop,init:0
-msgid "Processing Details"
-msgstr "Verwerkingsdetails"
-
-#. module: account_banking_nl_clieop
-#: model:payment.type,name:account_banking_nl_clieop.export_clieop_sal
-msgid "ClieOp3 Salary Payment Batch"
-msgstr "ClieOp3 salarisverwerking"
-
-#. module: account_banking_nl_clieop
-#: wizard_button:account_banking_nl_clieop.banking_export_clieop,init,create:0
-msgid "Create"
-msgstr "Maak"
-
-#. module: account_banking_nl_clieop
-#: selection:account_banking_nl_clieop.banking_export_clieop,create,filetype:0
-#: selection:banking.export.clieop,filetype:0
-msgid "Direct Debit Batch"
-msgstr "Incassobatch"
-
-#. module: account_banking_nl_clieop
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
-
-#. module: account_banking_nl_clieop
-#: wizard_field:account_banking_nl_clieop.banking_export_clieop,create,file:0
-#: field:banking.export.clieop,file:0
-msgid "ClieOp File"
-msgstr "ClieOp-bestand"
-
-#. module: account_banking_nl_clieop
-#: code:addons/account_banking_nl_clieop/wizard/export_clieop.py:0
-#, python-format
-msgid ""
-"You cannot send international bank transfers '\n"
-"                              'through ClieOp3!"
-msgstr ""
-"U kunt geen internationale betalingen met ClieOp3'\n"
-"                               ' insturen!"
-
-#. module: account_banking_nl_clieop
-#: code:addons/account_banking_nl_clieop/wizard/export_clieop.py:0
-#, python-format
-msgid "You can\'t create ClieOp orders more than 30 days in advance."
-msgstr "U kunt geen ClieOp opdrachten aanmaken voor meer dan 30 dagen vooruit."
-
-#. module: account_banking_nl_clieop
-#: wizard_field:account_banking_nl_clieop.banking_export_clieop,init,execution_date:0
-msgid "Execution Date"
-msgstr "Uitvoeringsdatum"
-
-#. module: account_banking_nl_clieop
-#: wizard_field:account_banking_nl_clieop.banking_export_clieop,init,fixed_message:0
-msgid "Fixed Message"
-msgstr "Vast bericht"
-
-#. module: account_banking_nl_clieop
-#: wizard_field:account_banking_nl_clieop.banking_export_clieop,create,filetype:0
-#: field:banking.export.clieop,filetype:0
-msgid "File Type"
-msgstr "Bestandsformaat"
-
-#. module: account_banking_nl_clieop
-#: model:payment.type,name:account_banking_nl_clieop.export_clieop_inc
-msgid "ClieOp3 Direct Debit Batch"
-msgstr "ClieOp3 incassoverwerking"
-
-#. module: account_banking_nl_clieop
-#: wizard_field:account_banking_nl_clieop.banking_export_clieop,create,testcode:0
-#: wizard_field:account_banking_nl_clieop.banking_export_clieop,init,test:0
-#: field:banking.export.clieop,testcode:0
-msgid "Test Run"
-msgstr "Testverwerking"
-
-#. module: account_banking_nl_clieop
-#: selection:account_banking_nl_clieop.banking_export_clieop,init,batchtype:0
-msgid "Payments"
-msgstr "Betalingen"
-
-#. module: account_banking_nl_clieop
-#: code:addons/account_banking_nl_clieop/wizard/export_clieop.py:0
-#, python-format
-msgid "Error"
-msgstr "Fout"
-
-#. module: account_banking_nl_clieop
-#: selection:account_banking_nl_clieop.banking_export_clieop,init,batchtype:0
-msgid "Salary Payments"
-msgstr "Salarisbetalingen"
-
-#. module: account_banking_nl_clieop
-#: wizard_view:account_banking_nl_clieop.banking_export_clieop,create:0
-#: wizard_view:account_banking_nl_clieop.banking_export_clieop,init:0
-#: view:banking.export.clieop:0
-msgid "Client Opdrachten Export"
-msgstr "Client Opdrachten Export"
-
-#. module: account_banking_nl_clieop
-#: wizard_view:account_banking_nl_clieop.banking_export_clieop,init:0
-msgid "Additional message for all transactions"
-msgstr "Toegevoegd bericht voor alle transacties"
-
-#. module: account_banking_nl_clieop
-#: model:ir.actions.act_window,name:account_banking_nl_clieop.action_account_banking_clieops
-#: model:ir.ui.menu,name:account_banking_nl_clieop.menu_action_account_banking_exported_clieop_files
-msgid "Generated ClieOp3 Files"
-msgstr "Gegenereerde ClieOp3-bestanden"
-
-#. module: account_banking_nl_clieop
-#: model:ir.module.module,description:account_banking_nl_clieop.module_meta_information
-msgid ""
-"\n"
-"    Module to export payment orders in ClieOp format.\n"
-"\n"
-"    ClieOp format is used by Dutch banks to batch national bank transfers.\n"
-"    This module uses the account_banking logic.\n"
-"    "
-msgstr ""
-"\n"
-"    Module voor het exporteren van betalingsopdrachten in ClieOp-formaat.\n"
-"\n"
-"    ClieOp-formaat wordt gebruikt door Nederlandse banks voor "
-"batchverwerking van national banktransacties.\n"
-"    Deze module gebruikt de account_banking logica.\n"
-"    "
-
-#. module: account_banking_nl_clieop
-#: wizard_field:account_banking_nl_clieop.banking_export_clieop,init,reference:0
-msgid "Reference"
-msgstr "Referentie"
-
-#. module: account_banking_nl_clieop
-#: help:account_banking_nl_clieop.banking_export_clieop,init,execution_date:0
-msgid ""
-"This is the date the file should be processed by the bank. Don't choose a "
-"date beyond the nearest date in your payments. The latest allowed date is 30 "
-"days from now.\n"
-"Please keep in mind that banks only execute on working days and typically "
-"use a delay of two days between execution date and effective transfer date."
-msgstr ""
-"Dit is de datum dat het bestand verwerkt dient te worden door de bank. Kies "
-"geen datum verder dan 30 dagen vooruit.\n"
-"Onthoud dat veel banken in alleen verwerken op werkdagen en dat er doorgaans "
-"twee dagen vertraging zit tussen verwerkingsdatum en effectieve datum.\n"
-
-#. module: account_banking_nl_clieop
-#: field:banking.export.clieop,payment_order_ids:0
-msgid "Payment Orders"
-msgstr "Betalingsopdrachten"
-
-#. module: account_banking_nl_clieop
-#: view:banking.export.clieop:0
-msgid "General Information"
-msgstr "Algemene informatie"
-
-#. module: account_banking_nl_clieop
-#: wizard_field:account_banking_nl_clieop.banking_export_clieop,create,total_amount:0
-#: field:banking.export.clieop,total_amount:0
-msgid "Total Amount"
-msgstr "Totaalbedrag"
-
-#. module: account_banking_nl_clieop
-#: field:banking.export.clieop,daynumber:0
-msgid "ClieOp Transaction nr of the Day"
-msgstr "ClieOp dagtransactienummer"
-
-#. module: account_banking_nl_clieop
-#: wizard_button:account_banking_nl_clieop.banking_export_clieop,create,cancel:0
-#: wizard_button:account_banking_nl_clieop.banking_export_clieop,init,end:0
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: account_banking_nl_clieop
-#: wizard_field:account_banking_nl_clieop.banking_export_clieop,create,identification:0
-#: field:banking.export.clieop,identification:0
-msgid "Identification"
-msgstr "Identificatie"
-
-#. module: account_banking_nl_clieop
-#: selection:account_banking_nl_clieop.banking_export_clieop,create,testcode:0
-#: code:addons/account_banking_nl_clieop/account_banking_nl_clieop.py:0
-#: code:addons/account_banking_nl_clieop/wizard/export_clieop.py:0
-#: selection:banking.export.clieop,testcode:0
-#, python-format
-msgid "Yes"
-msgstr "Ja"
-
-#. module: account_banking_nl_clieop
-#: selection:account_banking_nl_clieop.banking_export_clieop,create,filetype:0
-#: selection:banking.export.clieop,filetype:0
-msgid "Payment Batch"
-msgstr "Betalingsbatch"
-
-#. module: account_banking_nl_clieop
-#: field:banking.export.clieop,date_generated:0
-msgid "Generation Date"
-msgstr "Aanmaakdatum"
diff --git a/account_banking_nl_clieop/wizard/clieop.py b/account_banking_nl_clieop/wizard/clieop.py
index 1353671dd..cb547d7c2 100644
--- a/account_banking_nl_clieop/wizard/clieop.py
+++ b/account_banking_nl_clieop/wizard/clieop.py
@@ -278,7 +278,7 @@ class Transaction(object):
         self.transaction.transactiontype = type_
         self.transaction.accountno_beneficiary = accountno_beneficiary
         self.transaction.accountno_payer = accountno_payer
-        self.transaction.amount = int(amount * 100)
+        self.transaction.amount = int(round(amount * 100))
         if reference:
             self.paymentreference.paymentreference = reference
         # Allow long message lines to redistribute over multiple message
diff --git a/account_banking_nl_clieop/wizard/export_clieop.py b/account_banking_nl_clieop/wizard/export_clieop.py
index 36b00049c..2780c8491 100644
--- a/account_banking_nl_clieop/wizard/export_clieop.py
+++ b/account_banking_nl_clieop/wizard/export_clieop.py
@@ -138,13 +138,19 @@ class banking_export_clieop_wizard(osv.osv_memory):
             readonly=True,
             string='File',
             ),
+        'filename': fields.related(
+            'file_id', 'filename',
+            type='char', size=32,
+            readonly=True,
+            string='Filename',
+            ),
         'payment_order_ids': fields.many2many(
             'payment.order', 'rel_wiz_payorders', 'wizard_id',
             'payment_order_id', 'Payment Orders',
             readonly=True,
             ),
         }
-    
+
     _defaults = {
         'test': True,
         }
@@ -334,6 +340,7 @@ class banking_export_clieop_wizard(osv.osv_memory):
                 no_transactions = order.nr_posts,
                 testcode = order.testcode,
                 file = base64.encodestring(clieopfile.rawdata),
+                filename = 'Clieop03-{0}.txt'.format(order.identification),
                 daynumber = int(clieopfile.header.file_id[2:]),
                 payment_order_ids = [
                     [6, 0, [x.id for x in clieop_export['payment_order_ids']]]
@@ -375,7 +382,7 @@ class banking_export_clieop_wizard(osv.osv_memory):
             clieop_obj = self.pool.get('banking.export.clieop')
             payment_order_obj = self.pool.get('payment.order')
             clieop_file = clieop_obj.write(
-                cursor, uid, clieop_export['file_id'].id, {'state':'sent'}
+                cursor, uid, clieop_export['file_id'].id, {'state': 'sent'}
                 )
             wf_service = netsvc.LocalService('workflow')
             for order in clieop_export['payment_order_ids']:
diff --git a/account_banking_nl_clieop/wizard/export_clieop_view.xml b/account_banking_nl_clieop/wizard/export_clieop_view.xml
index 454560eb1..3c6754e51 100644
--- a/account_banking_nl_clieop/wizard/export_clieop_view.xml
+++ b/account_banking_nl_clieop/wizard/export_clieop_view.xml
@@ -6,53 +6,54 @@
             <field name="model">banking.export.clieop.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-		<form string="Client Opdrachten Export">
-		    <field name="state" invisible="True"/>
-		    <group states="create">
-			<separator colspan="4" string="Processing Details" />
-			<field name="batchtype" />
-			<field name="execution_date" />
-			<field name="test" />
-			<separator colspan="4" string="Reference for further communication" />
-			<field name="reference" colspan="2" />
-			<separator colspan="4" string="Additional message for all transactions" />
-			<field name="fixed_message" />
-			<newline/>
-			<button icon="gtk-close"
-				special="cancel"
-				string="Cancel"
-				/>
-			<button icon="gtk-ok"
-				string="Create" 
-				name="create_clieop"
-				type="object"
-				/>
-		    </group>
-		    <group states="finish">
-			<field name="filetype" />
-			<field name="identification" />
-			<field name="total_amount" />
-			<field name="check_no_accounts" />
-			<field name="no_transactions" />
-			<field name="prefered_date" />
-			<field name="testcode" />
-			<newline/>
-			<field name="file_id" />
-			<field name="file" />
-			<newline/>
-			<button icon="gtk-close"
-				string="Cancel" 
-				name="cancel_clieop"
-				type="object"
-				/>
-			<button icon="gtk-ok"
-				string="Finish" 
-				name="save_clieop"
-				type="object"
-				/>
-		    </group>
-		</form>
-	    </field>
-	</record>
+                <form string="Client Opdrachten Export">
+                    <field name="state" invisible="True"/>
+                    <group states="create">
+                        <separator colspan="4" string="Processing Details" />
+                        <field name="batchtype" />
+                        <field name="execution_date" />
+                        <field name="test" />
+                        <separator colspan="4" string="Reference for further communication" />
+                        <field name="reference" colspan="2" />
+                        <separator colspan="4" string="Additional message for all transactions" />
+                        <field name="fixed_message" />
+                        <newline/>
+                        <button icon="gtk-close"
+                                special="cancel"
+                                string="Cancel"
+                                />
+                        <button icon="gtk-ok"
+                                string="Create" 
+                                name="create_clieop"
+                                type="object"
+                                />
+                    </group>
+                    <group states="finish">
+                        <field name="filetype" />
+                        <field name="identification" />
+                        <field name="total_amount" />
+                        <field name="check_no_accounts" />
+                        <field name="no_transactions" />
+                        <field name="prefered_date" />
+                        <field name="testcode" />
+                        <newline/>
+                        <field name="filename" invisible="True"/>
+                        <field name="file_id" />
+                        <field name="file" filename="filename"/>
+                        <newline/>
+                        <button icon="gtk-close"
+                                string="Cancel" 
+                                name="cancel_clieop"
+                                type="object"
+                                />
+                        <button icon="gtk-ok"
+                                string="Finish" 
+                                name="save_clieop"
+                                type="object"
+                                />
+                    </group>
+                </form>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/account_direct_debit/workflow/account_payment.xml b/account_direct_debit/workflow/account_payment.xml
index 6c529a490..7ea27c523 100644
--- a/account_direct_debit/workflow/account_payment.xml
+++ b/account_direct_debit/workflow/account_payment.xml
@@ -12,7 +12,7 @@
             another state, 'sent_wait' between sent and done.
         -->
         <record id="account_payment.act_done" model="workflow.activity">
-            <field name="flow_stop">False</field>
+            <field name="flow_stop" eval="False"/>
         </record>
 
         <record id="trans_done_sent" model="workflow.transition">
diff --git a/bank_statement_instant_voucher/__init__.py b/bank_statement_instant_voucher/__init__.py
new file mode 100644
index 000000000..16e8b082f
--- /dev/null
+++ b/bank_statement_instant_voucher/__init__.py
@@ -0,0 +1 @@
+import model
diff --git a/bank_statement_instant_voucher/__openerp__.py b/bank_statement_instant_voucher/__openerp__.py
new file mode 100644
index 000000000..5a811d541
--- /dev/null
+++ b/bank_statement_instant_voucher/__openerp__.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2012 Therp BV (<http://therp.nl>).
+#
+#    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 instant voucher",
+    "version": "1.0r028",
+    "author": "Therp BV",
+    "category": 'Base',
+    'complexity': "normal",
+    "description": """
+This module adds a new button on the bank statement line that allows the
+accountant to instantly create a sales or purchase voucher based on the
+values of the bank statement line.
+
+This module does not depend on account_banking, but if this module is
+installed, the bank statement line will be reconciled automatically
+in the confirmation step of the wizard.
+
+If account_banking is not installed, the accountant will still have to
+reconcile the associated move line with the move line from the bank
+statement line manually.
+
+If the wizard is cancelled,the created voucher will be deleted again.
+
+Known limitations:
+
+Currency conversion and payment difference writeoff are not yet
+supported.
+    """,
+    'website': 'http://therp.nl',
+    'images': [],
+    'depends': ['account_voucher'],
+    'data': [
+        'view/account_voucher_instant.xml',
+        'view/account_bank_statement_line.xml',
+    ],
+    "license": 'AGPL-3',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/bank_statement_instant_voucher/i18n/nl.po b/bank_statement_instant_voucher/i18n/nl.po
new file mode 100644
index 000000000..d6cfa507e
--- /dev/null
+++ b/bank_statement_instant_voucher/i18n/nl.po
@@ -0,0 +1,158 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* bank_statement_instant_voucher
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-11-12 10:42+0000\n"
+"PO-Revision-Date: 2012-11-12 10:42+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: bank_statement_instant_voucher
+#: view:account.voucher.instant:0
+msgid "Confirm"
+msgstr "Bevestig"
+
+#. module: bank_statement_instant_voucher
+#: code:addons/bank_statement_instant_voucher/model/account_voucher_instant.py:71
+#, python-format
+msgid "Voucher for statement line %s.%s"
+msgstr "Journaalbon voor bankafschrift %s.%s"
+
+#. module: bank_statement_instant_voucher
+#: field:account.voucher.instant,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: bank_statement_instant_voucher
+#: code:addons/bank_statement_instant_voucher/model/account_voucher_instant.py:201
+#, python-format
+msgid "The voucher could not be posted."
+msgstr "De journaalbon kon niet worden bevestigd."
+
+#. module: bank_statement_instant_voucher
+#: selection:account.voucher.instant,state:0
+msgid "ready"
+msgstr "ready"
+
+#. module: bank_statement_instant_voucher
+#: model:ir.model,name:bank_statement_instant_voucher.model_account_voucher_instant
+msgid "Instant Voucher"
+msgstr "Instant journaalbon"
+
+#. module: bank_statement_instant_voucher
+#: selection:account.voucher.instant,state:0
+msgid "confirm"
+msgstr "confirm"
+
+#. module: bank_statement_instant_voucher
+#: view:account.bank.statement:0
+#: model:ir.actions.act_window,name:bank_statement_instant_voucher.act_instant_voucher
+msgid "Create matching voucher"
+msgstr "Bijpassende journaalbon aanmaken"
+
+#. module: bank_statement_instant_voucher
+#: code:addons/bank_statement_instant_voucher/model/account_voucher_instant.py:137
+#, python-format
+msgid "Cannot determine statement line"
+msgstr "Kan de bankafschriftregel niet afleiden"
+
+#. module: bank_statement_instant_voucher
+#: selection:account.voucher.instant,state:0
+msgid "init"
+msgstr "init"
+
+#. module: bank_statement_instant_voucher
+#: code:addons/bank_statement_instant_voucher/model/account_voucher_instant.py:209
+#, python-format
+msgid "The voucher's move line could not be posted."
+msgstr "De journaalposten van de journaalbon konden niet geboekt worden"
+
+#. module: bank_statement_instant_voucher
+#: model:ir.model,name:bank_statement_instant_voucher.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Bankafschriftregel"
+
+#. module: bank_statement_instant_voucher
+#: view:account.voucher.instant:0
+msgid "Create voucher"
+msgstr "Journaalbon aanmaken"
+
+#. module: bank_statement_instant_voucher
+#: code:addons/bank_statement_instant_voucher/model/account_voucher_instant.py:214
+#, python-format
+msgid "The amount on the bank statement line needs to be the same as on the voucher. Write-off is not yet supported."
+msgstr "Het bedrag op het bankafschrift dient gelijk te zijn aan het bedrag op de journaalbon. Afschrijven is nog niet ondersteund."
+
+#. module: bank_statement_instant_voucher
+#: code:addons/bank_statement_instant_voucher/model/account_voucher_instant.py:59
+#: code:addons/bank_statement_instant_voucher/model/account_voucher_instant.py:136
+#: code:addons/bank_statement_instant_voucher/model/account_voucher_instant.py:190
+#: code:addons/bank_statement_instant_voucher/model/account_voucher_instant.py:200
+#: code:addons/bank_statement_instant_voucher/model/account_voucher_instant.py:208
+#: code:addons/bank_statement_instant_voucher/model/account_voucher_instant.py:213
+#: code:addons/bank_statement_instant_voucher/model/account_voucher_instant.py:224
+#, python-format
+msgid "Error"
+msgstr "Fout"
+
+#. module: bank_statement_instant_voucher
+#: code:addons/bank_statement_instant_voucher/model/account_voucher_instant.py:60
+#, python-format
+msgid "No %s journal defined"
+msgstr "Geen %s-dagboek ingesteld"
+
+#. module: bank_statement_instant_voucher
+#: constraint:account.bank.statement.line:0
+msgid "The amount of the voucher must be the same amount as the one on the statement line"
+msgstr "Het bedrag op de bon moet hetzelfde bedrag zijn dat vermeld staat op de afschriftregel"
+
+#. module: bank_statement_instant_voucher
+#: field:account.voucher.instant,balance:0
+msgid "Balance"
+msgstr "Balans"
+
+#. module: bank_statement_instant_voucher
+#: field:account.voucher.instant,statement_line_id:0
+msgid "Bank statement line"
+msgstr "Bankafschriftregel"
+
+#. module: bank_statement_instant_voucher
+#: field:account.voucher.instant,ref:0
+msgid "Reference"
+msgstr "Referentie"
+
+#. module: bank_statement_instant_voucher
+#: code:addons/bank_statement_instant_voucher/model/account_voucher_instant.py:191
+#, python-format
+msgid "Currency on the bank statement line needs to be the same as on the voucher. Currency conversion is not yet supported."
+msgstr "De valuta van de bankafschriftregel dient gelijk te zijn aan die op de journaalbon. Omrekenen tussen valuta is nog niet ondersteund."
+
+#. module: bank_statement_instant_voucher
+#: code:addons/bank_statement_instant_voucher/model/account_voucher_instant.py:225
+#, python-format
+msgid "Cannot match a confirmed statement line"
+msgstr "Kan een bevestigde bankafschriftregel niet afletteren"
+
+#. module: bank_statement_instant_voucher
+#: field:account.voucher.instant,voucher_id:0
+msgid "Voucher"
+msgstr "Journaalbon"
+
+#. module: bank_statement_instant_voucher
+#: view:account.voucher.instant:0
+msgid "Cancel"
+msgstr "Annuleer"
+
+#. module: bank_statement_instant_voucher
+#: field:account.voucher.instant,partner_id:0
+msgid "Partner"
+msgstr "Relatie"
+
diff --git a/bank_statement_instant_voucher/model/__init__.py b/bank_statement_instant_voucher/model/__init__.py
new file mode 100644
index 000000000..bb3faa358
--- /dev/null
+++ b/bank_statement_instant_voucher/model/__init__.py
@@ -0,0 +1,2 @@
+import account_voucher_instant
+import account_bank_statement_line
diff --git a/bank_statement_instant_voucher/model/account_bank_statement_line.py b/bank_statement_instant_voucher/model/account_bank_statement_line.py
new file mode 100644
index 000000000..cf8beb9c3
--- /dev/null
+++ b/bank_statement_instant_voucher/model/account_bank_statement_line.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2012 Therp BV (<http://therp.nl>).
+#
+#    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.osv import osv, fields
+
+
+class account_bank_statement_line(osv.Model):
+    _inherit = 'account.bank.statement.line'
+    def create_instant_voucher(self, cr, uid, ids, context=None):
+        res = False
+        if ids:
+            if isinstance(ids, (int, float)):
+                ids = [ids]
+            if context is None:
+                context = {}
+            local_context = context.copy()
+            local_context['active_id'] = ids[0]
+            wizard_obj = self.pool.get('account.voucher.instant')
+            res = {
+                'name': wizard_obj._description,
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': wizard_obj._name,
+                'domain': [],
+                'context': local_context,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'res_id': False,
+                'nodestroy': False,
+                }
+        return res
diff --git a/bank_statement_instant_voucher/model/account_voucher_instant.py b/bank_statement_instant_voucher/model/account_voucher_instant.py
new file mode 100644
index 000000000..7ca3727ba
--- /dev/null
+++ b/bank_statement_instant_voucher/model/account_voucher_instant.py
@@ -0,0 +1,306 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2012 Therp BV (<http://therp.nl>).
+#
+#    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.osv import osv, fields
+from openerp.tools.translate import _
+from openerp.addons.decimal_precision import decimal_precision as dp
+
+
+class instant_voucher(osv.TransientModel):
+    _name = 'account.voucher.instant'
+    _description = 'Instant Voucher'
+
+    def cancel(self, cr, uid, ids, context=None):
+        """
+        Delete the voucher and close window
+        """
+        assert len(ids) == 1, "Will only take one resource id"
+        instant = self.browse(cr, uid, ids[0], context=context)
+        if instant.voucher_id:
+            self.pool.get('account.voucher').cancel_voucher(
+                cr, uid, [instant.voucher_id.id], context=context)
+            self.pool.get('account.voucher').unlink(
+                cr, uid, [instant.voucher_id.id], context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+    def get_voucher_defaults(
+        self, cr, uid, vals, context=None):
+        """
+        Gather conditional defaults based on given key, value pairs
+
+        :param vals: dictionary of key, value pairs
+        :returns: dictionary of default values for fields not in vals
+        """
+        values_pool = self.pool.get('ir.values')
+        voucher_pool = self.pool.get('account.voucher')
+        res = {}
+        for (key, val) in vals.iteritems():
+            if val and voucher_pool._all_columns[key].column.change_default:
+                for default in values_pool.get_defaults(
+                    cr, uid, 'account.voucher', '%s=%s' % (key, val)):
+                    if default[1] not in vals:
+                        res[default[1]] = default[2]
+        return res
+
+    def create_voucher(self, cr, uid, ids, context=None):
+        """
+        Create a fully fledged voucher counterpart for the
+        statement line. User only needs to process taxes and may
+        adapt cost/income account.
+        """
+        assert len(ids) == 1, "Will only take one resource id"
+        voucher_pool = self.pool.get('account.voucher')
+        period_pool = self.pool.get('account.period')
+        instant = self.browse(cr, uid, ids[0], context=context)
+        line = instant.statement_line_id
+        voucher_type = line.amount < 0 and 'purchase' or 'sale'
+        journal_ids = self.pool.get('account.journal').search(
+            cr, uid, [('company_id', '=', line.company_id.id),
+                      ('type', '=', voucher_type)])
+        if not journal_ids:
+            osv.exept_osv(
+                _('Error'),
+                _('No %s journal defined') % voucher_type)
+               
+        journal = self.pool.get('account.journal').browse(
+            cr, uid, journal_ids[0], context=context)
+        if journal.type in ('sale', 'sale_refund'):
+            line_account_id = (journal.default_credit_account_id and
+                          journal.default_credit_account_id.id or False)
+        elif journal.type in ('purchase', 'expense', 'purchase_refund'):
+            line_account_id = (journal.default_debit_account_id and
+                          journal.default_debit_account_id.id or False)
+        vals = {
+            'name': _('Voucher for statement line %s.%s') % (line.statement_id.name, line.name),
+            'reference': line.ref or False,
+            'company_id': line.company_id.id,
+            'partner_id': instant.partner_id.id,
+            'date': line.date or res.get('line.date', False),
+            'account_id': line.account_id.id,
+            'type': voucher_type,
+            'line_ids': [(0, 0, {'amount': abs(line.amount),
+                                 'account_id': line_account_id,
+                                 'type': line.amount < 0 and 'dr' or 'cr',
+                                 'name': line.ref or False,
+                                 })],
+            'amount': line.amount and abs(line.amount) or res.get('amount', False),
+            'journal_id': journal_ids[0],
+            }
+        if vals['date']:
+            period_ids = period_pool.find(cr, uid, vals['date'], context=context)
+            if period_ids:
+                vals['period_id'] = period_ids[0]
+        vals.update(self.get_voucher_defaults(cr, uid, vals, context=context))
+
+        voucher_id = voucher_pool.create(
+            cr, uid, vals, context=context)
+        self.write(
+            cr, uid, ids[0], 
+            {'voucher_id': voucher_id,
+             'state': 'ready',
+             'type': voucher_type,
+             }, context=context)
+        return {
+            'name': self._description,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': self._name,
+            'domain': [],
+            'context': context,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'res_id': ids[0],
+            'nodestroy': False,
+            }
+
+    def dummy(self, cr, uid, ids, context=None):
+        return {
+            'name': self._description,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': self._name,
+            'domain': [],
+            'context': context,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'res_id': ids[0],
+            'nodestroy': False,
+            }
+
+    def default_get(self, cr, uid, fields_list, context=None):
+        """
+        Gather sane default values from the originating statement line
+        """
+        res = super(instant_voucher, self).default_get(
+            cr, uid, fields_list, context=context)
+        if 'statement_line_id' in fields_list:
+            res['statement_line_id'] = (
+                context.get('active_id') or
+                context.get('active_ids') and context.get('active_ids')[0])
+            if not res['statement_line_id']:
+                raise osv.except_osv(
+                    _('Error'),
+                    _('Cannot determine statement line'))
+            line = self.pool.get('account.bank.statement.line').browse(
+                cr, uid, res['statement_line_id'], context=context)
+            if 'balance' in fields_list:
+                res['balance'] = line.amount
+            if 'ref' in fields_list:
+                res['ref'] = line.ref
+            if 'partner_id' in fields_list:
+                if line.partner_id:
+                    res['partner_id'] = line.partner_id.id
+        return res
+
+    def _get_balance(self, cr, uid, ids, field_name, args, context=None):
+        """
+        Compute the expected residual
+        TODO: currency conversion
+        """
+        res = {}
+        for instant in self.browse(cr, uid, ids, context=context):
+            if instant.voucher_id and instant.voucher_id.state == 'posted':
+                amount = instant.statement_line_id.amount
+                counteramount = 0.0
+                for line in instant.voucher_id.move_ids:
+                    if line.account_id.id == instant.statement_line_id.account_id.id:
+                        counteramount = line.debit - line.credit
+                for line in instant.voucher_id.move_ids:
+                    if line.account_id.id == instant.statement_line_id.account_id.id:
+                        counteramount = line.debit - line.credit
+            else:
+                amount = abs(instant.statement_line_id.amount)
+                counteramount = abs(instant.voucher_id and instant.voucher_id.amount or 0.0)
+            res[instant.id] = amount - counteramount
+        return res
+
+    def confirm(self, cr, uid, ids, context=None):
+        """
+        Post the voucher if necessary
+        Post the voucher's move lines if necessary
+        Sanity checks on currency and residual = 0.0
+        
+        If the account_banking module is installed, perform matching
+        and reconciliation. If not, the user is left to manual
+        reconciliation of OpenERP.
+        """
+        assert len(ids) == 1, "Will only take one resource id"
+        statement_line_obj = self.pool.get('account.bank.statement.line')
+        voucher_obj = self.pool.get('account.voucher')
+        move_obj = self.pool.get('account.move')
+        instant = self.browse(cr, uid, ids[0], context=context)
+        voucher_currency = (instant.voucher_id.currency_id and
+                            instant.voucher_id.currency_id or
+                            instant.voucher_id.company_id.currency_id)
+        if (instant.statement_line_id.statement_id.currency.id !=
+            voucher_currency.id):
+            raise osv.except_osv(
+                _("Error"),
+                _("Currency on the bank statement line needs to be the "
+                  "same as on the voucher. Currency conversion is not yet "
+                  "supported."))
+        if instant.voucher_id.state != 'posted':
+            voucher_obj.proforma_voucher(
+                cr, uid, [instant.voucher_id.id], context=context)
+            instant.refresh()
+            if instant.voucher_id.state != 'posted':
+                raise osv.except_osv(
+                    _("Error"),
+                    _("The voucher could not be posted."))
+        if instant.voucher_id.move_id.state != 'posted':
+            move_obj.post(
+                cr, uid, [instant.voucher_id.move_id.id], context=context)
+            instant.refresh()
+            if instant.voucher_id.move_id.state != 'posted':
+                raise osv.except_osv(
+                    _("Error"),
+                    _("The voucher's move line could not be posted."))
+        if not self.pool.get('res.currency').is_zero(
+            cr, uid, voucher_currency, instant.balance):
+            raise osv.except_osv(
+                _("Error"),
+                _("The amount on the bank statement line needs to be the "
+                  "same as on the voucher. Write-off is not yet "
+                  "supported."))
+        # Banking Addons integration:
+        # Gather the info needed to match the bank statement line
+        # and trigger its posting and reconciliation.
+        if 'import_transaction_id' in statement_line_obj._columns:
+            if instant.statement_line_id.state == 'confirmed':
+                raise osv.except_osv(
+                    _("Error"),
+                    _("Cannot match a confirmed statement line"))
+            if not instant.statement_line_id.import_transaction_id:
+                statement_line_obj.create_instant_transaction(
+                    cr, uid, instant.statement_line_id.id, context=context)
+                instant.statement_line_id.refresh()
+            for line in instant.voucher_id.move_ids:
+                if line.account_id.id == instant.statement_line_id.account_id.id:
+                    self.pool.get('banking.import.transaction').write(
+                        cr, uid, instant.statement_line_id.import_transaction_id.id,
+                        {
+                            'move_line_id': line.id,
+                            'move_line_ids': [(6, 0, [line.id])],
+                            'match_type': 'move',
+                            'invoice_id': False,
+                            'invoice_ids': [(6, 0, [])],
+                            }, context=context)
+
+                    statement_line_obj.confirm(
+                        cr, uid, [instant.statement_line_id.id], context=context)
+                    break
+        return {'type': 'ir.actions.act_window_close'}
+
+    _columns = {
+        'balance': fields.function(
+                    _get_balance,
+                    type='float',
+                    digits_compute=dp.get_precision('Account'),
+                    string="Balance",),
+        'partner_id': fields.many2one(
+            'res.partner',
+            'Partner',
+            required=True),
+        'statement_line_id': fields.many2one(
+            'account.bank.statement.line',
+            'Bank statement line',
+            readonly=True),
+        'ref': fields.related(
+            'statement_line_id', 'ref',
+            type="char", size="48",
+            readonly=True,
+            string="Reference"),
+        'voucher_id': fields.many2one(
+            'account.voucher',
+            'Voucher',
+            readonly=True),
+        'state': fields.selection(
+            [('init', 'init'),
+             ('ready', 'ready'),
+             ('confirm', 'confirm')],
+            'State'),
+        'type': fields.selection(
+            [('sale', 'Sale'),
+             ('purchase', 'Purchase')],
+            'Voucher type'),
+        }
+
+    _defaults = {'state': 'init'}
diff --git a/bank_statement_instant_voucher/view/account_bank_statement_line.xml b/bank_statement_instant_voucher/view/account_bank_statement_line.xml
new file mode 100644
index 000000000..1ca7ea52b
--- /dev/null
+++ b/bank_statement_instant_voucher/view/account_bank_statement_line.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_banking_bank_statement_form" model="ir.ui.view">
+            <field name="name">Add instant voucher button to bank statement line on statement form</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form" />
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="priority" eval="30"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='voucher_id']"
+                       position="before">
+                    <button name="create_instant_voucher" states="draft"
+                            string="Create matching voucher"
+                            icon="STOCK_COPY"
+                            type="object"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/bank_statement_instant_voucher/view/account_voucher_instant.xml b/bank_statement_instant_voucher/view/account_voucher_instant.xml
new file mode 100644
index 000000000..cccf06fb8
--- /dev/null
+++ b/bank_statement_instant_voucher/view/account_voucher_instant.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="instant_voucher_form" model="ir.ui.view">
+            <field name="name">Instant voucher form view</field>
+            <field name="model">account.voucher.instant</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form>
+                    <field name="state" invisible="1" readonly="1"/>
+                    <field name="statement_line_id"/>
+                    <field name="ref"/>
+                    <newline/>
+                    <field name="partner_id"/>
+                    <field name="balance"/>
+                    <newline/>
+                    <field name="type" invisible="1"/>
+                    <field name="voucher_id"
+                           context="{'statement_line_id': statement_line_id,
+                                     'form_view_ref': (
+                                     type == 'sale' and 'account_voucher.view_sale_receipt_form'
+                                     or 'account_voucher.view_purchase_receipt_form')
+                                     }"
+                           />
+                    <newline/>
+                    <newline/>
+                    <button icon="gtk-cancel"
+                            string="Cancel"
+                            name="cancel"
+                            type="object"/>
+                    <button icon="gtk-ok" string="Confirm"
+                            states="ready"
+                            name="confirm"
+                            type="object"
+                            />
+                    <button icon="gtk-ok" string="Create voucher"
+                            states="init"
+                            name="create_voucher"
+                            type="object"
+                            />
+                </form>
+            </field>
+        </record>
+        <act_window name="Create matching voucher"
+            res_model="account.voucher.instant"
+            src_model="account.bank.statement.line"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            id="act_instant_voucher"/>
+    </data>
+</openerp>