diff --git a/account_banking/banking_import_transaction.py b/account_banking/banking_import_transaction.py
index 79801c84e..5c0cd1faf 100644
--- a/account_banking/banking_import_transaction.py
+++ b/account_banking/banking_import_transaction.py
@@ -193,6 +193,10 @@ class banking_import_transaction(orm.Model):
                     iname = invoice.name.upper()
                     if iname in ref or iname in msg:
                         return True
+                if invoice.supplier_invoice_number and len(invoice.supplier_invoice_number) > 2:
+                    supp_ref = invoice.supplier_invoice_number.upper()
+                    if supp_ref in ref or supp_ref in msg:
+                        return True
             elif invoice.type.startswith('out_'):
                 # External id's possible and likely
                 inum = invoice.number.upper()
@@ -1211,8 +1215,6 @@ class banking_import_transaction(orm.Model):
                     'match_type',
                     'move_line_id', 
                     'invoice_id', 
-                    'manual_invoice_id', 
-                    'manual_move_line_id',
                     ]] +
                      [(x, [(6, 0, [])]) for x in [
                         'move_line_ids',
@@ -1299,9 +1301,9 @@ class banking_import_transaction(orm.Model):
         'exchange_rate': fields.float('exchange_rate'),
         'transferred_amount': fields.float('transferred_amount'),
         'message': fields.char('message', size=1024),
-        'remote_owner': fields.char('remote_owner', size=24),
-        'remote_owner_address': fields.char('remote_owner_address', size=24),
-        'remote_owner_city': fields.char('remote_owner_city', size=24),
+        'remote_owner': fields.char('remote_owner', size=128),
+        'remote_owner_address': fields.char('remote_owner_address', size=256),
+        'remote_owner_city': fields.char('remote_owner_city', size=128),
         'remote_owner_postalcode': fields.char('remote_owner_postalcode', size=24),
         'remote_owner_country_code': fields.char('remote_owner_country_code', size=24),
         'remote_owner_custno': fields.char('remote_owner_custno', size=24),
diff --git a/account_banking/data/account_banking_data.xml b/account_banking/data/account_banking_data.xml
index 3d47ad718..14ae6eafe 100644
--- a/account_banking/data/account_banking_data.xml
+++ b/account_banking/data/account_banking_data.xml
@@ -13,12 +13,5 @@
             <field eval="False" name="required"/>
             <field eval="False" name="readonly"/>
         </record>
-        <!-- 
-             BIC is not legally required
-             See https://bugs.launchpad.net/bugs/933472
-        -->
-        <record id="base_iban.bank_swift_field" model="res.partner.bank.type.field">
-            <field eval="False" name="required"/>
-        </record>
     </data>
 </openerp>
diff --git a/account_banking/migrations/0.1.81/post-set-statement-line-state.py b/account_banking/migrations/6.1.0.1.81/post-set-statement-line-state.py
similarity index 100%
rename from account_banking/migrations/0.1.81/post-set-statement-line-state.py
rename to account_banking/migrations/6.1.0.1.81/post-set-statement-line-state.py
diff --git a/account_banking/migrations/7.0.0.1/pre-migration.py b/account_banking/migrations/7.0.0.1/pre-migration.py
new file mode 100644
index 000000000..e12284d0e
--- /dev/null
+++ b/account_banking/migrations/7.0.0.1/pre-migration.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Therp BV (<http://therp.nl>).
+#    All Rights Reserved
+#
+#    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/>.
+#
+##############################################################################
+
+def migrate(cr, version):
+    if not version:
+        return
+
+    # workflow state moved to another, new module
+    cr.execute(
+        """
+        UPDATE ir_model_data 
+        SET module = 'account_banking_payment'
+        WHERE name = 'trans_done_sent'
+        AND module = 'account_direct_debit'
+        """)
diff --git a/account_banking/sepa/iban.py b/account_banking/sepa/iban.py
index 7d16840d9..817b043b1 100644
--- a/account_banking/sepa/iban.py
+++ b/account_banking/sepa/iban.py
@@ -190,7 +190,7 @@ class IBAN(str):
     BBAN_formats = {
         'AL': BBANFormat('CCBBBBVAAAAAAAAAAAAAAAAAA', '%B%A'),
         'AD': BBANFormat('CCCCBBBBAAAAAAAAAAAA', '%A'),
-        'AT': BBANFormat('BBBBBAAAAAAAAAAA', '%A BLZ %C'),
+        'AT': BBANFormat('BBBBBAAAAAAAAAAA', '%A BLZ %B'),
         'BE': BBANFormat('CCCAAAAAAAVV', '%C-%A-%V'),
         'BA': BBANFormat('BBBCCCAAAAAAAA', '%I'),
         'BG': BBANFormat('BBBBCCCCAAAAAAAAAA', '%I'),
diff --git a/account_banking/wizard/banking_transaction_wizard.py b/account_banking/wizard/banking_transaction_wizard.py
index 0fc71677c..255d7979c 100644
--- a/account_banking/wizard/banking_transaction_wizard.py
+++ b/account_banking/wizard/banking_transaction_wizard.py
@@ -314,6 +314,10 @@ class banking_transaction_wizard(orm.TransientModel):
         'ref': fields.related(
             'statement_line_id', 'ref', type='char', size=32,
             string="Reference", readonly=True),
+        'message': fields.related(
+            'statement_line_id', 'import_transaction_id', 'message',
+            type='char', size=1024,
+            string="Message", readonly=True),
         'partner_id': fields.related(
             'statement_line_id', 'partner_id',
             type='many2one', relation='res.partner',
@@ -363,13 +367,6 @@ class banking_transaction_wizard(orm.TransientModel):
                 ('payment_order_manual', 'Payment order (manual)'),
                 ], 
             string='Match type', readonly=True),
-        'manual_invoice_id': fields.many2one(
-            'account.invoice', 'Match this invoice',
-            domain=[('reconciled', '=', False)]),
-        'manual_move_line_id': fields.many2one(
-            'account.move.line', 'Or match this entry',
-            domain=[('account_id.reconcile', '=', True),
-                    ('reconcile_id', '=', False)]),
         'manual_invoice_ids': fields.many2many(
             'account.invoice',
             'banking_transaction_wizard_account_invoice_rel',
diff --git a/account_banking/wizard/banking_transaction_wizard.xml b/account_banking/wizard/banking_transaction_wizard.xml
index 1e970eb7e..018b87210 100644
--- a/account_banking/wizard/banking_transaction_wizard.xml
+++ b/account_banking/wizard/banking_transaction_wizard.xml
@@ -17,8 +17,9 @@
                             <separator string="Transaction data" colspan="4"/>
                             <field name="partner_id"/>
                             <field name="date"/>
-                            <field name="ref"/>
                             <field name="amount"/>
+                            <field name="ref"/>
+                            <field name="message" colspan="4"/>
                         </group>
                         
                         <!-- (semi-) automatic matching and selection -->
diff --git a/account_banking/wizard/link_partner.py b/account_banking/wizard/link_partner.py
index c4d9108f6..fc4f83acd 100644
--- a/account_banking/wizard/link_partner.py
+++ b/account_banking/wizard/link_partner.py
@@ -22,6 +22,7 @@
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
 from openerp.addons.account_banking.wizard import banktools
+import ast
 
 class link_partner(orm.TransientModel):
     _name = 'banking.link_partner'
@@ -37,6 +38,16 @@ class link_partner(orm.TransientModel):
         'statement_line_id': fields.many2one(
             'account.bank.statement.line',
             'Statement line', required=True),
+        'amount': fields.related(
+            'statement_line_id', 'amount', type='float',
+            string="Amount", readonly=True),
+        'ref': fields.related(
+            'statement_line_id', 'ref', type='char', size=32,
+            string="Reference", readonly=True),
+        'message': fields.related(
+            'statement_line_id', 'import_transaction_id', 'message',
+            type='char', size=1024,
+            string="Message", readonly=True),
         'remote_account': fields.char(
             'Account number', size=24, readonly=True),
         # Partner values
@@ -50,6 +61,11 @@ class link_partner(orm.TransientModel):
         'phone': fields.char('Phone', size=64),
         'fax': fields.char('Fax', size=64),
         'mobile': fields.char('Mobile', size=64),
+        'is_company': fields.boolean('Is a Company'),
+        }
+    
+    _defaults = {
+        'is_company': True,
         }
     
     def create(self, cr, uid, vals, context=None):
@@ -79,9 +95,19 @@ class link_partner(orm.TransientModel):
             if 'customer' not in vals and statement_line.amount > 0:
                 vals['customer'] = True
 
-            if not vals.get('street'):
-                vals['street'] = transaction.remote_owner_address
-            if not vals.get('street'):
+            address_list = []
+            try:
+                address_list = ast.literal_eval(
+                    transaction.remote_owner_address or [])
+            except ValueError:
+                pass
+            if address_list and not vals.get('street'):
+                vals['street'] = address_list.pop(0)
+            if address_list and not vals.get('street2'):
+                vals['street2'] = address_list.pop(0)
+            if transaction.remote_owner_postalcode and not vals.get('zip'):
+                vals['zip'] = transaction.remote_owner_postalcode
+            if transaction.remote_owner_city and not vals.get('city'):
                 vals['city'] = transaction.remote_owner_city
             if not vals.get('country_id'):
                 vals['country_id'] = banktools.get_country_id(
@@ -101,10 +127,12 @@ class link_partner(orm.TransientModel):
         :param wizard: read record of wizard (with load='_classic_write')
         :param values: the dictionary of partner values that will be updated
         """
-        for field in ['name',
+        for field in ['is_company',
+                      'name',
                       'street', 
                       'street2',
                       'zip',
+                      'city',
                       'country_id',
                       'state_id',
                       'phone',
@@ -126,10 +154,7 @@ class link_partner(orm.TransientModel):
         else:
             wiz_read = self.read(
                 cr, uid, ids[0], context=context, load='_classic_write')
-            partner_fields = self.pool.get(
-                'res.partner')._columns.keys()
             partner_vals = {
-                    'is_company': True,
                     'type': 'default',
                     }
             self.update_partner_values(
diff --git a/account_banking/wizard/link_partner.xml b/account_banking/wizard/link_partner.xml
index c9c2d21c9..bf0c46a67 100644
--- a/account_banking/wizard/link_partner.xml
+++ b/account_banking/wizard/link_partner.xml
@@ -7,15 +7,24 @@
             <field name="model">banking.link_partner</field>
             <field name="arch" type="xml">
                 <form string="Link partner">
-                    <group colspan="4" col="6">
+                    <group colspan="4" col="6" string="Transaction data">
+                        <field name="ref" />
+                        <field name="amount" />
+                        <field name="remote_account" />
+                        <field name="message" colspan="6"/>
+                    </group>
+                    <group colspan="4" col="4" string="Create or link partner">
                         <field name="name"
                                attrs="{'readonly': [('partner_id', '!=', False)]}" />
                         <field name="partner_id"/>
-                        <field name="remote_account" />
+                    </group>
+                    <group colspan="2">
+                        <field name="is_company" />
                     </group>
                     <group colspan="4"
                            string="Address"
-                           attrs="{'invisible': [('partner_id', '!=', False)]}">
+                           attrs="{'invisible': [('partner_id', '!=', False)]}"
+                           col="4">
                         <group colspan="2" col="2">
                             <field name="street"/>
                             <field name="street2"/>
diff --git a/account_banking_nl_clieop/migrations/0.63/post-fill-ir_model_id.py b/account_banking_nl_clieop/migrations/6.1.0.63/post-fill-ir_model_id.py
similarity index 100%
rename from account_banking_nl_clieop/migrations/0.63/post-fill-ir_model_id.py
rename to account_banking_nl_clieop/migrations/6.1.0.63/post-fill-ir_model_id.py
diff --git a/account_banking_nl_clieop/migrations/0.64/post-set-payment-order-type.py b/account_banking_nl_clieop/migrations/6.1.0.64/post-set-payment-order-type.py
similarity index 100%
rename from account_banking_nl_clieop/migrations/0.64/post-set-payment-order-type.py
rename to account_banking_nl_clieop/migrations/6.1.0.64/post-set-payment-order-type.py
diff --git a/account_banking_payment/__openerp__.py b/account_banking_payment/__openerp__.py
index af1ecab2e..a0984398f 100644
--- a/account_banking_payment/__openerp__.py
+++ b/account_banking_payment/__openerp__.py
@@ -32,17 +32,14 @@
     'category': 'Banking addons',
     'depends': [
         'account_banking',
-        'account_payment',
+        'account_banking_payment_export',
         ],
     'data': [
         'view/account_payment.xml',
         'view/banking_transaction_wizard.xml',
         'view/payment_mode.xml',
         'view/payment_mode_type.xml',
-        'view/bank_payment_manual.xml',
-        'data/payment_mode_type.xml',
         'workflow/account_payment.xml',
-        'security/ir.model.access.csv',
     ],
     'description': '''
     This addon adds payment infrastructure to the Banking Addons.
diff --git a/account_banking_payment/model/__init__.py b/account_banking_payment/model/__init__.py
index 9908c8e01..e7ae81724 100644
--- a/account_banking_payment/model/__init__.py
+++ b/account_banking_payment/model/__init__.py
@@ -5,5 +5,4 @@ import payment_mode_type
 import payment_order_create
 import banking_import_transaction
 import banking_transaction_wizard
-import bank_payment_manual
 import banking_import_line
diff --git a/account_banking_payment/model/account_payment.py b/account_banking_payment/model/account_payment.py
index 2e21a6952..608c49dd9 100644
--- a/account_banking_payment/model/account_payment.py
+++ b/account_banking_payment/model/account_payment.py
@@ -115,49 +115,6 @@ class payment_order(orm.Model):
         'payment_order_type': 'payment',
         }
 
-    def launch_wizard(self, cr, uid, ids, context=None):
-        """
-        Search for a wizard to launch according to the type.
-        If type is manual. just confirm the order.
-        Previously (pre-v6) in account_payment/wizard/wizard_pay.py
-        """
-        if context == None:
-            context = {}
-        result = {}
-        orders = self.browse(cr, uid, ids, context)
-        order = orders[0]
-        # check if a wizard is defined for the first order
-        if order.mode.type and order.mode.type.ir_model_id:
-            context['active_ids'] = ids
-            wizard_model = order.mode.type.ir_model_id.model
-            wizard_obj = self.pool.get(wizard_model)
-            wizard_id = wizard_obj.create(cr, uid, {}, context)
-            result = {
-                'name': wizard_obj._description or _('Payment Order Export'),
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': wizard_model,
-                'domain': [],
-                'context': context,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'res_id': wizard_id,
-                'nodestroy': True,
-                }
-        else:
-            # should all be manual orders without type or wizard model
-            for order in orders[1:]:
-                if order.mode.type and order.mode.type.ir_model_id:
-                    raise orm.except_orm(
-                        _('Error'),
-                        _('You can only combine payment orders of the same type')
-                        )
-            # process manual payments
-            wf_service = netsvc.LocalService('workflow')
-            for order_id in ids:
-                wf_service.trg_validate(uid, 'payment.order', order_id, 'sent', cr)
-        return result
-
     def _write_payment_lines(self, cr, uid, ids, **kwargs):
         '''
         ORM method for setting attributes of corresponding payment.line objects.
@@ -303,7 +260,7 @@ class payment_order(orm.Model):
                         'journal_id': order.mode.transfer_journal_id.id,
                         'name': '%s %s' % (labels[order.payment_order_type], 
                                            line.move_line_id.move_id.name),
-                        'reference': '%s%s' % (order.payment_order_type[:3].upper(),
+                        'ref': '%s%s' % (order.payment_order_type[:3].upper(),
                                                line.move_line_id.move_id.name),
                         }, context=context)
 
diff --git a/account_banking_payment/model/payment_line.py b/account_banking_payment/model/payment_line.py
index 3abae5ff0..7b5345ecf 100644
--- a/account_banking_payment/model/payment_line.py
+++ b/account_banking_payment/model/payment_line.py
@@ -151,8 +151,8 @@ class payment_line(orm.Model):
         if torec_move_line.reconcile_partial_id:
             line_ids = [
                 x.id for x in 
-                transit_move_line.reconcile_partial_id.line_partial_ids
-                ] + [torec_move_line.id]
+                torec_move_line.reconcile_partial_id.line_partial_ids
+                ] + [transit_move_line.id]
 
         total = move_line_obj.get_balance(cr, uid, line_ids)
         vals = {
diff --git a/account_banking_payment/model/payment_mode.py b/account_banking_payment/model/payment_mode.py
index f93acec8e..6237593b6 100644
--- a/account_banking_payment/model/payment_mode.py
+++ b/account_banking_payment/model/payment_mode.py
@@ -27,28 +27,9 @@ from openerp.osv import orm, fields
 
 
 class payment_mode(orm.Model):
-    ''' Restoring the payment type from version 5,
-    used to select the export wizard (if any) '''
     _inherit = "payment.mode"
 
-    def suitable_bank_types(self, cr, uid, payment_mode_id=None, context=None):
-        """ Reinstates functional code for suitable bank type filtering.
-        Current code in account_payment is disfunctional.
-        """
-        res = []
-        payment_mode = self.browse(
-            cr, uid, payment_mode_id, context)
-        if (payment_mode and payment_mode.type and
-            payment_mode.type.suitable_bank_types):
-            res = [type.code for type in payment_mode.type.suitable_bank_types]
-        return res
-
     _columns = {
-        'type': fields.many2one(
-            'payment.mode.type', 'Payment type',
-            required=True,
-            help='Select the Payment Type for the Payment Mode.'
-            ),
         'transfer_account_id': fields.many2one(
             'account.account', 'Transfer account',
             domain=[('type', '=', 'other'),
diff --git a/account_banking_payment/model/payment_mode_type.py b/account_banking_payment/model/payment_mode_type.py
index 51de7ca66..572cce869 100644
--- a/account_banking_payment/model/payment_mode_type.py
+++ b/account_banking_payment/model/payment_mode_type.py
@@ -27,30 +27,9 @@ from openerp.osv import orm, fields
 
 
 class payment_mode_type(orm.Model):
-    _name = 'payment.mode.type'
-    _description = 'Payment Mode Type'
+    _inherit = 'payment.mode.type'
+
     _columns = {
-        'name': fields.char(
-            'Name', size=64, required=True,
-            help='Payment Type'
-            ),
-        'code': fields.char(
-            'Code', size=64, required=True,
-            help='Specify the Code for Payment Type'
-            ),
-        # Setting suitable_bank_types to required pending
-        # https://bugs.launchpad.net/openobject-addons/+bug/786845
-        'suitable_bank_types': fields.many2many(
-            'res.partner.bank.type',
-            'bank_type_payment_type_rel',
-            'pay_type_id','bank_type_id',
-            'Suitable bank types', required=True),
-        'ir_model_id': fields.many2one(
-            'ir.model', 'Payment wizard',
-            help=('Select the Payment Wizard for payments of this type. '
-                  'Leave empty for manual processing'),
-            domain=[('osv_memory', '=', True)],
-            ),
         'payment_order_type': fields.selection(
             [('payment', 'Payment'),('debit', 'Direct debit')],
             'Payment order type', required=True,
diff --git a/account_banking_payment/model/payment_order_create.py b/account_banking_payment/model/payment_order_create.py
index 68a0d22f4..c7ac88790 100644
--- a/account_banking_payment/model/payment_order_create.py
+++ b/account_banking_payment/model/payment_order_create.py
@@ -23,9 +23,7 @@
 #
 ##############################################################################
 
-from datetime import datetime
 from openerp.osv import orm, fields
-from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
 from openerp.tools.translate import _
 
 
diff --git a/account_banking_payment/view/account_payment.xml b/account_banking_payment/view/account_payment.xml
index 4f7601332..c26847abf 100644
--- a/account_banking_payment/view/account_payment.xml
+++ b/account_banking_payment/view/account_payment.xml
@@ -17,10 +17,6 @@
                             'invisible':[('state','!=','draft')]
                         }</attribute>
                     </xpath>
-                    <xpath expr="//button[@string='Make Payments']"
-                           position="attributes">
-                        <attribute name="name">launch_wizard</attribute>
-                    </xpath>
                     <!-- Communication only used for 'structured' communication -->
                     <xpath expr="//field[@name='line_ids']/form//field[@name='communication']"
                            position="attributes">
diff --git a/account_banking_payment/view/bank_payment_manual.xml b/account_banking_payment/view/bank_payment_manual.xml
deleted file mode 100644
index 538862ca3..000000000
--- a/account_banking_payment/view/bank_payment_manual.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_payment_manual_form" model="ir.ui.view">
-            <field name="name">Form for manual payment wizard</field>
-            <field name="model">payment.manual</field>
-            <field name="arch" type="xml">
-                <form string="Manual payment">
-                    <label string="Payment order(s) have been set to 'sent'"/>
-                    <button special="cancel" icon="gtk-ok" string="OK"/>
-                </form>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/account_banking_payment/view/payment_mode.xml b/account_banking_payment/view/payment_mode.xml
index bb3c19ff4..c46823c8d 100644
--- a/account_banking_payment/view/payment_mode.xml
+++ b/account_banking_payment/view/payment_mode.xml
@@ -8,10 +8,9 @@
         <record id="view_payment_mode_form_inherit" model="ir.ui.view">
             <field name="name">payment.mode.form.inherit</field>
             <field name="model">payment.mode</field>
-            <field name="inherit_id" ref="account_payment.view_payment_mode_form"/>
+            <field name="inherit_id" ref="account_banking_payment_export.view_payment_mode_form_inherit"/>
             <field name="arch" type="xml">
-                <field name="company_id" position="after">
-                    <field name="type"/>
+                <field name="type" position="after">
                     <group colspan="4" col="4">
                         <group colspan="2">
                             <separator colspan="2"
diff --git a/account_banking_payment/view/payment_mode_type.xml b/account_banking_payment/view/payment_mode_type.xml
index 47a5121c9..eb8ce821a 100644
--- a/account_banking_payment/view/payment_mode_type.xml
+++ b/account_banking_payment/view/payment_mode_type.xml
@@ -2,29 +2,14 @@
 <openerp>
     <data>
 
-        <record id="view_payment_mode_tree_inherit" model="ir.ui.view">
-            <field name="name">payment.mode.tree.inherit</field>
-            <field name="model">payment.mode</field>
-            <field name="inherit_id" ref="account_payment.view_payment_mode_tree"/>
-            <field name="arch" type="xml">
-                <field name="company_id" position="after">
-                    <field name="type"/>
-                </field>
-            </field>
-        </record>
-
-	<!-- basic view for payment mode type -->
-        <record model="ir.ui.view" id="view_payment_mode_type_form">
+        <record model="ir.ui.view" id="view_payment_mode_type_form_inherit">
             <field name="name">view.payment.mode.type.form</field>
             <field name="model">payment.mode.type</field>
+            <field name="inherit_id" ref="account_banking_payment_export.view_payment_mode_type_form"/>
             <field name="arch" type="xml">
-                <form string="Payment mode">
-		    <field name="name" />
-		    <field name="code" />
-		    <field name="suitable_bank_types"/>
-		    <field name="payment_order_type"/>
-		    <field name="ir_model_id"/>
-                </form>
+                <field name="suitable_bank_types" position="after">    
+                    <field name="payment_order_type"/>
+                </field>
             </field>
         </record>
 
diff --git a/account_banking_payment/workflow/account_payment.xml b/account_banking_payment/workflow/account_payment.xml
index 3db2f9fb6..510a6610f 100644
--- a/account_banking_payment/workflow/account_payment.xml
+++ b/account_banking_payment/workflow/account_payment.xml
@@ -29,6 +29,12 @@ write({'state':'rejected'})</field>
             <field name="act_to" ref="account_banking.act_sent"/>
             <field name="signal">sent</field>
         </record>
+        <!-- the done signal continues to work but goes to sent -->
+        <record id="account_banking.trans_open_done" model="workflow.transition">
+            <field name="act_from" ref="account_payment.act_open"/>
+            <field name="act_to" ref="account_banking.act_sent"/>
+            <field name="signal">done</field>
+        </record>
         <!-- From sent straight to sent_wait -->
         <record id="account_banking.trans_sent_sent_wait" model="workflow.transition">
             <field name="act_from" ref="account_banking.act_sent"/>
diff --git a/account_banking_payment_export/__init__.py b/account_banking_payment_export/__init__.py
new file mode 100644
index 000000000..36ec7207a
--- /dev/null
+++ b/account_banking_payment_export/__init__.py
@@ -0,0 +1 @@
+from . import model
\ No newline at end of file
diff --git a/account_banking_payment_export/__openerp__.py b/account_banking_payment_export/__openerp__.py
new file mode 100644
index 000000000..8640f5bb3
--- /dev/null
+++ b/account_banking_payment_export/__openerp__.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
+#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
+#            
+#    All other contributions are (C) by their respective contributors
+#
+#    All Rights Reserved
+#
+#    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': 'Account Banking - Payments Export Infrastructure',
+    'version': '0.1.164',
+    'license': 'AGPL-3',
+    'author': 'Banking addons community',
+    'website': 'https://launchpad.net/banking-addons',
+    'category': 'Banking addons',
+    'depends': [
+        'account_payment',
+        'base_iban',  # for manual_bank_tranfer
+        ],
+    'conflicts': [
+        # lp:account-payment/account_payment_extension also adds
+        # a type field to payment.mode, with a very similar purpose.
+        # We can't add a dependency on account_payment_extension here
+        # because account_payment_extension adds many other features
+        # that probably conflict with other parts of lp:banking-addons.
+        # Proposal to resolve: make account_payment_extension depend
+        # on the present account_banking_payment_export module.
+        'account_payment_extension',
+        ],
+    'data': [
+        'view/account_payment.xml',
+        'view/bank_payment_manual.xml',
+        'view/payment_mode.xml',
+        'view/payment_mode_type.xml',
+        'data/payment_mode_type.xml',
+        'security/ir.model.access.csv',
+    ],
+    'description': '''
+        Infrastructure to export payment orders.
+
+        This technical module provides the base infrastructure to export 
+        payment orders for electronic banking. It provides the following
+        technical features:
+        * a new payment.mode.type model
+        * payment.mode now has a mandatory type
+        * a better implementation of payment_mode.suitable_bank_types() based on payment.mode.type
+        * the "make payment" button launches a wizard depending on the payment.mode.type
+        * a manual payment mode type is provided as an example, with a default "do nothing" wizard
+    ''',
+    'auto_install': True,
+    'installable': True,
+}
diff --git a/account_banking_payment/data/payment_mode_type.xml b/account_banking_payment_export/data/payment_mode_type.xml
similarity index 74%
rename from account_banking_payment/data/payment_mode_type.xml
rename to account_banking_payment_export/data/payment_mode_type.xml
index 96b0e0c56..c1e4a4abd 100644
--- a/account_banking_payment/data/payment_mode_type.xml
+++ b/account_banking_payment_export/data/payment_mode_type.xml
@@ -2,13 +2,13 @@
 <openerp>
     <data>
         <!-- Add manual bank transfer as default payment option -->
-        <record model="payment.mode.type" id="account_banking.manual_bank_tranfer">
+        <record model="payment.mode.type" id="manual_bank_tranfer">
             <field name="name">Manual Bank Transfer</field>
             <field name="code">BANKMAN</field>
             <field name="suitable_bank_types"
                 eval="[(6,0,[ref('base.bank_normal'),ref('base_iban.bank_iban'),])]" />
             <field name="ir_model_id"
-                   ref="account_banking_payment.model_payment_manual"/>
+                   ref="model_payment_manual"/>
         </record>
     </data>
 </openerp>
diff --git a/account_banking_payment_export/model/__init__.py b/account_banking_payment_export/model/__init__.py
new file mode 100644
index 000000000..5c7e00141
--- /dev/null
+++ b/account_banking_payment_export/model/__init__.py
@@ -0,0 +1,5 @@
+from . import account_payment
+from . import bank_payment_manual
+from . import payment_mode
+from . import payment_mode_type
+from . import payment_order_create
\ No newline at end of file
diff --git a/account_banking_payment_export/model/account_payment.py b/account_banking_payment_export/model/account_payment.py
new file mode 100644
index 000000000..e5a14e8aa
--- /dev/null
+++ b/account_banking_payment_export/model/account_payment.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
+#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
+#            
+#    All other contributions are (C) by their respective contributors
+#
+#    All Rights Reserved
+#
+#    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 orm
+from openerp.tools.translate import _
+from openerp import netsvc
+
+
+class payment_order(orm.Model):
+    _inherit = 'payment.order'
+
+    def launch_wizard(self, cr, uid, ids, context=None):
+        """
+        Search for a wizard to launch according to the type.
+        If type is manual. just confirm the order.
+        Previously (pre-v6) in account_payment/wizard/wizard_pay.py
+        """
+        if context == None:
+            context = {}
+        result = {}
+        orders = self.browse(cr, uid, ids, context)
+        order = orders[0]
+        # check if a wizard is defined for the first order
+        if order.mode.type and order.mode.type.ir_model_id:
+            context['active_ids'] = ids
+            wizard_model = order.mode.type.ir_model_id.model
+            wizard_obj = self.pool.get(wizard_model)
+            wizard_id = wizard_obj.create(cr, uid, {}, context)
+            result = {
+                'name': wizard_obj._description or _('Payment Order Export'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': wizard_model,
+                'domain': [],
+                'context': context,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'res_id': wizard_id,
+                'nodestroy': True,
+                }
+        else:
+            # should all be manual orders without type or wizard model
+            for order in orders[1:]:
+                if order.mode.type and order.mode.type.ir_model_id:
+                    raise orm.except_orm(
+                        _('Error'),
+                        _('You can only combine payment orders of the same type')
+                        )
+            # process manual payments
+            wf_service = netsvc.LocalService('workflow')
+            for order_id in ids:
+                wf_service.trg_validate(uid, 'payment.order', order_id, 'done', cr)
+        return result
diff --git a/account_banking_payment/model/bank_payment_manual.py b/account_banking_payment_export/model/bank_payment_manual.py
similarity index 58%
rename from account_banking_payment/model/bank_payment_manual.py
rename to account_banking_payment_export/model/bank_payment_manual.py
index 700bf0210..8cfa35d53 100644
--- a/account_banking_payment/model/bank_payment_manual.py
+++ b/account_banking_payment_export/model/bank_payment_manual.py
@@ -24,7 +24,7 @@
 ##############################################################################
 
 '''
-This module contains a single "wizard" for including a 'sent' state for manual
+This module contains a single "wizard" for confirming manual
 bank transfers.
 '''
 
@@ -34,20 +34,26 @@ from openerp import netsvc
 
 class payment_manual(orm.TransientModel):
     _name = 'payment.manual'
-    _description = 'Set payment orders to \'sent\' manually'
-
-    def default_get(self, cr, uid, fields_list, context=None):
-        if context and context.get('active_ids'):
-            payment_order_obj = self.pool.get('payment.order')
-            wf_service = netsvc.LocalService('workflow')
-            for order_id in context['active_ids']:
-                wf_service.trg_validate(
-                    uid, 'payment.order', order_id, 'sent', cr)
-        return super(payment_manual, self).default_get(
-            cr, uid, fields_list, context=None)
+    _description = 'Send payment order(s) manually'
 
     _columns = {
-        # dummy field, to trigger a call to default_get
-        'name': fields.char('Name', size=1),
+        'payment_order_ids': fields.many2many('payment.order',
+            'wiz_manual_payorders_rel', 'wizard_id', 'payment_order_id',
+            'Payment orders', readonly=True),
         }
 
+    def create(self, cr, uid, vals, context=None):
+        payment_order_ids = context.get('active_ids', [])
+        vals.update({
+            'payment_order_ids': [[6, 0, payment_order_ids]],
+        })
+        return super(payment_manual, self).create(cr, uid,
+            vals, context=context)
+
+    def button_ok(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService('workflow')
+        for wiz in self.browse(cr, uid, ids, context=context):
+            for order_id in wiz.payment_order_ids:
+                wf_service.trg_validate(
+                    uid, 'payment.order', order_id.id, 'done', cr)
+        return {'type': 'ir.actions.act_window_close'}
diff --git a/account_banking_payment_export/model/payment_mode.py b/account_banking_payment_export/model/payment_mode.py
new file mode 100644
index 000000000..0d85d3aa3
--- /dev/null
+++ b/account_banking_payment_export/model/payment_mode.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
+#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
+#            
+#    All other contributions are (C) by their respective contributors
+#
+#    All Rights Reserved
+#
+#    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 orm, fields
+
+
+class payment_mode(orm.Model):
+    ''' Restoring the payment type from version 5,
+    used to select the export wizard (if any) '''
+    _inherit = "payment.mode"
+
+    def suitable_bank_types(self, cr, uid, payment_mode_id=None, context=None):
+        """ Reinstates functional code for suitable bank type filtering.
+        Current code in account_payment is disfunctional.
+        """
+        res = []
+        payment_mode = self.browse(
+            cr, uid, payment_mode_id, context)
+        if (payment_mode and payment_mode.type and
+            payment_mode.type.suitable_bank_types):
+            res = [t.code for t in payment_mode.type.suitable_bank_types]
+        return res
+
+    _columns = {
+        'type': fields.many2one(
+            'payment.mode.type', 'Payment type',
+            required=True,
+            help='Select the Payment Type for the Payment Mode.'
+            ),
+        }
diff --git a/account_banking_payment_export/model/payment_mode_type.py b/account_banking_payment_export/model/payment_mode_type.py
new file mode 100644
index 000000000..dbc60d5ab
--- /dev/null
+++ b/account_banking_payment_export/model/payment_mode_type.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
+#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
+#            
+#    All other contributions are (C) by their respective contributors
+#
+#    All Rights Reserved
+#
+#    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 orm, fields
+
+
+class payment_mode_type(orm.Model):
+    _name = 'payment.mode.type'
+    _description = 'Payment Mode Type'
+    _columns = {
+        'name': fields.char(
+            'Name', size=64, required=True,
+            help='Payment Type'
+            ),
+        'code': fields.char(
+            'Code', size=64, required=True,
+            help='Specify the Code for Payment Type'
+            ),
+        'suitable_bank_types': fields.many2many(
+            'res.partner.bank.type',
+            'bank_type_payment_type_rel',
+            'pay_type_id','bank_type_id',
+            'Suitable bank types', required=True),
+        'ir_model_id': fields.many2one(
+            'ir.model', 'Payment wizard',
+            help=('Select the Payment Wizard for payments of this type. '
+                  'Leave empty for manual processing'),
+            domain=[('osv_memory', '=', True)],
+            ),
+    }
+    
+    def _auto_init(self, cr, context=None):
+        r = super(payment_mode_type, self)._auto_init(cr, context=context)
+        # migrate xmlid from manual_bank_transfer to avoid dependency on account_banking
+        cr.execute("""UPDATE ir_model_data SET module='account_banking_payment_export'
+                      WHERE module='account_banking' AND 
+                            name='manual_bank_tranfer' AND 
+                            model='payment.mode.type'""")
+        return r
diff --git a/account_banking_payment_export/model/payment_order_create.py b/account_banking_payment_export/model/payment_order_create.py
new file mode 100644
index 000000000..278d4327a
--- /dev/null
+++ b/account_banking_payment_export/model/payment_order_create.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 ACSONE SA/NV (<http://acsone.eu>);.
+#            
+#    All other contributions are (C) by their respective contributors
+#
+#    All Rights Reserved
+#
+#    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 orm
+
+
+class payment_order_create(orm.TransientModel):
+    _inherit = 'payment.order.create'
+
+    def create_payment(self, cr, uid, ids, context=None):
+        '''This method adapts the core create_payment() 
+        to pass the payment mode to line2bank() through the context,
+        so it is in turn propagated to suitable_bank_types().
+        
+        This is necessary because the core does not propagate the payment mode to line2bank: t = None in
+        http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/view/head:/account_payment/wizard/account_payment_order.py#L72
+        
+        Hack idea courtesy Stefan Rijnhart.
+        '''
+        if context is None:
+            context = {}
+        order_obj = self.pool.get('payment.order')
+        payment = order_obj.browse(cr, uid, context['active_id'], context=context)
+        context['_fix_payment_mode_id'] = payment.mode.id
+        return super(payment_order_create, self).create_payment(cr, uid, ids, context=context)
+    
+
+class account_move_line(orm.Model):
+    _inherit = 'account.move.line'
+    
+    def line2bank(self, cr, uid, ids, payment_mode_id=None, context=None):
+        '''Obtain payment_type from context, see create_payment above'''
+        if context is None:
+            context = {}
+        payment_mode_id = payment_mode_id or context.get('_fix_payment_mode_id')
+        return super(account_move_line, self).line2bank(cr, uid, ids, payment_mode_id, context=context)
+
diff --git a/account_banking_payment/security/ir.model.access.csv b/account_banking_payment_export/security/ir.model.access.csv
similarity index 100%
rename from account_banking_payment/security/ir.model.access.csv
rename to account_banking_payment_export/security/ir.model.access.csv
diff --git a/account_banking_payment_export/view/account_payment.xml b/account_banking_payment_export/view/account_payment.xml
new file mode 100644
index 000000000..a8e7ed547
--- /dev/null
+++ b/account_banking_payment_export/view/account_payment.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- restore wizard functionality when making payments
+          -->
+
+        <record id="view_banking_payment_order_form_1" model="ir.ui.view">
+            <field name="name">account.payment.order.form.banking-1</field>
+            <field name="inherit_id" ref="account_payment.view_payment_order_form" />
+            <field name="model">payment.order</field>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//button[@string='Make Payments']"
+                           position="attributes">
+                        <attribute name="name">launch_wizard</attribute>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/account_banking_payment_export/view/bank_payment_manual.xml b/account_banking_payment_export/view/bank_payment_manual.xml
new file mode 100644
index 000000000..e350c9b6f
--- /dev/null
+++ b/account_banking_payment_export/view/bank_payment_manual.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_payment_manual_form" model="ir.ui.view">
+            <field name="name">Form for manual payment wizard</field>
+            <field name="model">payment.manual</field>
+            <field name="arch" type="xml">
+                <form string="Manual payment" version="7.0">
+                    <label string="Please execute payment order manually, and click OK when succesfully sent."/>
+                    <footer>
+	                    <button name="button_ok" type="object" string="OK" class="oe_highlight"/>
+	                    <button special="cancel" string="Cancel" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/account_banking_payment_export/view/payment_mode.xml b/account_banking_payment_export/view/payment_mode.xml
new file mode 100644
index 000000000..98fa44475
--- /dev/null
+++ b/account_banking_payment_export/view/payment_mode.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- 
+             Add the payment mode type and transfer settings
+        -->
+        <record id="view_payment_mode_form_inherit" model="ir.ui.view">
+            <field name="name">payment.mode.form.inherit</field>
+            <field name="model">payment.mode</field>
+            <field name="inherit_id" ref="account_payment.view_payment_mode_form"/>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <field name="type"/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/account_banking_payment_export/view/payment_mode_type.xml b/account_banking_payment_export/view/payment_mode_type.xml
new file mode 100644
index 000000000..682265a2d
--- /dev/null
+++ b/account_banking_payment_export/view/payment_mode_type.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_payment_mode_tree_inherit" model="ir.ui.view">
+            <field name="name">payment.mode.tree.inherit</field>
+            <field name="model">payment.mode</field>
+            <field name="inherit_id" ref="account_payment.view_payment_mode_tree"/>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <field name="type"/>
+                </field>
+            </field>
+        </record>
+
+        <!-- basic view for payment mode type -->
+        <record model="ir.ui.view" id="view_payment_mode_type_form">
+            <field name="name">view.payment.mode.type.form</field>
+            <field name="model">payment.mode.type</field>
+            <field name="arch" type="xml">
+                <form string="Payment mode">
+                    <field name="name" />
+                    <field name="code" />
+                    <field name="suitable_bank_types"/>
+                    <field name="ir_model_id"/>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/account_banking_sepa_credit_transfer/__openerp__.py b/account_banking_sepa_credit_transfer/__openerp__.py
index 35891b16c..751058ea2 100644
--- a/account_banking_sepa_credit_transfer/__openerp__.py
+++ b/account_banking_sepa_credit_transfer/__openerp__.py
@@ -26,7 +26,7 @@
     'author': 'Akretion',
     'website': 'http://www.akretion.com',
     'category': 'Banking addons',
-    'depends': ['account_banking_payment'],
+    'depends': ['account_banking_payment_export'],
     'data': [
         'account_banking_sepa_view.xml',
         'wizard/export_sepa_view.xml',
diff --git a/account_banking_sepa_credit_transfer/account_banking_sepa.py b/account_banking_sepa_credit_transfer/account_banking_sepa.py
index decb6a532..432b59267 100644
--- a/account_banking_sepa_credit_transfer/account_banking_sepa.py
+++ b/account_banking_sepa_credit_transfer/account_banking_sepa.py
@@ -20,8 +20,6 @@
 ##############################################################################
 
 from openerp.osv import orm, fields
-import time
-from openerp.tools.translate import _
 from openerp.addons.decimal_precision import decimal_precision as dp
 
 
diff --git a/account_banking_sepa_credit_transfer/account_banking_sepa_view.xml b/account_banking_sepa_credit_transfer/account_banking_sepa_view.xml
index fca4ba4d2..1fdab318f 100644
--- a/account_banking_sepa_credit_transfer/account_banking_sepa_view.xml
+++ b/account_banking_sepa_credit_transfer/account_banking_sepa_view.xml
@@ -65,7 +65,7 @@
 
 
 <menuitem id="menu_account_banking_sepa"
-          parent="account_banking.menu_finance_banking_actions"
+          parent="account_payment.menu_main_payment"
           action="action_account_banking_sepa"
           sequence="15"
           />
diff --git a/account_banking_sepa_credit_transfer/wizard/export_sepa.py b/account_banking_sepa_credit_transfer/wizard/export_sepa.py
index f1583fc68..598962dd6 100644
--- a/account_banking_sepa_credit_transfer/wizard/export_sepa.py
+++ b/account_banking_sepa_credit_transfer/wizard/export_sepa.py
@@ -101,8 +101,6 @@ class banking_export_sepa_wizard(orm.TransientModel):
         '''
         Creates the SEPA Credit Transfer file. That's the important code !
         '''
-        payment_order_obj = self.pool.get('payment.order')
-
         sepa_export = self.browse(cr, uid, ids[0], context=context)
 
         my_company_name = sepa_export.payment_order_ids[0].mode.bank_id.partner_id.name
@@ -211,8 +209,9 @@ class banking_export_sepa_wizard(orm.TransientModel):
         debtor_account_iban.text = my_company_iban
         debtor_agent = etree.SubElement(payment_info, 'DbtrAgt')
         debtor_agent_institution = etree.SubElement(debtor_agent, 'FinInstnId')
-        debtor_agent_bic = etree.SubElement(debtor_agent_institution, bic_xml_tag)
-        debtor_agent_bic.text = my_company_bic
+        if my_company_bic:
+            debtor_agent_bic = etree.SubElement(debtor_agent_institution, bic_xml_tag)
+            debtor_agent_bic.text = my_company_bic
         charge_bearer = etree.SubElement(payment_info, 'ChrgBr')
         charge_bearer.text = sepa_export.charge_bearer
 
@@ -238,10 +237,11 @@ class banking_export_sepa_wizard(orm.TransientModel):
                 amount_control_sum += line.amount_currency
                 creditor_agent = etree.SubElement(credit_transfer_transaction_info, 'CdtrAgt')
                 creditor_agent_institution = etree.SubElement(creditor_agent, 'FinInstnId')
-                creditor_agent_bic = etree.SubElement(creditor_agent_institution, bic_xml_tag)
                 if not line.bank_id:
                     raise orm.except_orm(_('Error :'), _("Missing Bank Account on invoice '%s' (payment order line reference '%s').") %(line.ml_inv_ref.number, line.name))
-                creditor_agent_bic.text = line.bank_id.bank.bic
+                if line.bank_id.bank.bic:
+                    creditor_agent_bic = etree.SubElement(creditor_agent_institution, bic_xml_tag)
+                    creditor_agent_bic.text = line.bank_id.bank.bic
                 creditor = etree.SubElement(credit_transfer_transaction_info, 'Cdtr')
                 creditor_name = etree.SubElement(creditor, 'Nm')
                 creditor_name.text = self._limit_size(cr, uid, line.partner_id.name, name_maxsize, context=context)
@@ -328,12 +328,15 @@ class banking_export_sepa_wizard(orm.TransientModel):
 
     def save_sepa(self, cr, uid, ids, context=None):
         '''
-        Save the SEPA PAIN: mark all payments in the file as 'sent'.
+        Save the SEPA PAIN: send the done signal to all payment orders in the file.
+        With the default workflow, they will transition to 'done', while with the
+        advanced workflow in account_banking_payment they will transition to 'sent'
+        waiting reconciliation.
         '''
         sepa_export = self.browse(cr, uid, ids[0], context=context)
-        sepa_file = self.pool.get('banking.export.sepa').write(cr, uid,
+        self.pool.get('banking.export.sepa').write(cr, uid,
             sepa_export.file_id.id, {'state': 'sent'}, context=context)
         wf_service = netsvc.LocalService('workflow')
         for order in sepa_export.payment_order_ids:
-            wf_service.trg_validate(uid, 'payment.order', order.id, 'sent', cr)
+            wf_service.trg_validate(uid, 'payment.order', order.id, 'done', cr)
         return {'type': 'ir.actions.act_window_close'}
diff --git a/account_direct_debit/__openerp__.py b/account_direct_debit/__openerp__.py
index f5791122b..5cc16dcac 100644
--- a/account_direct_debit/__openerp__.py
+++ b/account_direct_debit/__openerp__.py
@@ -25,7 +25,7 @@
     'author': ['Therp BV', 'Smile'],
     'website': 'https://launchpad.net/banking-addons',
     'category': 'Banking addons',
-    'depends': ['account_banking'],
+    'depends': ['account_banking_payment'],
     'data': [
         'view/account_payment.xml',
         'view/account_invoice.xml',
diff --git a/account_direct_debit/migrations/7.0.2/post-migration.py b/account_direct_debit/migrations/7.0.2/post-migration.py
new file mode 100644
index 000000000..a6ec3af59
--- /dev/null
+++ b/account_direct_debit/migrations/7.0.2/post-migration.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Therp BV (<http://therp.nl>).
+#            
+#    All other contributions are (C) by their respective contributors
+#
+#    All Rights Reserved
+#
+#    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/>.
+#
+##############################################################################
+
+def migrate(cr, version):
+    if not version:
+        return
+    cr.execute(
+        """
+        UPDATE payment_line
+        SET transit_move_line_id = banking_addons_61_debit_move_line_id
+        """)
+    cr.execute(
+        """
+        ALTER TABLE "payment_line"
+        DROP COLUMN "banking_addons_61_debit_move_line_id"
+        """
+        )
diff --git a/account_direct_debit/migrations/7.0.2/pre-migration.py b/account_direct_debit/migrations/7.0.2/pre-migration.py
index 3dd113401..a167bca53 100644
--- a/account_direct_debit/migrations/7.0.2/pre-migration.py
+++ b/account_direct_debit/migrations/7.0.2/pre-migration.py
@@ -22,6 +22,9 @@
 #
 ##############################################################################
 
+import logging
+logger = logging.getLogger()
+
 def rename_columns(cr, column_spec):
     """
     Rename table columns. Taken from OpenUpgrade.
@@ -41,17 +44,8 @@ def migrate(cr, version):
     if not version:
         return
 
-    # workflow state moved to another module
-    cr.execute(
-        """
-        UPDATE ir_model_data 
-        SET module = 'account_banking_payment'
-        WHERE name = 'trans_done_sent'
-        AND module = 'account_direct_debit'
-        """)
-
     # rename field debit_move_line_id
     rename_columns(cr, {
             'payment_line': [
-                ('debit_move_line_id', 'transit_move_line_id'),
+                ('debit_move_line_id', 'banking_addons_61_debit_move_line_id'),
                 ]})
diff --git a/base_iban_bic_not_required/__init__.py b/base_iban_bic_not_required/__init__.py
new file mode 100644
index 000000000..16e8b082f
--- /dev/null
+++ b/base_iban_bic_not_required/__init__.py
@@ -0,0 +1 @@
+import model
diff --git a/base_iban_bic_not_required/__openerp__.py b/base_iban_bic_not_required/__openerp__.py
new file mode 100644
index 000000000..08a6fb582
--- /dev/null
+++ b/base_iban_bic_not_required/__openerp__.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Therp BV (<http://therp.nl>).
+#    All Rights Reserved
+#
+#    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': 'IBAN - Bic not required',
+    'version': '0.1',
+    'license': 'AGPL-3',
+    'author': 'Banking addons community',
+    'website': 'https://launchpad.net/banking-addons',
+    'category': 'Banking addons',
+    'depends': [
+        'base_iban',
+        ],
+    'description': '''
+The account_iban module in OpenERP mandates the presence of a BIC
+code on an IBAN account number through a constraint. However, as of
+Februari 2012 there is a resolution from the EU that drops this requirement
+(see section 8 of [1]). This module reverts the constraint on BICs in the
+base_iban module.
+
+See also https://bugs.launchpad.net/openobject-addons/+bug/933472
+
+[1] http://www.europarl.europa.eu/sides/getDoc.do?pubRef=-//EP//TEXT+TA+P7-TA-2012-0037+0+DOC+XML+V0//EN&language=EN#BKMD-9
+    ''',
+    'data': [
+        'data/res_partner_bank_type_field.xml',
+        ],
+    'installable': True,
+}
diff --git a/base_iban_bic_not_required/data/res_partner_bank_type_field.xml b/base_iban_bic_not_required/data/res_partner_bank_type_field.xml
new file mode 100644
index 000000000..274347a4d
--- /dev/null
+++ b/base_iban_bic_not_required/data/res_partner_bank_type_field.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="base_iban.bank_swift_field"
+                model="res.partner.bank.type.field">
+            <field eval="False" name="required"/>
+        </record>
+    </data>
+</openerp>
diff --git a/base_iban_bic_not_required/model/__init__.py b/base_iban_bic_not_required/model/__init__.py
new file mode 100644
index 000000000..3f2925496
--- /dev/null
+++ b/base_iban_bic_not_required/model/__init__.py
@@ -0,0 +1 @@
+import res_partner_bank
diff --git a/base_iban_bic_not_required/model/res_partner_bank.py b/base_iban_bic_not_required/model/res_partner_bank.py
new file mode 100644
index 000000000..126e628bd
--- /dev/null
+++ b/base_iban_bic_not_required/model/res_partner_bank.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Therp BV (<http://therp.nl>).
+#    All Rights Reserved
+#
+#    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 orm
+
+
+class res_partner_bank(orm.Model):
+    _inherit = 'res.partner.bank'
+
+    def _check_bank(self, cr, uid, ids, context=None):
+        #suppress base_iban's constraint to enforce BICs for IBANs
+        #workaround for lp:933472
+        return True
+
+    # Redefine constraint to update its function reference
+    _constraints = [
+        (_check_bank, 
+         '\nPlease define BIC/Swift code on bank for bank '
+         'type IBAN Account to make valid payments',
+         ['bic'])
+    ]