Merge lp:~akretion-team/banking-addons/61-sepa-direct-debit into lp:banking-addons/6.1

[Alexis de Lattre]

This is the 6.1 equivalent of my merge on the 7.0 branch.

This branch contains :
- support for SEPA direct debit
- the work I carried out with Luc de Meyer (Noviat) during a code sprint on November 21st to get the additionnal features that were present in Luc's module account_pain for SEPA credit transfer (including the "Initiating Party Issuer", which is required by a few countries including Belgium and structured remittance info)
- the module account_banking_pain_base : this module allows to share as much code as possible between the module for credit transfers and the module for direct debits

P.S. : 38 days left before SEPA migration deadline !

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hi Alexis,

Is the 7.0 branch this one? https://code.launchpad.net/~akretion-team/banking-addons/70-sepa-direct-debit/+merge/195139
Is the 6.1 branch "work in progress" like the 7.0 one?

Neat piece of work! LGTM so far

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Oh, just saw this one https://code.launchpad.net/~akretion-team/banking-addons/70-sepa-trf-dd-updates/+merge/200019 for the 7.0 version

review: Approve

[lp:~akretion-team/banking-addons/61-sepa-direct-debit]

191. By Alexis de Lattre on 2014-02-04

FIX to avoid a crash when adding payment lines via "Select invoices to collect" with date_preferred == fixed
This was caused by a wrong field name : payment.date_planned -> payment.date_scheduled

[Stefan Rijnhart (Opener) (stefan-opener)]

It seems this still needs updating with the results from the review of the 7.0 branch https://code.launchpad.net/~akretion-team/banking-addons/70-sepa-trf-dd-updates/+merge/200019. Otherwise, looks good obviously.

There are some seemingly unrelated changes in account_banking/account_banking.py, but they all look like improvements to me. The changes to exception handling in this file are probably trying to fix the same issue that this branch addresses: https://code.launchpad.net/~therp-nl/banking-addons/6.1-no_unnecessary_raise/+merge/205647.

review: Needs Fixing

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

A month without activity, I set this as WIP

[lp:~akretion-team/banking-addons/61-sepa-direct-debit]

192. By Alexis de Lattre on 2014-03-19

Add storno field in payment line views.
Add menu entry for payment lines.
Remove readonly=True for storno field, because we may want to set it by hand if we don't have automatic import of bank statements.

Unmerged revisions

192. By Alexis de Lattre on 2014-03-19

Add storno field in payment line views.
Add menu entry for payment lines.
Remove readonly=True for storno field, because we may want to set it by hand if we don't have automatic import of bank statements.

191. By Alexis de Lattre on 2014-02-04

FIX to avoid a crash when adding payment lines via "Select invoices to collect" with date_preferred == fixed
This was caused by a wrong field name : payment.date_planned -> payment.date_scheduled

190. By Alexis de Lattre on 2013-12-24

Backport all SEPA-related modules from current lp:~akretion-team/banking-addons/70-sepa-trf-dd-updates (7.0) to 6.1
Avoid bloacking error message when there is no transfer journal/account on payment mode.

189. By Alexis de Lattre on 2013-11-20

Add account_banking_sepa_direct_debit, backported to OpenERP 6.1.

188. By Alexis de Lattre on 2013-11-20

[FIX] Allow offline usage
payment_order_type on payment.order is readonly when not in draft state.

=== modified file 'account_banking/account_banking.py'
--- account_banking/account_banking.py	2014-02-10 20:13:22 +0000
+++ account_banking/account_banking.py	2014-03-19 00:47:00 +0000
@@ -1057,6 +1057,7 @@
         'payment_order_type': fields.selection(
             [('payment', 'Payment'),('debit', 'Direct debit')],
             'Payment order type', required=True,
+            readonly=True, states={'draft': [('readonly', False)]},
             ),
         'date_sent': fields.date('Send date', readonly=True),
     }
@@ -1510,8 +1511,13 @@
                         _('The account number appears to be invalid for '
                           '%(country)s')
                         % {'country': country.name}
+<<<<<<< TREE
                         ))
             if info is False:
+=======
+                    ))
+            except:
+>>>>>>> MERGE-SOURCE
                 if country.code in sepa.IBAN.countries:
                     acc_number_fmt = sepa.BBAN(acc_number, country.code)
                     if acc_number_fmt.valid:
@@ -1576,7 +1582,10 @@
         if not bic:
             return {}
 
-        info, address = sepa.online.bank_info(bic)
+        try:
+            info, address = sepa.online.bank_info(bic)
+        except:
+            return {}
         if not info:
             return {}
 
 
=== modified file 'account_banking/wizard/account_payment_order.py'
--- account_banking/wizard/account_payment_order.py	2013-06-04 21:10:24 +0000
+++ account_banking/wizard/account_payment_order.py	2014-03-19 00:47:00 +0000
@@ -76,9 +76,9 @@
             elif payment.date_prefered == 'fixed':
                 ### account_banking
                 # date_to_pay = payment.date_planned
-                date_to_pay = payment.date_planned and \
-                           str2date(payment.date_planned) > _today\
-                           and payment.date_planned or False
+                date_to_pay = payment.date_scheduled and \
+                           str2date(payment.date_scheduled) > _today\
+                           and payment.date_scheduled or False
                 ### end account banking
 
             ### account_banking
 
=== added directory 'account_banking_pain_base'
=== added file 'account_banking_pain_base/__init__.py'
--- account_banking_pain_base/__init__.py	1970-01-01 00:00:00 +0000
+++ account_banking_pain_base/__init__.py	2014-03-19 00:47:00 +0000
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    PAIN Base module for OpenERP
+#    Copyright (C) 2013 Akretion (http://www.akretion.com)
+#    @author: Alexis de Lattre <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import payment_line
+from . import payment_mode
+from . import company
+from . import banking_export_pain
 
=== added file 'account_banking_pain_base/__openerp__.py'
--- account_banking_pain_base/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_banking_pain_base/__openerp__.py	2014-03-19 00:47:00 +0000
@@ -0,0 +1,50 @@
+##############################################################################
+#
+#    PAIN base module for OpenERP
+#    Copyright (C) 2013 Akretion (http://www.akretion.com)
+#    @author: Alexis de Lattre <[e-mail]>
+#
+#    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 PAIN Base Module',
+    'summary': 'Base module for PAIN file generation',
+    'version': '0.1',
+    'license': 'AGPL-3',
+    'author': 'Akretion, Noviat',
+    'website': 'http://openerp-community-association.org/',
+    'category': 'Hidden',
+    'depends': ['account_banking'],
+    'external_dependencies': {
+        'python': ['unidecode', 'lxml'],
+        },
+    'data': [
+        'payment_line_view.xml',
+        'payment_mode_view.xml',
+        'company_view.xml',
+    ],
+    'description': '''
+Base module for PAIN file generation
+====================================
+
+This module contains fields and functions that are used by the module for SEPA Credit Transfer (account_banking_sepa_credit_transfer) and SEPA Direct Debit (account_banking_sepa_direct_debit). This module doesn't provide any functionnality by itself.
+
+This module is part of the banking addons: https://launchpad.net/banking-addons
+
+This module was started during the Akretion-Noviat code sprint of November 21st 2013 in Epiais les Louvres (France).
+    ''',
+    'active': False,
+    'installable': True,
+}
 
=== added file 'account_banking_pain_base/banking_export_pain.py'
--- account_banking_pain_base/banking_export_pain.py	1970-01-01 00:00:00 +0000
+++ account_banking_pain_base/banking_export_pain.py	2014-03-19 00:47:00 +0000
@@ -0,0 +1,409 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    PAIN Base module for OpenERP
+#    Copyright (C) 2013 Akretion (http://www.akretion.com)
+#    @author: Alexis de Lattre <[e-mail]>
+#
+#    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.tools.safe_eval import safe_eval
+from datetime import datetime
+from unidecode import unidecode
+from lxml import etree
+from openerp import tools
+import logging
+import base64
+
+logger = logging.getLogger(__name__)
+
+
+class banking_export_pain(orm.AbstractModel):
+    _name = 'banking.export.pain'
+
+    def _validate_iban(self, cr, uid, iban, context=None):
+        '''if IBAN is valid, returns IBAN
+        if IBAN is NOT valid, raises an error message'''
+        partner_bank_obj = self.pool.get('res.partner.bank')
+        if partner_bank_obj.is_iban_valid(cr, uid, iban, context=context):
+            return iban.replace(' ', '')
+        else:
+            raise orm.except_orm(
+                _('Error:'), _("This IBAN is not valid : %s") % iban)
+
+    def _prepare_field(
+            self, cr, uid, field_name, field_value, eval_ctx, max_size=0,
+            gen_args=None, context=None):
+        '''This function is designed to be inherited !'''
+        if gen_args is None:
+            gen_args = {}
+        assert isinstance(eval_ctx, dict), 'eval_ctx must contain a dict'
+        try:
+            value = safe_eval(field_value, eval_ctx)
+            # SEPA uses XML ; XML = UTF-8 ; UTF-8 = support for all characters
+            # But we are dealing with banks...
+            # and many banks don't want non-ASCCI characters !
+            # cf section 1.4 "Character set" of the SEPA Credit Transfer
+            # Scheme Customer-to-bank guidelines
+            if gen_args.get('convert_to_ascii'):
+                value = unidecode(value)
+                unallowed_ascii_chars = [
+                    '"', '#', '$', '%', '&', '*', ';', '<', '>', '=', '@',
+                    '[', ']', '^', '_', '`', '{', '}', '|', '~', '\\', '!']
+                for unallowed_ascii_char in unallowed_ascii_chars:
+                    value = value.replace(unallowed_ascii_char, '-')
+        except:
+            line = eval_ctx.get('line')
+            if line:
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("Cannot compute the '%s' of the Payment Line with "
+                        "reference '%s'.")
+                    % (field_name, line.name))
+            else:
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("Cannot compute the '%s'.") % field_name)
+        if not isinstance(value, (str, unicode)):
+            raise orm.except_orm(
+                _('Field type error:'),
+                _("The type of the field '%s' is %s. It should be a string "
+                    "or unicode.")
+                % (field_name, type(value)))
+        if not value:
+            raise orm.except_orm(
+                _('Error:'),
+                _("The '%s' is empty or 0. It should have a non-null value.")
+                % field_name)
+        if max_size and len(value) > max_size:
+            value = value[0:max_size]
+        return value
+
+    def _prepare_export_sepa(
+            self, cr, uid, total_amount, transactions_count, xml_string,
+            gen_args, context=None):
+        return {
+            'batch_booking': gen_args['sepa_export'].batch_booking,
+            'charge_bearer': gen_args['sepa_export'].charge_bearer,
+            'total_amount': total_amount,
+            'nb_transactions': transactions_count,
+            'file': base64.encodestring(xml_string),
+            'payment_order_ids': [(
+                6, 0, [x.id for x in gen_args['sepa_export'].payment_order_ids]
+            )],
+        }
+
+    def _validate_xml(self, cr, uid, xml_string, gen_args, context=None):
+        xsd_etree_obj = etree.parse(
+            tools.file_open(gen_args['pain_xsd_file']))
+        official_pain_schema = etree.XMLSchema(xsd_etree_obj)
+
+        try:
+            root_to_validate = etree.fromstring(xml_string)
+            official_pain_schema.assertValid(root_to_validate)
+        except Exception, e:
+            logger.warning(
+                "The XML file is invalid against the XML Schema Definition")
+            logger.warning(xml_string)
+            logger.warning(e)
+            raise orm.except_orm(
+                _('Error:'),
+                _("The generated XML file is not valid against the official "
+                    "XML Schema Definition. The generated XML file and the "
+                    "full error have been written in the server logs. Here "
+                    "is the error, which may give you an idea on the cause "
+                    "of the problem : %s")
+                % str(e))
+        return True
+
+    def finalize_sepa_file_creation(
+            self, cr, uid, ids, xml_root, total_amount, transactions_count,
+            gen_args, context=None):
+        xml_string = etree.tostring(
+            xml_root, pretty_print=True, encoding='UTF-8',
+            xml_declaration=True)
+        logger.debug(
+            "Generated SEPA XML file in format %s below"
+            % gen_args['pain_flavor'])
+        logger.debug(xml_string)
+        self._validate_xml(cr, uid, xml_string, gen_args, context=context)
+
+        file_id = gen_args['file_obj'].create(
+            cr, uid, self._prepare_export_sepa(
+                cr, uid, total_amount, transactions_count,
+                xml_string, gen_args, context=context),
+            context=context)
+
+        self.write(
+            cr, uid, ids, {
+                'file_id': file_id,
+                'state': 'finish',
+            }, context=context)
+
+        action = {
+            'name': 'SEPA File',
+            'type': 'ir.actions.act_window',
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': self._name,
+            'res_id': ids[0],
+            'target': 'new',
+            }
+        return action
+
+    def generate_group_header_block(
+            self, cr, uid, parent_node, gen_args, context=None):
+        group_header_1_0 = etree.SubElement(parent_node, 'GrpHdr')
+        message_identification_1_1 = etree.SubElement(
+            group_header_1_0, 'MsgId')
+        message_identification_1_1.text = self._prepare_field(
+            cr, uid, 'Message Identification',
+            'sepa_export.payment_order_ids[0].reference',
+            {'sepa_export': gen_args['sepa_export']}, 35,
+            gen_args=gen_args, context=context)
+        creation_date_time_1_2 = etree.SubElement(group_header_1_0, 'CreDtTm')
+        creation_date_time_1_2.text = datetime.strftime(
+            datetime.today(), '%Y-%m-%dT%H:%M:%S')
+        if gen_args.get('pain_flavor') == 'pain.001.001.02':
+            # batch_booking is in "Group header" with pain.001.001.02
+            # and in "Payment info" in pain.001.001.03/04
+            batch_booking = etree.SubElement(group_header_1_0, 'BtchBookg')
+            batch_booking.text = \
+                str(gen_args['sepa_export'].batch_booking).lower()
+        nb_of_transactions_1_6 = etree.SubElement(
+            group_header_1_0, 'NbOfTxs')
+        control_sum_1_7 = etree.SubElement(group_header_1_0, 'CtrlSum')
+        # Grpg removed in pain.001.001.03
+        if gen_args.get('pain_flavor') == 'pain.001.001.02':
+            grouping = etree.SubElement(group_header_1_0, 'Grpg')
+            grouping.text = 'GRPD'
+        self.generate_initiating_party_block(
+            cr, uid, group_header_1_0, gen_args,
+            context=context)
+        return group_header_1_0, nb_of_transactions_1_6, control_sum_1_7
+
+    def generate_start_payment_info_block(
+            self, cr, uid, parent_node, payment_info_ident,
+            priority, local_instrument, sequence_type, requested_date,
+            eval_ctx, gen_args, context=None):
+        payment_info_2_0 = etree.SubElement(parent_node, 'PmtInf')
+        payment_info_identification_2_1 = etree.SubElement(
+            payment_info_2_0, 'PmtInfId')
+        payment_info_identification_2_1.text = self._prepare_field(
+            cr, uid, 'Payment Information Identification',
+            payment_info_ident, eval_ctx, 35,
+            gen_args=gen_args, context=context)
+        payment_method_2_2 = etree.SubElement(payment_info_2_0, 'PmtMtd')
+        if gen_args.get('pain_flavor').startswith('pain.008.'):
+            payment_method_2_2.text = 'DD'
+            request_date_tag = 'ReqdColltnDt'
+        else:
+            payment_method_2_2.text = 'TRF'
+            request_date_tag = 'ReqdExctnDt'
+        if gen_args.get('pain_flavor') != 'pain.001.001.02':
+            batch_booking_2_3 = etree.SubElement(payment_info_2_0, 'BtchBookg')
+            batch_booking_2_3.text = \
+                str(gen_args['sepa_export'].batch_booking).lower()
+        # The "SEPA Customer-to-bank
+        # Implementation guidelines" for SCT and SDD says that control sum
+        # and nb_of_transactions should be present
+        # at both "group header" level and "payment info" level
+            nb_of_transactions_2_4 = etree.SubElement(
+                payment_info_2_0, 'NbOfTxs')
+            control_sum_2_5 = etree.SubElement(payment_info_2_0, 'CtrlSum')
+        payment_type_info_2_6 = etree.SubElement(
+            payment_info_2_0, 'PmtTpInf')
+        if priority:
+            instruction_priority_2_7 = etree.SubElement(
+                payment_type_info_2_6, 'InstrPrty')
+            instruction_priority_2_7.text = priority
+        service_level_2_8 = etree.SubElement(
+            payment_type_info_2_6, 'SvcLvl')
+        service_level_code_2_9 = etree.SubElement(service_level_2_8, 'Cd')
+        service_level_code_2_9.text = 'SEPA'
+        if local_instrument:
+            local_instrument_2_11 = etree.SubElement(
+                payment_type_info_2_6, 'LclInstrm')
+            local_instr_code_2_12 = etree.SubElement(
+                local_instrument_2_11, 'Cd')
+            local_instr_code_2_12.text = local_instrument
+        if sequence_type:
+            sequence_type_2_14 = etree.SubElement(
+                payment_type_info_2_6, 'SeqTp')
+            sequence_type_2_14.text = sequence_type
+
+        requested_date_2_17 = etree.SubElement(
+            payment_info_2_0, request_date_tag)
+        requested_date_2_17.text = requested_date
+        return payment_info_2_0, nb_of_transactions_2_4, control_sum_2_5
+
+    def generate_initiating_party_block(
+            self, cr, uid, parent_node, gen_args, context=None):
+        my_company_name = self._prepare_field(
+            cr, uid, 'Company Name',
+            'sepa_export.payment_order_ids[0].mode.bank_id.partner_id.name',
+            {'sepa_export': gen_args['sepa_export']},
+            gen_args.get('name_maxsize'), gen_args=gen_args, context=context)
+        initiating_party_1_8 = etree.SubElement(parent_node, 'InitgPty')
+        initiating_party_name = etree.SubElement(initiating_party_1_8, 'Nm')
+        initiating_party_name.text = my_company_name
+        initiating_party_identifier = self.pool['res.company'].\
+            _get_initiating_party_identifier(
+                cr, uid,
+                gen_args['sepa_export'].payment_order_ids[0].company_id.id,
+                context=context)
+        initiating_party_issuer = gen_args['sepa_export'].\
+            payment_order_ids[0].company_id.initiating_party_issuer
+        if initiating_party_identifier and initiating_party_issuer:
+            iniparty_id = etree.SubElement(initiating_party_1_8, 'Id')
+            iniparty_org_id = etree.SubElement(iniparty_id, 'OrgId')
+            iniparty_org_other = etree.SubElement(iniparty_org_id, 'Othr')
+            iniparty_org_other_id = etree.SubElement(iniparty_org_other, 'Id')
+            iniparty_org_other_id.text = initiating_party_identifier
+            iniparty_org_other_issuer = etree.SubElement(
+                iniparty_org_other, 'Issr')
+            iniparty_org_other_issuer.text = initiating_party_issuer
+        return True
+
+    def generate_party_bic(
+            self, cr, uid, parent_node, party_type, party_type_label, bic,
+            eval_ctx, gen_args, context=None):
+        '''Generate the piece of the XML file corresponding to BIC
+        This code is mutualized between TRF and DD'''
+        party_agent = etree.SubElement(parent_node, '%sAgt' % party_type)
+        party_agent_institution = etree.SubElement(
+            party_agent, 'FinInstnId')
+        party_agent_bic = etree.SubElement(
+            party_agent_institution, gen_args.get('bic_xml_tag'))
+        party_agent_bic.text = self._prepare_field(
+            cr, uid, '%s BIC' % party_type_label, bic, eval_ctx,
+            gen_args=gen_args, context=context)
+        return True
+
+    def generate_party_block(
+            self, cr, uid, parent_node, party_type, order, name, iban, bic,
+            eval_ctx, gen_args, context=None):
+        '''Generate the piece of the XML file corresponding to Name+IBAN+BIC
+        This code is mutualized between TRF and DD'''
+        assert order in ('B', 'C'), "Order can be 'B' or 'C'"
+        if party_type == 'Cdtr':
+            party_type_label = 'Creditor'
+        elif party_type == 'Dbtr':
+            party_type_label = 'Debtor'
+        # At C level, the order is : BIC, Name, IBAN
+        # At B level, the order is : Name, IBAN, BIC
+        if order == 'C':
+            self.generate_party_bic(
+                cr, uid, parent_node, party_type, party_type_label, bic,
+                eval_ctx, gen_args, context=context)
+        party = etree.SubElement(parent_node, party_type)
+        party_name = etree.SubElement(party, 'Nm')
+        party_name.text = self._prepare_field(
+            cr, uid, '%s Name' % party_type_label, name, eval_ctx,
+            gen_args.get('name_maxsize'),
+            gen_args=gen_args, context=context)
+        party_account = etree.SubElement(
+            parent_node, '%sAcct' % party_type)
+        party_account_id = etree.SubElement(party_account, 'Id')
+        party_account_iban = etree.SubElement(
+            party_account_id, 'IBAN')
+        piban = self._prepare_field(
+            cr, uid, '%s IBAN' % party_type_label, iban, eval_ctx,
+            gen_args=gen_args,
+            context=context)
+        viban = self._validate_iban(cr, uid, piban, context=context)
+        party_account_iban.text = viban
+        if order == 'B':
+            self.generate_party_bic(
+                cr, uid, parent_node, party_type, party_type_label, bic,
+                eval_ctx, gen_args, context=context)
+        return True
+
+    def generate_remittance_info_block(
+            self, cr, uid, parent_node, line, gen_args, context=None):
+
+        remittance_info_2_91 = etree.SubElement(
+            parent_node, 'RmtInf')
+        if line.state == 'normal':
+            remittance_info_unstructured_2_99 = etree.SubElement(
+                remittance_info_2_91, 'Ustrd')
+            remittance_info_unstructured_2_99.text = \
+                self._prepare_field(
+                    cr, uid, 'Remittance Unstructured Information',
+                    'line.communication', {'line': line}, 140,
+                    gen_args=gen_args,
+                    context=context)
+        else:
+            if not line.struct_communication_type:
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("Missing 'Structured Communication Type' on payment "
+                        "line with reference '%s'.")
+                    % (line.name))
+            remittance_info_unstructured_2_100 = etree.SubElement(
+                remittance_info_2_91, 'Strd')
+            creditor_ref_information_2_120 = etree.SubElement(
+                remittance_info_unstructured_2_100, 'CdtrRefInf')
+            if gen_args.get('pain_flavor') == 'pain.001.001.02':
+                creditor_ref_info_type_2_121 = etree.SubElement(
+                    creditor_ref_information_2_120, 'CdtrRefTp')
+                creditor_ref_info_type_code_2_123 = etree.SubElement(
+                    creditor_ref_info_type_2_121, 'Cd')
+                creditor_ref_info_type_issuer_2_125 = etree.SubElement(
+                    creditor_ref_info_type_2_121, 'Issr')
+                creditor_reference_2_126 = etree.SubElement(
+                    creditor_ref_information_2_120, 'CdtrRef')
+            else:
+                creditor_ref_info_type_2_121 = etree.SubElement(
+                    creditor_ref_information_2_120, 'Tp')
+                creditor_ref_info_type_or_2_122 = etree.SubElement(
+                    creditor_ref_info_type_2_121, 'CdOrPrtry')
+                creditor_ref_info_type_code_2_123 = etree.SubElement(
+                    creditor_ref_info_type_or_2_122, 'Cd')
+                creditor_ref_info_type_issuer_2_125 = etree.SubElement(
+                    creditor_ref_info_type_2_121, 'Issr')
+                creditor_reference_2_126 = etree.SubElement(
+                    creditor_ref_information_2_120, 'Ref')
+
+            creditor_ref_info_type_code_2_123.text = 'SCOR'
+            creditor_ref_info_type_issuer_2_125.text = \
+                line.struct_communication_type
+            creditor_reference_2_126.text = \
+                self._prepare_field(
+                    cr, uid, 'Creditor Structured Reference',
+                    'line.communication', {'line': line}, 35,
+                    gen_args=gen_args,
+                    context=context)
+        return True
+
+    def generate_creditor_scheme_identification(
+            self, cr, uid, parent_node, identification, identification_label,
+            eval_ctx, scheme_name_proprietary, gen_args, context=None):
+        csi_id = etree.SubElement(
+            parent_node, 'Id')
+        csi_privateid = csi_id = etree.SubElement(csi_id, 'PrvtId')
+        csi_other = etree.SubElement(csi_privateid, 'Othr')
+        csi_other_id = etree.SubElement(csi_other, 'Id')
+        csi_other_id.text = self._prepare_field(
+            cr, uid, identification_label, identification, eval_ctx,
+            gen_args=gen_args, context=context)
+        csi_scheme_name = etree.SubElement(csi_other, 'SchmeNm')
+        csi_scheme_name_proprietary = etree.SubElement(
+            csi_scheme_name, 'Prtry')
+        csi_scheme_name_proprietary.text = scheme_name_proprietary
+        return True
 
