PstCd and TwnNm not present in pain files 001.003.xx and 008.003.xx. Added check of pain_flavor.

This commit is contained in:
Timka Piric
2018-11-07 12:01:35 +01:00
committed by Carlos Roca
parent f6d036b7ec
commit 8c428c4b1e
2 changed files with 471 additions and 13 deletions

View File

@@ -18,6 +18,41 @@ msgstr ""
msgid "A payment method of the same type already exists with this code and PAIN version"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Account Management"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Advance Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Agricultural Transfer"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Air"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Alimony Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Anesthesia Services"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Annuity"
msgstr ""
#. module: account_banking_pain_base
#: model:ir.model,name:account_banking_pain_base.model_bank_payment_line
msgid "Bank Payment Lines"
@@ -33,6 +68,11 @@ msgstr ""
msgid "Bonus Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Bonus Payment."
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.order,charge_bearer:0
msgid "Borne by Creditor"
@@ -43,6 +83,26 @@ msgstr ""
msgid "Borne by Debtor"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Bus"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Business Expenses"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Cable TV Bill"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Cancellation Fee"
msgstr ""
#. module: account_banking_pain_base
#: code:addons/account_banking_pain_base/models/account_payment_order.py:104
#, python-format
@@ -55,6 +115,11 @@ msgstr ""
msgid "Cannot compute the '%s'."
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Car Loan Principal Repayment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
msgid "Card Bulk Clearing"
@@ -62,6 +127,7 @@ msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
#: selection:account.payment.line,purpose:0
msgid "Cash Management Transfer"
msgstr ""
@@ -76,21 +142,81 @@ msgstr ""
msgid "Charge Bearer"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Charity Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Child Benefit"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Collection Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Commercial Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Commission"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Commodity Transfer"
msgstr ""
#. module: account_banking_pain_base
#: model:ir.model,name:account_banking_pain_base.model_res_company
msgid "Companies"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Consumer Third Party Consolidated Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Convalescent Care Facility"
msgstr ""
#. module: account_banking_pain_base
#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_method_convert_to_ascii
msgid "Convert to ASCII"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Copyright"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Costs"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
msgid "Credit Card Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Credit Card Payment "
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Debit Card Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
msgid "Debit Card Payment"
@@ -101,21 +227,57 @@ msgstr ""
msgid "Deliver Against Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Dental Services"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Derivatives"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
#: selection:account.payment.line,purpose:0
msgid "Dividend"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Durable Medicale Equipment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Electricity Bill"
msgstr ""
#. module: account_banking_pain_base
#: model:ir.model.fields,help:account_banking_pain_base.field_res_config_settings_group_pain_multiple_identifier
msgid "Enable this option if your country requires several SEPA/PAIN identifiers like in Spain."
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Energies"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Estate Tax"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
msgid "Fee Collection"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Ferry"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.order,charge_bearer:0
msgid "Following Service Level"
@@ -127,12 +289,34 @@ msgid "Following service level : transaction charges are to be applied following
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
msgid "Government Payment"
#: selection:account.payment.line,purpose:0
msgid "Foreign Exchange"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Gas Bill"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Government Insurance"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
#: selection:account.payment.line,purpose:0
msgid "Government Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Health Insurance"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
#: selection:account.payment.line,purpose:0
msgid "Hedging"
msgstr ""
@@ -141,6 +325,26 @@ msgstr ""
msgid "High"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Home Health Care"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Hospital Care"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Housing Loan Repayment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Housing Tax"
msgstr ""
#. module: account_banking_pain_base
#: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_method_convert_to_ascii
msgid "If active, Odoo will convert each accented character to the corresponding unaccented character, so that only ASCII characters are used in the generated PAIN file."
@@ -148,7 +352,9 @@ msgstr ""
#. module: account_banking_pain_base
#: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line_category_purpose
#: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line_purpose
#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line_category_purpose
#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line_purpose
msgid "If neither your bank nor your local regulations oblige you to set the category purpose, leave the field empty."
msgstr ""
@@ -157,6 +363,11 @@ msgstr ""
msgid "If true, the bank statement will display only one debit line for all the wire transfers of the SEPA XML file ; if false, the bank statement will display one debit line per wire transfer of the SEPA XML file."
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Income Tax"
msgstr ""
#. module: account_banking_pain_base
#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_mode_initiating_party_identifier
#: model:ir.model.fields,field_description:account_banking_pain_base.field_res_company_initiating_party_identifier
@@ -171,16 +382,49 @@ msgstr ""
msgid "Initiating Party Issuer"
msgstr ""
#. module: account_banking_pain_base
#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_mode_initiating_party_scheme
#: model:ir.model.fields,field_description:account_banking_pain_base.field_res_company_initiating_party_scheme
#: model:ir.model.fields,field_description:account_banking_pain_base.field_res_config_settings_initiating_party_scheme
msgid "Initiating Party Scheme"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Installment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Instalment Hire Purchase Agreement"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,local_instrument:0
msgid "Instant Transfer"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Insurance Premium"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
#: selection:account.payment.line,purpose:0
msgid "Interest"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Intermediate Care Facility"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Intra Company Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
msgid "Intra-Company Payment"
@@ -196,11 +440,37 @@ msgstr ""
msgid "Irrevocable Debit Card Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Labor Insurance"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "License Fee"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Life Insurance"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Liquidity Management"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
#: selection:account.payment.line,purpose:0
msgid "Loan"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Loan Repayment"
msgstr ""
#. module: account_banking_pain_base
#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line_local_instrument
#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line_local_instrument
@@ -208,16 +478,46 @@ msgid "Local Instrument"
msgstr ""
#. module: account_banking_pain_base
#: code:addons/account_banking_pain_base/models/account_payment_order.py:301
#: selection:account.payment.line,purpose:0
msgid "Long Term Care Facility"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Medical Services"
msgstr ""
#. module: account_banking_pain_base
#: code:addons/account_banking_pain_base/models/account_payment_order.py:310
#, python-format
msgid "Missing 'Initiating Party Issuer' and/or 'Initiating Party Identifier' for the company '%s'. Both fields must have a value."
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Multiple Service Types"
msgstr ""
#. module: account_banking_pain_base
#: model:ir.model.fields,field_description:account_banking_pain_base.field_res_config_settings_group_pain_multiple_identifier
msgid "Multiple identifiers"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Netting"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Network Charge"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Network Communication"
msgstr ""
#. module: account_banking_pain_base
#: code:addons/account_banking_pain_base/models/account_payment_method.py:22
#, python-format
@@ -229,11 +529,31 @@ msgstr ""
msgid "Normal"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Not Otherwise Specified"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Opening Fee"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Other"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
msgid "Other Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Other Telecom Related Bill"
msgstr ""
#. module: account_banking_pain_base
#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_method_pain_version
msgid "PAIN Version"
@@ -259,22 +579,89 @@ msgstr ""
msgid "Payment Order"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Payment Terms"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
#: selection:account.payment.line,purpose:0
msgid "Pension Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Preauthorized debit"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Precious Metal"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Price Payment"
msgstr ""
#. module: account_banking_pain_base
#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line_priority
#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line_priority
msgid "Priority"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Property Insurance"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Purchase Sale Of Goods"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Purchase Sale Of Services"
msgstr ""
#. module: account_banking_pain_base
#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line_purpose
#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line_purpose
msgid "Purpose"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Railway"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Receipt Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
msgid "Receive Against Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Recurring Installment Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Rent"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Royalties"
msgstr ""
#. module: account_banking_pain_base
#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order_sepa
msgid "SEPA Payment"
@@ -292,11 +679,18 @@ msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
#: selection:account.payment.line,purpose:0
msgid "Salary Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Savings"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
#: selection:account.payment.line,purpose:0
msgid "Securities"
msgstr ""
@@ -307,19 +701,37 @@ msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
#: selection:account.payment.line,purpose:0
msgid "Social Security Benefit"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Study"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Subscription"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
#: selection:account.payment.line,purpose:0
msgid "Supplier Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
#: selection:account.payment.line,purpose:0
msgid "Tax Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Telephone Bill"
msgstr ""
#. module: account_banking_pain_base
#: code:addons/account_banking_pain_base/models/account_payment_order.py:117
#, python-format
@@ -374,11 +786,28 @@ msgid "This will be used as the 'Initiating Party Issuer' in the PAIN files gene
"- Service suffix (N, issued by bank)"
msgstr ""
#. module: account_banking_pain_base
#: model:ir.model.fields,help:account_banking_pain_base.field_res_company_initiating_party_scheme
#: model:ir.model.fields,help:account_banking_pain_base.field_res_config_settings_initiating_party_scheme
msgid "This will be used as the 'Initiating Party Scheme Name' in the PAIN files generated by Odoo."
msgstr ""
#. module: account_banking_pain_base
#: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_mode_initiating_party_scheme
msgid "This will be used as the 'Initiating Party Scheme Name' in the PAIN files generated by Odoo. This value is determined by the financial institution that will process the file. If not defined, no scheme will be used.\n"
""
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
msgid "Trade"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Trade Services"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
msgid "Trade Settlement Payment"
@@ -386,14 +815,40 @@ msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
#: selection:account.payment.line,purpose:0
msgid "Treasury Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Trust Fund"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Unemployment Disability Benefit"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
msgid "VAT Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Value Added Tax Payment"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Vision Care"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,purpose:0
msgid "Water Bill"
msgstr ""
#. module: account_banking_pain_base
#: selection:account.payment.line,category_purpose:0
msgid "WithHolding"

