banking-addons-team team mailing list archive
-
banking-addons-team team
-
Mailing list archive
-
Message #01069
lp:~akretion-team/banking-addons/70-sepa-credit-transfer-update into lp:banking-addons
Alexis de Lattre has proposed merging lp:~akretion-team/banking-addons/70-sepa-credit-transfer-update into lp:banking-addons.
Requested reviews:
Banking Addons Core Editors (banking-addons-team)
For more details, see:
https://code.launchpad.net/~akretion-team/banking-addons/70-sepa-credit-transfer-update/+merge/194948
This merge proposal improves the module account_banking_sepa_credit_transfer.
It contains the implementation of ideas that I had during the development of my module account_banking_sepa_direct_debit (which is in another dev branch) and that are already implemented in that module.
The main improvements are the following :
1) Only use ASCII characters in the XML file, as stated in the "SEPA Credit Transfer scheme customer to bank implementation guidelines" of the European Payment Council (chapter 1.4 "Character set") and as confirmed by my own experience with French banks. For that, I use the python lib unidecode.
2) Use the payment order reference as the Message Identification of the XML file. Advantage : it is unique by design, it makes it easy to find the payment order from the XML file, a sequence is easy to customize, etc...
3) Use the payment line sequence as the "End to End Identification"
4) the content of the XML can now be inherited via the function _prepare_field()
There are other smaller improvements that you will find the commit messages.
Updating to this new version requires "-u account_banking_sepa_credit_transfer"
--
https://code.launchpad.net/~akretion-team/banking-addons/70-sepa-credit-transfer-update/+merge/194948
Your team Banking Addons Core Editors is requested to review the proposed merge of lp:~akretion-team/banking-addons/70-sepa-credit-transfer-update into lp:banking-addons.
=== modified file 'account_banking_sepa_credit_transfer/__init__.py'
--- account_banking_sepa_credit_transfer/__init__.py 2013-06-28 19:24:03 +0000
+++ account_banking_sepa_credit_transfer/__init__.py 2013-11-12 21:49:58 +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-08-09 20:55:49 +0000
+++ account_banking_sepa_credit_transfer/__openerp__.py 2013-11-12 21:49:58 +0000
@@ -21,12 +21,15 @@
{
'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_payment_export'],
+ 'depends': ['account_banking_payment'],
+ 'external_dependencies': {
+ 'python': ['unidecode', 'lxml'],
+ },
'data': [
'account_banking_sepa_view.xml',
'wizard/export_sepa_view.xml',
@@ -36,7 +39,7 @@
'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.
=== modified file 'account_banking_sepa_credit_transfer/account_banking_sepa.py'
--- account_banking_sepa_credit_transfer/account_banking_sepa.py 2013-09-12 07:32:00 +0000
+++ account_banking_sepa_credit_transfer/account_banking_sepa.py 2013-11-12 21:49:58 +0000
@@ -21,18 +21,24 @@
from openerp.osv import orm, fields
from openerp.addons.decimal_precision import decimal_precision as dp
+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 = {
@@ -40,36 +46,36 @@
'payment.order',
'account_payment_order_sepa_rel',
'banking_export_sepa_id', 'account_order_id',
- 'Payment orders',
+ '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',
+ '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,
+ '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': fields.date.context_today,
'state': 'draft',
}
=== modified file 'account_banking_sepa_credit_transfer/account_banking_sepa_view.xml'
--- account_banking_sepa_credit_transfer/account_banking_sepa_view.xml 2013-08-09 20:55:49 +0000
+++ account_banking_sepa_credit_transfer/account_banking_sepa_view.xml 2013-11-12 21:49:58 +0000
@@ -14,20 +14,19 @@
<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"/>
@@ -47,9 +46,9 @@
<field name="model">banking.export.sepa</field>
<field name="arch" type="xml">
<tree string="SEPA Credit Transfer">
- <field name="msg_identification"/>
+ <field name="filename"/>
<field name="prefered_exec_date"/>
- <field name="generation_date"/>
+ <field name="create_date"/>
<field name="nb_transactions"/>
</tree>
</field>
@@ -57,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>
@@ -71,7 +70,7 @@
/>
<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 2013-11-12 21:49:58 +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-07-15 14:30:13 +0000
+++ account_banking_sepa_credit_transfer/data/payment_type_sepa_sct.xml 2013-11-12 21:49:58 +0000
@@ -4,20 +4,29 @@
<!-- 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"/>
+ <field name="payment_order_type">payment</field>
+</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>
@@ -26,7 +35,7 @@
<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-10-25 16:07:34 +0000
+++ account_banking_sepa_credit_transfer/i18n/account_banking_sepa_credit_transfer.pot 2013-11-12 21:49:58 +0000
@@ -6,8 +6,13 @@
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
"POT-Creation-Date: 2013-10-25 15:59+0000\n"
"PO-Revision-Date: 2013-10-25 15:59+0000\n"
+=======
+"POT-Creation-Date: 2013-11-12 21:32+0000\n"
+"PO-Revision-Date: 2013-11-12 21:32+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,14 +21,9 @@
"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"
+#: field:banking.export.sepa,prefered_exec_date:0
+#: field:banking.export.sepa.wizard,prefered_exec_date:0
+msgid "Prefered Execution Date"
msgstr ""
#. module: account_banking_sepa_credit_transfer
@@ -32,8 +32,9 @@
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
@@ -54,9 +55,14 @@
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
+#: 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 ""
#. module: account_banking_sepa_credit_transfer
@@ -66,8 +72,9 @@
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
@@ -91,6 +98,33 @@
msgstr ""
#. module: account_banking_sepa_credit_transfer
+<<<<<<< TREE
+=======
+#: 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
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:122
+#, python-format
+msgid "Cannot compute the '%s'."
+msgstr ""
+
+#. 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 ""
+
+#. module: account_banking_sepa_credit_transfer
+>>>>>>> MERGE-SOURCE
#: selection:banking.export.sepa,state:0
msgid "Sent"
msgstr ""
@@ -106,6 +140,7 @@
msgstr ""
#. module: account_banking_sepa_credit_transfer
+<<<<<<< TREE
#: field:banking.export.sepa,msg_identification:0
#: field:banking.export.sepa.wizard,msg_identification:0
msgid "Message identification"
@@ -113,31 +148,98 @@
#. module: account_banking_sepa_credit_transfer
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:287
+=======
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:169
+>>>>>>> MERGE-SOURCE
#, 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_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
+#: 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 ""
+
+#. 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
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:125
+#, python-format
+msgid "Field type error:"
+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:351
+#, 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
+#: 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 ""
#. 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 ""
-
-#. 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"
+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
+#: 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 ""
+
+#. 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
#: field:banking.export.sepa,payment_order_ids:0
#: field:banking.export.sepa.wizard,payment_order_ids:0
+<<<<<<< TREE
msgid "Payment orders"
msgstr ""
@@ -210,6 +312,21 @@
#: 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"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account_banking_sepa_credit_transfer
@@ -234,6 +351,7 @@
msgstr ""
#. module: account_banking_sepa_credit_transfer
+<<<<<<< TREE
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:132
#, 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'."
@@ -252,6 +370,10 @@
#: 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"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account_banking_sepa_credit_transfer
=== modified file 'account_banking_sepa_credit_transfer/i18n/fr.po'
--- account_banking_sepa_credit_transfer/i18n/fr.po 2013-11-12 06:38:51 +0000
+++ account_banking_sepa_credit_transfer/i18n/fr.po 2013-11-12 21:49:58 +0000
@@ -4,11 +4,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
"POT-Creation-Date: 2013-10-25 15:59+0000\n"
"PO-Revision-Date: 2013-11-11 17:51+0000\n"
"Last-Translator: Pedro Manuel Baeza <pedro.baeza@xxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2013-11-12 21:33+0000\n"
+"PO-Revision-Date: 2013-11-12 21:33+0000\n"
+"Last-Translator: <>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,15 +23,10 @@
"X-Generator: Launchpad (build 16820)\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"
+#: 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"
#. module: account_banking_sepa_credit_transfer
#: selection:banking.export.sepa.wizard,state:0
@@ -33,6 +34,7 @@
msgstr "Créer"
#. module: account_banking_sepa_credit_transfer
+<<<<<<< TREE
#: help:banking.export.sepa.wizard,msg_identification:0
msgid ""
"This is the message identification of the entire SEPA XML file. 35 "
@@ -40,6 +42,12 @@
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"
+>>>>>>> MERGE-SOURCE
#. module: account_banking_sepa_credit_transfer
#: field:banking.export.sepa,filename:0
@@ -59,10 +67,15 @@
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
+#: 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 "Impossible de générer le '%s' de la ligne de paiement ayant la référence de facture '%s'."
#. module: account_banking_sepa_credit_transfer
#: selection:banking.export.sepa,charge_bearer:0
@@ -71,9 +84,10 @@
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
#: model:ir.model,name:account_banking_sepa_credit_transfer.model_banking_export_sepa_wizard
@@ -96,6 +110,33 @@
msgstr "Réconcilié"
#. module: account_banking_sepa_credit_transfer
+<<<<<<< TREE
+=======
+#: 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
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:122
+#, python-format
+msgid "Cannot compute the '%s'."
+msgstr "Impossible de générer le '%s'."
+
+#. 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 "Le champ '%s' est de type %s. Le type devrait être string ou unicode."
+
+#. module: account_banking_sepa_credit_transfer
+>>>>>>> MERGE-SOURCE
#: selection:banking.export.sepa,state:0
msgid "Sent"
msgstr "Envoyé"
@@ -111,6 +152,7 @@
msgstr "Générer"
#. module: account_banking_sepa_credit_transfer
+<<<<<<< TREE
#: field:banking.export.sepa,msg_identification:0
#: field:banking.export.sepa.wizard,msg_identification:0
msgid "Message identification"
@@ -118,6 +160,9 @@
#. module: account_banking_sepa_credit_transfer
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:287
+=======
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:169
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"The generated XML file is not valid against the official XML Schema "
@@ -131,13 +176,72 @@
"une idée sur la cause du problème : %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 "Supportés par l'émetteur"
+
+#. 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 "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
+#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:125
+#, python-format
+msgid "Field type error:"
+msgstr "Erreur dans le type de champ:"
+
+#. 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:351
+#, 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
+#: 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 "Le '%s' est vide ou égal à 0. La valeur devrait être non nulle."
+
+#. module: account_banking_sepa_credit_transfer
#: help:banking.export.sepa,charge_bearer:0
+<<<<<<< TREE
#: help:banking.export.sepa.wizard,charge_bearer:0
msgid ""
"Shared : transaction charges on the sender side are to be borne by the "
@@ -161,14 +265,31 @@
#: selection:banking.export.sepa.wizard,charge_bearer:0
msgid "Borne by creditor"
msgstr "Supportés par le destinataire"
+=======
+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
+#: 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 "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
+#: 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"
+>>>>>>> MERGE-SOURCE
#. module: account_banking_sepa_credit_transfer
#: 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
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.act_banking_export_sepa_payment_order
msgid "Generated SEPA Credit Transfer files"
msgstr ""
@@ -239,6 +360,18 @@
#: 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"
+>>>>>>> MERGE-SOURCE
#. module: account_banking_sepa_credit_transfer
#: help:banking.export.sepa,batch_booking:0
@@ -275,6 +408,7 @@
msgstr "Annuler"
#. module: account_banking_sepa_credit_transfer
+<<<<<<< TREE
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:132
#, python-format
msgid ""
@@ -300,6 +434,11 @@
#: 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 "Generation Date"
+>>>>>>> MERGE-SOURCE
#. module: account_banking_sepa_credit_transfer
#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.action_account_banking_sepa
=== 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 2013-11-12 21:49:58 +0000 differ
=== modified file 'account_banking_sepa_credit_transfer/wizard/__init__.py'
--- account_banking_sepa_credit_transfer/wizard/__init__.py 2013-06-28 19:24:03 +0000
+++ account_banking_sepa_credit_transfer/wizard/__init__.py 2013-11-12 21:49:58 +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-18 08:42:48 +0000
+++ account_banking_sepa_credit_transfer/wizard/export_sepa.py 2013-11-12 21:49:58 +0000
@@ -23,48 +23,55 @@
from openerp.osv import orm, fields
import base64
-from datetime import datetime, timedelta
+from datetime import datetime
from openerp.tools.translate import _
+from openerp.tools.safe_eval import safe_eval
from openerp import tools, netsvc
from lxml import etree
import logging
+from unidecode import unidecode
_logger = logging.getLogger(__name__)
class banking_export_sepa_wizard(orm.TransientModel):
_name = 'banking.export.sepa.wizard'
- _description = 'Export SEPA Credit Transfer XML file'
+ _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',
+ '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."),
- 'prefered_exec_date': fields.date('Prefered execution date',
+ '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.'),
'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 = {
@@ -72,13 +79,6 @@
'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'''
@@ -86,29 +86,95 @@
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)
+ raise orm.except_orm(
+ _('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 _prepare_field(
+ self, cr, uid, field_name, field_value, eval_ctx, max_size=0,
+ context=None):
+ '''This function is designed to be inherited !'''
+ assert isinstance(eval_ctx, dict), 'eval_ctx must contain a dict'
+ try:
+ # 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
+ value = unidecode(safe_eval(field_value, eval_ctx))
+ except:
+ line = eval_ctx.get('line')
+ if line:
+ raise orm.except_orm(
+ _('Error:'),
+ _("Cannot compute the '%s' of the Payment Line with Invoice Reference '%s'.")
+ % (field_name, self.pool['account.invoice'].name_get(cr, uid, [line.ml_inv_ref.id], context=context)[0][1]))
+ 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, sepa_export, total_amount, transactions_count,
+ xml_string, context=None):
+ return {
+ '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])
+ ],
+ }
+
+ def _validate_xml(self, cr, uid, xml_string, pain_flavor):
+ xsd_etree_obj = etree.parse(
+ tools.file_open(
+ 'account_banking_sepa_credit_transfer/data/%s.xsd'
+ % pain_flavor))
+ 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 create_sepa(self, cr, uid, ids, context=None):
'''
Creates the SEPA Credit Transfer file. That's the important code !
'''
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
if pain_flavor == 'pain.001.001.02':
bic_xml_tag = 'BIC'
@@ -118,23 +184,28 @@
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 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' 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
+ 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)
if sepa_export.prefered_exec_date:
my_requested_exec_date = sepa_export.prefered_exec_date
else:
@@ -148,73 +219,99 @@
root = etree.Element('Document', nsmap=pain_ns)
pain_root = etree.SubElement(root, root_xml_tag)
+
+ my_company_name = self._prepare_field(
+ cr, uid, 'Company Name',
+ 'sepa_export.payment_order_ids[0].mode.bank_id.partner_id.name',
+ {'sepa_export': sepa_export}, name_maxsize, context=context)
+
# 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')
+ group_header_1_0 = etree.SubElement(pain_root, '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': sepa_export}, 35, 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 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')
+ batch_booking = etree.SubElement(group_header_1_0, 'BtchBookg')
+ batch_booking.text = str(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 pain_flavor == 'pain.001.001.02':
- grouping = etree.SubElement(group_header, 'Grpg')
+ grouping = etree.SubElement(group_header_1_0, '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)
+ initiating_party_1_8 = etree.SubElement(group_header_1_0, 'InitgPty')
+ initiating_party_name = etree.SubElement(initiating_party_1_8, 'Nm')
+ initiating_party_name.text = my_company_name
+
# 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']:
+ payment_info_2_0 = etree.SubElement(pain_root, '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',
+ "sepa_export.payment_order_ids[0].reference",
+ {'sepa_export': sepa_export}, 35, context=context)
+ payment_method_2_2 = etree.SubElement(payment_info_2_0, 'PmtMtd')
+ payment_method_2_2.text = 'TRF'
+ if pain_flavor in [
+ 'pain.001.001.03', 'pain.001.001.04', 'pain.001.001.05']:
# 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
+ batch_booking_2_3 = etree.SubElement(payment_info_2_0, 'BtchBookg')
+ batch_booking_2_3.text = str(sepa_export.batch_booking).lower()
# 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
+ # "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')
+ if pain_flavor in [
+ 'pain.001.001.03', 'pain.001.001.04', 'pain.001.001.05']:
+ 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')
+ 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'
+ requested_exec_date_2_17 = etree.SubElement(
+ payment_info_2_0, 'ReqdExctnDt')
+ requested_exec_date_2_17.text = my_requested_exec_date
+ debtor_2_19 = etree.SubElement(payment_info_2_0, 'Dbtr')
+ debtor_name = etree.SubElement(debtor_2_19, 'Nm')
+ debtor_name.text = my_company_name
+ debtor_account_2_20 = etree.SubElement(payment_info_2_0, 'DbtrAcct')
+ debtor_account_id = etree.SubElement(debtor_account_2_20, '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
+ debtor_account_iban.text = self._validate_iban(
+ cr, uid, self._prepare_field(
+ cr, uid, 'Company IBAN',
+ 'sepa_export.payment_order_ids[0].mode.bank_id.acc_number',
+ {'sepa_export': sepa_export}, context=context),
+ context=context)
+ debtor_agent_2_21 = etree.SubElement(payment_info_2_0, 'DbtrAgt')
+ debtor_agent_institution = etree.SubElement(
+ debtor_agent_2_21, 'FinInstnId')
+ debtor_agent_bic = etree.SubElement(
+ debtor_agent_institution, bic_xml_tag)
+ # TODO validate BIC with pattern
+ # [A-Z]{6,6}[A-Z2-9][A-NP-Z0-9]([A-Z0-9]{3,3}){0,1}
+ # because OpenERP doesn't have a constraint on BIC
+ debtor_agent_bic.text = self._prepare_field(
+ cr, uid, 'Company BIC',
+ 'sepa_export.payment_order_ids[0].mode.bank_id.bank.bic',
+ {'sepa_export': sepa_export}, context=context)
+ charge_bearer_2_24 = etree.SubElement(payment_info_2_0, 'ChrgBr')
+ charge_bearer_2_24.text = sepa_export.charge_bearer
transactions_count = 0
total_amount = 0.0
@@ -226,88 +323,100 @@
for line in payment_order.line_ids:
transactions_count += 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
+ 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, context=context)
+ currency_name = self._prepare_field(
+ cr, uid, 'Currency Code', 'line.currency.name',
+ {'line': line}, 3, 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 += line.amount_currency
- creditor_agent = etree.SubElement(credit_transfer_transaction_info, 'CdtrAgt')
- creditor_agent_institution = etree.SubElement(creditor_agent, 'FinInstnId')
+ creditor_agent_2_77 = etree.SubElement(
+ credit_transfer_transaction_info_2_27, 'CdtrAgt')
+ creditor_agent_institution = etree.SubElement(
+ creditor_agent_2_77, 'FinInstnId')
if not line.bank_id:
- raise orm.except_orm(_('Error :'), _("Missing Bank Account on invoice '%s' (payment order line reference '%s').") %(line.ml_inv_ref.number, line.name))
- 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)
+ raise orm.except_orm(
+ _('Error:'),
+ _("Missing Bank Account on invoice '%s' (payment order line reference '%s').")
+ % (line.ml_inv_ref.number, line.name))
+ creditor_agent_bic = etree.SubElement(
+ creditor_agent_institution, bic_xml_tag)
+ creditor_agent_bic.text = self._prepare_field(
+ cr, uid, 'Customer BIC', 'line.bank_id.bank.bic',
+ {'line': line}, context=context)
+ creditor_2_79 = etree.SubElement(
+ credit_transfer_transaction_info_2_27, 'Cdtr')
+ creditor_name = etree.SubElement(creditor_2_79, 'Nm')
+ creditor_name.text = self._prepare_field(
+ cr, uid, 'Customer Name', 'line.partner_id.name',
+ {'line': line}, name_maxsize, context=context)
+ creditor_account_2_80 = etree.SubElement(
+ credit_transfer_transaction_info_2_27, 'CdtrAcct')
+ creditor_account_id = etree.SubElement(
+ creditor_account_2_80, 'Id')
+ creditor_account_iban = etree.SubElement(
+ creditor_account_id, 'IBAN')
+ creditor_account_iban.text = self._validate_iban(
+ cr, uid, self._prepare_field(
+ cr, uid, 'Customer IBAN',
+ 'line.bank_id.acc_number', {'line': line},
+ context=context),
+ context=context)
+ remittance_info_2_91 = etree.SubElement(
+ credit_transfer_transaction_info_2_27, '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_2_99 = etree.SubElement(
+ remittance_info_2_91, 'Ustrd')
+ remittance_info_unstructured_2_99.text = self._prepare_field(
+ cr, uid, 'Remittance Information', 'line.communication',
+ {'line': line}, 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
+ if pain_flavor in [
+ 'pain.001.001.03', 'pain.001.001.04', 'pain.001.001.05']:
+ nb_of_transactions_1_6.text = nb_of_transactions_2_4.text = \
+ str(transactions_count)
+ control_sum_1_7.text = control_sum_2_5.text = \
+ '%.2f' % amount_control_sum
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")
+ nb_of_transactions_1_6.text = str(transactions_count)
+ control_sum_1_7.text = '%.2f' % amount_control_sum
+
+ xml_string = etree.tostring(
+ root, pretty_print=True, encoding='UTF-8', xml_declaration=True)
+ _logger.debug(
+ "Generated SEPA Credit Transfer XML file in format %s below"
+ % pain_flavor)
_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 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))
+ self._validate_xml(cr, uid, xml_string, pain_flavor)
# 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)
+ file_id = self.pool.get('banking.export.sepa').create(
+ cr, uid, self._prepare_export_sepa(
+ cr, uid, sepa_export, total_amount, transactions_count,
+ xml_string, context=context),
+ context=context)
- self.write(cr, uid, ids, {
- 'file_id': file_id,
- 'state': 'finish',
+ self.write(
+ cr, uid, ids, {
+ 'file_id': file_id,
+ 'state': 'finish',
}, context=context)
action = {
- 'name': 'SEPA XML',
+ 'name': 'SEPA Credit Transfer File',
'type': 'ir.actions.act_window',
'view_type': 'form',
'view_mode': 'form,tree',
@@ -317,26 +426,27 @@
}
return action
-
def cancel_sepa(self, cr, uid, ids, context=None):
'''
Cancel the SEPA PAIN: 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: 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.
+ Save the SEPA PAIN: send the done signal to all payment
+ orders in the file. With the default workflow, they will
+ transition to 'done', while with the advanced workflow in
+ account_banking_payment they will transition to 'sent' waiting
+ reconciliation.
'''
sepa_export = self.browse(cr, uid, ids[0], context=context)
- 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, 'done', cr)
=== modified file 'account_banking_sepa_credit_transfer/wizard/export_sepa_view.xml'
--- account_banking_sepa_credit_transfer/wizard/export_sepa_view.xml 2013-08-02 22:39:11 +0000
+++ account_banking_sepa_credit_transfer/wizard/export_sepa_view.xml 2013-11-12 21:49:58 +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 <alexis.delattre@xxxxxxxxxxxx>
The licence is in the file __openerp__.py
-->
@@ -11,24 +11,16 @@
<field name="name">banking.export.sepa.wizard.view</field>
<field name="model">banking.export.sepa.wizard</field>
<field name="arch" type="xml">
- <form string="SEPA XML file generation" version="7.0">
+ <form string="SEPA File Generation" version="7.0">
<field name="state" invisible="True"/>
<group states="create">
- <separator colspan="4" string="Processing details" />
<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" />
</group>
<group states="finish">
<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" /> -->
- <!-- <field name="file_id" /> -->
+ <field name="nb_transactions" />
<field name="file" filename="filename" />
<field name="filename" invisible="True"/>
</group>
Follow ups