=== added file 'account_banking_pain_base/company.py'
--- account_banking_pain_base/company.py	1970-01-01 00:00:00 +0000
+++ account_banking_pain_base/company.py	2014-03-19 00:47:00 +0000
@@ -0,0 +1,78 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    PAIN Base module for OpenERP
+#    Copyright (C) 2013 Akretion (http://www.akretion.com)
+#    Copyright (C) 2013 Noviat (http://www.noviat.com)
+#    @author: Alexis de Lattre <[e-mail]>
+#    @author: Luc de Meyer (Noviat)
+#
+#    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 res_company(orm.Model):
+    _inherit = 'res.company'
+
+    _columns = {
+        'initiating_party_issuer': fields.char(
+            'Initiating Party Issuer', size=35,
+            help="This will be used as the 'Initiating Party Issuer' in the "
+            "PAIN files generated by OpenERP."),
+    }
+
+    def _get_initiating_party_identifier(
+            self, cr, uid, company_id, context=None):
+        '''The code here may be different from one country to another.
+        If you need to add support for an additionnal country, you can
+        contribute your code here or inherit this function in the
+        localization modules for your country'''
+        assert isinstance(company_id, int), 'Only one company ID'
+        company = self.browse(cr, uid, company_id, context=context)
+        company_vat = company.vat
+        party_identifier = False
+        if company_vat and company_vat[0:2].upper() in ['BE']:
+            party_identifier = company_vat[2:].replace(' ', '')
+        return party_identifier
+
+    def _initiating_party_issuer_default(self, cr, uid, context=None):
+        '''If you need to add support for an additionnal country, you can
+        add an entry in the dict "party_issuer_per_country" here
+        or inherit this function in the localization modules for
+        your country'''
+        initiating_party_issuer = ''
+        # If your country require the 'Initiating Party Issuer', you should
+        # contribute the entry for your country in the dict below
+        party_issuer_per_country = {
+            'BE': 'KBO-BCE',  # KBO-BCE = the registry of companies in Belgium
+        }
+        company_id = self._company_default_get(
+            cr, uid, 'res.company', context=context)
+        if company_id:
+            company = self.browse(cr, uid, company_id, context=context)
+            country_code = company.country_id.code
+            initiating_party_issuer = party_issuer_per_country.get(
+                country_code, '')
+        return initiating_party_issuer
+
+    def _initiating_party_issuer_def(self, cr, uid, context=None):
+        return self._initiating_party_issuer_default(
+            cr, uid, context=context)
+
+    _defaults = {
+        'initiating_party_issuer': _initiating_party_issuer_def,
+    }
 
