[FIX] lost translations

[ADD] search view for bank statement line view [FIX] disable noninteractive splitting of transactions [FIX] disable noninteractive caching of 'matched' transactions [IMP] show transaction related data on the wizard
2025-02-02 10:37:31 +02:00 · 2012-01-16 17:15:55 +01:00
parent b1d692a544
commit cac9e86554
8 changed files with 594 additions and 14 deletions
--- a/account_banking/init.py
+++ b/account_banking/init.py
@@ -26,7 +26,7 @@
 ##############################################################################
 import sepa
 import record
-import bank_import_transaction
+import banking_import_transaction
 import account_banking
 import parsers
 import wizard
--- a/account_banking/openerp.py
+++ b/account_banking/openerp.py
@@ -30,7 +30,7 @@
 ##############################################################################
 {
    'name': 'Account Banking',
-    'version': '0.1.100',
+    'version': '0.1.101',
    'license': 'GPL-3',
    'author': 'Banking addons community',
    'website': 'https://launchpad.net/banking-addons',
--- a/account_banking/account_banking.py
+++ b/account_banking/account_banking.py
@@ -580,14 +580,14 @@ class account_bank_statement_line(osv.osv):
                            states={'draft':[('readonly', False)]},
                            ),
        'period_id': fields.many2one('account.period', 'Period', required=True,
-                            states={'confirm': [('readonly', True)]}),
+                            states={'confirmed': [('readonly', True)]}),
        'currency': fields.many2one('res.currency', 'Currency', required=True,
-                            states={'confirm': [('readonly', True)]}),
+                            states={'confirmed': [('readonly', True)]}),

        # Not used yet, but usefull in the future.
        'international': fields.boolean('International Transaction',
                            required=False,
-                            states={'confirm': [('readonly', True)]},
+                            states={'confirmed': [('readonly', True)]},
                            ),
        'reconcile_id': fields.many2one(
            'account.move.reconcile', 'Reconciliation', readonly=True
--- a/account_banking/account_banking_view.xml
+++ b/account_banking/account_banking_view.xml
@@ -505,6 +505,37 @@
            </field>
        </record>

+	<!-- search view for bank statement lines -->
+        <record id="view_account_bank_statement_line_search" model="ir.ui.view">
+            <field name="name">account.bank.statement.line.search</field>
+            <field name="model">account.bank.statement.line</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Bank Transactions ">
+                    <group>
+                        <filter string="Draft" domain="[('state','=','draft')]" icon="terp-camera_test"/>
+                        <filter string="Confirmed" domain="[('state','=','confirmed')]" icon="terp-dialog-close"/>
+                        <separator orientation="vertical"/>
+                        <field name="ref"/>
+                        <field name="type"/>
+                        <field name="period_id"/>
+                    </group>
+                    <newline/>
+                    <group>
+                        <field name="date"/>
+                        <field name="partner_id"/>
+                        <field name="partner_bank_id"/>
+                        <field name="account_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+
        <!-- Add a shortcut menu for bank accounts -->
        <record model="ir.actions.act_window" id="action_bank_statement_line_tree">
            <field name="name">Bank Transactions</field>
@@ -512,9 +543,11 @@
            <field name="res_model">account.bank.statement.line</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_bank_statement_line_search"/>
        </record>
-        <menuitem string="Bank Transactions" action="action_bank_statement_line_tree" id="menu_bank_statement_line_tree" parent="account.menu_finance_bank_and_cash" sequence="6"/>
-    </data>
-
-
+        <menuitem string="Bank Transactions"
+		  action="action_bank_statement_line_tree"
+		  id="menu_bank_statement_line_tree"
+		  parent="account.menu_finance_bank_and_cash" sequence="8"/>
+     </data>
 </openerp>
--- a/account_banking/banking_import_transaction.py
+++ b/account_banking/banking_import_transaction.py
@@ -52,6 +52,9 @@ class banking_import_transaction(osv.osv):
    _description = 'Bank import transaction'
    _rec_name = 'transaction'

+    # This variable is used to match supplier invoices with an invoice date after
+    # the real payment date. This can occur with online transactions (web shops).
+    # TODO: Convert this to a proper configuration variable
    payment_window = datetime.timedelta(days=10)

    def _match_costs(self, cr, uid, trans, period_id, account_info, log):
@@ -240,6 +243,10 @@ class banking_import_transaction(osv.osv):
            return False

        def _cached(move_line):
+            # Disabled, we allow for multiple matches in
+            # the interactive wizard
+            return False
+
            '''Check if the move_line has been cached'''
            return move_line.id in linked_invoices

@@ -389,6 +396,10 @@ class banking_import_transaction(osv.osv):
                    # Partial payment, reuse invoice
                    _cache(move_line, expected - found)
                elif abs(expected) < abs(found):
+                    # Disabled splitting transactions for now
+                    # TODO allow splitting in the interactive wizard
+                    pass
+
                    # Possible combined payments, need to split transaction to
                    # verify
                    _cache(move_line)
@@ -1649,6 +1660,9 @@ class account_bank_statement_line(osv.osv):
        return res
        
    def confirm(self, cr, uid, ids, context=None):
+        # TODO: a confirmed transaction should remove its reconciliation target
+        # from other transactions where it is one of multiple candidates or
+        # even the proposed reconciliation target.
        statement_obj = self.pool.get('account.bank.statement')
        obj_seq = self.pool.get('ir.sequence')
        import_transaction_obj = self.pool.get('banking.import.transaction')
--- a/account_banking/i18n/nl.po
+++ b/account_banking/i18n/nl.po
@@ -35,11 +35,44 @@ msgstr "remote_bank_eangln"
 msgid "Entry lines"
 msgstr "Boekingsregels"

+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:310
+#, python-format
+msgid "Number of bank costs invoices created"
+msgstr "Aantal bankkosten-facturen aangemaakt"
+
+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:1017
+#: code:addons/account_banking/banking_import_transaction.py:632
+#: code:addons/account_banking/banking_import_transaction.py:644
+#: code:addons/account_banking/banking_import_transaction.py:648
+#, python-format
+msgid "Cannot unreconcile"
+msgstr "Kan niet afletteren"
+
 #. module: account_banking
 #: selection:banking.import.line,transaction_type:0
 msgid "Unknown"
 msgstr "Onbekend"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:950
+#, python-format
+msgid "Cannot check for duplicate. I can't find myself."
+msgstr "Kan niet controleren op duplicaten, ik kan de eigen mutatie niet terugvinden."
+
+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:298
+#, python-format
+msgid "Number of errors found"
+msgstr "Aantal gevonden fouten"
+
+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:229
+#, python-format
+msgid "Statement %(statement_id)s for account %(bank_account)s uses different currency than the defined bank journal."
+msgstr "Afschrift %(statement_id)s voor rekening %(bank_account)s gebruikt een andere valuta dan het ingestelde bankboek."
+
 #. module: account_banking
 #: view:account.bank.statement:0
 #: view:account.bank.statement.line:0
@@ -51,6 +84,23 @@ msgstr "Transactie annuleren"
 msgid "Select the processing details:"
 msgstr "Selecteer de verwerkingsdetails:"

+#. module: account_banking
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Groepeer op..."
+
+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:198
+#, python-format
+msgid "Statements found for unknown account %(bank_account)s"
+msgstr "Afschriften gevonden voor onbekende bankrekening %(bank_account)s"
+
+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:1320
+#, python-format
+msgid "Invalid format"
+msgstr "Ongeldig formaat"
+
 #. module: account_banking
 #: field:banking.import.line,banking_import_id:0
 msgid "Bank import"
@@ -67,6 +117,12 @@ msgstr "Afschrift"
 msgid "Statement lines"
 msgstr "Afschriftregels"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:605
+#, python-format
+msgid "Reconcile payment order not implemented"
+msgstr "Afletteren betaalopdracht nog niet geïmplementeerd"
+
 #. module: account_banking
 #: selection:banking.import.line,type:0
 msgid "Supplier"
@@ -107,6 +163,18 @@ msgstr "Standaard dagboek voor bankrekening"
 msgid "Statements File"
 msgstr "Bankafschriftbestand"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:601
+#, python-format
+msgid "Cannot reconcile: no direct debit order"
+msgstr "Kan niet afletteren: geen incasso-opdracht"
+
+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:1321
+#, python-format
+msgid "The account number has the wrong format for %(country)s"
+msgstr "Het rekeningnummer heeft het verkeerde formaat voor %(country)s"
+
 #. module: account_banking
 #: field:account.banking.bank.import,import_id:0
 msgid "Import File"
@@ -149,6 +217,12 @@ msgstr "Restbedrag"
 msgid "Linked Invoice"
 msgstr "Gerelateerde factuur"

+#. module: account_banking
+#: code:addons/account_banking/wizard/banktools.py:107
+#, python-format
+msgid "Bank account %(account_no)s was not found in the database"
+msgstr "Bankrekening %(account_no)s niet gevonden in de database"
+
 #. module: account_banking
 #: selection:account.banking.bank.import,state:0
 msgid "init"
@@ -165,6 +239,12 @@ msgstr "transferred_amount"
 msgid "Bank Transactions"
 msgstr "Bankmutaties"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:1676
+#, python-format
+msgid "You cannot confirm a bank transfer marked as a duplicate (%s.%s)"
+msgstr "Een bankmutatie gemarkeerd als duplicaat kan niet worden bevestigd (%s.%s)"
+
 #. module: account_banking
 #: field:banking.import.line,statement_line_id:0
 msgid "Resulting statement line"
@@ -176,6 +256,12 @@ msgstr "Bankafschriftregel"
 msgid "Matching invoices"
 msgstr "Gematchte facturen"

+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:1435
+#, python-format
+msgid "Free Reference"
+msgstr "Vrije referentie"
+
 #. module: account_banking
 #: field:banking.import.line,reconcile_id:0
 msgid "Reconciliaton"
@@ -206,6 +292,24 @@ msgstr "Kostendagboek"
 msgid "remote_currency"
 msgstr "remote_currency"

+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:300
+#, python-format
+msgid "Number of statements skipped due to errors"
+msgstr "Aantal afschriften overgeslagen door fouten"
+
+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:949
+#, python-format
+msgid "Cannot check for duplicate"
+msgstr "Kan niet controleren op duplicaten"
+
+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:1351
+#, python-format
+msgid "Invalid IBAN account number!"
+msgstr "Ongeldig IBAN-rekeningnummer"
+
 #. module: account_banking
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
@@ -238,6 +342,12 @@ msgstr "Standaardinstellingen bankrekening voor import"
 msgid "Amount"
 msgstr "Bedrag"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:704
+#, python-format
+msgid "Line id not found"
+msgstr "Regel id niet gevonden"
+
 #. module: account_banking
 #: field:account.bank.statement.line,match_type:0
 #: field:banking.import.transaction,match_type:0
@@ -245,6 +355,11 @@ msgstr "Bedrag"
 msgid "Match type"
 msgstr "Matchtype"

+#. module: account_banking
+#: help:banking.import.transaction,bank_country_code:0
+msgid "Fallback default country for new partner records, as defined by the import parser"
+msgstr "Achtervang-standaardland voor nieuwe relaties, zoals ingegeven door de invoerparser"
+
 #. module: account_banking
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
@@ -278,6 +393,12 @@ msgstr "Afschriften"
 msgid "Matching payment or storno"
 msgstr "Gevonden betaling of storno"

+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:128
+#, python-format
+msgid "Unable to import parser %(parser)s. Parser class not found."
+msgstr "Niet in staat parser %(parser)s te importeren. Parser class niet gevonden."
+
 #. module: account_banking
 #: model:ir.model,name:account_banking.model_account_bank_statement_line
 msgid "Bank Statement Line"
@@ -293,6 +414,12 @@ msgstr "Mogelijke dubbele import"
 msgid "Reference"
 msgstr "Referentie"

+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:444
+#, python-format
+msgid "Journal Item \"%s\" is not valid"
+msgstr "Journaalpost \"%s\" is niet geldig"
+
 #. module: account_banking
 #: field:account.banking.account.settings,default_debit_account_id:0
 msgid "Default debit account"
@@ -305,11 +432,24 @@ msgstr "Standaard debetrekening"
 msgid "Move"
 msgstr "Boeking"

+#. module: account_banking
+#: code:addons/account_banking/wizard/banktools.py:307
+#: code:addons/account_banking/wizard/banktools.py:397
+#, python-format
+msgid "Unknown Bank"
+msgstr "Onbekende bank"
+
 #. module: account_banking
 #: selection:banking.import.line,transaction_type:0
 msgid "Invoice payment"
 msgstr "Factuurbetaling"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:1673
+#, python-format
+msgid "Bank transfer flagged as duplicate"
+msgstr "Bankmutatie is gemarkeerd als duplicaat"
+
 #. module: account_banking
 #: field:banking.import.transaction,writeoff_move_line_id:0
 msgid "Write off move line"
@@ -331,6 +471,18 @@ msgstr "Match deze mutatie"
 msgid "The payment line name must be unique!"
 msgstr "De betaalregelnaam moet uniek zijn!"

+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:1309
+#, python-format
+msgid "The account number appears to be invalid for %(country)s"
+msgstr "Het bankrekeningnummer lijkt ongeldig te zijn voor %(country)s"
+
+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:633
+#, python-format
+msgid "Cannot unreconcile: this operation is not yet supported for match type 'payment'"
+msgstr "Kan niet afletteren: deze bewerking wordt noge niet ondersteund voor matches van het type 'betaling'"
+
 #. module: account_banking
 #: field:banking.import.line,partner_id:0
 msgid "Partner"
@@ -443,6 +595,12 @@ msgstr "Algemeen"
 msgid "Type"
 msgstr "Type"

+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:251
+#, python-format
+msgid "Statement %(id)s known - skipped"
+msgstr "Afschrift %(id)s al bekend - overgeslagen"
+
 #. module: account_banking
 #: view:banking.transaction.wizard:0
 msgid "If the amount exceeds the match, you must set a write-off account and journal for the residual of this reconciliation. If the amount is smaller than the match, this is optional. If you do not set a write-off account in this case, the result will be a partial reconciliation."
@@ -458,6 +616,34 @@ msgstr "Boekingsregel"
 msgid "Payment from a payment order"
 msgstr "Betaling uit een betaalopdracht"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:1732
+#: code:addons/account_banking/banking_import_transaction.py:1741
+#, python-format
+msgid "Cannot cancel bank transaction"
+msgstr "Kan de bankmutatie niet annuleren"
+
+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:443
+#: code:addons/account_banking/banking_import_transaction.py:1818
+#, python-format
+msgid "Error !"
+msgstr "Fout !"
+
+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:1308
+#, python-format
+msgid "Invalid data"
+msgstr "Ongeldige gegevens"
+
+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:684
+#: code:addons/account_banking/banking_import_transaction.py:688
+#: code:addons/account_banking/banking_import_transaction.py:703
+#, python-format
+msgid "Cannot cancel link with storno"
+msgstr "Kan de relatie met de storno niet annuleren"
+
 #. module: account_banking
 #: selection:account.banking.bank.import,state:0
 msgid "review"
@@ -508,16 +694,34 @@ msgstr "Betaling"
 msgid "Payment order to reconcile"
 msgstr "Betaalopdracht ter aflettering"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:1742
+#, python-format
+msgid "Cannot cancel this bank transaction. The information needed to undo the accounting entries has not been recorded"
+msgstr "Kan de bankmutatie niet annuleren. De benodigde informatie om de boekingen teniet te doen is niet beschikbaar"
+
 #. module: account_banking
 #: view:banking.transaction.wizard:0
 msgid "Duplicate flag"
 msgstr "Duplicaatkenmerk"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:461
+#, python-format
+msgid "Entry is already reconciled"
+msgstr "Boeking is al afgeletterd"
+
 #. module: account_banking
 #: view:account.banking.bank.import:0
 msgid "Transaction"
 msgstr "Mutatie"

+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:1282
+#, python-format
+msgid "Insufficient data to select online conversion database"
+msgstr "Onvoldoende gegevens om een online conversiebestand te selecteren"
+
 #. module: account_banking
 #: field:account.banking.bank.import,statement_ids:0
 #: view:account.banking.imported.file:0
@@ -659,6 +863,28 @@ msgstr "error"
 msgid "Manual"
 msgstr "Handmatig"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:1733
+#, python-format
+msgid "The bank statement that this transaction belongs to has already been confirmed"
+msgstr "Het bankafschrift waar deze mutatie toe behoort is al bevestigd"
+
+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:127
+#: code:addons/account_banking/wizard/bank_import.py:141
+#, python-format
+msgid "ERROR!"
+msgstr "FOUT!"
+
+#. module: account_banking
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,state:0
+#: field:account.banking.bank.import,state:0
+#: field:account.banking.imported.file,state:0
+#: field:payment.line,export_state:0
+msgid "State"
+msgstr "Staat"
+
 #. module: account_banking
 #: view:account.banking.bank.import:0
 msgid "Import Bank Transactions File"
@@ -669,6 +895,18 @@ msgstr "Bankmutatiebestand import"
 msgid "Make Payments"
 msgstr "Maak betalingen"

+#. module: account_banking
+#: code:addons/account_banking/wizard/banktools.py:206
+#, python-format
+msgid "Account %(account_no)s is not owned by %(partner)s"
+msgstr "Rekening %(account_no)s is geen eigendom van %(partner)s"
+
+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:1414
+#, python-format
+msgid "My reference"
+msgstr "Mijn referentie"
+
 #. module: account_banking
 #: field:banking.import.transaction,statement_line_id:0
 #: field:banking.transaction.wizard,statement_line_id:0
@@ -690,6 +928,17 @@ msgstr "Afschrijven restbedrag"
 msgid "effective_date"
 msgstr "effective_date"

+#. module: account_banking
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions "
+msgstr "Zoek bankmutaties"
+
+#. module: account_banking
+#: code:addons/account_banking/wizard/banktools.py:179
+#, python-format
+msgid "More then one possible match found for partner with name %(name)s"
+msgstr "Meer dan één mogelijke match gevonden voor partner met naam %(name)s"
+
 #. module: account_banking
 #: field:payment.order,date_sent:0
 msgid "Send date"
@@ -717,6 +966,11 @@ msgstr "Mutaties"
 msgid "Currency"
 msgstr "Valuta"

+#. module: account_banking
+#: field:banking.import.transaction,bank_country_code:0
+msgid "Bank country code"
+msgstr "Bank country code"
+
 #. module: account_banking
 #: help:payment.mode.type,ir_model_id:0
 msgid "Select the Payment Wizard for payments of this type. Leave empty for manual processing"
@@ -738,6 +992,30 @@ msgstr "Meerdere matches"
 msgid "Log"
 msgstr "Log"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:553
+#, python-format
+msgid "Cannot link transaction %s with accounting entry"
+msgstr "Kan mutatie %s niet koppelen aan een journaalboeking"
+
+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:1177
+#, python-format
+msgid "transaction %(statement_id)s.%(transaction_id)s for account %(bank_account)s uses different currency than the defined bank journal."
+msgstr "Mutatie %(statement_id)s.%(transaction_id)s van bankrekening %(bank_account)s gebruikt een andere valuta dan het ingestelde bankboek."
+
+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:580
+#, python-format
+msgid "Cannot link with storno"
+msgstr "Kan niet koppelen met een storno"
+
+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:543
+#, python-format
+msgid "Cannot link transaction %s with invoice"
+msgstr "Kan mutatie %s niet koppelen aan een factuur"
+
 #. module: account_banking
 #: selection:account.banking.imported.file,state:0
 msgid "Review"
@@ -753,11 +1031,29 @@ msgstr "Of koppel deze boekingsregel"
 msgid "Payment Type"
 msgstr "Betaaltype"

+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:1281
+#, python-format
+msgid "Insufficient data"
+msgstr "Onvoldoende gegevens"
+
 #. module: account_banking
 #: field:account.banking.imported.file,file:0
 msgid "Raw Data"
 msgstr "Ruwe data"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:1813
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr "Er is een standaardrekening niet ingesteld op het dagboek."
+
+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:649
+#, python-format
+msgid "Unreconcile payment order not implemented"
+msgstr "Unreconcile payment order not implemented"
+
 #. module: account_banking
 #: help:account.banking.account.settings,default_debit_account_id:0
 msgid "The account to use when an unexpected payment is received. This can be needed when a customer pays in advance or when no matching invoice can be found. Mind that you can correct movements before confirming them."
@@ -769,6 +1065,12 @@ msgstr "De grootboekrekening waarop een onverwachte betaling kan worden geboekt,
 msgid "Payment order type"
 msgstr "Type betaalopdracht"

+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:296
+#, python-format
+msgid "Total number of transactions"
+msgstr "Totaal aantal transacties"
+
 #. module: account_banking
 #: field:banking.import.transaction,exchange_rate:0
 msgid "exchange_rate"
@@ -779,6 +1081,18 @@ msgstr "exchange_rate"
 msgid "Duplicate"
 msgstr "Duplicaat"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:1683
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr "Er moet een analytisch journaal worden ingesteld op het '%s' journaal!"
+
+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:1812
+#, python-format
+msgid "Configuration Error !"
+msgstr "Configuratiefout !"
+
 #. module: account_banking
 #: selection:account.bank.statement.line,state:0
 #: selection:payment.line,export_state:0
@@ -795,6 +1109,12 @@ msgstr "Afletteren ongedaan maken"
 msgid "Bank Statements File"
 msgstr "Bankafschriftbestand"

+#. module: account_banking
+#: code:addons/account_banking/parsers/models.py:368
+#, python-format
+msgid "This is a stub. Please implement your own."
+msgstr "Dit is een stub. Maak alstublieft uw eigen versie."
+
 #. module: account_banking
 #: field:banking.import.transaction,type:0
 msgid "type"
@@ -905,11 +1225,55 @@ msgstr "U kunt het afletteren van de mutatie ongedaan maken"
 msgid "Import transaction"
 msgstr "Geïmporteerde mutatie"

+#. module: account_banking
+#: code:addons/account_banking/wizard/banktools.py:60
+#, python-format
+msgid "No suitable fiscal year found for date %(date)s and company %(company_name)s"
+msgstr "Geen geschikt boekjaar gevonden voor datum %(date)s en bedrijf %(company_name)s"
+
+#. module: account_banking
+#: code:addons/account_banking/wizard/banking_transaction_wizard.py:153
+#, python-format
+msgid "No entry found for the selected invoice. \" +\n"
+"                              \"Try manual reconciliation."
+msgstr "Geen boeking gevonden voor de geselecteerde factuur. \" +\n"
+"                              \"Probeer handmatig af te letteren."
+
 #. module: account_banking
 #: field:banking.import.transaction,error_message:0
 msgid "error_message"
 msgstr "error_message"

+#. module: account_banking
+#: code:addons/account_banking/wizard/banktools.py:82
+#, python-format
+msgid "Multiple overlapping periods for date %(date)s and company %(company_name)s"
+msgstr "Meerdere overlappende periodes gevonden voor datum %(date)s en bedrijf %(company_name)s"
+
+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:142
+#, python-format
+msgid "The imported statements appear to be invalid! Check your file."
+msgstr "De geïmporteerde afschriften lijken onjuist! Controleer uw bestand."
+
+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:304
+#, python-format
+msgid "Number of statements loaded"
+msgstr "Aantal geladen afschriften"
+
+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:302
+#, python-format
+msgid "Number of transactions skipped due to errors"
+msgstr "Aantal overgeslagen transacties als gevolg van fouten"
+
+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:1822
+#, python-format
+msgid "Statement %s is confirmed, journal items are created."
+msgstr "Afschrift %s is bevestigd, journaalposten worden aangemaakt."
+
 #. module: account_banking
 #: field:banking.import.transaction,statement:0
 msgid "statement"
@@ -951,12 +1315,36 @@ msgstr "Betaalwizard"
 msgid "Set write-off account"
 msgstr "Stel de grootboekrekening in ter afschrijving"

+#. module: account_banking
+#: code:addons/account_banking/wizard/banking_transaction_wizard.py:152
+#, python-format
+msgid "No entry found for the selected invoice"
+msgstr "Geen boeking gevonden voor de geselecteerde factuur"
+
+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:358
+#, python-format
+msgid "Unable to link transaction id %(trans)s (ref: %(ref)s) to invoice: invoice %(invoice)s was already paid"
+msgstr "Kan de mutatie met id %(trans)s (referentie: %(ref)s) niet aan factuur %(invoice)s koppelen, deze is al betaald"
+
+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:1090
+#, python-format
+msgid "Cannot perform match on a confirmed transction"
+msgstr "Kan geen match uitvoeren op een bevestigde mutatie"
+
 #. module: account_banking
 #: field:banking.import.transaction,invoice_id:0
 #: field:banking.transaction.wizard,invoice_id:0
 msgid "Invoice to reconcile"
 msgstr "Factuur ter aflettering"

+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:294
+#, python-format
+msgid "Total number of statements"
+msgstr "Totaal aantal afschriften"
+
 #. module: account_banking
 #: field:banking.import.transaction,provision_costs_description:0
 msgid "provision_costs_description"
@@ -972,6 +1360,14 @@ msgstr "Code"
 msgid "Manual match"
 msgstr "Handmatige match"

+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:1018
+#, python-format
+msgid "Cannot unreconcile debit order: \"+\n"
+"              \"Not implemented."
+msgstr "Kan aflettering van een incasso-opdracht niet ongedaa maken: \"+\n"
+"              \"Niet geïmplementeerd."
+
 #. module: account_banking
 #: view:banking.transaction.wizard:0
 msgid "Multiple matches were found for this bank transfer. You must pick one of the matches or select a match manually below."
@@ -1020,6 +1416,12 @@ msgstr "Gereed"
 msgid "Invoice"
 msgstr "Factuur"

+#. module: account_banking
+#: code:addons/account_banking/parsers/models.py:272
+#, python-format
+msgid "Invalid value for transfer_type"
+msgstr "Ongeldige waarde voor transfer_type"
+
 #. module: account_banking
 #: view:payment.order:0
 msgid "Select Invoices to Pay"
@@ -1050,11 +1452,29 @@ msgstr "Boekingen"
 msgid "Responsible User"
 msgstr "Verantwoordelijk gebruiker"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:1680
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "Geen analytisch dagboek !"
+
 #. module: account_banking
 #: selection:account.banking.imported.file,state:0
 msgid "Unfinished"
 msgstr "Niet gereed"

+#. module: account_banking
+#: code:addons/account_banking/wizard/banking_transaction_wizard.py:176
+#, python-format
+msgid "Cannot select for reconcilion"
+msgstr "Kan niet selecteren voor afletteren"
+
+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:1089
+#, python-format
+msgid "Cannot perform match"
+msgstr "Kan de match niet uitvoeren"
+
 #. module: account_banking
 #: model:ir.model,name:account_banking.model_payment_order
 msgid "Payment Order"
@@ -1066,9 +1486,26 @@ msgid "Account Banking"
 msgstr "Account Banking"

 #. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:781
+#, python-format
+msgid "Bank transaction %s: write off not implemented for \" +\n"
+"                          \"this match type."
+msgstr "Bankmutatie %s: afschrijven niet geïmplementeerd voor \" +\n"
+"                          \"dit matchtype."
+
+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:645
+#, python-format
+msgid "Cannot unreconcile: no direct debit order"
+msgstr "Kan niet afletteren: geen incasso-opdracht"
+
+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:1352
+#: code:addons/account_banking/account_banking.py:1356
 #: constraint:res.partner.bank:0
+#, python-format
 msgid "The IBAN number doesn't seem to be correct"
-msgstr "Het IBAN lijkt niet correct te zijn."
+msgstr "Het IBAN-nummer lijkt niet correct te zijn"

 #. module: account_banking
 #: selection:banking.import.line,transaction_type:0
@@ -1086,6 +1523,12 @@ msgstr "Multimatch"
 msgid "remote_owner_city"
 msgstr "remote_owner_city"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:1142
+#, python-format
+msgid "Transaction found for unknown account %(bank_account)s"
+msgstr "Mutatie gevonden voor onbekende bankrekening %(bank_account)s"
+
 #. module: account_banking
 #: selection:account.banking.bank.import,state:0
 msgid "ready"
@@ -1102,6 +1545,18 @@ msgstr "Overeenkomende boekingsregels"
 msgid "File Format"
 msgstr "Bestandsformaat"

+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:922
+#, python-format
+msgid "You can only combine payment orders of the same type"
+msgstr "Alleen betaalopdrachten van hetzelfde type kunnen worden gecombineerd"
+
+#. module: account_banking
+#: code:addons/account_banking/wizard/banktools.py:66
+#, python-format
+msgid "Multiple overlapping fiscal years found for date %(date)s and company %(company_name)s"
+msgstr "Meerdere overlappende boekjaren gevonden voor datum %(date)s en bedrijf %(company_name)s"
+
 #. module: account_banking
 #: field:account.banking.account.settings,journal_id:0
 msgid "Journal"
@@ -1155,6 +1610,17 @@ msgstr "Bank"
 msgid "Customer"
 msgstr "Klant"

+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:1008
+#: code:addons/account_banking/banking_import_transaction.py:468
+#: code:addons/account_banking/banking_import_transaction.py:600
+#: code:addons/account_banking/banking_import_transaction.py:604
+#: code:addons/account_banking/banking_import_transaction.py:772
+#: code:addons/account_banking/banking_import_transaction.py:780
+#, python-format
+msgid "Cannot reconcile"
+msgstr "Kan niet afletteren"
+
 #. module: account_banking
 #: field:banking.import.line,name:0
 #: field:banking.transaction.wizard,name:0
@@ -1167,6 +1633,18 @@ msgstr "Naam"
 msgid "The account to use when the bank invoices its own costs. Leave it blank to disable automatic invoice generation on bank costs."
 msgstr "De grootboekrekening waarop facturen met bankkosten kunnen worden geboekt. Laat leeg om het genereren van dergelijke facturen uit te schakelen."

+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:206
+#, python-format
+msgid "Statements found for account %(bank_account)s, but no default journal was defined."
+msgstr "Bankafschriften gevonden voor bankrekening %(bank_account)s, maar er is geen standaard dagboek ingesteld."
+
+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:329
+#, python-format
+msgid "Review Bank Statements"
+msgstr "Inzage bankafschriften"
+
 #. module: account_banking
 #: field:account.bank.statement.line,partner_bank_id:0
 #: field:account.banking.account.settings,partner_bank_id:0
@@ -1174,6 +1652,12 @@ msgstr "De grootboekrekening waarop facturen met bankkosten kunnen worden geboek
 msgid "Bank Account"
 msgstr "Bankrekening"

+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:306
+#, python-format
+msgid "Number of transactions loaded"
+msgstr "Aantal geladen transacties"
+
 #. module: account_banking
 #: field:banking.import.transaction,payment_order_ids:0
 msgid "Payment orders"
@@ -1184,11 +1668,32 @@ msgstr "Betaalopdrachten"
 msgid "System match"
 msgstr "Automatische match"

+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:581
+#: code:addons/account_banking/banking_import_transaction.py:685
+#, python-format
+msgid "No direct debit order item"
+msgstr "Geen onderdeel van een incasso-opdracht"
+
+#. module: account_banking
+#: code:addons/account_banking/banking_import_transaction.py:689
+#, python-format
+msgid "The direct debit order item is not marked for storno"
+msgstr "Dit item uit de incasso-opdracht is niet gemarkeerd als storno"
+
 #. module: account_banking
 #: model:ir.model,name:account_banking.model_payment_order_create
 msgid "payment.order.create"
 msgstr "payment.order.create"

+#. module: account_banking
+#: code:addons/account_banking/account_banking.py:1009
+#, python-format
+msgid "Cannot reconcile debit order: \"+\n"
+"              \"Not implemented."
+msgstr "Kan een incasso-opdracht niet afletteren: \"+\n"
+"              \"Niet geïmplementeerd."
+
 #. module: account_banking
 #: field:banking.import.transaction,local_currency:0
 msgid "local_currency"
@@ -1209,10 +1714,22 @@ msgstr "rekeningnummer"
 msgid "Payment type"
 msgstr "Betaaltype"

+#. module: account_banking
+#: code:addons/account_banking/wizard/bank_import.py:308
+#, python-format
+msgid "Number of transactions matched"
+msgstr "Aantal transacties herkend"
+
 #. module: account_banking
 #: field:banking.import.transaction,transaction:0
 msgid "transaction"
-msgstr "transaction"
+msgstr "mutatie"
+
+#. module: account_banking
+#: code:addons/account_banking/wizard/banktools.py:200
+#, python-format
+msgid "More than one bank account was found with the same number %(account_no)s"
+msgstr "Meer dan één bankrekening gevonden met hetzelfde rekeningnummer %(account_no)s"

 #. module: account_banking
 #: field:banking.import.transaction,remote_account:0
--- a/account_banking/wizard/banking_transaction_wizard.py
+++ b/account_banking/wizard/banking_transaction_wizard.py
@@ -267,6 +267,16 @@ class banking_transaction_wizard(osv.osv_memory):
        'amount': fields.related(
            'statement_line_id', 'amount', type='float',
            string="Amount", readonly=True),
+        'date': fields.related(
+            'statement_line_id', 'date', type='date',
+            string="Date", readonly=True),
+        'ref': fields.related(
+            'statement_line_id', 'ref', type='char', size=32,
+            string="Reference", readonly=True),
+        'partner_id': fields.related(
+            'statement_line_id', 'partner_id',
+            type='many2one', relation='res.partner',
+            string="Partner", readonly=True),
        'import_transaction_id': fields.related(
            'statement_line_id', 'import_transaction_id', 
            string="Import transaction",
--- a/account_banking/wizard/banking_transaction_wizard.xml
+++ b/account_banking/wizard/banking_transaction_wizard.xml
@@ -13,9 +13,14 @@
                    <field name="move_line_ids" invisible="True"/>
                    <field name="match_multi" invisible="True"/>
                    <field name="duplicate" invisible="True"/>
-                    <field name="amount" invisible="True"/>
-
                    <group colspan="2" col="2">
+                        <group colspan="2" col="4">
+                            <separator string="Transaction data"/>
+                            <field name="date"/>
+                            <field name="amount"/>
+                            <field name="ref"/>
+                            <field name="partner_id"/>
+                        </group>

                        <!-- Duplicate flagging -->
                        <group colspan="2" col="2" attrs="{'invisible': [('duplicate', '=', False)]}">
@@ -34,7 +39,8 @@

                            <separator string="Current match" colspan="2"/>
                            <field name="match_type"/>
-                            <group attrs="{'invisible': [('match_multi', '=', False)]}">
+                            <group attrs="{'invisible': [('match_multi', '=', False)]}" colspan="2" col="2">
+                                <separator string="Multiple matches" colspan="2"/>
                                <label colspan="2" string="Multiple matches were found for this bank transfer. You must pick one of the matches or select a match manually below." />
                            </group>
                            <field name='payment_line_id'