View File

@@ -409,16 +409,19 @@ class AccountPaymentOrder(models.Model):
partner = partner_bank.partner_id
if partner.country_id:
postal_address = etree.SubElement(party, 'PstlAdr')
if partner.zip:
pstcd = etree.SubElement(postal_address, 'PstCd')
pstcd.text = self._prepare_field(
'Postal Code', 'partner.zip',
{'partner': partner}, 16, gen_args=gen_args)
if partner.city:
twnnm = etree.SubElement(postal_address, 'TwnNm')
twnnm.text = self._prepare_field(
'Town Name', 'partner.city',
{'partner': partner}, 35, gen_args=gen_args)
if gen_args.get('pain_flavor').startswith(
'pain.001.001.') or gen_args.get('pain_flavor').startswith(
'pain.008.001.'):
if partner.zip:
pstcd = etree.SubElement(postal_address, 'PstCd')
pstcd.text = self._prepare_field(
'Postal Code', 'partner.zip',
{'partner': partner}, 16, gen_args=gen_args)
if partner.city:
twnnm = etree.SubElement(postal_address, 'TwnNm')
twnnm.text = self._prepare_field(
'Town Name', 'partner.city',
{'partner': partner}, 35, gen_args=gen_args)
country = etree.SubElement(postal_address, 'Ctry')
country.text = self._prepare_field(
'Country', 'partner.country_id.code',