=== added file 'account_banking_pain_base/company_view.xml'
--- account_banking_pain_base/company_view.xml	1970-01-01 00:00:00 +0000
+++ account_banking_pain_base/company_view.xml	2014-03-19 00:47:00 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2013 Akretion (http://www.akretion.com)
+  @author: Alexis de Lattre <[e-mail]>
+  The licence is in the file __openerp__.py
+-->
+<openerp>
+<data>
+
+<record id="view_company_form" model="ir.ui.view">
+    <field name="name">pain.group.on.res.company.form</field>
+    <field name="model">res.company</field>
+    <field name="inherit_id" ref="base.view_company_form"/>
+    <field name="arch" type="xml">
+        <field name="currency_id" position="after">
+            <group name="pain" string="Payment Initiation" colspan="2" col="2">
+                <field name="initiating_party_issuer"/>
+            </group>
+        </field>
+    </field>
+</record>
+
+</data>
+</openerp>
 
=== added directory 'account_banking_pain_base/i18n'
=== added file 'account_banking_pain_base/i18n/account_banking_pain_base.pot'
--- account_banking_pain_base/i18n/account_banking_pain_base.pot	1970-01-01 00:00:00 +0000
+++ account_banking_pain_base/i18n/account_banking_pain_base.pot	2014-03-19 00:47:00 +0000
@@ -0,0 +1,146 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_banking_pain_base
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-23 21:26+0000\n"
+"PO-Revision-Date: 2013-12-23 21:26+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_banking_pain_base
+#: field:res.company,initiating_party_issuer:0
+msgid "Initiating Party Issuer"
+msgstr ""
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:122
+#, python-format
+msgid "The generated XML file is not valid against the official XML Schema Definition. The generated XML file and the full error have been written in the server logs. Here is the error, which may give you an idea on the cause of the problem : %s"
+msgstr ""
+
+#. module: account_banking_pain_base
+#: field:payment.line,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: account_banking_pain_base
+#: model:ir.model,name:account_banking_pain_base.model_payment_line
+msgid "Payment Line"
+msgstr ""
+
+#. module: account_banking_pain_base
+#: model:ir.model,name:account_banking_pain_base.model_payment_mode
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_banking_pain_base
+#: help:res.company,initiating_party_issuer:0
+msgid "This will be used as the 'Initiating Party Issuer' in the PAIN files generated by OpenERP."
+msgstr ""
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:351
+#, python-format
+msgid "Missing 'Structured Communication Type' on payment line with reference '%s'."
+msgstr ""
+
+#. module: account_banking_pain_base
+#: selection:payment.line,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:70
+#, python-format
+msgid "Cannot compute the '%s' of the Payment Line with reference '%s'."
+msgstr ""
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:77
+#, python-format
+msgid "Cannot compute the '%s'."
+msgstr ""
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:81
+#, python-format
+msgid "The type of the field '%s' is %s. It should be a string or unicode."
+msgstr ""
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:47
+#: code:addons/account_banking_pain_base/banking_export_pain.py:69
+#: code:addons/account_banking_pain_base/banking_export_pain.py:76
+#: code:addons/account_banking_pain_base/banking_export_pain.py:86
+#: code:addons/account_banking_pain_base/banking_export_pain.py:121
+#: code:addons/account_banking_pain_base/banking_export_pain.py:350
+#, python-format
+msgid "Error:"
+msgstr ""
+
+#. module: account_banking_pain_base
+#: model:ir.model,name:account_banking_pain_base.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:47
+#, python-format
+msgid "This IBAN is not valid : %s"
+msgstr ""
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:80
+#, python-format
+msgid "Field type error:"
+msgstr ""
+
+#. module: account_banking_pain_base
+#: field:payment.line,struct_communication_type:0
+msgid "Structured Communication Type"
+msgstr ""
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:87
+#, python-format
+msgid "The '%s' is empty or 0. It should have a non-null value."
+msgstr ""
+
+#. module: account_banking_pain_base
+#: model:ir.model,name:account_banking_pain_base.model_banking_export_pain
+msgid "banking.export.pain"
+msgstr ""
+
+#. module: account_banking_pain_base
+#: help:payment.mode,convert_to_ascii:0
+msgid "If active, OpenERP will convert each accented caracter to the corresponding unaccented caracter, so that only ASCII caracters are used in the generated PAIN file."
+msgstr ""
+
+#. module: account_banking_pain_base
+#: help:payment.line,priority:0
+msgid "This field will be used as the 'Instruction Priority' in the generated PAIN file."
+msgstr ""
+
+#. module: account_banking_pain_base
+#: view:res.company:0
+msgid "Payment Initiation"
+msgstr ""
+
+#. module: account_banking_pain_base
+#: selection:payment.line,priority:0
+msgid "High"
+msgstr ""
+
+#. module: account_banking_pain_base
+#: field:payment.mode,convert_to_ascii:0
+msgid "Convert to ASCII"
+msgstr ""
+
 
=== added file 'account_banking_pain_base/i18n/fr.po'
--- account_banking_pain_base/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ account_banking_pain_base/i18n/fr.po	2014-03-19 00:47:00 +0000
@@ -0,0 +1,146 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_banking_pain_base
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-23 21:27+0000\n"
+"PO-Revision-Date: 2013-12-23 21:27+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_banking_pain_base
+#: field:res.company,initiating_party_issuer:0
+msgid "Initiating Party Issuer"
+msgstr "Initiating Party Issuer"
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:122
+#, python-format
+msgid "The generated XML file is not valid against the official XML Schema Definition. The generated XML file and the full error have been written in the server logs. Here is the error, which may give you an idea on the cause of the problem : %s"
+msgstr "Le fichier XML généré n'est pas valide par rapport à la Définition du Schéma XML officiel. Le fichier XML généré et le message d'erreur complet ont été écrits dans les logs du serveur. Voici l'erreur, qui vous donnera peut-être une idée sur la cause du problème : %s"
+
+#. module: account_banking_pain_base
+#: field:payment.line,priority:0
+msgid "Priority"
+msgstr "Priorité"
+
+#. module: account_banking_pain_base
+#: model:ir.model,name:account_banking_pain_base.model_payment_line
+msgid "Payment Line"
+msgstr "Ligne de paiement"
+
+#. module: account_banking_pain_base
+#: model:ir.model,name:account_banking_pain_base.model_payment_mode
+msgid "Payment Mode"
+msgstr "Mode de paiement"
+
+#. module: account_banking_pain_base
+#: help:res.company,initiating_party_issuer:0
+msgid "This will be used as the 'Initiating Party Issuer' in the PAIN files generated by OpenERP."
+msgstr "Ce champ sera le 'Initiating Party Issuer' dans les fichiers PAIN générés par OpenERP."
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:351
+#, python-format
+msgid "Missing 'Structured Communication Type' on payment line with reference '%s'."
+msgstr "Le 'Type de communication structuré' n'est pas renseigné sur la ligne de paiement ayant la référence '%s'."
+
+#. module: account_banking_pain_base
+#: selection:payment.line,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:70
+#, python-format
+msgid "Cannot compute the '%s' of the Payment Line with reference '%s'."
+msgstr "Impossible de calculer le '%s' de la ligne de paiement ayant la référence '%s'."
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:77
+#, python-format
+msgid "Cannot compute the '%s'."
+msgstr "Impossible de calculer le '%s'."
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:81
+#, python-format
+msgid "The type of the field '%s' is %s. It should be a string or unicode."
+msgstr "Le type du champ '%s' est %s. Il devrait être de type string ou unicode."
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:47
+#: code:addons/account_banking_pain_base/banking_export_pain.py:69
+#: code:addons/account_banking_pain_base/banking_export_pain.py:76
+#: code:addons/account_banking_pain_base/banking_export_pain.py:86
+#: code:addons/account_banking_pain_base/banking_export_pain.py:121
+#: code:addons/account_banking_pain_base/banking_export_pain.py:350
+#, python-format
+msgid "Error:"
+msgstr "Erreur :"
+
+#. module: account_banking_pain_base
+#: model:ir.model,name:account_banking_pain_base.model_res_company
+msgid "Companies"
+msgstr "Sociétés"
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:47
+#, python-format
+msgid "This IBAN is not valid : %s"
+msgstr "Cet IBAN n'est pas valide : %s"
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:80
+#, python-format
+msgid "Field type error:"
+msgstr "Erreur dans le type de champ :"
+
+#. module: account_banking_pain_base
+#: field:payment.line,struct_communication_type:0
+msgid "Structured Communication Type"
+msgstr "Type de communication structurée"
+
+#. module: account_banking_pain_base
+#: code:addons/account_banking_pain_base/banking_export_pain.py:87
+#, python-format
+msgid "The '%s' is empty or 0. It should have a non-null value."
+msgstr "Le '%s' est vide ou égal à 0. Il devrait avoir une valeur non-nulle."
+
+#. module: account_banking_pain_base
+#: model:ir.model,name:account_banking_pain_base.model_banking_export_pain
+msgid "banking.export.pain"
+msgstr "banking.export.pain"
+
+#. module: account_banking_pain_base
+#: help:payment.mode,convert_to_ascii:0
+msgid "If active, OpenERP will convert each accented caracter to the corresponding unaccented caracter, so that only ASCII caracters are used in the generated PAIN file."
+msgstr "Si actif, OpenERP convertira chaque caractère accentué en son équivalent non accentué, de telle façon que seuls des caractères ASCII soient utilisés dans le fichier PAIN généré."
+
+#. module: account_banking_pain_base
+#: help:payment.line,priority:0
+msgid "This field will be used as the 'Instruction Priority' in the generated PAIN file."
+msgstr "Ce champ sera le 'Instruction Priority' dans le fichier PAIN généré."
+
+#. module: account_banking_pain_base
+#: view:res.company:0
+msgid "Payment Initiation"
+msgstr "Payment Initiation"
+
+#. module: account_banking_pain_base
+#: selection:payment.line,priority:0
+msgid "High"
+msgstr "Élevé"
+
+#. module: account_banking_pain_base
+#: field:payment.mode,convert_to_ascii:0
+msgid "Convert to ASCII"
+msgstr "Convertir en ASCII"
+
 
=== added file 'account_banking_pain_base/payment_line.py'
--- account_banking_pain_base/payment_line.py	1970-01-01 00:00:00 +0000
+++ account_banking_pain_base/payment_line.py	2014-03-19 00:47:00 +0000
@@ -0,0 +1,52 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    PAIN Base module for OpenERP
+#    Copyright (C) 2013 Akretion (http://www.akretion.com)
+#    @author: Alexis de Lattre <[e-mail]>
+#
+#    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_line(orm.Model):
+    _inherit = 'payment.line'
+
+    def _get_struct_communication_types(self, cr, uid, context=None):
+        return [('ISO', 'ISO')]
+
+    _columns = {
+        'priority': fields.selection([
+            ('NORM', 'Normal'),
+            ('HIGH', 'High'),
+            ], 'Priority',
+            help="This field will be used as the 'Instruction Priority' in "
+            "the generated PAIN file."),
+        # Update size from 64 to 140, because PAIN allows 140 caracters
+        'communication': fields.char(
+            'Communication', size=140, required=True,
+            help="Used as the message between ordering customer and current "
+            "company. Depicts 'What do you want to say to the recipient "
+            "about this order ?'"),
+        'struct_communication_type': fields.selection(
+            _get_struct_communication_types, 'Structured Communication Type'),
+    }
+
+    _defaults = {
+        'priority': 'NORM',
+        'struct_communication_type': 'ISO',
+    }
 
=== added file 'account_banking_pain_base/payment_line_view.xml'
--- account_banking_pain_base/payment_line_view.xml	1970-01-01 00:00:00 +0000
+++ account_banking_pain_base/payment_line_view.xml	2014-03-19 00:47:00 +0000
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2013 Akretion (http://www.akretion.com)
+  @author: Alexis de Lattre <[e-mail]>
+  The licence is in the file __openerp__.py
+-->
+<openerp>
+<data>
+
+<record id="view_payment_line_form" model="ir.ui.view">
+    <field name="name">pain.base.payment.line.form</field>
+    <field name="model">payment.line</field>
+    <field name="inherit_id" ref="account_payment.view_payment_line_form"/>
+    <field name="arch" type="xml">
+        <field name="bank_id" position="after">
+            <field name="priority"/>
+            <newline />
+        </field>
+        <field name="communication2" position="replace"/>
+        <field name="state" position="after">
+            <field name="struct_communication_type" attrs="{'invisible': [('state', '!=', 'structured')], 'required': [('state', '=', 'structured')]}"/>
+        </field>
+    </field>
+</record>
+
+<record id="view_payment_order_form" model="ir.ui.view">
+    <field name="name">pain.base.payment.line.inside.order.form</field>
+    <field name="model">payment.order</field>
+    <field name="inherit_id" ref="account_payment.view_payment_order_form"/>
+    <field name="arch" type="xml">
+        <xpath expr="//field[@name='line_ids']/form//field[@name='bank_id']" position="after">
+            <field name="priority"/>
+            <newline />
+        </xpath>
+        <xpath expr="//field[@name='line_ids']/form//field[@name='communication2']" position="replace"/>
+        <xpath expr="//field[@name='line_ids']/form//field[@name='state']" position="after">
+            <field name="struct_communication_type" attrs="{'invisible': [('state', '!=', 'structured')], 'required': [('state', '=', 'structured')]}"/>
+        </xpath>
+    </field>
+</record>
+
+</data>
+</openerp>
 
=== added file 'account_banking_pain_base/payment_mode.py'
--- account_banking_pain_base/payment_mode.py	1970-01-01 00:00:00 +0000
+++ account_banking_pain_base/payment_mode.py	2014-03-19 00:47:00 +0000
@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    PAIN Base module for OpenERP
+#    Copyright (C) 2013 Akretion (http://www.akretion.com)
+#    @author: Alexis de Lattre <[e-mail]>
+#
+#    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):
+    _inherit = 'payment.mode'
+
+    _columns = {
+        'convert_to_ascii': fields.boolean(
+            'Convert to ASCII',
+            help="If active, OpenERP will convert each accented caracter to "
+            "the corresponding unaccented caracter, so that only ASCII "
+            "caracters are used in the generated PAIN file."),
+    }
+
+    _defaults = {
+        'convert_to_ascii': True,
+    }
 
=== added file 'account_banking_pain_base/payment_mode_view.xml'
--- account_banking_pain_base/payment_mode_view.xml	1970-01-01 00:00:00 +0000
+++ account_banking_pain_base/payment_mode_view.xml	2014-03-19 00:47:00 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2013 Akretion (http://www.akretion.com)
+  @author: Alexis de Lattre <[e-mail]>
+  The licence is in the file __openerp__.py
+-->
+<openerp>
+<data>
+
+<record id="view_payment_mode_form_inherit" model="ir.ui.view">
+    <field name="name">add.convert_to_ascii.in.payment.mode.form</field>
+    <field name="model">payment.mode</field>
+    <field name="inherit_id" ref="account_banking.view_payment_mode_form_inherit"/>
+    <field name="arch" type="xml">
+        <field name="type" position="after">
+            <field name="convert_to_ascii"/>
+        </field>
+    </field>
+</record>
+
+</data>
+</openerp>
 
=== modified file 'account_banking_sepa_credit_transfer/__init__.py'
--- account_banking_sepa_credit_transfer/__init__.py	2013-05-15 20:09:21 +0000
+++ account_banking_sepa_credit_transfer/__init__.py	2014-03-19 00:47:00 +0000
@@ -20,6 +20,5 @@
 #
 ##############################################################################
 
-import wizard
-import account_banking_sepa
-
+from . import wizard
+from . import account_banking_sepa
 
=== modified file 'account_banking_sepa_credit_transfer/__openerp__.py'
--- account_banking_sepa_credit_transfer/__openerp__.py	2013-09-22 19:51:06 +0000
+++ account_banking_sepa_credit_transfer/__openerp__.py	2014-03-19 00:47:00 +0000
@@ -21,24 +21,25 @@
 {
     'name': 'Account Banking SEPA Credit Transfer',
     'summary': 'Create SEPA XML files for Credit Transfers',
-    'version': '0.1',
+    'version': '0.2',
     'license': 'AGPL-3',
     'author': 'Akretion',
     'website': 'http://www.akretion.com',
     'category': 'Banking addons',
-    'depends': ['account_banking'],
-    'init_xml': [],
-    'update_xml': [
+    'depends': ['account_banking_pain_base'],
+    'external_dependencies': {
+        'python': ['unidecode', 'lxml'],
+        },
+    'data': [
         'account_banking_sepa_view.xml',
         'wizard/export_sepa_view.xml',
         'data/payment_type_sepa_sct.xml',
         'security/ir.model.access.csv',
     ],
-    'demo_xml': [],
     'description': '''
 Module to export payment orders in SEPA XML file format.
 
-SEPA PAIN (PAyment INitiation) is the new european standard for Customer-to-Bank payment instructions. This module implements SEPA Credit Transfer (SCT), more specifically PAIN versions 001.001.02, 001.001.03 and 001.001.04. It is part of the ISO 20022 standard, available on http://www.iso20022.org.
+SEPA PAIN (PAyment INitiation) is the new european standard for Customer-to-Bank payment instructions. This module implements SEPA Credit Transfer (SCT), more specifically PAIN versions 001.001.02, 001.001.03, 001.001.04 and 001.001.05. It is part of the ISO 20022 standard, available on http://www.iso20022.org.
 
 The Implementation Guidelines for SEPA Credit Transfer published by the European Payments Council (http://http://www.europeanpaymentscouncil.eu) use PAIN version 001.001.03, so it's probably the version of PAIN that you should try first.
 
@@ -48,4 +49,5 @@
     ''',
     'active': False,
     'installable': True,
+    'application': True,
 }
 
=== modified file 'account_banking_sepa_credit_transfer/account_banking_sepa.py'
--- account_banking_sepa_credit_transfer/account_banking_sepa.py	2013-05-22 21:07:52 +0000
+++ account_banking_sepa_credit_transfer/account_banking_sepa.py	2014-03-19 00:47:00 +0000
@@ -19,22 +19,26 @@
 #
 ##############################################################################
 
-from osv import osv, fields
-import time
-from tools.translate import _
+from openerp.osv import orm, fields
 import decimal_precision as dp
-
-
-class banking_export_sepa(osv.osv):
+from unidecode import unidecode
+
+
+class banking_export_sepa(orm.Model):
     '''SEPA export'''
     _name = 'banking.export.sepa'
     _description = __doc__
-    _rec_name = 'msg_identification'
+    _rec_name = 'filename'
 
     def _generate_filename(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for sepa_file in self.browse(cr, uid, ids, context=context):
-            res[sepa_file.id] = 'sepa_' + (sepa_file.msg_identification or '') + '.xml'
+            ref = sepa_file.payment_order_ids[0].reference
+            if ref:
+                label = unidecode(ref.replace('/', '-'))
+            else:
+                label = 'error'
+            res[sepa_file.id] = 'sct_%s.xml' % label
         return res
 
     _columns = {
@@ -42,39 +46,45 @@
             'payment.order',
             'account_payment_order_sepa_rel',
             'banking_export_sepa_id', 'account_order_id',
-            'Payment orders',
-            readonly=True),
-        'prefered_exec_date': fields.date('Prefered execution date', readonly=True),
-        'nb_transactions': fields.integer('Number of transactions', readonly=True),
-        'total_amount': fields.float('Total amount',
-            digits_compute=dp.get_precision('Account'), readonly=True),
-        'msg_identification': fields.char('Message identification', size=35,
-            readonly=True),
-        'batch_booking': fields.boolean('Batch booking', readonly=True,
-            help="If true, the bank statement will display only one debit line for all the wire transfers of the SEPA XML file ; if false, the bank statement will display one debit line per wire transfer of the SEPA XML file."),
+            'Payment Orders',
+            readonly=True),
+        'nb_transactions': fields.integer(
+            'Number of Transactions', readonly=True),
+        'total_amount': fields.float(
+            'Total Amount', digits_compute=dp.get_precision('Account'),
+            readonly=True),
+        'batch_booking': fields.boolean(
+            'Batch Booking', readonly=True,
+            help="If true, the bank statement will display only one debit "
+            "line for all the wire transfers of the SEPA XML file ; "
+            "if false, the bank statement will display one debit line "
+            "per wire transfer of the SEPA XML file."),
         'charge_bearer': fields.selection([
+            ('SLEV', 'Following Service Level'),
             ('SHAR', 'Shared'),
-            ('CRED', 'Borne by creditor'),
-            ('DEBT', 'Borne by debtor'),
-            ('SLEV', 'Following service level'),
-            ], 'Charge bearer', readonly=True,
-            help='Shared : transaction charges on the sender side are to be borne by the debtor, transaction charges on the receiver side are to be borne by the creditor (most transfers use this). Borne by creditor : all transaction charges are to be borne by the creditor. Borne by debtor : all transaction charges are to be borne by the debtor. Following service level : transaction charges are to be applied following the rules agreed in the service level and/or scheme.'),
-        'generation_date': fields.datetime('Generation date',
+            ('CRED', 'Borne by Creditor'),
+            ('DEBT', 'Borne by Debtor'),
+            ], 'Charge Bearer', readonly=True,
+            help="Following service level : transaction charges are to be "
+            "applied following the rules agreed in the service level and/or "
+            "scheme (SEPA Core messages must use this). Shared : "
+            "transaction charges on the creditor side are to be borne by "
+            "the creditor, transaction charges on the debtor side are to "
+            "be borne by the debtor. Borne by creditor : all transaction "
+            "charges are to be borne by the creditor. Borne by debtor : "
+            "all transaction charges are to be borne by the debtor."),
+        'create_date': fields.datetime('Generation Date', readonly=True),
+        'file': fields.binary('SEPA XML File', readonly=True),
+        'filename': fields.function(
+            _generate_filename, type='char', size=256, string='Filename',
             readonly=True),
-        'file': fields.binary('SEPA XML file', readonly=True),
-        'filename': fields.function(_generate_filename, type='char', size=256,
-            method=True, string='Filename', readonly=True),
         'state': fields.selection([
-                ('draft', 'Draft'),
-                ('sent', 'Sent'),
-                ('done', 'Reconciled'),
+            ('draft', 'Draft'),
+            ('sent', 'Sent'),
+            ('done', 'Reconciled'),
             ], 'State', readonly=True),
     }
 
     _defaults = {
-        'generation_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'state': 'draft',
     }
-
-banking_export_sepa()
-
 
=== modified file 'account_banking_sepa_credit_transfer/account_banking_sepa_view.xml'
--- account_banking_sepa_credit_transfer/account_banking_sepa_view.xml	2013-09-22 19:51:06 +0000
+++ account_banking_sepa_credit_transfer/account_banking_sepa_view.xml	2014-03-19 00:47:00 +0000
@@ -15,20 +15,18 @@
         <form string="SEPA Credit Transfer">
             <notebook>
                 <page string="General Information">
-                    <field name="msg_identification" select="1" />
                     <field name="total_amount" />
                     <field name="nb_transactions" />
-                    <field name="prefered_exec_date" />
                     <field name="batch_booking" />
                     <field name="charge_bearer"/>
-                    <field name="generation_date" />
+                    <field name="create_date" />
                     <newline />
                     <field name="file" filename="filename"/>
                     <field name="filename" invisible="True"/>
                 </page>
                 <page string="Payment Orders">
                     <field name="payment_order_ids" colspan="4" nolabel="1">
-                        <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" string="Payment order">
+                        <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" string="Payment Orders">
                             <field name="reference"/>
                             <field name="date_created"/>
                             <field name="date_done"/>
@@ -49,9 +47,8 @@
     <field name="type">tree</field>
     <field name="arch" type="xml">
         <tree string="SEPA Credit Transfer">
-            <field name="msg_identification"/>
-            <field name="prefered_exec_date"/>
-            <field name="generation_date"/>
+            <field name="filename"/>
+            <field name="create_date"/>
             <field name="nb_transactions"/>
         </tree>
     </field>
@@ -59,7 +56,7 @@
 
 
 <record id="action_account_banking_sepa" model="ir.actions.act_window">
-    <field name="name">Generated SEPA Credit Transfer XML files</field>
+    <field name="name">SEPA Credit Transfer Files</field>
     <field name="res_model">banking.export.sepa</field>
     <field name="view_type">form</field>
     <field name="view_mode">tree,form</field>
@@ -67,13 +64,13 @@
 
 
 <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"
           />
 
 <act_window id="act_banking_export_sepa_payment_order"
-    name="Generated SEPA Credit Transfer files"
+    name="SEPA Credit Transfer Files"
     domain="[('payment_order_ids', '=', active_id)]"
     res_model="banking.export.sepa"
     src_model="payment.order"
 
=== added file 'account_banking_sepa_credit_transfer/data/pain.001.001.05.xsd'
--- account_banking_sepa_credit_transfer/data/pain.001.001.05.xsd	1970-01-01 00:00:00 +0000
+++ account_banking_sepa_credit_transfer/data/pain.001.001.05.xsd	2014-03-19 00:47:00 +0000
@@ -0,0 +1,931 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generated by Standards Editor (build:R1.0.41.3) on 2013 Mar 05 13:39:40, ISO 20022 version : 2013-->
+<xs:schema xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.001.05" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="urn:iso:std:iso:20022:tech:xsd:pain.001.001.05">
+    <xs:element name="Document" type="Document"/>
+    <xs:complexType name="AccountIdentification4Choice">
+        <xs:choice>
+            <xs:element name="IBAN" type="IBAN2007Identifier"/>
+            <xs:element name="Othr" type="GenericAccountIdentification1"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="AccountSchemeName1Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="ExternalAccountIdentification1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:simpleType name="ActiveOrHistoricCurrencyAndAmount_SimpleType">
+        <xs:restriction base="xs:decimal">
+            <xs:fractionDigits value="5"/>
+            <xs:totalDigits value="18"/>
+            <xs:minInclusive value="0"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ActiveOrHistoricCurrencyAndAmount">
+        <xs:simpleContent>
+            <xs:extension base="ActiveOrHistoricCurrencyAndAmount_SimpleType">
+                <xs:attribute name="Ccy" type="ActiveOrHistoricCurrencyCode" use="required"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:simpleType name="ActiveOrHistoricCurrencyCode">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z]{3,3}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="AddressType2Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="ADDR"/>
+            <xs:enumeration value="PBOX"/>
+            <xs:enumeration value="HOME"/>
+            <xs:enumeration value="BIZZ"/>
+            <xs:enumeration value="MLTO"/>
+            <xs:enumeration value="DLVY"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="AmountType3Choice">
+        <xs:choice>
+            <xs:element name="InstdAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
+            <xs:element name="EqvtAmt" type="EquivalentAmount2"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:simpleType name="AnyBICIdentifier">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z]{6,6}[A-Z2-9][A-NP-Z0-9]([A-Z0-9]{3,3}){0,1}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="Authorisation1Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="Authorisation1Code"/>
+            <xs:element name="Prtry" type="Max128Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:simpleType name="Authorisation1Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="AUTH"/>
+            <xs:enumeration value="FDET"/>
+            <xs:enumeration value="FSUM"/>
+            <xs:enumeration value="ILEV"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="BICFIIdentifier">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z]{6,6}[A-Z2-9][A-NP-Z0-9]([A-Z0-9]{3,3}){0,1}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="BaseOneRate">
+        <xs:restriction base="xs:decimal">
+            <xs:fractionDigits value="10"/>
+            <xs:totalDigits value="11"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="BatchBookingIndicator">
+        <xs:restriction base="xs:boolean"/>
+    </xs:simpleType>
+    <xs:complexType name="BranchAndFinancialInstitutionIdentification5">
+        <xs:sequence>
+            <xs:element name="FinInstnId" type="FinancialInstitutionIdentification8"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="BrnchId" type="BranchData2"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="BranchData2">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Id" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CashAccount24">
+        <xs:sequence>
+            <xs:element name="Id" type="AccountIdentification4Choice"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="CashAccountType2Choice"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Ccy" type="ActiveOrHistoricCurrencyCode"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max70Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CashAccountType2Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="ExternalCashAccountType1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="CategoryPurpose1Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="ExternalCategoryPurpose1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:simpleType name="ChargeBearerType1Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="DEBT"/>
+            <xs:enumeration value="CRED"/>
+            <xs:enumeration value="SHAR"/>
+            <xs:enumeration value="SLEV"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="Cheque7">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="ChqTp" type="ChequeType2Code"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="ChqNb" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="ChqFr" type="NameAndAddress10"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="DlvryMtd" type="ChequeDeliveryMethod1Choice"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="DlvrTo" type="NameAndAddress10"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="InstrPrty" type="Priority2Code"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="ChqMtrtyDt" type="ISODate"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="FrmsCd" type="Max35Text"/>
+            <xs:element maxOccurs="2" minOccurs="0" name="MemoFld" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="RgnlClrZone" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="PrtLctn" type="Max35Text"/>
+            <xs:element maxOccurs="5" minOccurs="0" name="Sgntr" type="Max70Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="ChequeDelivery1Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="MLDB"/>
+            <xs:enumeration value="MLCD"/>
+            <xs:enumeration value="MLFA"/>
+            <xs:enumeration value="CRDB"/>
+            <xs:enumeration value="CRCD"/>
+            <xs:enumeration value="CRFA"/>
+            <xs:enumeration value="PUDB"/>
+            <xs:enumeration value="PUCD"/>
+            <xs:enumeration value="PUFA"/>
+            <xs:enumeration value="RGDB"/>
+            <xs:enumeration value="RGCD"/>
+            <xs:enumeration value="RGFA"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ChequeDeliveryMethod1Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="ChequeDelivery1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:simpleType name="ChequeType2Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="CCHQ"/>
+            <xs:enumeration value="CCCH"/>
+            <xs:enumeration value="BCHQ"/>
+            <xs:enumeration value="DRFT"/>
+            <xs:enumeration value="ELDR"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ClearingSystemIdentification2Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="ExternalClearingSystemIdentification1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="ClearingSystemMemberIdentification2">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="ClrSysId" type="ClearingSystemIdentification2Choice"/>
+            <xs:element name="MmbId" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ContactDetails2">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="NmPrfx" type="NamePrefix1Code"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="PhneNb" type="PhoneNumber"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="MobNb" type="PhoneNumber"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="FaxNb" type="PhoneNumber"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="EmailAdr" type="Max2048Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Othr" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="CountryCode">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z]{2,2}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="CreditDebitCode">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="CRDT"/>
+            <xs:enumeration value="DBIT"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="CreditTransferTransaction6">
+        <xs:sequence>
+            <xs:element name="PmtId" type="PaymentIdentification1"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="PmtTpInf" type="PaymentTypeInformation19"/>
+            <xs:element name="Amt" type="AmountType3Choice"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="XchgRateInf" type="ExchangeRate1"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="ChrgBr" type="ChargeBearerType1Code"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="ChqInstr" type="Cheque7"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="UltmtDbtr" type="PartyIdentification43"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt1" type="BranchAndFinancialInstitutionIdentification5"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt1Acct" type="CashAccount24"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt2" type="BranchAndFinancialInstitutionIdentification5"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt2Acct" type="CashAccount24"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt3" type="BranchAndFinancialInstitutionIdentification5"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt3Acct" type="CashAccount24"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CdtrAgt" type="BranchAndFinancialInstitutionIdentification5"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CdtrAgtAcct" type="CashAccount24"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Cdtr" type="PartyIdentification43"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CdtrAcct" type="CashAccount24"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="UltmtCdtr" type="PartyIdentification43"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="InstrForCdtrAgt" type="InstructionForCreditorAgent1"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="InstrForDbtrAgt" type="Max140Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Purp" type="Purpose2Choice"/>
+            <xs:element maxOccurs="10" minOccurs="0" name="RgltryRptg" type="RegulatoryReporting3"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Tax" type="TaxInformation3"/>
+            <xs:element maxOccurs="10" minOccurs="0" name="RltdRmtInf" type="RemittanceLocation2"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="RmtInf" type="RemittanceInformation7"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="SplmtryData" type="SupplementaryData1"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CreditorReferenceInformation2">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="CreditorReferenceType2"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Ref" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CreditorReferenceType1Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="DocumentType3Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="CreditorReferenceType2">
+        <xs:sequence>
+            <xs:element name="CdOrPrtry" type="CreditorReferenceType1Choice"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CustomerCreditTransferInitiationV05">
+        <xs:sequence>
+            <xs:element name="GrpHdr" type="GroupHeader48"/>
+            <xs:element maxOccurs="unbounded" minOccurs="1" name="PmtInf" type="PaymentInstruction9"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="SplmtryData" type="SupplementaryData1"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="DateAndPlaceOfBirth">
+        <xs:sequence>
+            <xs:element name="BirthDt" type="ISODate"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="PrvcOfBirth" type="Max35Text"/>
+            <xs:element name="CityOfBirth" type="Max35Text"/>
+            <xs:element name="CtryOfBirth" type="CountryCode"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="DatePeriodDetails">
+        <xs:sequence>
+            <xs:element name="FrDt" type="ISODate"/>
+            <xs:element name="ToDt" type="ISODate"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="DecimalNumber">
+        <xs:restriction base="xs:decimal">
+            <xs:fractionDigits value="17"/>
+            <xs:totalDigits value="18"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="DiscountAmountAndType1">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="DiscountAmountType1Choice"/>
+            <xs:element name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="DiscountAmountType1Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="ExternalDiscountAmountType1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="Document">
+        <xs:sequence>
+            <xs:element name="CstmrCdtTrfInitn" type="CustomerCreditTransferInitiationV05"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="DocumentAdjustment1">
+        <xs:sequence>
+            <xs:element name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CdtDbtInd" type="CreditDebitCode"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Rsn" type="Max4Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="AddtlInf" type="Max140Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="DocumentType3Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="RADM"/>
+            <xs:enumeration value="RPIN"/>
+            <xs:enumeration value="FXDR"/>
+            <xs:enumeration value="DISP"/>
+            <xs:enumeration value="PUOR"/>
+            <xs:enumeration value="SCOR"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="DocumentType5Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="MSIN"/>
+            <xs:enumeration value="CNFA"/>
+            <xs:enumeration value="DNFA"/>
+            <xs:enumeration value="CINV"/>
+            <xs:enumeration value="CREN"/>
+            <xs:enumeration value="DEBN"/>
+            <xs:enumeration value="HIRI"/>
+            <xs:enumeration value="SBIN"/>
+            <xs:enumeration value="CMCN"/>
+            <xs:enumeration value="SOAC"/>
+            <xs:enumeration value="DISP"/>
+            <xs:enumeration value="BOLD"/>
+            <xs:enumeration value="VCHR"/>
+            <xs:enumeration value="AROI"/>
+            <xs:enumeration value="TSUT"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="EquivalentAmount2">
+        <xs:sequence>
+            <xs:element name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
+            <xs:element name="CcyOfTrf" type="ActiveOrHistoricCurrencyCode"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ExchangeRate1">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="UnitCcy" type="ActiveOrHistoricCurrencyCode"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="XchgRate" type="BaseOneRate"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="RateTp" type="ExchangeRateType1Code"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CtrctId" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="ExchangeRateType1Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="SPOT"/>
+            <xs:enumeration value="SALE"/>
+            <xs:enumeration value="AGRD"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExternalAccountIdentification1Code">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="4"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExternalCashAccountType1Code">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="4"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExternalCategoryPurpose1Code">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="4"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExternalClearingSystemIdentification1Code">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="5"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExternalDiscountAmountType1Code">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="4"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExternalFinancialInstitutionIdentification1Code">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="4"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExternalLocalInstrument1Code">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="35"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExternalOrganisationIdentification1Code">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="4"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExternalPersonIdentification1Code">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="4"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExternalPurpose1Code">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="4"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExternalServiceLevel1Code">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="4"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExternalTaxAmountType1Code">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="4"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="FinancialIdentificationSchemeName1Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="ExternalFinancialInstitutionIdentification1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="FinancialInstitutionIdentification8">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="BICFI" type="BICFIIdentifier"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="ClrSysMmbId" type="ClearingSystemMemberIdentification2"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Othr" type="GenericFinancialIdentification1"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="GenericAccountIdentification1">
+        <xs:sequence>
+            <xs:element name="Id" type="Max34Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="AccountSchemeName1Choice"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="GenericFinancialIdentification1">
+        <xs:sequence>
+            <xs:element name="Id" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="FinancialIdentificationSchemeName1Choice"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="GenericOrganisationIdentification1">
+        <xs:sequence>
+            <xs:element name="Id" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="OrganisationIdentificationSchemeName1Choice"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="GenericPersonIdentification1">
+        <xs:sequence>
+            <xs:element name="Id" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="PersonIdentificationSchemeName1Choice"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="GroupHeader48">
+        <xs:sequence>
+            <xs:element name="MsgId" type="Max35Text"/>
+            <xs:element name="CreDtTm" type="ISODateTime"/>
+            <xs:element maxOccurs="2" minOccurs="0" name="Authstn" type="Authorisation1Choice"/>
+            <xs:element name="NbOfTxs" type="Max15NumericText"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CtrlSum" type="DecimalNumber"/>
+            <xs:element name="InitgPty" type="PartyIdentification43"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="FwdgAgt" type="BranchAndFinancialInstitutionIdentification5"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="IBAN2007Identifier">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z]{2,2}[0-9]{2,2}[a-zA-Z0-9]{1,30}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ISODate">
+        <xs:restriction base="xs:date"/>
+    </xs:simpleType>
+    <xs:simpleType name="ISODateTime">
+        <xs:restriction base="xs:dateTime"/>
+    </xs:simpleType>
+    <xs:simpleType name="Instruction3Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="CHQB"/>
+            <xs:enumeration value="HOLD"/>
+            <xs:enumeration value="PHOB"/>
+            <xs:enumeration value="TELB"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="InstructionForCreditorAgent1">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Cd" type="Instruction3Code"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="InstrInf" type="Max140Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="LocalInstrument2Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="ExternalLocalInstrument1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:simpleType name="Max10Text">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="10"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Max128Text">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="128"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Max140Text">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="140"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Max15NumericText">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[0-9]{1,15}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Max16Text">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="16"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Max2048Text">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="2048"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Max34Text">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="34"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Max350Text">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="350"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Max35Text">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="35"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Max4Text">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="4"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Max70Text">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="70"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="NameAndAddress10">
+        <xs:sequence>
+            <xs:element name="Nm" type="Max140Text"/>
+            <xs:element name="Adr" type="PostalAddress6"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="NamePrefix1Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="DOCT"/>
+            <xs:enumeration value="MIST"/>
+            <xs:enumeration value="MISS"/>
+            <xs:enumeration value="MADM"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Number">
+        <xs:restriction base="xs:decimal">
+            <xs:fractionDigits value="0"/>
+            <xs:totalDigits value="18"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="OrganisationIdentification8">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="AnyBIC" type="AnyBICIdentifier"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Othr" type="GenericOrganisationIdentification1"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="OrganisationIdentificationSchemeName1Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="ExternalOrganisationIdentification1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="Party11Choice">
+        <xs:choice>
+            <xs:element name="OrgId" type="OrganisationIdentification8"/>
+            <xs:element name="PrvtId" type="PersonIdentification5"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="PartyIdentification43">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Id" type="Party11Choice"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CtryOfRes" type="CountryCode"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CtctDtls" type="ContactDetails2"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="PaymentIdentification1">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="InstrId" type="Max35Text"/>
+            <xs:element name="EndToEndId" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="PaymentInstruction9">
+        <xs:sequence>
+            <xs:element name="PmtInfId" type="Max35Text"/>
+            <xs:element name="PmtMtd" type="PaymentMethod3Code"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="BtchBookg" type="BatchBookingIndicator"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="NbOfTxs" type="Max15NumericText"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CtrlSum" type="DecimalNumber"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="PmtTpInf" type="PaymentTypeInformation19"/>
+            <xs:element name="ReqdExctnDt" type="ISODate"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="PoolgAdjstmntDt" type="ISODate"/>
+            <xs:element name="Dbtr" type="PartyIdentification43"/>
+            <xs:element name="DbtrAcct" type="CashAccount24"/>
+            <xs:element name="DbtrAgt" type="BranchAndFinancialInstitutionIdentification5"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="DbtrAgtAcct" type="CashAccount24"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="InstrForDbtrAgt" type="Max140Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="UltmtDbtr" type="PartyIdentification43"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="ChrgBr" type="ChargeBearerType1Code"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="ChrgsAcct" type="CashAccount24"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="ChrgsAcctAgt" type="BranchAndFinancialInstitutionIdentification5"/>
+            <xs:element maxOccurs="unbounded" minOccurs="1" name="CdtTrfTxInf" type="CreditTransferTransaction6"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="PaymentMethod3Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="CHK"/>
+            <xs:enumeration value="TRF"/>
+            <xs:enumeration value="TRA"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="PaymentTypeInformation19">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="InstrPrty" type="Priority2Code"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="SvcLvl" type="ServiceLevel8Choice"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="LclInstrm" type="LocalInstrument2Choice"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CtgyPurp" type="CategoryPurpose1Choice"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="PercentageRate">
+        <xs:restriction base="xs:decimal">
+            <xs:fractionDigits value="10"/>
+            <xs:totalDigits value="11"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="PersonIdentification5">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="DtAndPlcOfBirth" type="DateAndPlaceOfBirth"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Othr" type="GenericPersonIdentification1"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="PersonIdentificationSchemeName1Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="ExternalPersonIdentification1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:simpleType name="PhoneNumber">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="\+[0-9]{1,3}-[0-9()+\-]{1,30}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="PostalAddress6">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="AdrTp" type="AddressType2Code"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Dept" type="Max70Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="SubDept" type="Max70Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="StrtNm" type="Max70Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="BldgNb" type="Max16Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="PstCd" type="Max16Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="TwnNm" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CtrySubDvsn" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Ctry" type="CountryCode"/>
+            <xs:element maxOccurs="7" minOccurs="0" name="AdrLine" type="Max70Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="Priority2Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="HIGH"/>
+            <xs:enumeration value="NORM"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="Purpose2Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="ExternalPurpose1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="ReferredDocumentInformation3">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="ReferredDocumentType2"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Nb" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="RltdDt" type="ISODate"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ReferredDocumentType1Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="DocumentType5Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="ReferredDocumentType2">
+        <xs:sequence>
+            <xs:element name="CdOrPrtry" type="ReferredDocumentType1Choice"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="RegulatoryAuthority2">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Ctry" type="CountryCode"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="RegulatoryReporting3">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="DbtCdtRptgInd" type="RegulatoryReportingType1Code"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Authrty" type="RegulatoryAuthority2"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Dtls" type="StructuredRegulatoryReporting3"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="RegulatoryReportingType1Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="CRED"/>
+            <xs:enumeration value="DEBT"/>
+            <xs:enumeration value="BOTH"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="RemittanceAmount2">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="DuePyblAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="DscntApldAmt" type="DiscountAmountAndType1"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CdtNoteAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="TaxAmt" type="TaxAmountAndType1"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="AdjstmntAmtAndRsn" type="DocumentAdjustment1"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="RmtdAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="RemittanceInformation7">
+        <xs:sequence>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Ustrd" type="Max140Text"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Strd" type="StructuredRemittanceInformation9"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="RemittanceLocation2">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="RmtId" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="RmtLctnMtd" type="RemittanceLocationMethod2Code"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="RmtLctnElctrncAdr" type="Max2048Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="RmtLctnPstlAdr" type="NameAndAddress10"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="RemittanceLocationMethod2Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="FAXI"/>
+            <xs:enumeration value="EDIC"/>
+            <xs:enumeration value="URID"/>
+            <xs:enumeration value="EMAL"/>
+            <xs:enumeration value="POST"/>
+            <xs:enumeration value="SMSM"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ServiceLevel8Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="ExternalServiceLevel1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="StructuredRegulatoryReporting3">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Dt" type="ISODate"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Ctry" type="CountryCode"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Cd" type="Max10Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Inf" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="StructuredRemittanceInformation9">
+        <xs:sequence>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="RfrdDocInf" type="ReferredDocumentInformation3"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="RfrdDocAmt" type="RemittanceAmount2"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CdtrRefInf" type="CreditorReferenceInformation2"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Invcr" type="PartyIdentification43"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Invcee" type="PartyIdentification43"/>
+            <xs:element maxOccurs="3" minOccurs="0" name="AddtlRmtInf" type="Max140Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="SupplementaryData1">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="PlcAndNm" type="Max350Text"/>
+            <xs:element name="Envlp" type="SupplementaryDataEnvelope1"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="SupplementaryDataEnvelope1">
+        <xs:sequence>
+            <xs:any namespace="##any" processContents="lax"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TaxAmount1">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Rate" type="PercentageRate"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="TaxblBaseAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="TtlAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Dtls" type="TaxRecordDetails1"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TaxAmountAndType1">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="TaxAmountType1Choice"/>
+            <xs:element name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TaxAmountType1Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="ExternalTaxAmountType1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="TaxAuthorisation1">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Titl" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TaxInformation3">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Cdtr" type="TaxParty1"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Dbtr" type="TaxParty2"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="AdmstnZn" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="RefNb" type="Max140Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Mtd" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="TtlTaxblBaseAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="TtlTaxAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Dt" type="ISODate"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="SeqNb" type="Number"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Rcrd" type="TaxRecord1"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TaxParty1">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="TaxId" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="RegnId" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="TaxTp" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TaxParty2">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="TaxId" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="RegnId" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="TaxTp" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Authstn" type="TaxAuthorisation1"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TaxPeriod1">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Yr" type="ISODate"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="TaxRecordPeriod1Code"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="FrToDt" type="DatePeriodDetails"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TaxRecord1">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Ctgy" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CtgyDtls" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="DbtrSts" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CertId" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="FrmsCd" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Prd" type="TaxPeriod1"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="TaxAmt" type="TaxAmount1"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="AddtlInf" type="Max140Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TaxRecordDetails1">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Prd" type="TaxPeriod1"/>
+            <xs:element name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="TaxRecordPeriod1Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="MM01"/>
+            <xs:enumeration value="MM02"/>
+            <xs:enumeration value="MM03"/>
+            <xs:enumeration value="MM04"/>
+            <xs:enumeration value="MM05"/>
+            <xs:enumeration value="MM06"/>
+            <xs:enumeration value="MM07"/>
+            <xs:enumeration value="MM08"/>
+            <xs:enumeration value="MM09"/>
+            <xs:enumeration value="MM10"/>
+            <xs:enumeration value="MM11"/>
+            <xs:enumeration value="MM12"/>
+            <xs:enumeration value="QTR1"/>
+            <xs:enumeration value="QTR2"/>
+            <xs:enumeration value="QTR3"/>
+            <xs:enumeration value="QTR4"/>
+            <xs:enumeration value="HLF1"/>
+            <xs:enumeration value="HLF2"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
 
=== modified file 'account_banking_sepa_credit_transfer/data/payment_type_sepa_sct.xml'
--- account_banking_sepa_credit_transfer/data/payment_type_sepa_sct.xml	2013-09-23 13:38:15 +0000
+++ account_banking_sepa_credit_transfer/data/payment_type_sepa_sct.xml	2014-03-19 00:47:00 +0000
@@ -1,34 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
+<data noupdate="0">
 
 
 <!-- TODO In the suitable_bank_types field, we should restrict to IBAN type and Rib+IBAN of l10n_fr_rib ? -->
+<record id="export_sepa_sct_001_001_05" model="payment.mode.type">
+    <field name="name">SEPA Credit Transfer v05</field>
+    <field name="code">pain.001.001.05</field>
+    <field name="suitable_bank_types"
+       eval="[(6,0,[ref('base_iban.bank_iban')])]" />
+    <field name="ir_model_id" ref="model_banking_export_sepa_wizard"/>
+</record>
+
 <record id="export_sepa_sct_001_001_04" model="payment.mode.type">
     <field name="name">SEPA Credit Transfer v04</field>
     <field name="code">pain.001.001.04</field>
     <field name="suitable_bank_types"
-           eval="[(6,0,[ref('base_iban.bank_iban')])]" />
+       eval="[(6,0,[ref('base_iban.bank_iban')])]" />
     <field name="ir_model_id" ref="model_banking_export_sepa_wizard"/>
-    <field name="payment_order_type">payment</field>
 </record>
 
 <record id="export_sepa_sct_001_001_03" model="payment.mode.type">
-    <field name="name">SEPA Credit Transfer v03</field>
+    <field name="name">SEPA Credit Transfer v03 (recommended)</field>
     <field name="code">pain.001.001.03</field>
     <field name="suitable_bank_types"
-           eval="[(6,0,[ref('base_iban.bank_iban')])]" />
+       eval="[(6,0,[ref('base_iban.bank_iban')])]" />
     <field name="ir_model_id" ref="model_banking_export_sepa_wizard"/>
-    <field name="payment_order_type">payment</field>
 </record>
 
 <record id="export_sepa_sct_001_001_02" model="payment.mode.type">
     <field name="name">SEPA Credit Transfer v02</field>
     <field name="code">pain.001.001.02</field>
     <field name="suitable_bank_types"
-           eval="[(6,0,[ref('base_iban.bank_iban')])]" />
+       eval="[(6,0,[ref('base_iban.bank_iban')])]" />
     <field name="ir_model_id" ref="model_banking_export_sepa_wizard"/>
-    <field name="payment_order_type">payment</field>
 </record>
 
 
 
=== modified file 'account_banking_sepa_credit_transfer/i18n/account_banking_sepa_credit_transfer.pot'
--- account_banking_sepa_credit_transfer/i18n/account_banking_sepa_credit_transfer.pot	2013-06-06 08:04:29 +0000
+++ account_banking_sepa_credit_transfer/i18n/account_banking_sepa_credit_transfer.pot	2014-03-19 00:47:00 +0000
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-06 08:01+0000\n"
-"PO-Revision-Date: 2013-06-06 08:01+0000\n"
+"POT-Creation-Date: 2013-12-23 22:49+0000\n"
+"PO-Revision-Date: 2013-12-23 22:49+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,24 +16,14 @@
 "Plural-Forms: \n"
 
 #. module: account_banking_sepa_credit_transfer
-#: field:banking.export.sepa,file:0
-#: field:banking.export.sepa.wizard,file_id:0
-msgid "SEPA XML file"
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
-#: view:banking.export.sepa:0
-msgid "Payment order"
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
 #: selection:banking.export.sepa.wizard,state:0
 msgid "Create"
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
-#: help:banking.export.sepa.wizard,msg_identification:0
-msgid "This is the message identification of the entire SEPA XML file. 35 characters max."
+#: field:banking.export.sepa,nb_transactions:0
+#: field:banking.export.sepa.wizard,nb_transactions:0
+msgid "Number of Transactions"
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
@@ -43,11 +33,6 @@
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
-#: view:banking.export.sepa:0
-msgid "General information"
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
 #: field:banking.export.sepa,state:0
 #: field:banking.export.sepa.wizard,state:0
 msgid "State"
@@ -59,9 +44,8 @@
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
-#: field:banking.export.sepa,prefered_exec_date:0
-#: field:banking.export.sepa.wizard,prefered_exec_date:0
-msgid "Prefered execution date"
+#: help:banking.export.sepa.wizard,charge_bearer:0
+msgid "Following service level : transaction charges are to be applied following the rules agreed in the service level and/or scheme (SEPA Core messages must use this). Shared : transaction charges on the debtor side are to be borne by the debtor, transaction charges on the creditor side are to be borne by the creditor. Borne by creditor : all transaction charges are to be borne by the creditor. Borne by debtor : all transaction charges are to be borne by the debtor."
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
@@ -71,13 +55,19 @@
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
-#: field:banking.export.sepa,generation_date:0
-msgid "Generation date"
+#: field:banking.export.sepa,batch_booking:0
+#: field:banking.export.sepa.wizard,batch_booking:0
+msgid "Batch Booking"
+msgstr ""
+
+#. module: account_banking_sepa_credit_transfer
+#: selection:banking.export.sepa,state:0
+msgid "Sent"
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
 #: model:ir.model,name:account_banking_sepa_credit_transfer.model_banking_export_sepa_wizard
-msgid "Export SEPA Credit Transfer XML file"
+msgid "Export SEPA Credit Transfer File"
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
@@ -96,19 +86,15 @@
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
-#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.act_banking_export_sepa_payment_order
-msgid "Generated SEPA files"
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
-#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.action_account_banking_sepa
-#: model:ir.ui.menu,name:account_banking_sepa_credit_transfer.menu_account_banking_sepa
-msgid "Generated SEPA XML files"
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
-#: selection:banking.export.sepa,state:0
-msgid "Sent"
+#: selection:banking.export.sepa,charge_bearer:0
+#: selection:banking.export.sepa.wizard,charge_bearer:0
+msgid "Following Service Level"
+msgstr ""
+
+#. module: account_banking_sepa_credit_transfer
+#: selection:banking.export.sepa,charge_bearer:0
+#: selection:banking.export.sepa.wizard,charge_bearer:0
+msgid "Borne by Creditor"
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
@@ -122,90 +108,80 @@
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
-#: field:banking.export.sepa,msg_identification:0
-#: field:banking.export.sepa.wizard,msg_identification:0
-msgid "Message identification"
+#: selection:banking.export.sepa,charge_bearer:0
+#: selection:banking.export.sepa.wizard,charge_bearer:0
+msgid "Borne by Debtor"
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
-#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:284
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:128
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:245
 #, python-format
-msgid "The generated XML file is not valid against the official XML Schema Definition. The generated XML file and the full error have been written in the server logs. Here is the error, which may give you an idea on the cause of the problem : %s"
+msgid "Error:"
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
 #: field:banking.export.sepa,total_amount:0
 #: field:banking.export.sepa.wizard,total_amount:0
-msgid "Total amount"
+msgid "Total Amount"
+msgstr ""
+
+#. module: account_banking_sepa_credit_transfer
+#: field:banking.export.sepa,charge_bearer:0
+#: field:banking.export.sepa.wizard,charge_bearer:0
+msgid "Charge Bearer"
+msgstr ""
+
+#. module: account_banking_sepa_credit_transfer
+#: view:banking.export.sepa.wizard:0
+msgid "SEPA File Generation"
+msgstr ""
+
+#. module: account_banking_sepa_credit_transfer
+#: model:ir.model,name:account_banking_sepa_credit_transfer.model_banking_export_sepa
+msgid "SEPA export"
+msgstr ""
+
+#. module: account_banking_sepa_credit_transfer
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:246
+#, python-format
+msgid "Missing Bank Account on invoice '%s' (payment order line reference '%s')."
+msgstr ""
+
+#. module: account_banking_sepa_credit_transfer
+#: field:banking.export.sepa,file:0
+#: field:banking.export.sepa.wizard,file_id:0
+msgid "SEPA XML File"
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
 #: help:banking.export.sepa,charge_bearer:0
-#: help:banking.export.sepa.wizard,charge_bearer:0
-msgid "Shared : transaction charges on the sender side are to be borne by the debtor, transaction charges on the receiver side are to be borne by the creditor (most transfers use this). Borne by creditor : all transaction charges are to be borne by the creditor. Borne by debtor : all transaction charges are to be borne by the debtor. Following service level : transaction charges are to be applied following the rules agreed in the service level and/or scheme."
+msgid "Following service level : transaction charges are to be applied following the rules agreed in the service level and/or scheme (SEPA Core messages must use this). Shared : transaction charges on the creditor side are to be borne by the creditor, transaction charges on the debtor side are to be borne by the debtor. Borne by creditor : all transaction charges are to be borne by the creditor. Borne by debtor : all transaction charges are to be borne by the debtor."
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
-#: selection:banking.export.sepa,charge_bearer:0
-#: selection:banking.export.sepa.wizard,charge_bearer:0
-msgid "Borne by creditor"
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:129
+#, python-format
+msgid "Payment Type Code '%s' is not supported. The only Payment Type Codes supported for SEPA Credit Transfers are 'pain.001.001.02', 'pain.001.001.03', 'pain.001.001.04' and 'pain.001.001.05'."
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
 #: view:banking.export.sepa:0
 #: field:banking.export.sepa,payment_order_ids:0
 #: field:banking.export.sepa.wizard,payment_order_ids:0
-msgid "Payment orders"
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
-#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:90
-#, python-format
-msgid "This IBAN is not valid : %s"
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
-#: view:banking.export.sepa.wizard:0
-msgid "SEPA XML file generation"
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
-#: view:banking.export.sepa.wizard:0
-msgid "Reference for further communication"
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
-#: view:banking.export.sepa.wizard:0
-msgid "Processing details"
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
-#: model:ir.model,name:account_banking_sepa_credit_transfer.model_banking_export_sepa
-msgid "SEPA export"
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
-#: selection:banking.export.sepa,charge_bearer:0
-#: selection:banking.export.sepa.wizard,charge_bearer:0
-msgid "Borne by debtor"
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
-#: field:banking.export.sepa,nb_transactions:0
-#: field:banking.export.sepa.wizard,nb_transactions:0
-msgid "Number of transactions"
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
-#: selection:banking.export.sepa,charge_bearer:0
-#: selection:banking.export.sepa.wizard,charge_bearer:0
-msgid "Following service level"
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
-#: field:banking.export.sepa,charge_bearer:0
-#: field:banking.export.sepa.wizard,charge_bearer:0
-msgid "Charge bearer"
+msgid "Payment Orders"
+msgstr ""
+
+#. module: account_banking_sepa_credit_transfer
+#: view:banking.export.sepa:0
+msgid "General Information"
+msgstr ""
+
+#. module: account_banking_sepa_credit_transfer
+#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.act_banking_export_sepa_payment_order
+#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.action_account_banking_sepa
+#: model:ir.ui.menu,name:account_banking_sepa_credit_transfer.menu_account_banking_sepa
+msgid "SEPA Credit Transfer Files"
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
@@ -215,11 +191,6 @@
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
-#: help:banking.export.sepa.wizard,prefered_exec_date:0
-msgid "This is the date on which the file should be processed by the bank. Please keep in mind that banks only execute on working days and typically use a delay of two days between execution date and effective transfer date."
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
 #: field:banking.export.sepa.wizard,file:0
 msgid "File"
 msgstr ""
@@ -230,22 +201,7 @@
 msgstr ""
 
 #. module: account_banking_sepa_credit_transfer
-#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:135
-#, python-format
-msgid "Payment Type Code '%s' is not supported. The only Payment Type Codes supported for SEPA Credit Transfers are 'pain.001.001.02', 'pain.001.001.03' and 'pain.001.001.04'."
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
-#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:90
-#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:135
-#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:284
-#, python-format
-msgid "Error :"
-msgstr ""
-
-#. module: account_banking_sepa_credit_transfer
-#: field:banking.export.sepa,batch_booking:0
-#: field:banking.export.sepa.wizard,batch_booking:0
-msgid "Batch booking"
+#: field:banking.export.sepa,create_date:0
+msgid "Generation Date"
 msgstr ""
 
 
=== modified file 'account_banking_sepa_credit_transfer/i18n/fr.po'
--- account_banking_sepa_credit_transfer/i18n/fr.po	2013-06-06 08:04:29 +0000
+++ account_banking_sepa_credit_transfer/i18n/fr.po	2014-03-19 00:47:00 +0000
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-06 08:01+0000\n"
-"PO-Revision-Date: 2013-06-06 08:01+0000\n"
+"POT-Creation-Date: 2013-12-23 22:52+0000\n"
+"PO-Revision-Date: 2013-12-23 22:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,25 +16,15 @@
 "Plural-Forms: \n"
 
 #. module: account_banking_sepa_credit_transfer
-#: field:banking.export.sepa,file:0
-#: field:banking.export.sepa.wizard,file_id:0
-msgid "SEPA XML file"
-msgstr "Fichier SEPA XML"
-
-#. module: account_banking_sepa_credit_transfer
-#: view:banking.export.sepa:0
-msgid "Payment order"
-msgstr "Ordre de paiement"
-
-#. module: account_banking_sepa_credit_transfer
 #: selection:banking.export.sepa.wizard,state:0
 msgid "Create"
 msgstr "Créer"
 
 #. module: account_banking_sepa_credit_transfer
-#: help:banking.export.sepa.wizard,msg_identification:0
-msgid "This is the message identification of the entire SEPA XML file. 35 characters max."
-msgstr "Ceci est le libellé d'identification du fichier SEPA XML. 35 caractères maximum."
+#: field:banking.export.sepa,nb_transactions:0
+#: field:banking.export.sepa.wizard,nb_transactions:0
+msgid "Number of Transactions"
+msgstr "Nombre de transactions"
 
 #. module: account_banking_sepa_credit_transfer
 #: field:banking.export.sepa,filename:0
@@ -43,11 +33,6 @@
 msgstr "Nom du fichier"
 
 #. module: account_banking_sepa_credit_transfer
-#: view:banking.export.sepa:0
-msgid "General information"
-msgstr "Informations générales"
-
-#. module: account_banking_sepa_credit_transfer
 #: field:banking.export.sepa,state:0
 #: field:banking.export.sepa.wizard,state:0
 msgid "State"
@@ -59,10 +44,9 @@
 msgstr "Brouillon"
 
 #. module: account_banking_sepa_credit_transfer
-#: field:banking.export.sepa,prefered_exec_date:0
-#: field:banking.export.sepa.wizard,prefered_exec_date:0
-msgid "Prefered execution date"
-msgstr "Date d'exécution demandée"
+#: help:banking.export.sepa.wizard,charge_bearer:0
+msgid "Following service level : transaction charges are to be applied following the rules agreed in the service level and/or scheme (SEPA Core messages must use this). Shared : transaction charges on the debtor side are to be borne by the debtor, transaction charges on the creditor side are to be borne by the creditor. Borne by creditor : all transaction charges are to be borne by the creditor. Borne by debtor : all transaction charges are to be borne by the debtor."
+msgstr "Suivant le niveau de service : la répartition des frais bancaires suit les règles pré-établies dans le schema ou dans le contrat avec la banque (les messages SEPA Core doivent utiliser ce paramètre). Partagés : les frais bancaires côté débiteur sont à la charge du débiteur, les frais bancaires côté créancier sont à la charge du créancier. Supportés par le créancier : tous les frais bancaires sont à la charge du créancier. Supportés par le débiteur : tous les frais bancaires sont à la charge du débiteur."
 
 #. module: account_banking_sepa_credit_transfer
 #: selection:banking.export.sepa,charge_bearer:0
@@ -71,14 +55,20 @@
 msgstr "Partagé"
 
 #. module: account_banking_sepa_credit_transfer
-#: field:banking.export.sepa,generation_date:0
-msgid "Generation date"
-msgstr "Date de génération"
+#: field:banking.export.sepa,batch_booking:0
+#: field:banking.export.sepa.wizard,batch_booking:0
+msgid "Batch Booking"
+msgstr "Débit groupé"
+
+#. module: account_banking_sepa_credit_transfer
+#: selection:banking.export.sepa,state:0
+msgid "Sent"
+msgstr "Envoyé"
 
 #. module: account_banking_sepa_credit_transfer
 #: model:ir.model,name:account_banking_sepa_credit_transfer.model_banking_export_sepa_wizard
-msgid "Export SEPA Credit Transfer XML file"
-msgstr "Exporte the fichier de virement SEPA XML"
+msgid "Export SEPA Credit Transfer File"
+msgstr "Exporte le fichier de virement SEPA"
 
 #. module: account_banking_sepa_credit_transfer
 #: view:banking.export.sepa:0
@@ -96,20 +86,16 @@
 msgstr "Réconcilié"
 
 #. module: account_banking_sepa_credit_transfer
-#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.act_banking_export_sepa_payment_order
-msgid "Generated SEPA files"
-msgstr "Fichiers SEPA générés"
-
-#. module: account_banking_sepa_credit_transfer
-#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.action_account_banking_sepa
-#: model:ir.ui.menu,name:account_banking_sepa_credit_transfer.menu_account_banking_sepa
-msgid "Generated SEPA XML files"
-msgstr "Fichiers SEPA XML générés"
-
-#. module: account_banking_sepa_credit_transfer
-#: selection:banking.export.sepa,state:0
-msgid "Sent"
-msgstr "Envoyé"
+#: selection:banking.export.sepa,charge_bearer:0
+#: selection:banking.export.sepa.wizard,charge_bearer:0
+msgid "Following Service Level"
+msgstr "Suivant le niveau de service"
+
+#. module: account_banking_sepa_credit_transfer
+#: selection:banking.export.sepa,charge_bearer:0
+#: selection:banking.export.sepa.wizard,charge_bearer:0
+msgid "Borne by Creditor"
+msgstr "Supportés par le destinataire"
 
 #. module: account_banking_sepa_credit_transfer
 #: view:banking.export.sepa.wizard:0
@@ -122,91 +108,81 @@
 msgstr "Générer"
 
 #. module: account_banking_sepa_credit_transfer
-#: field:banking.export.sepa,msg_identification:0
-#: field:banking.export.sepa.wizard,msg_identification:0
-msgid "Message identification"
-msgstr "Libellé d'identification"
+#: selection:banking.export.sepa,charge_bearer:0
+#: selection:banking.export.sepa.wizard,charge_bearer:0
+msgid "Borne by Debtor"
+msgstr "Supportés par l'émetteur"
 
 #. module: account_banking_sepa_credit_transfer
-#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:284
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:128
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:245
 #, python-format
-msgid "The generated XML file is not valid against the official XML Schema Definition. The generated XML file and the full error have been written in the server logs. Here is the error, which may give you an idea on the cause of the problem : %s"
-msgstr "Le fichier XML généré n'est pas valide par rapport à la Définition du Schéma XML officiel. Le fichier XML généré et le message d'erreur complet ont été écrits dans les logs du serveur. Voici l'erreur, qui vous donnera peut-être une idée sur la cause du problème : %s"
+msgid "Error:"
+msgstr "Erreur :"
 
 #. module: account_banking_sepa_credit_transfer
 #: field:banking.export.sepa,total_amount:0
 #: field:banking.export.sepa.wizard,total_amount:0
-msgid "Total amount"
+msgid "Total Amount"
 msgstr "Montant total"
 
 #. module: account_banking_sepa_credit_transfer
+#: field:banking.export.sepa,charge_bearer:0
+#: field:banking.export.sepa.wizard,charge_bearer:0
+msgid "Charge Bearer"
+msgstr "Répartition des frais"
+
+#. module: account_banking_sepa_credit_transfer
+#: view:banking.export.sepa.wizard:0
+msgid "SEPA File Generation"
+msgstr "Génération du fichier SEPA"
+
+#. module: account_banking_sepa_credit_transfer
+#: model:ir.model,name:account_banking_sepa_credit_transfer.model_banking_export_sepa
+msgid "SEPA export"
+msgstr "Export SEPA"
+
+#. module: account_banking_sepa_credit_transfer
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:246
+#, python-format
+msgid "Missing Bank Account on invoice '%s' (payment order line reference '%s')."
+msgstr "Compte bancaire manquant sur la facture '%s' (référence de la ligne de paiement : '%s')."
+
+#. module: account_banking_sepa_credit_transfer
+#: field:banking.export.sepa,file:0
+#: field:banking.export.sepa.wizard,file_id:0
+msgid "SEPA XML File"
+msgstr "Fichier SEPA XML"
+
+#. module: account_banking_sepa_credit_transfer
 #: help:banking.export.sepa,charge_bearer:0
-#: help:banking.export.sepa.wizard,charge_bearer:0
-msgid "Shared : transaction charges on the sender side are to be borne by the debtor, transaction charges on the receiver side are to be borne by the creditor (most transfers use this). Borne by creditor : all transaction charges are to be borne by the creditor. Borne by debtor : all transaction charges are to be borne by the debtor. Following service level : transaction charges are to be applied following the rules agreed in the service level and/or scheme."
-msgstr "Partagés : les frais bancaires côté émetteur sont à la charge de l'émetteur et les frais bancaires côté destinataire sont à la charge du destinataire (la plupart des virements utilisent cette répartition). Supportés par le destinataire : tous les frais bancaires sont à la charge du destinataire. Supportés par l'émetteur : tous les frais bancaires sont à la charge de l'émetteur. Suivant le niveau de service : la répartition des frais bancaires suit les règles pré-établies dans le contrat avec la banque."
+msgid "Following service level : transaction charges are to be applied following the rules agreed in the service level and/or scheme (SEPA Core messages must use this). Shared : transaction charges on the creditor side are to be borne by the creditor, transaction charges on the debtor side are to be borne by the debtor. Borne by creditor : all transaction charges are to be borne by the creditor. Borne by debtor : all transaction charges are to be borne by the debtor."
+msgstr "Suivant le niveau de service : la répartition des frais bancaires suit les règles pré-établies dans le schema ou dans le contrat avec la banque (les messages SEPA Core doivent utiliser ce paramètre). Partagés : les frais bancaires côté débiteur sont à la charge du débiteur, les frais bancaires côté créancier sont à la charge du créancier. Supportés par le créancier : tous les frais bancaires sont à la charge du créancier. Supportés par le débiteur : tous les frais bancaires sont à la charge du débiteur."
 
 #. module: account_banking_sepa_credit_transfer
-#: selection:banking.export.sepa,charge_bearer:0
-#: selection:banking.export.sepa.wizard,charge_bearer:0
-msgid "Borne by creditor"
-msgstr "Supportés par le destinataire"
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:129
+#, python-format
+msgid "Payment Type Code '%s' is not supported. The only Payment Type Codes supported for SEPA Credit Transfers are 'pain.001.001.02', 'pain.001.001.03', 'pain.001.001.04' and 'pain.001.001.05'."
+msgstr "Le code du Type de paiement '%s' n'est pas supporté. Les seuls codes de Type de paiement supportés pour les virements SEPA sont 'pain.001.001.02', 'pain.001.001.03', 'pain.001.001.04' et 'pain.001.001.05'."
 
 #. module: account_banking_sepa_credit_transfer
 #: view:banking.export.sepa:0
 #: field:banking.export.sepa,payment_order_ids:0
 #: field:banking.export.sepa.wizard,payment_order_ids:0
-msgid "Payment orders"
+msgid "Payment Orders"
 msgstr "Ordres de paiement"
 
 #. module: account_banking_sepa_credit_transfer
-#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:90
-#, python-format
-msgid "This IBAN is not valid : %s"
-msgstr "Cet IBAN n'est pas valide : %s"
-
-#. module: account_banking_sepa_credit_transfer
-#: view:banking.export.sepa.wizard:0
-msgid "SEPA XML file generation"
-msgstr "Génération du fichier SEPA XML"
-
-#. module: account_banking_sepa_credit_transfer
-#: view:banking.export.sepa.wizard:0
-msgid "Reference for further communication"
-msgstr "Référence pour communication ultérieure"
-
-#. module: account_banking_sepa_credit_transfer
-#: view:banking.export.sepa.wizard:0
-msgid "Processing details"
-msgstr "Paramètres"
-
-#. module: account_banking_sepa_credit_transfer
-#: model:ir.model,name:account_banking_sepa_credit_transfer.model_banking_export_sepa
-msgid "SEPA export"
-msgstr "Export SEPA"
-
-#. module: account_banking_sepa_credit_transfer
-#: selection:banking.export.sepa,charge_bearer:0
-#: selection:banking.export.sepa.wizard,charge_bearer:0
-msgid "Borne by debtor"
-msgstr "Supportés par l'émetteur"
-
-#. module: account_banking_sepa_credit_transfer
-#: field:banking.export.sepa,nb_transactions:0
-#: field:banking.export.sepa.wizard,nb_transactions:0
-msgid "Number of transactions"
-msgstr "Nombre de transactions"
-
-#. module: account_banking_sepa_credit_transfer
-#: selection:banking.export.sepa,charge_bearer:0
-#: selection:banking.export.sepa.wizard,charge_bearer:0
-msgid "Following service level"
-msgstr "Suivant le niveau de service"
-
-#. module: account_banking_sepa_credit_transfer
-#: field:banking.export.sepa,charge_bearer:0
-#: field:banking.export.sepa.wizard,charge_bearer:0
-msgid "Charge bearer"
-msgstr "Répartition des frais"
+#: view:banking.export.sepa:0
+msgid "General Information"
+msgstr "Informations générales"
+
+#. module: account_banking_sepa_credit_transfer
+#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.act_banking_export_sepa_payment_order
+#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.action_account_banking_sepa
+#: model:ir.ui.menu,name:account_banking_sepa_credit_transfer.menu_account_banking_sepa
+msgid "SEPA Credit Transfer Files"
+msgstr "Fichiers de virement SEPA"
 
 #. module: account_banking_sepa_credit_transfer
 #: help:banking.export.sepa,batch_booking:0
@@ -215,11 +191,6 @@
 msgstr "Si coché, le relevé de compte ne comportera qu'une ligne de débit pour tous les virements du fichier SEPA XML ; si non coché, le relevé de compte comportera une ligne de débit pour chaque virement du fichier SEPA XML."
 
 #. module: account_banking_sepa_credit_transfer
-#: help:banking.export.sepa.wizard,prefered_exec_date:0
-msgid "This is the date on which the file should be processed by the bank. Please keep in mind that banks only execute on working days and typically use a delay of two days between execution date and effective transfer date."
-msgstr "C'est la date à laquelle le fichier doit être traité par la banque. Gardez en tête que les banques réalisent des traitements seulement les jours ouvrés et ont habituellement un délai de 2 jours entre la date de traitement et la date du transfert effectif."
-
-#. module: account_banking_sepa_credit_transfer
 #: field:banking.export.sepa.wizard,file:0
 msgid "File"
 msgstr "Fichier"
@@ -230,22 +201,7 @@
 msgstr "Annuler"
 
 #. module: account_banking_sepa_credit_transfer
-#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:135
-#, python-format
-msgid "Payment Type Code '%s' is not supported. The only Payment Type Codes supported for SEPA Credit Transfers are 'pain.001.001.02', 'pain.001.001.03' and 'pain.001.001.04'."
-msgstr "Le code '%s' pour le Type de Paiment n'est pas supporté. Les seuls codes de Types de Paiement supportés pour les virements SEPA sont 'pain.001.001.02', 'pain.001.001.03' et 'pain.001.001.04'."
-
-#. module: account_banking_sepa_credit_transfer
-#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:90
-#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:135
-#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:284
-#, python-format
-msgid "Error :"
-msgstr "Erreur :"
-
-#. module: account_banking_sepa_credit_transfer
-#: field:banking.export.sepa,batch_booking:0
-#: field:banking.export.sepa.wizard,batch_booking:0
-msgid "Batch booking"
-msgstr "Débit groupé"
+#: field:banking.export.sepa,create_date:0
+msgid "Generation Date"
+msgstr "Date de génération"
 
 
=== added file 'account_banking_sepa_credit_transfer/i18n/nl.po'
--- account_banking_sepa_credit_transfer/i18n/nl.po	1970-01-01 00:00:00 +0000
+++ account_banking_sepa_credit_transfer/i18n/nl.po	2014-03-19 00:47:00 +0000
@@ -0,0 +1,405 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* account_banking_sepa_credit_transfer
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-13 09:13+0000\n"
+"PO-Revision-Date: 2013-12-03 11:49+0000\n"
+"Last-Translator: Jan Jurkus (GCE CAD-Service) <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-04 05:59+0000\n"
+"X-Generator: Launchpad (build 16861)\n"
+
+#. module: account_banking_sepa_credit_transfer
+#: field:banking.export.sepa,prefered_exec_date:0
+#: field:banking.export.sepa.wizard,prefered_exec_date:0
+msgid "Prefered Execution Date"
+msgstr "Voorkeurs uitvoerdatum"
+
+#. module: account_banking_sepa_credit_transfer
+#: selection:banking.export.sepa.wizard,state:0
+msgid "Create"
+msgstr "Aanmaken"
+
+#. module: account_banking_sepa_credit_transfer
+#: field:banking.export.sepa,nb_transactions:0
+#: field:banking.export.sepa.wizard,nb_transactions:0
+msgid "Number of Transactions"
+msgstr "Aantal transacties"
+
+#. module: account_banking_sepa_credit_transfer
+#: field:banking.export.sepa,filename:0
+#: field:banking.export.sepa.wizard,filename:0
+msgid "Filename"
+msgstr "Bestandsnaam"
+
+#. module: account_banking_sepa_credit_transfer
+#: field:banking.export.sepa,state:0
+#: field:banking.export.sepa.wizard,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: account_banking_sepa_credit_transfer
+#: selection:banking.export.sepa,state:0
+msgid "Draft"
+msgstr "Concept"
+
+#. module: account_banking_sepa_credit_transfer
+#: help:banking.export.sepa.wizard,charge_bearer:0
+msgid ""
+"Following service level : transaction charges are to be applied following "
+"the rules agreed in the service level and/or scheme (SEPA Core messages must "
+"use this). Shared : transaction charges on the debtor side are to be borne "
+"by the debtor, transaction charges on the creditor side are to be borne by "
+"the creditor. Borne by creditor : all transaction charges are to be borne by "
+"the creditor. Borne by debtor : all transaction charges are to be borne by "
+"the debtor."
+msgstr ""
+"Volg service level: Transactie kosten worden toegepast volgens de "
+"afgesproken regels in het service level en/of schema (Voor SEPA berichten "
+"deze gebruiken). Gedeeld : De transactiekosten aan de debiteur zijde zijn "
+"voor de schuldeiser, transactiekosten aan de crediteur kant zijn voor de "
+"schuldenaar. Rekening van de schuldenaar: Alle transactie kosten zijn voor "
+"rekening van de schuldenaar. Rekening van de schuldeiser: Alle transactie "
+"kosten zijn voor rekening van de schuldeiser."
+
+#. module: account_banking_sepa_credit_transfer
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:117
+#, python-format
+msgid ""
+"Cannot compute the '%s' of the Payment Line with Invoice Reference '%s'."
+msgstr ""
+"Niet mogelijk de '%s' van de betaalregel te berekenen met factuurreferentie "
+"'%s'."
+
+#. module: account_banking_sepa_credit_transfer
+#: selection:banking.export.sepa,charge_bearer:0
+#: selection:banking.export.sepa.wizard,charge_bearer:0
+msgid "Shared"
+msgstr "Gedeeld"
+
+#. module: account_banking_sepa_credit_transfer
+#: field:banking.export.sepa,batch_booking:0
+#: field:banking.export.sepa.wizard,batch_booking:0
+msgid "Batch Booking"
+msgstr "Bach verwerking"
+
+#. module: account_banking_sepa_credit_transfer
+#: model:ir.model,name:account_banking_sepa_credit_transfer.model_banking_export_sepa_wizard
+msgid "Export SEPA Credit Transfer XML file"
+msgstr "Exporteer SEPA XML overschrijvingsbestand"
+
+#. module: account_banking_sepa_credit_transfer
+#: view:banking.export.sepa:0
+msgid "SEPA Credit Transfer"
+msgstr "SEPA overschrijving"
+
+#. module: account_banking_sepa_credit_transfer
+#: selection:banking.export.sepa.wizard,state:0
+msgid "Finish"
+msgstr "Gereed"
+
+#. module: account_banking_sepa_credit_transfer
+#: selection:banking.export.sepa,state:0
+msgid "Reconciled"
+msgstr "Afgeletterd"
+
+#. module: account_banking_sepa_credit_transfer
+#: selection:banking.export.sepa,charge_bearer:0
+#: selection:banking.export.sepa.wizard,charge_bearer:0
+msgid "Following Service Level"
+msgstr "Volg service level"
+
+#. module: account_banking_sepa_credit_transfer
+#: selection:banking.export.sepa,charge_bearer:0
+#: selection:banking.export.sepa.wizard,charge_bearer:0
+msgid "Borne by Creditor"
+msgstr "Rekening van schuldeiser"
+
+#. module: account_banking_sepa_credit_transfer
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:122
+#, python-format
+msgid "Cannot compute the '%s'."
+msgstr "Niet mogelijk de '%s' te berekenen."
+
+#. module: account_banking_sepa_credit_transfer
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:126
+#, python-format
+msgid "The type of the field '%s' is %s. It should be a string or unicode."
+msgstr ""
+"Het veldsoort van het veld '%s' is %s. Het moet een string of unicode soort "
+"zijn."
+
+#. module: account_banking_sepa_credit_transfer
+#: selection:banking.export.sepa,state:0
+msgid "Sent"
+msgstr "Verzonden"
+
+#. module: account_banking_sepa_credit_transfer
+#: view:banking.export.sepa.wizard:0
+msgid "Validate"
+msgstr "Bevestig"
+
+#. module: account_banking_sepa_credit_transfer
+#: view:banking.export.sepa.wizard:0
+msgid "Generate"
+msgstr "Genereer"
+
+#. module: account_banking_sepa_credit_transfer
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:169
+#, python-format
+msgid ""
+"The generated XML file is not valid against the official XML Schema "
+"Definition. The generated XML file and the full error have been written in "
+"the server logs. Here is the error, which may give you an idea on the cause "
+"of the problem : %s"
+msgstr ""
+"Het gegenereerde XML bestand is niet geldig volgens de officiële XML schema "
+"definities. Het gegenereerde XML bestand en de volledige fout zijn "
+"weggeschreven in de server log bestanden. Hier is de fout, wat u een idee "
+"kunt geven over de oorzaak van het probleem: %s\""
+
+#. module: account_banking_sepa_credit_transfer
+#: selection:banking.export.sepa,charge_bearer:0
+#: selection:banking.export.sepa.wizard,charge_bearer:0
+msgid "Borne by Debtor"
+msgstr "Rekening van schuldenaar"
+
+#. module: account_banking_sepa_credit_transfer
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:90
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:116
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:121
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:130
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:168
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:206
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:350
+#, python-format
+msgid "Error:"
+msgstr "Fout:"
+
+#. module: account_banking_sepa_credit_transfer
+#: field:banking.export.sepa,total_amount:0
+#: field:banking.export.sepa.wizard,total_amount:0
+msgid "Total Amount"
+msgstr "Totaalbedrag"
+
+#. module: account_banking_sepa_credit_transfer
+#: field:banking.export.sepa,charge_bearer:0
+#: field:banking.export.sepa.wizard,charge_bearer:0
+msgid "Charge Bearer"
+msgstr "Kostenverdeling"
+
+#. module: account_banking_sepa_credit_transfer
+#: view:banking.export.sepa.wizard:0
+msgid "SEPA File Generation"
+msgstr "SEPA bestand genereren"
+
+#. module: account_banking_sepa_credit_transfer
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:125
+#, python-format
+msgid "Field type error:"
+msgstr "Veldsoort fout:"
+
+#. module: account_banking_sepa_credit_transfer
+#: model:ir.model,name:account_banking_sepa_credit_transfer.model_banking_export_sepa
+msgid "SEPA export"
+msgstr "SEPA export"
+
+#. module: account_banking_sepa_credit_transfer
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:351
+#, python-format
+msgid ""
+"Missing Bank Account on invoice '%s' (payment order line reference '%s')."
+msgstr ""
+"Ontbrekende bankrekening op factuur '%s' (betaalregel referentie '%s')"
+
+#. module: account_banking_sepa_credit_transfer
+#: field:banking.export.sepa,file:0
+#: field:banking.export.sepa.wizard,file_id:0
+msgid "SEPA XML File"
+msgstr "SEPA XML bestand"
+
+#. module: account_banking_sepa_credit_transfer
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:131
+#, python-format
+msgid "The '%s' is empty or 0. It should have a non-null value."
+msgstr "De '%s' is leeg of 0. Het mag geen lege of nul waarde hebben."
+
+#. module: account_banking_sepa_credit_transfer
+#: help:banking.export.sepa,charge_bearer:0
+msgid ""
+"Following service level : transaction charges are to be applied following "
+"the rules agreed in the service level and/or scheme (SEPA Core messages must "
+"use this). Shared : transaction charges on the creditor side are to be borne "
+"by the creditor, transaction charges on the debtor side are to be borne by "
+"the debtor. Borne by creditor : all transaction charges are to be borne by "
+"the creditor. Borne by debtor : all transaction charges are to be borne by "
+"the debtor."
+msgstr ""
+"Volg service level: Transactie kosten worden toegepast volgens de "
+"afgesproken regels in het service level en/of schema (Voor SEPA berichten "
+"deze gebruiken). Gedeeld : De transactiekosten aan de crediteur zijde zijn "
+"voor de schuldenaar, transactiekosten aan de debiteur kant zijn voor de "
+"schuldeiser. Rekening van de schuldenaar: Alle transactie kosten zijn voor "
+"rekening van de schuldenaar. Rekening van de schuldeiser: Alle transactie "
+"kosten zijn voor rekening van de schuldeiser."
+
+#. module: account_banking_sepa_credit_transfer
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:207
+#, python-format
+msgid ""
+"Payment Type Code '%s' is not supported. The only Payment Type Codes "
+"supported for SEPA Credit Transfers are 'pain.001.001.02', "
+"'pain.001.001.03', 'pain.001.001.04' and 'pain.001.001.05'."
+msgstr ""
+"Betaal type code '%s' wordt niet ondersteund. De enige betaal type codes "
+"voor SEPA credit boekingen zijn 'pain.001.001.02', 'pain.001.001.03' en "
+"'pain.001.001.04'."
+
+#. module: account_banking_sepa_credit_transfer
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:90
+#, python-format
+msgid "This IBAN is not valid : %s"
+msgstr "Deze IBAN is niet geldig : %s"
+
+#. module: account_banking_sepa_credit_transfer
+#: view:banking.export.sepa:0
+#: field:banking.export.sepa,payment_order_ids:0
+#: field:banking.export.sepa.wizard,payment_order_ids:0
+msgid "Payment Orders"
+msgstr "Betaalopdrachten"
+
+#. module: account_banking_sepa_credit_transfer
+#: view:banking.export.sepa:0
+msgid "General Information"
+msgstr "Algemene informatie"
+
+#. module: account_banking_sepa_credit_transfer
+#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.act_banking_export_sepa_payment_order
+#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.action_account_banking_sepa
+#: model:ir.ui.menu,name:account_banking_sepa_credit_transfer.menu_account_banking_sepa
+msgid "SEPA Credit Transfer Files"
+msgstr "SEPA Credit Transfer bestanden"
+
+#. module: account_banking_sepa_credit_transfer
+#: help:banking.export.sepa,batch_booking:0
+#: help:banking.export.sepa.wizard,batch_booking:0
+msgid ""
+"If true, the bank statement will display only one debit line for all the "
+"wire transfers of the SEPA XML file ; if false, the bank statement will "
+"display one debit line per wire transfer of the SEPA XML file."
+msgstr ""
+"Indien aangevinkt zal het bankafschrift maar één debet regel weergeven voor "
+"alle overschrijvingen van het SEPA XML bestand. Indien uitgevinkt, zal het "
+"bankafschrift een debet regel weergeven per SEPA XML bestand."
+
+#. module: account_banking_sepa_credit_transfer
+#: help:banking.export.sepa.wizard,prefered_exec_date:0
+msgid ""
+"This is the date on which the file should be processed by the bank. Please "
+"keep in mind that banks only execute on working days and typically use a "
+"delay of two days between execution date and effective transfer date."
+msgstr ""
+"Dit is de datum waarop het bestand zou moeten worden verwerkt door de bank. "
+"Houdt u er rekening mee dat banken alleen op werkdagen de bestanden "
+"verwerken en veelal een vertraging hebben van twee dagen tussen de "
+"verwerkingsdatum en de effectieve overschrijfdatum."
+
+#. module: account_banking_sepa_credit_transfer
+#: field:banking.export.sepa.wizard,file:0
+msgid "File"
+msgstr "Bestand"
+
+#. module: account_banking_sepa_credit_transfer
+#: view:banking.export.sepa.wizard:0
+msgid "Cancel"
+msgstr "Annuleren"
+
+#. module: account_banking_sepa_credit_transfer
+#: field:banking.export.sepa,create_date:0
+msgid "Generation Date"
+msgstr "Aangemaakt op"
+
+#~ msgid "SEPA XML file"
+#~ msgstr "SEPA XML bestand"
+
+#~ msgid "Number of transactions"
+#~ msgstr "Aantal transacties"
+
+#~ msgid ""
+#~ "This is the message identification of the entire SEPA XML file. 35 "
+#~ "characters max."
+#~ msgstr ""
+#~ "Dit is een bericht identificatie van het gehele SEPA XML bestand. Maximaal "
+#~ "35 karakters."
+
+#~ msgid "Prefered execution date"
+#~ msgstr "Voorkeurs uitvoerdatum"
+
+#~ msgid "Generation date"
+#~ msgstr "Aanmaakdatum"
+
+#~ msgid "Message identification"
+#~ msgstr "Bericht identificatie"
+
+#~ msgid "Total amount"
+#~ msgstr "Totaal bedrag"
+
+#~ msgid "Borne by creditor"
+#~ msgstr "Rekening van schuldeiser"
+
+#~ msgid "Payment orders"
+#~ msgstr "Betaalopdrachten"
+
+#~ msgid "Generated SEPA Credit Transfer files"
+#~ msgstr "Gegenereerde SEPA overschrijfbestanden"
+
+#~ msgid "SEPA XML file generation"
+#~ msgstr "SEPA XML bestand generatie"
+
+#~ msgid "Reference for further communication"
+#~ msgstr "Referentie voor verdere communicatie"
+
+#~ msgid "Processing details"
+#~ msgstr "Verwerkings details"
+
+#~ msgid "Borne by debtor"
+#~ msgstr "Rekening van schuldenaar"
+
+#~ msgid "Payment order"
+#~ msgstr "Betaalopdracht"
+
+#~ msgid "Following service level"
+#~ msgstr "Volg service level"
+
+#~ msgid "Charge bearer"
+#~ msgstr "Kostenverdeling"
+
+#~ msgid ""
+#~ "Shared : transaction charges on the sender side are to be borne by the "
+#~ "debtor, transaction charges on the receiver side are to be borne by the "
+#~ "creditor (most transfers use this). Borne by creditor : all transaction "
+#~ "charges are to be borne by the creditor. Borne by debtor : all transaction "
+#~ "charges are to be borne by the debtor. Following service level : transaction "
+#~ "charges are to be applied following the rules agreed in the service level "
+#~ "and/or scheme."
+#~ msgstr ""
+#~ "Gedeeld : De transactiekosten aan de verzender kant zijn voor de "
+#~ "schuldeiser, transactiekosten aan de ontvanger kant zijn voor de schuldenaar "
+#~ "(deze keuze wordt het meest gebruikt). Rekening van de schuldenaar: Alle "
+#~ "transactie kosten zijn voor rekening van de schuldenaar. Rekening van de "
+#~ "schuldeiser: Alle transactie kosten zijn voor rekening van de schuldeiser. "
+#~ "Volg service level: Transactie kosten worden toegepast volgens de "
+#~ "afgesporken regels in het service level en/of schema."
+
+#~ msgid "Batch booking"
+#~ msgstr "Batch boeking"
+
+#~ msgid "Generated SEPA Credit Transfer XML files"
+#~ msgstr "Gengenereerde SEPA XML overschrijf bestanden"
 
=== added directory 'account_banking_sepa_credit_transfer/static'
=== added directory 'account_banking_sepa_credit_transfer/static/src'
=== added directory 'account_banking_sepa_credit_transfer/static/src/img'
=== added file 'account_banking_sepa_credit_transfer/static/src/img/icon.png'
 Binary files account_banking_sepa_credit_transfer/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and account_banking_sepa_credit_transfer/static/src/img/icon.png	2014-03-19 00:47:00 +0000 differ
=== modified file 'account_banking_sepa_credit_transfer/wizard/__init__.py'
--- account_banking_sepa_credit_transfer/wizard/__init__.py	2013-05-15 20:09:21 +0000
+++ account_banking_sepa_credit_transfer/wizard/__init__.py	2014-03-19 00:47:00 +0000
@@ -20,4 +20,4 @@
 #
 ##############################################################################
 
-import export_sepa
+from . import export_sepa
 
=== modified file 'account_banking_sepa_credit_transfer/wizard/export_sepa.py'
--- account_banking_sepa_credit_transfer/wizard/export_sepa.py	2013-10-14 14:43:35 +0000
+++ account_banking_sepa_credit_transfer/wizard/export_sepa.py	2014-03-19 00:47:00 +0000
@@ -21,51 +21,58 @@
 ##############################################################################
 
 
-from osv import osv, fields
-import base64
-from datetime import datetime, timedelta
-from tools.translate import _
-import tools
+from openerp.osv import orm, fields
+from openerp.tools.translate import _
+from openerp import netsvc
 from lxml import etree
-import logging
-import netsvc
-
-_logger = logging.getLogger(__name__)
-
-
-class banking_export_sepa_wizard(osv.osv_memory):
+
+
+class banking_export_sepa_wizard(orm.TransientModel):
     _name = 'banking.export.sepa.wizard'
-    _description = 'Export SEPA Credit Transfer XML file'
+    _inherit = ['banking.export.pain']
+    _description = 'Export SEPA Credit Transfer File'
+
     _columns = {
-        'state': fields.selection([('create', 'Create'), ('finish', 'Finish')],
-            'State', readonly=True),
-        'msg_identification': fields.char('Message identification', size=35,
-            # Can't set required=True on the field because it blocks
-            # the launch of the wizard -> I set it as required in the view
-            help='This is the message identification of the entire SEPA XML file. 35 characters max.'),
-        'batch_booking': fields.boolean('Batch booking',
-            help="If true, the bank statement will display only one debit line for all the wire transfers of the SEPA XML file ; if false, the bank statement will display one debit line per wire transfer of the SEPA XML file."),
-        'prefered_exec_date': fields.date('Prefered execution date',
-            help='This is the date on which the file should be processed by the bank. Please keep in mind that banks only execute on working days and typically use a delay of two days between execution date and effective transfer date.'),
+        'state': fields.selection([
+            ('create', 'Create'),
+            ('finish', 'Finish'),
+            ], 'State', readonly=True),
+        'batch_booking': fields.boolean(
+            'Batch Booking',
+            help="If true, the bank statement will display only one debit "
+            "line for all the wire transfers of the SEPA XML file ; if "
+            "false, the bank statement will display one debit line per wire "
+            "transfer of the SEPA XML file."),
         'charge_bearer': fields.selection([
+            ('SLEV', 'Following Service Level'),
             ('SHAR', 'Shared'),
-            ('CRED', 'Borne by creditor'),
-            ('DEBT', 'Borne by debtor'),
-            ('SLEV', 'Following service level'),
-            ], 'Charge bearer', required=True,
-            help='Shared : transaction charges on the sender side are to be borne by the debtor, transaction charges on the receiver side are to be borne by the creditor (most transfers use this). Borne by creditor : all transaction charges are to be borne by the creditor. Borne by debtor : all transaction charges are to be borne by the debtor. Following service level : transaction charges are to be applied following the rules agreed in the service level and/or scheme.'),
-        'nb_transactions': fields.related('file_id', 'nb_transactions',
-            type='integer', string='Number of transactions', readonly=True),
-        'total_amount': fields.related('file_id', 'total_amount', type='float',
-            string='Total amount', readonly=True),
-        'file_id': fields.many2one('banking.export.sepa', 'SEPA XML file', readonly=True),
-        'file': fields.related('file_id', 'file', string="File", type='binary',
+            ('CRED', 'Borne by Creditor'),
+            ('DEBT', 'Borne by Debtor'),
+            ], 'Charge Bearer', required=True,
+            help="Following service level : transaction charges are to be "
+            "applied following the rules agreed in the service level and/or "
+            "scheme (SEPA Core messages must use this). Shared : transaction "
+            "charges on the debtor side are to be borne by the debtor, "
+            "transaction charges on the creditor side are to be borne by "
+            "the creditor. Borne by creditor : all transaction charges are "
+            "to be borne by the creditor. Borne by debtor : all transaction "
+            "charges are to be borne by the debtor."),
+        'nb_transactions': fields.related(
+            'file_id', 'nb_transactions', type='integer',
+            string='Number of Transactions', readonly=True),
+        'total_amount': fields.related(
+            'file_id', 'total_amount', type='float', string='Total Amount',
             readonly=True),
-        'filename': fields.related('file_id', 'filename', string="Filename",
-            type='char', size=256, readonly=True),
-        'payment_order_ids': fields.many2many('payment.order',
-            'wiz_sepa_payorders_rel', 'wizard_id', 'payment_order_id',
-            'Payment orders', readonly=True),
+        'file_id': fields.many2one(
+            'banking.export.sepa', 'SEPA XML File', readonly=True),
+        'file': fields.related(
+            'file_id', 'file', string="File", type='binary', readonly=True),
+        'filename': fields.related(
+            'file_id', 'filename', string="Filename", type='char',
+            size=256, readonly=True),
+        'payment_order_ids': fields.many2many(
+            'payment.order', 'wiz_sepa_payorders_rel', 'wizard_id',
+            'payment_order_id', 'Payment Orders', readonly=True),
         }
 
     _defaults = {
@@ -73,46 +80,24 @@
         'state': 'create',
         }
 
-
-    def _limit_size(self, cr, uid, field, max_size, context=None):
-        '''Limit size of strings to respect the PAIN standard'''
-        max_size = int(max_size)
-        return field[0:max_size]
-
-
-    def _validate_iban(self, cr, uid, iban, context=None):
-        '''if IBAN is valid, returns IBAN
-        if IBAN is NOT valid, raises an error message'''
-        partner_bank_obj = self.pool.get('res.partner.bank')
-        if partner_bank_obj.is_iban_valid(cr, uid, iban, context=context):
-            return iban.replace(' ', '')
-        else:
-            raise osv.except_osv(_('Error :'), _("This IBAN is not valid : %s") % iban)
-
     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(banking_export_sepa_wizard, self).create(cr, uid,
-            vals, context=context)
-
+        return super(banking_export_sepa_wizard, self).create(
+            cr, uid, vals, context=context)
 
     def create_sepa(self, cr, uid, ids, context=None):
         '''
         Creates the SEPA Credit Transfer file. That's the important code !
         '''
-        payment_order_obj = self.pool.get('payment.order')
-
+        if context is None:
+            context = {}
         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
-        my_company_iban = self._validate_iban(cr, uid, sepa_export.payment_order_ids[0].mode.bank_id.acc_number, context=context)
-        my_company_bic = sepa_export.payment_order_ids[0].mode.bank_id.bank.bic
-        #my_company_country_code = sepa_export.payment_order_ids[0].mode.bank_id.partner_id.address[0].country_id.code
-        #my_company_city = sepa_export.payment_order_ids[0].mode.bank_id.partner_id.address[0].city
-        #my_company_street1 = sepa_export.payment_order_ids[0].mode.bank_id.partner_id.address[0].street
         pain_flavor = sepa_export.payment_order_ids[0].mode.type.code
+        convert_to_ascii = \
+            sepa_export.payment_order_ids[0].mode.convert_to_ascii
         if pain_flavor == 'pain.001.001.02':
             bic_xml_tag = 'BIC'
             name_maxsize = 70
@@ -121,226 +106,193 @@
             bic_xml_tag = 'BIC'
             # size 70 -> 140 for <Nm> with pain.001.001.03
             # BUT the European Payment Council, in the document
-            # "SEPA Credit Transfer Scheme Customer-to-bank Implementation guidelines" v6.0
-            # available on http://www.europeanpaymentscouncil.eu/knowledge_bank.cfm
+            # "SEPA Credit Transfer Scheme Customer-to-bank
+            # Implementation guidelines" v6.0 available on
+            # http://www.europeanpaymentscouncil.eu/knowledge_bank.cfm
             # says that 'Nm' should be limited to 70
-            # so we follow the "European Payment Council" and we put 70 and not 140
+            # so we follow the "European Payment Council"
+            # and we put 70 and not 140
             name_maxsize = 70
             root_xml_tag = 'CstmrCdtTrfInitn'
         elif pain_flavor == 'pain.001.001.04':
             bic_xml_tag = 'BICFI'
             name_maxsize = 140
             root_xml_tag = 'CstmrCdtTrfInitn'
-        else:
-            raise osv.except_osv(_('Error :'), _("Payment Type Code '%s' is not supported. The only Payment Type Codes supported for SEPA Credit Transfers are 'pain.001.001.02', 'pain.001.001.03' and 'pain.001.001.04'.") % pain_flavor)
-        if sepa_export.batch_booking:
-            my_batch_booking = 'true'
-        else:
-            my_batch_booking = 'false'
-        my_msg_identification = sepa_export.msg_identification
-        if sepa_export.prefered_exec_date:
-            my_requested_exec_date = sepa_export.prefered_exec_date
-        else:
-            my_requested_exec_date = datetime.strftime(datetime.today() + timedelta(days=1), '%Y-%m-%d')
+        elif pain_flavor == 'pain.001.001.05':
+            bic_xml_tag = 'BICFI'
+            name_maxsize = 140
+            root_xml_tag = 'CstmrCdtTrfInitn'
+
+        else:
+            raise orm.except_orm(
+                _('Error:'),
+                _("Payment Type Code '%s' is not supported. The only "
+                    "Payment Type Codes supported for SEPA Credit Transfers "
+                    "are 'pain.001.001.02', 'pain.001.001.03', "
+                    "'pain.001.001.04' and 'pain.001.001.05'.")
+                % pain_flavor)
+
+        gen_args = {
+            'bic_xml_tag': bic_xml_tag,
+            'name_maxsize': name_maxsize,
+            'convert_to_ascii': convert_to_ascii,
+            'pain_flavor': pain_flavor,
+            'sepa_export': sepa_export,
+            'file_obj': self.pool['banking.export.sepa'],
+            'pain_xsd_file':
+            'account_banking_sepa_credit_transfer/data/%s.xsd'
+            % pain_flavor,
+        }
 
         pain_ns = {
             'xsi': 'http://www.w3.org/2001/XMLSchema-instance',
             None: 'urn:iso:std:iso:20022:tech:xsd:%s' % pain_flavor,
             }
 
-        root = etree.Element('Document', nsmap=pain_ns)
-        pain_root = etree.SubElement(root, root_xml_tag)
+        xml_root = etree.Element('Document', nsmap=pain_ns)
+        pain_root = etree.SubElement(xml_root, root_xml_tag)
+        pain_03_to_05 = \
+            ['pain.001.001.03', 'pain.001.001.04', 'pain.001.001.05']
+
         # A. Group header
-        group_header = etree.SubElement(pain_root, 'GrpHdr')
-        message_identification = etree.SubElement(group_header, 'MsgId')
-        message_identification.text = self._limit_size(cr, uid, my_msg_identification, 35, context=context)
-        creation_date_time = etree.SubElement(group_header, 'CreDtTm')
-        creation_date_time.text = datetime.strftime(datetime.today(), '%Y-%m-%dT%H:%M:%S')
-        if pain_flavor == 'pain.001.001.02':
-            # batch_booking is in "Group header" with pain.001.001.02
-            # and in "Payment info" in pain.001.001.03/04
-            batch_booking = etree.SubElement(group_header, 'BtchBookg')
-            batch_booking.text = my_batch_booking
-        nb_of_transactions_grphdr = etree.SubElement(group_header, 'NbOfTxs')
-        control_sum_grphdr = etree.SubElement(group_header, 'CtrlSum')
-        # Grpg removed in pain.001.001.03
-        if pain_flavor == 'pain.001.001.02':
-            grouping = etree.SubElement(group_header, 'Grpg')
-            grouping.text = 'GRPD'
-        initiating_party = etree.SubElement(group_header, 'InitgPty')
-        initiating_party_name = etree.SubElement(initiating_party, 'Nm')
-        initiating_party_name.text = self._limit_size(cr, uid, my_company_name, name_maxsize, context=context)
-        # B. Payment info
-        payment_info = etree.SubElement(pain_root, 'PmtInf')
-        payment_info_identification = etree.SubElement(payment_info, 'PmtInfId')
-        payment_info_identification.text = self._limit_size(cr, uid, my_msg_identification, 35, context=context)
-        payment_method = etree.SubElement(payment_info, 'PmtMtd')
-        payment_method.text = 'TRF'
-        if pain_flavor in ['pain.001.001.03', 'pain.001.001.04']:
-            # batch_booking is in "Group header" with pain.001.001.02
-            # and in "Payment info" in pain.001.001.03/04
-            batch_booking = etree.SubElement(payment_info, 'BtchBookg')
-            batch_booking.text = my_batch_booking
-        # It may seem surprising, but the
-        # "SEPA Credit Transfer Scheme Customer-to-bank Implementation guidelines"
-        # v6.0 says that control sum and nb_of_transactions should be present
-        # at both "group header" level and "payment info" level
-        # This seems to be confirmed by the tests carried out at
-        # BNP Paribas in PAIN v001.001.03
-        if pain_flavor in ['pain.001.001.03', 'pain.001.001.04']:
-            nb_of_transactions_pmtinf = etree.SubElement(payment_info, 'NbOfTxs')
-            control_sum_pmtinf = etree.SubElement(payment_info, 'CtrlSum')
-        payment_type_info = etree.SubElement(payment_info, 'PmtTpInf')
-        service_level = etree.SubElement(payment_type_info, 'SvcLvl')
-        service_level_code = etree.SubElement(service_level, 'Cd')
-        service_level_code.text = 'SEPA'
-        requested_exec_date = etree.SubElement(payment_info, 'ReqdExctnDt')
-        requested_exec_date.text = my_requested_exec_date
-        debtor = etree.SubElement(payment_info, 'Dbtr')
-        debtor_name = etree.SubElement(debtor, 'Nm')
-        debtor_name.text = self._limit_size(cr, uid, my_company_name, name_maxsize, context=context)
-#        debtor_address = etree.SubElement(debtor, 'PstlAdr')
-#        debtor_street = etree.SubElement(debtor_address, 'AdrLine')
-#        debtor_street.text = my_company_street1
-#        debtor_city = etree.SubElement(debtor_address, 'AdrLine')
-#        debtor_city.text = my_company_city
-#        debtor_country = etree.SubElement(debtor_address, 'Ctry')
-#        debtor_country.text = my_company_country_code
-        debtor_account = etree.SubElement(payment_info, 'DbtrAcct')
-        debtor_account_id = etree.SubElement(debtor_account, 'Id')
-        debtor_account_iban = etree.SubElement(debtor_account_id, 'IBAN')
-        debtor_account_iban.text = my_company_iban
-        debtor_agent = etree.SubElement(payment_info, 'DbtrAgt')
-        debtor_agent_institution = etree.SubElement(debtor_agent, 'FinInstnId')
-        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
+        group_header_1_0, nb_of_transactions_1_6, control_sum_1_7 = \
+            self.generate_group_header_block(
+                cr, uid, pain_root, gen_args, context=context)
 
-        transactions_count = 0
+        transactions_count_1_6 = 0
         total_amount = 0.0
-        amount_control_sum = 0.0
-        # Iterate on payment orders
+        amount_control_sum_1_7 = 0.0
+        lines_per_group = {}
+        # key = (requested_date, priority)
+        # values = list of lines as object
+        today = fields.date.context_today(self, cr, uid, context=context)
         for payment_order in sepa_export.payment_order_ids:
             total_amount = total_amount + payment_order.total
-            # Iterate each payment lines
             for line in payment_order.line_ids:
-                transactions_count += 1
+                priority = line.priority
+                if payment_order.date_prefered == 'due':
+                    requested_date = line.ml_maturity_date or today
+                elif payment_order.date_prefered == 'fixed':
+                    requested_date = payment_order.date_scheduled or today
+                else:
+                    requested_date = today
+                key = (requested_date, priority)
+                if key in lines_per_group:
+                    lines_per_group[key].append(line)
+                else:
+                    lines_per_group[key] = [line]
+                # Write requested_date on 'Payment date' of the pay line
+                if requested_date != line.date:
+                    self.pool['payment.line'].write(
+                        cr, uid, line.id,
+                        {'date': requested_date}, context=context)
+
+        for (requested_date, priority), lines in lines_per_group.items():
+            # B. Payment info
+            payment_info_2_0, nb_of_transactions_2_4, control_sum_2_5 = \
+                self.generate_start_payment_info_block(
+                    cr, uid, pain_root,
+                    "sepa_export.payment_order_ids[0].reference + '-' "
+                    "+ requested_date.replace('-', '')  + '-' + priority",
+                    priority, False, False, requested_date, {
+                        'sepa_export': sepa_export,
+                        'priority': priority,
+                        'requested_date': requested_date,
+                    }, gen_args, context=context)
+
+            self.generate_party_block(
+                cr, uid, payment_info_2_0, 'Dbtr', 'B',
+                'sepa_export.payment_order_ids[0].mode.bank_id.partner_id.'
+                'name',
+                'sepa_export.payment_order_ids[0].mode.bank_id.acc_number',
+                'sepa_export.payment_order_ids[0].mode.bank_id.bank.bic',
+                {'sepa_export': sepa_export},
+                gen_args, context=context)
+
+            charge_bearer_2_24 = etree.SubElement(payment_info_2_0, 'ChrgBr')
+            charge_bearer_2_24.text = sepa_export.charge_bearer
+
+            transactions_count_2_4 = 0
+            amount_control_sum_2_5 = 0.0
+            for line in lines:
+                transactions_count_1_6 += 1
+                transactions_count_2_4 += 1
                 # C. Credit Transfer Transaction Info
-                credit_transfer_transaction_info = etree.SubElement(payment_info, 'CdtTrfTxInf')
-                payment_identification = etree.SubElement(credit_transfer_transaction_info, 'PmtId')
-                instruction_identification = etree.SubElement(payment_identification, 'InstrId')
-                instruction_identification.text = self._limit_size(cr, uid, line.communication, 35, context=context) #otherwise, we can reach the invoice fields via ml_inv_ref
-                end2end_identification = etree.SubElement(payment_identification, 'EndToEndId')
-                end2end_identification.text = self._limit_size(cr, uid, line.communication, 35, context=context)
-                amount = etree.SubElement(credit_transfer_transaction_info, 'Amt')
-                instructed_amount = etree.SubElement(amount, 'InstdAmt', Ccy=line.currency.name)
-                instructed_amount.text = '%.2f' % line.amount_currency
-                amount_control_sum += line.amount_currency
-                creditor_agent = etree.SubElement(credit_transfer_transaction_info, 'CdtrAgt')
-                creditor_agent_institution = etree.SubElement(creditor_agent, 'FinInstnId')
+                credit_transfer_transaction_info_2_27 = etree.SubElement(
+                    payment_info_2_0, 'CdtTrfTxInf')
+                payment_identification_2_28 = etree.SubElement(
+                    credit_transfer_transaction_info_2_27, 'PmtId')
+                end2end_identification_2_30 = etree.SubElement(
+                    payment_identification_2_28, 'EndToEndId')
+                end2end_identification_2_30.text = self._prepare_field(
+                    cr, uid, 'End to End Identification', 'line.name',
+                    {'line': line}, 35, gen_args=gen_args,
+                    context=context)
+                currency_name = self._prepare_field(
+                    cr, uid, 'Currency Code', 'line.currency.name',
+                    {'line': line}, 3, gen_args=gen_args,
+                    context=context)
+                amount_2_42 = etree.SubElement(
+                    credit_transfer_transaction_info_2_27, 'Amt')
+                instructed_amount_2_43 = etree.SubElement(
+                    amount_2_42, 'InstdAmt', Ccy=currency_name)
+                instructed_amount_2_43.text = '%.2f' % line.amount_currency
+                amount_control_sum_1_7 += line.amount_currency
+                amount_control_sum_2_5 += line.amount_currency
+
                 if not line.bank_id:
-                    raise osv.except_osv(_('Error :'), _("Missing Bank Account on invoice '%s' (payment order line reference '%s').") %(line.ml_inv_ref.number, line.name))
-                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)
-# I don't think they want it
-# If they want it, we need to implement full spec p26 appendix
-#                creditor_address = etree.SubElement(creditor, 'PstlAdr')
-#                creditor_street = etree.SubElement(creditor_address, 'AdrLine')
-#                creditor_street.text = line.partner_id.address[0].street
-#                creditor_city = etree.SubElement(creditor_address, 'AdrLine')
-#                creditor_city.text = line.partner_id.address[0].city
-#                creditor_country = etree.SubElement(creditor_address, 'Ctry')
-#                creditor_country.text = line.partner_id.address[0].country_id.code
-                creditor_account = etree.SubElement(credit_transfer_transaction_info, 'CdtrAcct')
-                creditor_account_id = etree.SubElement(creditor_account, 'Id')
-                creditor_account_iban = etree.SubElement(creditor_account_id, 'IBAN')
-                creditor_account_iban.text = self._validate_iban(cr, uid, line.bank_id.acc_number, context=context)
-                remittance_info = etree.SubElement(credit_transfer_transaction_info, 'RmtInf')
-                # switch to Structured (Strdr) ? If we do it, beware that the format is not the same between pain 02 and pain 03
-                remittance_info_unstructured = etree.SubElement(remittance_info, 'Ustrd')
-                remittance_info_unstructured.text = self._limit_size(cr, uid, line.communication, 140, context=context)
-
-        if pain_flavor in ['pain.001.001.03', 'pain.001.001.04']:
-            nb_of_transactions_grphdr.text = nb_of_transactions_pmtinf.text = str(transactions_count)
-            control_sum_grphdr.text = control_sum_pmtinf.text = '%.2f' % amount_control_sum
+                    raise orm.except_orm(
+                        _('Error:'),
+                        _("Missing Bank Account on invoice '%s' (payment "
+                            "order line reference '%s').")
+                        % (line.ml_inv_ref.number, line.name))
+                self.generate_party_block(
+                    cr, uid, credit_transfer_transaction_info_2_27, 'Cdtr',
+                    'C', 'line.partner_id.name', 'line.bank_id.acc_number',
+                    'line.bank_id.bank.bic', {'line': line}, gen_args,
+                    context=context)
+
+                self.generate_remittance_info_block(
+                    cr, uid, credit_transfer_transaction_info_2_27,
+                    line, gen_args, context=context)
+
+            if pain_flavor in pain_03_to_05:
+                nb_of_transactions_2_4.text = str(transactions_count_2_4)
+                control_sum_2_5.text = '%.2f' % amount_control_sum_2_5
+
+        if pain_flavor in pain_03_to_05:
+            nb_of_transactions_1_6.text = str(transactions_count_1_6)
+            control_sum_1_7.text = '%.2f' % amount_control_sum_1_7
         else:
-            nb_of_transactions_grphdr.text = str(transactions_count)
-            control_sum_grphdr.text = '%.2f' % amount_control_sum
-
-
-        xml_string = etree.tostring(root, pretty_print=True, encoding='UTF-8', xml_declaration=True)
-        _logger.debug("Generated SEPA XML file below")
-        _logger.debug(xml_string)
-        official_pain_schema = etree.XMLSchema(etree.parse(tools.file_open('account_banking_sepa_credit_transfer/data/%s.xsd' % pain_flavor)))
-
-        try:
-            root_to_validate = etree.fromstring(xml_string)
-            official_pain_schema.assertValid(root_to_validate)
-        except Exception, e:
-            _logger.warning("The XML file is invalid against the XML Schema Definition")
-            _logger.warning(xml_string)
-            _logger.warning(e)
-            raise osv.except_osv(_('Error :'), _('The generated XML file is not valid against the official XML Schema Definition. The generated XML file and the full error have been written in the server logs. Here is the error, which may give you an idea on the cause of the problem : %s') % str(e))
-
-        # CREATE the banking.export.sepa record
-        file_id = self.pool.get('banking.export.sepa').create(cr, uid,
-            {
-            'msg_identification': my_msg_identification,
-            'batch_booking': sepa_export.batch_booking,
-            'charge_bearer': sepa_export.charge_bearer,
-            'prefered_exec_date': sepa_export.prefered_exec_date,
-            'total_amount': total_amount,
-            'nb_transactions': transactions_count,
-            'file': base64.encodestring(xml_string),
-            'payment_order_ids': [
-                (6, 0, [x.id for x in sepa_export.payment_order_ids])
-            ],
-            }, context=context)
-
-        self.write(cr, uid, ids, {
-            'file_id': file_id,
-            'state': 'finish',
-            }, context=context)
-
-        action = {
-            'name': 'SEPA XML',
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': self._name,
-            'res_id': ids[0],
-            'target': 'new',
-            }
-        return action
-
+            nb_of_transactions_1_6.text = str(transactions_count_1_6)
+            control_sum_1_7.text = '%.2f' % amount_control_sum_1_7
+
+        return self.finalize_sepa_file_creation(
+            cr, uid, ids, xml_root, total_amount, transactions_count_1_6,
+            gen_args, context=context)
 
     def cancel_sepa(self, cr, uid, ids, context=None):
         '''
-        Cancel the SEPA PAIN: just drop the file
+        Cancel the SEPA file: just drop the file
         '''
         sepa_export = self.browse(cr, uid, ids[0], context=context)
-        self.pool.get('banking.export.sepa').unlink(cr, uid, sepa_export.file_id.id, context=context)
+        self.pool.get('banking.export.sepa').unlink(
+            cr, uid, sepa_export.file_id.id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-
     def save_sepa(self, cr, uid, ids, context=None):
         '''
-        Save the SEPA PAIN: mark all payments in the file as 'sent'.
+        Save the SEPA file: 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,
-            sepa_export.file_id.id, {'state': 'sent'}, context=context)
+        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)
         return {'type': 'ir.actions.act_window_close'}
-
-
-banking_export_sepa_wizard()
-
 
=== modified file 'account_banking_sepa_credit_transfer/wizard/export_sepa_view.xml'
--- account_banking_sepa_credit_transfer/wizard/export_sepa_view.xml	2013-05-23 13:11:42 +0000
+++ account_banking_sepa_credit_transfer/wizard/export_sepa_view.xml	2014-03-19 00:47:00 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2010-2012 Akretion (http://www.akretion.com)
+  Copyright (C) 2010-2013 Akretion (http://www.akretion.com)
   @author: Alexis de Lattre <[e-mail]>
   The licence is in the file __openerp__.py
 -->
@@ -12,33 +12,21 @@
     <field name="model">banking.export.sepa.wizard</field>
     <field name="type">form</field>
     <field name="arch" type="xml">
-        <form string="SEPA XML file generation">
+        <form string="SEPA File Generation">
             <field name="state" invisible="True"/>
-            <group states="create">
-                <separator colspan="4" string="Processing details" />
+            <group states="create" col="2" colspan="2">
                 <field name="batch_booking" />
-                <field name="prefered_exec_date" />
                 <field name="charge_bearer" />
-                <separator colspan="4" string="Reference for further communication" />
-                <field name="msg_identification" required="True" />
-                <newline />
-                <button icon="gtk-close" special="cancel" string="Cancel" colspan="2"/>
-                <button icon="gtk-ok" string="Generate" name="create_sepa" type="object" colspan="2"/>
+                <button icon="gtk-close" string="Cancel" special="cancel"/>
+                <button icon="gtk-ok" string="Generate" name="create_sepa" type="object"/>
             </group>
-            <group states="finish">
+            <group states="finish" col="2" colspan="2">
                 <field name="total_amount" />
-                <!-- Don't display this field, to avoid this bug :
-                https://bugs.launchpad.net/openobject-client-web/+bug/718989
-                Bug desc : in the Gtk client, you have to clic twice on the
-                "Create" button.
-                <field name="nb_transactions" /> -->
-                <newline />
-                <field name="file_id" />
+                <field name="nb_transactions" />
                 <field name="file" filename="filename" />
                 <field name="filename" invisible="True"/>
-                <newline />
-                <button icon="gtk-cancel" string="Cancel" name="cancel_sepa" type="object" colspan="2"/>
-                <button icon="gtk-ok" string="Validate" name="save_sepa" type="object" colspan="2"/>
+                <button icon="gtk-cancel" string="Cancel" name="cancel_sepa" type="object"/>
+                <button icon="gtk-ok" string="Validate" name="save_sepa" type="object"/>
             </group>
         </form>
     </field>
 
=== added directory 'account_banking_sepa_direct_debit'
=== added file 'account_banking_sepa_direct_debit/__init__.py'
--- account_banking_sepa_direct_debit/__init__.py	1970-01-01 00:00:00 +0000
+++ account_banking_sepa_direct_debit/__init__.py	2014-03-19 00:47:00 +0000
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    SEPA Direct Debit module for OpenERP
+#    Copyright (C) 2013 Akretion (http://www.akretion.com)
+#    @author: Alexis de Lattre <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import company
+from . import wizard
+from . import account_banking_sdd
 
=== added file 'account_banking_sepa_direct_debit/__openerp__.py'
--- account_banking_sepa_direct_debit/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_banking_sepa_direct_debit/__openerp__.py	2014-03-19 00:47:00 +0000
@@ -0,0 +1,61 @@
+##############################################################################
+#
+#    SEPA Direct Debit module for OpenERP
+#    Copyright (C) 2013 Akretion (http://www.akretion.com)
+#    @author: Alexis de Lattre <[e-mail]>
+#
+#    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 SEPA Direct Debit',
+    'summary': 'Create SEPA files for Direct Debit',
+    'version': '0.1',
+    'license': 'AGPL-3',
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com',
+    'category': 'Banking addons',
+    'depends': ['account_direct_debit', 'account_banking_pain_base'],
+    'external_dependencies': {
+        'python': ['unidecode', 'lxml'],
+        },
+    'data': [
+        'security/original_mandate_required_security.xml',
+        'account_banking_sdd_view.xml',
+        'sdd_mandate_view.xml',
+        'res_partner_bank_view.xml',
+        'account_payment_view.xml',
+        'company_view.xml',
+        'mandate_expire_cron.xml',
+        'account_invoice_view.xml',
+        'wizard/export_sdd_view.xml',
+        'data/payment_type_sdd.xml',
+        'data/mandate_reference_sequence.xml',
+        'security/ir.model.access.csv',
+    ],
+    'description': '''
+Module to export direct debit payment orders in SEPA XML file format.
+
+SEPA PAIN (PAyment INitiation) is the new european standard for Customer-to-Bank payment instructions. This module implements SEPA Direct Debit (SDD), more specifically PAIN versions 008.001.02, 008.001.03 and 008.001.04. It is part of the ISO 20022 standard, available on http://www.iso20022.org.
+
+The Implementation Guidelines for SEPA Direct Debit published by the European Payments Council (http://http://www.europeanpaymentscouncil.eu) use PAIN version 008.001.02. So if you don't know which version your bank supports, you should try version 008.001.02 first.
+
+This module uses the framework provided by the banking addons, cf https://launchpad.net/banking-addons
+
+Please contact Alexis de Lattre from Akretion <[e-mail]> for any help or question about this module.
+    ''',
+    'active': False,
+    'installable': True,
+    'application': True,
+}
 
=== added file 'account_banking_sepa_direct_debit/account_banking_sdd.py'
--- account_banking_sepa_direct_debit/account_banking_sdd.py	1970-01-01 00:00:00 +0000
+++ account_banking_sepa_direct_debit/account_banking_sdd.py	2014-03-19 00:47:00 +0000
@@ -0,0 +1,396 @@
+##############################################################################
+#
+#    SEPA Direct Debit module for OpenERP
+#    Copyright (C) 2013 Akretion (http://www.akretion.com)
+#    @author: Alexis de Lattre <[e-mail]>
+#
+#    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
+from openerp.tools.translate import _
+import decimal_precision as dp
+from unidecode import unidecode
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+import logging
+
+NUMBER_OF_UNUSED_MONTHS_BEFORE_EXPIRY = 36
+
+logger = logging.getLogger(__name__)
+
+
+class banking_export_sdd(orm.Model):
+    '''SEPA Direct Debit export'''
+    _name = 'banking.export.sdd'
+    _description = __doc__
+    _rec_name = 'filename'
+
+    def _generate_filename(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for sepa_file in self.browse(cr, uid, ids, context=context):
+            ref = sepa_file.payment_order_ids[0].reference
+            if ref:
+                label = unidecode(ref.replace('/', '-'))
+            else:
+                label = 'error'
+            res[sepa_file.id] = 'sdd_%s.xml' % label
+        return res
+
+    _columns = {
+        'payment_order_ids': fields.many2many(
+            'payment.order',
+            'account_payment_order_sdd_rel',
+            'banking_export_sepa_id', 'account_order_id',
+            'Payment Orders',
+            readonly=True),
+        'nb_transactions': fields.integer(
+            'Number of Transactions', readonly=True),
+        'total_amount': fields.float(
+            'Total Amount', digits_compute=dp.get_precision('Account'),
+            readonly=True),
+        'batch_booking': fields.boolean(
+            'Batch Booking', readonly=True,
+            help="If true, the bank statement will display only one credit "
+            "line for all the direct debits of the SEPA file ; if false, "
+            "the bank statement will display one credit line per direct "
+            "debit of the SEPA file."),
+        'charge_bearer': fields.selection([
+            ('SLEV', 'Following Service Level'),
+            ('SHAR', 'Shared'),
+            ('CRED', 'Borne by Creditor'),
+            ('DEBT', 'Borne by Debtor'),
+            ], 'Charge Bearer', readonly=True,
+            help="Following service level : transaction charges are to be "
+            "applied following the rules agreed in the service level and/or "
+            "scheme (SEPA Core messages must use this). Shared : "
+            "transaction charges on the creditor side are to be borne by "
+            "the creditor, transaction charges on the debtor side are to be "
+            "borne by the debtor. Borne by creditor : all transaction "
+            "charges are to be borne by the creditor. Borne by debtor : "
+            "all transaction charges are to be borne by the debtor."),
+        'create_date': fields.datetime('Generation Date', readonly=True),
+        'file': fields.binary('SEPA File', readonly=True),
+        'filename': fields.function(
+            _generate_filename, type='char', size=256,
+            string='Filename', readonly=True, store=True),
+        'state': fields.selection([
+            ('draft', 'Draft'),
+            ('sent', 'Sent'),
+            ('done', 'Reconciled'),
+            ], 'State', readonly=True),
+    }
+
+    _defaults = {
+        'state': 'draft',
+    }
+
+
+class sdd_mandate(orm.Model):
+    '''SEPA Direct Debit Mandate'''
+    _name = 'sdd.mandate'
+    _description = __doc__
+    _rec_name = 'unique_mandate_reference'
+    _order = 'signature_date desc'
+
+    _columns = {
+        'partner_bank_id': fields.many2one(
+            'res.partner.bank', 'Bank Account'),
+        'partner_id': fields.related(
+            'partner_bank_id', 'partner_id', type='many2one',
+            relation='res.partner', string='Partner', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'unique_mandate_reference': fields.char(
+            'Unique Mandate Reference', size=35, readonly=True),
+        'type': fields.selection([
+            ('recurrent', 'Recurrent'),
+            ('oneoff', 'One-Off'),
+            ], 'Type of Mandate', required=True),
+        'recurrent_sequence_type': fields.selection([
+            ('first', 'First'),
+            ('recurring', 'Recurring'),
+            ('final', 'Final'),
+            ], 'Sequence Type for Next Debit',
+            help="This field is only used for Recurrent mandates, not for "
+            "One-Off mandates."),
+        'signature_date': fields.date(
+            'Date of Signature of the Mandate'),
+        'scan': fields.binary('Scan of the Mandate'),
+        'last_debit_date': fields.date(
+            'Date of the Last Debit', readonly=True),
+        'state': fields.selection([
+            ('draft', 'Draft'),
+            ('valid', 'Valid'),
+            ('expired', 'Expired'),
+            ('cancel', 'Cancelled'),
+            ], 'Status',
+            help="Only valid mandates can be used in a payment line. A "
+            "cancelled mandate is a mandate that has been cancelled by "
+            "the customer. A one-off mandate expires after its first use. "
+            "A recurrent mandate expires after it's final use or if it "
+            "hasn't been used for 36 months."),
+        'payment_line_ids': fields.one2many(
+            'payment.line', 'sdd_mandate_id', "Related Payment Lines"),
+        'sepa_migrated': fields.boolean(
+            'Migrated to SEPA',
+            help="If this field is not active, the mandate section of the "
+            "next direct debit file that include this mandate will contain "
+            "the 'Original Mandate Identification' and the 'Original "
+            "Creditor Scheme Identification'. This is required in a few "
+            "countries (Belgium for instance), but not in all countries. "
+            "If this is not required in your country, you should keep this "
+            "field always active."),
+        'original_mandate_identification': fields.char(
+            'Original Mandate Identification', size=35,
+            help="When the field 'Migrated to SEPA' is not active, this "
+            "field will be used as the Original Mandate Identification in "
+            "the Direct Debit file."),
+        }
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, context:
+        self.pool['res.company']._company_default_get(
+            cr, uid, 'sdd.mandate', context=context),
+        'unique_mandate_reference': lambda self, cr, uid, ctx:
+        self.pool['ir.sequence'].get(cr, uid, 'sdd.mandate.reference'),
+        'state': 'draft',
+        'sepa_migrated': True,
+    }
+
+    _sql_constraints = [(
+        'mandate_ref_company_uniq',
+        'unique(unique_mandate_reference, company_id)',
+        'A Mandate with the same reference already exists for this company !'
+        )]
+
+    def _check_sdd_mandate(self, cr, uid, ids):
+        for mandate in self.browse(cr, uid, ids):
+            if (mandate.signature_date and
+                    mandate.signature_date >
+                    datetime.today().strftime('%Y-%m-%d')):
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("The date of signature of mandate '%s' is in the "
+                        "future !")
+                    % mandate.unique_mandate_reference)
+            if mandate.state == 'valid' and not mandate.signature_date:
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("Cannot validate the mandate '%s' without a date of "
+                        "signature.")
+                    % mandate.unique_mandate_reference)
+            if mandate.state == 'valid' and not mandate.partner_bank_id:
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("Cannot validate the mandate '%s' because it is not "
+                        "attached to a bank account.")
+                    % mandate.unique_mandate_reference)
+
+            if (mandate.signature_date and mandate.last_debit_date and
+                    mandate.signature_date > mandate.last_debit_date):
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("The mandate '%s' can't have a date of last debit "
+                        "before the date of signature.")
+                    % mandate.unique_mandate_reference)
+            if (mandate.type == 'recurrent'
+                    and not mandate.recurrent_sequence_type):
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("The recurrent mandate '%s' must have a sequence type.")
+                    % mandate.unique_mandate_reference)
+            if (mandate.type == 'recurrent' and not mandate.sepa_migrated
+                    and mandate.recurrent_sequence_type != 'first'):
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("The recurrent mandate '%s' which is not marked as "
+                        "'Migrated to SEPA' must have its recurrent sequence "
+                        "type set to 'First'.")
+                    % mandate.unique_mandate_reference)
+            if (mandate.type == 'recurrent' and not mandate.sepa_migrated
+                    and not mandate.original_mandate_identification):
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("You must set the 'Original Mandate Identification' "
+                        "on the recurrent mandate '%s' which is not marked "
+                        "as 'Migrated to SEPA'.")
+                    % mandate.unique_mandate_reference)
+        return True
+
+    _constraints = [
+        (_check_sdd_mandate, "Error msg in raise", [
+            'last_debit_date', 'signature_date', 'state', 'partner_bank_id',
+            'type', 'recurrent_sequence_type', 'sepa_migrated',
+            'original_mandate_identification',
+            ]),
+    ]
+
+    def mandate_type_change(self, cr, uid, ids, type):
+        if type == 'recurrent':
+            recurrent_sequence_type = 'first'
+        else:
+            recurrent_sequence_type = False
+        res = {'value': {'recurrent_sequence_type': recurrent_sequence_type}}
+        return res
+
+    def mandate_partner_bank_change(
+            self, cr, uid, ids, partner_bank_id, type, recurrent_sequence_type,
+            last_debit_date, state):
+        res = {'value': {}}
+        if partner_bank_id:
+            partner_bank_read = self.pool['res.partner.bank'].read(
+                cr, uid, partner_bank_id, ['partner_id'])['partner_id']
+            if partner_bank_read:
+                res['value']['partner_id'] = partner_bank_read[0]
+        if (state == 'valid' and partner_bank_id
+                and type == 'recurrent'
+                and recurrent_sequence_type != 'first'):
+            res['value']['recurrent_sequence_type'] = 'first'
+            res['warning'] = {
+                'title': _('Mandate update'),
+                'message': _(
+                    "As you changed the bank account attached to this "
+                    "mandate, the 'Sequence Type' has been set back to "
+                    "'First'."),
+                }
+        return res
+
+    def validate(self, cr, uid, ids, context=None):
+        to_validate_ids = []
+        for mandate in self.browse(cr, uid, ids, context=context):
+            assert mandate.state == 'draft', 'Mandate should be in draft state'
+            to_validate_ids.append(mandate.id)
+        self.write(
+            cr, uid, to_validate_ids, {'state': 'valid'}, context=context)
+        return True
+
+    def cancel(self, cr, uid, ids, context=None):
+        to_cancel_ids = []
+        for mandate in self.browse(cr, uid, ids, context=context):
+            assert mandate.state in ('draft', 'valid'),\
+                'Mandate should be in draft or valid state'
+            to_cancel_ids.append(mandate.id)
+        self.write(
+            cr, uid, to_cancel_ids, {'state': 'cancel'}, context=context)
+        return True
+
+    def _sdd_mandate_set_state_to_expired(self, cr, uid, context=None):
+        logger.info('Searching for SDD Mandates that must be set to Expired')
+        expire_limit_date = datetime.today() + \
+            relativedelta(months=-NUMBER_OF_UNUSED_MONTHS_BEFORE_EXPIRY)
+        expire_limit_date_str = expire_limit_date.strftime('%Y-%m-%d')
+        expired_mandate_ids = self.search(cr, uid, [
+            '|',
+            ('last_debit_date', '=', False),
+            ('last_debit_date', '<=', expire_limit_date_str),
+            ('state', '=', 'valid'),
+            ('signature_date', '<=', expire_limit_date_str),
+            ], context=context)
+        if expired_mandate_ids:
+            self.write(
+                cr, uid, expired_mandate_ids, {'state': 'expired'},
+                context=context)
+            logger.info(
+                'The following SDD Mandate IDs has been set to expired: %s'
+                % expired_mandate_ids)
+        else:
+            logger.info('0 SDD Mandates must be set to Expired')
+        return True
+
+
+class res_partner_bank(orm.Model):
+    _inherit = 'res.partner.bank'
+
+    _columns = {
+        'sdd_mandate_ids': fields.one2many(
+            'sdd.mandate', 'partner_bank_id', 'SEPA Direct Debit Mandates'),
+        }
+
+
+class payment_line(orm.Model):
+    _inherit = 'payment.line'
+
+    _columns = {
+        'sdd_mandate_id': fields.many2one(
+            'sdd.mandate', 'SEPA Direct Debit Mandate',
+            domain=[('state', '=', 'valid')]),
+        }
+
+    def create(self, cr, uid, vals, context=None):
+        '''If the customer invoice has a mandate, take it
+        otherwise, take the first valid mandate of the bank account'''
+        if context is None:
+            context = {}
+        if not vals:
+            vals = {}
+        partner_bank_id = vals.get('bank_id')
+        move_line_id = vals.get('move_line_id')
+        if (context.get('default_payment_order_type') == 'debit'
+                and 'sdd_mandate_id' not in vals):
+            if move_line_id:
+                line = self.pool['account.move.line'].browse(
+                    cr, uid, move_line_id, context=context)
+                if (line.invoice and line.invoice.type == 'out_invoice'
+                        and line.invoice.sdd_mandate_id):
+                    vals.update({
+                        'sdd_mandate_id': line.invoice.sdd_mandate_id.id,
+                        'bank_id':
+                        line.invoice.sdd_mandate_id.partner_bank_id.id,
+                    })
+            if partner_bank_id and 'sdd_mandate_id' not in vals:
+                mandate_ids = self.pool['sdd.mandate'].search(cr, uid, [
+                    ('partner_bank_id', '=', partner_bank_id),
+                    ('state', '=', 'valid'),
+                    ], context=context)
+                if mandate_ids:
+                    vals['sdd_mandate_id'] = mandate_ids[0]
+        return super(payment_line, self).create(cr, uid, vals, context=context)
+
+    def _check_mandate_bank_link(self, cr, uid, ids):
+        for payline in self.browse(cr, uid, ids):
+            if (payline.sdd_mandate_id and payline.bank_id
+                    and payline.sdd_mandate_id.partner_bank_id.id !=
+                    payline.bank_id.id):
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("The payment line with reference '%s' has the bank "
+                        "account '%s' which is not attached to the mandate "
+                        "'%s' (this mandate is attached to the bank account "
+                        "'%s').") % (
+                        payline.name,
+                        self.pool['res.partner.bank'].name_get(
+                            cr, uid, [payline.bank_id.id])[0][1],
+                        payline.sdd_mandate_id.unique_mandate_reference,
+                        self.pool['res.partner.bank'].name_get(
+                            cr, uid,
+                            [payline.sdd_mandate_id.partner_bank_id.id])[0][1],
+                    ))
+        return True
+
+    _constraints = [
+        (_check_mandate_bank_link, 'Error msg in raise',
+            ['sdd_mandate_id', 'bank_id']),
+    ]
+
+
+class account_invoice(orm.Model):
+    _inherit = 'account.invoice'
+
+    _columns = {
+        'sdd_mandate_id': fields.many2one(
+            'sdd.mandate', 'SEPA Direct Debit Mandate',
+            domain=[('state', '=', 'valid')], readonly=True,
+            states={'draft': [('readonly', False)]})
+        }
 
=== added file 'account_banking_sepa_direct_debit/account_banking_sdd_view.xml'
--- account_banking_sepa_direct_debit/account_banking_sdd_view.xml	1970-01-01 00:00:00 +0000
+++ account_banking_sepa_direct_debit/account_banking_sdd_view.xml	2014-03-19 00:47:00 +0000
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2013 Akretion (http://www.akretion.com)
+  @author: Alexis de Lattre <[e-mail]>
+  The licence is in the file __openerp__.py
+-->
+<openerp>
+<data>
+
+<record id="view_banking_export_sdd_form" model="ir.ui.view">
+    <field name="name">account.banking.export.sdd.form</field>
+    <field name="model">banking.export.sdd</field>
+    <field name="type">form</field>
+    <field name="arch" type="xml">
+        <form string="SEPA Direct Debit">
+            <notebook>
+                <page string="General Information">
+                    <field name="total_amount" />
+                    <field name="nb_transactions" />
+                    <field name="batch_booking" />
+                    <field name="charge_bearer"/>
+                    <field name="create_date" />
+                    <newline />
+                    <field name="file" filename="filename"/>
+                    <field name="filename" invisible="True"/>
+                </page>
+                <page string="Payment Orders">
+                    <field name="payment_order_ids" colspan="4" nolabel="1">
+                        <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" string="Payment Orders">
+                            <field name="reference"/>
+                            <field name="date_created"/>
+                            <field name="date_done"/>
+                            <field name="total"/>
+                            <field name="state"/>
+                        </tree>
+                    </field>
+                </page>
+            </notebook>
+        </form>
+    </field>
+</record>
+
+
+<record id="view_banking_export_sdd_tree" model="ir.ui.view">
+    <field name="name">account.banking.export.sdd.tree</field>
+    <field name="model">banking.export.sdd</field>
+    <field name="type">tree</field>
+    <field name="arch" type="xml">
+        <tree string="SEPA Direct Debit">
+            <field name="filename"/>
+            <field name="create_date"/>
+            <field name="nb_transactions"/>
+        </tree>
+    </field>
+</record>
+
+
+<record id="action_account_banking_sdd" model="ir.actions.act_window">
+    <field name="name">SEPA Direct Debit Files</field>
+    <field name="res_model">banking.export.sdd</field>
+    <field name="view_type">form</field>
+    <field name="view_mode">tree,form</field>
+</record>
+
+
+<menuitem id="menu_account_banking_sdd"
+          parent="account_payment.menu_main_payment"
+          action="action_account_banking_sdd"
+          sequence="20"
+          />
+
+<act_window id="act_banking_export_sdd_payment_order"
+    name="Generated SEPA Direct Debit Files"
+    domain="[('payment_order_ids', '=', active_id)]"
+    res_model="banking.export.sdd"
+    src_model="payment.order"
+    view_type="form"
+    view_mode="tree,form"
+/>
+
+</data>
+</openerp>
 
=== added file 'account_banking_sepa_direct_debit/account_invoice_view.xml'
--- account_banking_sepa_direct_debit/account_invoice_view.xml	1970-01-01 00:00:00 +0000
+++ account_banking_sepa_direct_debit/account_invoice_view.xml	2014-03-19 00:47:00 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2013 Akretion (http://www.akretion.com)
+  @author: Alexis de Lattre <[e-mail]>
+  The licence is in the file __openerp__.py
+-->
+<openerp>
+<data>
+
+<record id="invoice_form" model="ir.ui.view">
+    <field name="name">add.sdd.mandate.on.customer.invoice.form</field>
+    <field name="model">account.invoice</field>
+    <field name="inherit_id" ref="account.invoice_form"/>
+    <field name="arch" type="xml">
+        <field name="partner_bank_id" position="after">
+            <field name="sdd_mandate_id" domain="[('partner_id', '=', partner_id), ('state', '=', 'valid')]" attrs="{'invisible': [('type', '=', 'out_refund')]}"/>
+        </field>
+    </field>
+</record>
+
+</data>
+</openerp>
 
=== added file 'account_banking_sepa_direct_debit/account_payment_view.xml'
--- account_banking_sepa_direct_debit/account_payment_view.xml	1970-01-01 00:00:00 +0000
+++ account_banking_sepa_direct_debit/account_payment_view.xml	2014-03-19 00:47:00 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2013 Akretion (http://www.akretion.com)
+  @author: Alexis de Lattre <[e-mail]>
+  The licence is in the file __openerp__.py
+-->
+<openerp>
+<data>
+
+<record id="sdd_view_payment_order_form" model="ir.ui.view">
+    <field name="name">sdd.payment.order.form</field>
+    <field name="model">payment.order</field>
+    <field name="inherit_id" ref="account_payment.view_payment_order_form"/>
+    <field name="arch" type="xml">
+        <xpath expr="//field[@name='line_ids']/form/notebook/page/field[@name='bank_id']" position="after">
+            <field name="sdd_mandate_id" domain="[('partner_bank_id', '=', bank_id), ('state', '=', 'valid')]" invisible="context.get('default_payment_order_type')!='debit'" context="{'default_partner_bank_id': bank_id}"/>
+            <newline />
+        </xpath>
+        <xpath expr="//field[@name='line_ids']/tree/field[@name='bank_id']" position="after">
+            <field name="sdd_mandate_id" string="SDD Mandate" invisible="context.get('default_payment_order_type')!='debit'"/>
+        </xpath>
+    </field>
+</record>
+
+</data>
+</openerp>
 
=== added file 'account_banking_sepa_direct_debit/company.py'
--- account_banking_sepa_direct_debit/company.py	1970-01-01 00:00:00 +0000
+++ account_banking_sepa_direct_debit/company.py	2014-03-19 00:47:00 +0000
@@ -0,0 +1,89 @@
+##############################################################################
+#
+#    SEPA Direct Debit module for OpenERP
+#    Copyright (C) 2013 Akretion (http://www.akretion.com)
+#    @author: Alexis de Lattre <[e-mail]>
+#
+#    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
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class res_company(orm.Model):
+    _inherit = 'res.company'
+
+    _columns = {
+        'sepa_creditor_identifier': fields.char(
+            'SEPA Creditor Identifier', size=35,
+            help="Enter the Creditor Identifier that has been attributed "
+            "to your company to make SEPA Direct Debits. This identifier "
+            "is composed of :\n- your country ISO code (2 letters)\n- a "
+            "2-digits checkum\n- a 3-letters business code\n- a "
+            "country-specific identifier"),
+        'original_creditor_identifier': fields.char(
+            'Original Creditor Identifier', size=70),
+    }
+
+    def is_sepa_creditor_identifier_valid(
+            self, cr, uid, sepa_creditor_identifier, context=None):
+        """Check if SEPA Creditor Identifier is valid
+        @param sepa_creditor_identifier: SEPA Creditor Identifier as str
+            or unicode
+        @return: True if valid, False otherwise
+        """
+        if not isinstance(sepa_creditor_identifier, (str, unicode)):
+            return False
+        try:
+            sci_str = str(sepa_creditor_identifier)
+        except:
+            logger.warning(
+                "SEPA Creditor ID should contain only ASCII caracters.")
+            return False
+        sci = sci_str.lower()
+        if len(sci) < 9:
+            return False
+        before_replacement = sci[7:] + sci[0:2] + '00'
+        logger.debug(
+            "SEPA ID check before_replacement = %s" % before_replacement)
+        after_replacement = ''
+        for char in before_replacement:
+            if char.isalpha():
+                after_replacement += str(ord(char)-87)
+            else:
+                after_replacement += char
+        logger.debug(
+            "SEPA ID check after_replacement = %s" % after_replacement)
+        if int(sci[2:4]) == (98 - (int(after_replacement) % 97)):
+            return True
+        else:
+            return False
+
+    def _check_sepa_creditor_identifier(self, cr, uid, ids):
+        for company in self.browse(cr, uid, ids):
+            if company.sepa_creditor_identifier:
+                if not self.is_sepa_creditor_identifier_valid(
+                        cr, uid, company.sepa_creditor_identifier):
+                    return False
+        return True
+
+    _constraints = [
+        (_check_sepa_creditor_identifier,
+            "Invalid SEPA Creditor Identifier.",
+            ['sepa_creditor_identifier']),
+    ]
 
=== added file 'account_banking_sepa_direct_debit/company_view.xml'
--- account_banking_sepa_direct_debit/company_view.xml	1970-01-01 00:00:00 +0000
+++ account_banking_sepa_direct_debit/company_view.xml	2014-03-19 00:47:00 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2013 Akretion (http://www.akretion.com)
+  @author: Alexis de Lattre <[e-mail]>
+  The licence is in the file __openerp__.py
+-->
+<openerp>
+<data>
+
+<record id="sdd_res_company_form" model="ir.ui.view">
+    <field name="name">sepa_direct_debit.res.company.form</field>
+    <field name="model">res.company</field>
+    <field name="inherit_id" ref="account_banking_pain_base.view_company_form"/>
+    <field name="arch" type="xml">
+        <group name="pain" position="inside">
+            <field name="sepa_creditor_identifier"/>
+            <field name="original_creditor_identifier" groups="account_banking_sepa_direct_debit.group_original_mandate_required"/>
+        </group>
+    </field>
+</record>
+
+</data>
+</openerp>
 
=== added directory 'account_banking_sepa_direct_debit/data'
=== added file 'account_banking_sepa_direct_debit/data/mandate_reference_sequence.xml'
--- account_banking_sepa_direct_debit/data/mandate_reference_sequence.xml	1970-01-01 00:00:00 +0000
+++ account_banking_sepa_direct_debit/data/mandate_reference_sequence.xml	2014-03-19 00:47:00 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="1">
+
+
+<record id="sdd_mandate_seq_type" model="ir.sequence.type">
+    <field name="name">SDD Mandate Reference</field>
+    <field name="code">sdd.mandate.reference</field>
+</record>
+
+<record id="sdd_mandate_seq" model="ir.sequence">
+    <field name="name">SDD Mandate Reference</field>
+    <field name="code">sdd.mandate.reference</field>
+    <field name="prefix">RUM</field>
+    <field name="padding" eval="7"/>
+    <!-- remember that max size for the mandate ref is 35 -->
+</record>
+
+
+</data>
+</openerp>
 
=== added file 'account_banking_sepa_direct_debit/data/pain.008.001.02.xsd'
--- account_banking_sepa_direct_debit/data/pain.008.001.02.xsd	1970-01-01 00:00:00 +0000
+++ account_banking_sepa_direct_debit/data/pain.008.001.02.xsd	2014-03-19 00:47:00 +0000
@@ -0,0 +1,879 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--Generated by SWIFTStandards Workstation (build:R6.1.0.2) on 2009 Jan 08 17:30:53-->
+<xs:schema xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.001.02" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="urn:iso:std:iso:20022:tech:xsd:pain.008.001.02">
+    <xs:element name="Document" type="Document"/>
+    <xs:complexType name="AccountIdentification4Choice">
+        <xs:sequence>
+            <xs:choice>
+                <xs:element name="IBAN" type="IBAN2007Identifier"/>
+                <xs:element name="Othr" type="GenericAccountIdentification1"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="AccountSchemeName1Choice">
+        <xs:sequence>
+            <xs:choice>
+                <xs:element name="Cd" type="ExternalAccountIdentification1Code"/>
+                <xs:element name="Prtry" type="Max35Text"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="ActiveOrHistoricCurrencyAndAmount_SimpleType">
+        <xs:restriction base="xs:decimal">
+            <xs:minInclusive value="0"/>
+            <xs:fractionDigits value="5"/>
+            <xs:totalDigits value="18"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ActiveOrHistoricCurrencyAndAmount">
+        <xs:simpleContent>
+            <xs:extension base="ActiveOrHistoricCurrencyAndAmount_SimpleType">
+                <xs:attribute name="Ccy" type="ActiveOrHistoricCurrencyCode" use="required"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:simpleType name="ActiveOrHistoricCurrencyCode">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z]{3,3}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="AddressType2Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="ADDR"/>
+            <xs:enumeration value="PBOX"/>
+            <xs:enumeration value="HOME"/>
+            <xs:enumeration value="BIZZ"/>
+            <xs:enumeration value="MLTO"/>
+            <xs:enumeration value="DLVY"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="AmendmentInformationDetails6">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlMndtId" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlCdtrSchmeId" type="PartyIdentification32"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlCdtrAgt" type="BranchAndFinancialInstitutionIdentification4"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlCdtrAgtAcct" type="CashAccount16"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlDbtr" type="PartyIdentification32"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlDbtrAcct" type="CashAccount16"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlDbtrAgt" type="BranchAndFinancialInstitutionIdentification4"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlDbtrAgtAcct" type="CashAccount16"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlFnlColltnDt" type="ISODate"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlFrqcy" type="Frequency1Code"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="AnyBICIdentifier">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z]{6,6}[A-Z2-9][A-NP-Z0-9]([A-Z0-9]{3,3}){0,1}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="Authorisation1Choice">
+        <xs:sequence>
+            <xs:choice>
+                <xs:element name="Cd" type="Authorisation1Code"/>
+                <xs:element name="Prtry" type="Max128Text"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="Authorisation1Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="AUTH"/>
+            <xs:enumeration value="FDET"/>
+            <xs:enumeration value="FSUM"/>
+            <xs:enumeration value="ILEV"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="BICIdentifier">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z]{6,6}[A-Z2-9][A-NP-Z0-9]([A-Z0-9]{3,3}){0,1}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="BatchBookingIndicator">
+        <xs:restriction base="xs:boolean"/>
+    </xs:simpleType>
+    <xs:complexType name="BranchAndFinancialInstitutionIdentification4">
+        <xs:sequence>
+            <xs:element name="FinInstnId" type="FinancialInstitutionIdentification7"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="BrnchId" type="BranchData2"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="BranchData2">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Id" type="Max35Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CashAccount16">
+        <xs:sequence>
+            <xs:element name="Id" type="AccountIdentification4Choice"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="CashAccountType2"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Ccy" type="ActiveOrHistoricCurrencyCode"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max70Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CashAccountType2">
+        <xs:sequence>
+            <xs:choice>
+                <xs:element name="Cd" type="CashAccountType4Code"/>
+                <xs:element name="Prtry" type="Max35Text"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="CashAccountType4Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="CASH"/>
+            <xs:enumeration value="CHAR"/>
+            <xs:enumeration value="COMM"/>
+            <xs:enumeration value="TAXE"/>
+            <xs:enumeration value="CISH"/>
+            <xs:enumeration value="TRAS"/>
+            <xs:enumeration value="SACC"/>
+            <xs:enumeration value="CACC"/>
+            <xs:enumeration value="SVGS"/>
+            <xs:enumeration value="ONDP"/>
+            <xs:enumeration value="MGLD"/>
+            <xs:enumeration value="NREX"/>
+            <xs:enumeration value="MOMA"/>
+            <xs:enumeration value="LOAN"/>
+            <xs:enumeration value="SLRY"/>
+            <xs:enumeration value="ODFT"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="CategoryPurpose1Choice">
+        <xs:sequence>
+            <xs:choice>
+                <xs:element name="Cd" type="ExternalCategoryPurpose1Code"/>
+                <xs:element name="Prtry" type="Max35Text"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="ChargeBearerType1Code">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="DEBT"/>
+            <xs:enumeration value="CRED"/>
+            <xs:enumeration value="SHAR"/>
+            <xs:enumeration value="SLEV"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ClearingSystemIdentification2Choice">
+        <xs:sequence>
+            <xs:choice>
+                <xs:element name="Cd" type="ExternalClearingSystemIdentification1Code"/>
+                <xs:element name="Prtry" type="Max35Text"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ClearingSystemMemberIdentification2">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="ClrSysId" type="ClearingSystemIdentification2Choice"/>
+            <xs:element name="MmbId" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ContactDetails2">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="NmPrfx" type="NamePrefix1Code"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="PhneNb" type="PhoneNumber"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="MobNb" type="PhoneNumber"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="FaxNb" type="PhoneNumber"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="EmailAdr" type="Max2048Text"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Othr" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="CountryCode">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z]{2,2}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="CreditDebitCode">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="CRDT"/>
+            <xs:enumeration value="DBIT"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="CreditorReferenceInformation2">
+        <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="CreditorReferenceType2"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Ref" type="Max35Text"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CreditorReferenceType1Choice">
+        <xs:sequence>
+            <xs:choice>
+                <xs:element name="Cd" type="DocumentType3Code"/>
+                <xs:element name="Prtry" type="Max35Text"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CreditorReferenceType2">