From d4d6a301b7b581ecbeccf5b760030118785a0eb6 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Mon, 23 May 2016 10:42:28 +0200 Subject: [PATCH] Take into accounts the remarks of Eric Caudal --- account_banking_mandate/README.rst | 7 ++--- account_banking_mandate/__openerp__.py | 3 +- .../models/account_banking_mandate.py | 10 +++--- .../models/account_payment_method.py | 2 +- .../models/res_partner_bank.py | 4 +-- account_banking_mandate_sale/README.rst | 7 ++--- account_banking_pain_base/README.rst | 7 ++--- .../models/account_payment_line.py | 4 +-- .../models/account_payment_method.py | 6 ++-- .../README.rst | 17 +++++----- account_banking_sepa_direct_debit/README.rst | 7 ++--- .../models/common.py | 2 +- account_payment_mode/README.rst | 6 +--- account_payment_order/README.rst | 31 ++++--------------- account_payment_order/models/res_bank.py | 4 +-- account_payment_partner/README.rst | 7 ++--- account_payment_sale/README.rst | 7 ++--- 17 files changed, 44 insertions(+), 87 deletions(-) diff --git a/account_banking_mandate/README.rst b/account_banking_mandate/README.rst index 2366bc8c8..0fb4974ec 100644 --- a/account_banking_mandate/README.rst +++ b/account_banking_mandate/README.rst @@ -1,6 +1,7 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg :alt: License: AGPL-3 +======================= Account Banking Mandate ======================= @@ -46,11 +47,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed `feedback -`_. +help us smashing it by providing a detailed and welcomed feedback. Credits ======= diff --git a/account_banking_mandate/__openerp__.py b/account_banking_mandate/__openerp__.py index 76936cef4..864781e95 100644 --- a/account_banking_mandate/__openerp__.py +++ b/account_banking_mandate/__openerp__.py @@ -7,7 +7,7 @@ { 'name': 'Account Banking Mandate', 'summary': 'Banking mandates', - 'version': '9.0.0.2.0', + 'version': '9.0.1.0.0', 'license': 'AGPL-3', 'author': "Compassion CH, " "Serv. Tecnol. Avanzados - Pedro M. Baeza, " @@ -31,7 +31,6 @@ 'security/mandate_security.xml', 'security/ir.model.access.csv', ], - 'demo': [], 'test': ['test/banking_mandate.yml'], 'installable': True, } diff --git a/account_banking_mandate/models/account_banking_mandate.py b/account_banking_mandate/models/account_banking_mandate.py index fbecc4ca8..cd5958d7c 100644 --- a/account_banking_mandate/models/account_banking_mandate.py +++ b/account_banking_mandate/models/account_banking_mandate.py @@ -54,7 +54,7 @@ class AccountBankingMandate(models.Model): _sql_constraints = [( 'mandate_ref_company_uniq', 'unique(unique_mandate_reference, company_id)', - 'A Mandate with the same reference already exists for this company !')] + 'A Mandate with the same reference already exists for this company!')] @api.multi @api.constrains('signature_date', 'last_debit_date') @@ -65,7 +65,7 @@ class AccountBankingMandate(models.Model): mandate)): raise ValidationError( _("The date of signature of mandate '%s' " - "is in the future !") + "is in the future!") % mandate.unique_mandate_reference) if (mandate.signature_date and mandate.last_debit_date and mandate.signature_date > mandate.last_debit_date): @@ -108,7 +108,7 @@ class AccountBankingMandate(models.Model): for mandate in self: if mandate.state != 'draft': raise UserError( - _('Mandate should be in draft state')) + _('Mandate should be in draft state.')) self.write({'state': 'valid'}) return True @@ -117,7 +117,7 @@ class AccountBankingMandate(models.Model): for mandate in self: if mandate.state not in ('draft', 'valid'): raise UserError( - _('Mandate should be in draft or valid state')) + _('Mandate should be in draft or valid state.')) self.write({'state': 'cancel'}) return True @@ -129,6 +129,6 @@ class AccountBankingMandate(models.Model): for mandate in self: if mandate.state != 'cancel': raise UserError( - _('Mandate should be in cancel state')) + _('Mandate should be in cancel state.')) self.write({'state': 'draft'}) return True diff --git a/account_banking_mandate/models/account_payment_method.py b/account_banking_mandate/models/account_payment_method.py index 589506a9c..884365210 100644 --- a/account_banking_mandate/models/account_payment_method.py +++ b/account_banking_mandate/models/account_payment_method.py @@ -10,5 +10,5 @@ class AccountPaymentMethod(models.Model): mandate_required = fields.Boolean( string='Mandate Required', - help="Activate this option is this payment method requires your " + help="Activate this option if this payment method requires your " "customer to sign a direct debit mandate with your company.") diff --git a/account_banking_mandate/models/res_partner_bank.py b/account_banking_mandate/models/res_partner_bank.py index 119d3b4ff..028a1ddb8 100644 --- a/account_banking_mandate/models/res_partner_bank.py +++ b/account_banking_mandate/models/res_partner_bank.py @@ -12,5 +12,5 @@ class ResPartnerBank(models.Model): mandate_ids = fields.One2many( comodel_name='account.banking.mandate', inverse_name='partner_bank_id', string='Direct Debit Mandates', - help='Banking mandates represents an authorization that the bank ' - 'account owner gives to a company for a specific operation') + help='Banking mandates represent an authorization that the bank ' + 'account owner gives to a company for a specific operation.') diff --git a/account_banking_mandate_sale/README.rst b/account_banking_mandate_sale/README.rst index eb73e9cc8..2e8967e47 100644 --- a/account_banking_mandate_sale/README.rst +++ b/account_banking_mandate_sale/README.rst @@ -1,6 +1,7 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg :alt: License: AGPL-3 +============================ Account Banking Mandate Sale ============================ @@ -34,11 +35,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed `feedback -`_. +help us smashing it by providing a detailed and welcomed feedback. Credits ======= diff --git a/account_banking_pain_base/README.rst b/account_banking_pain_base/README.rst index f9e08a6b6..5e7f4774c 100644 --- a/account_banking_pain_base/README.rst +++ b/account_banking_pain_base/README.rst @@ -1,6 +1,7 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg :alt: License: AGPL-3 +================================ Account Banking PAIN Base Module ================================ @@ -46,11 +47,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed `feedback -`_. +help us smashing it by providing a detailed and welcomed feedback. Credits ======= diff --git a/account_banking_pain_base/models/account_payment_line.py b/account_banking_pain_base/models/account_payment_line.py index da183051c..9ecf53d86 100644 --- a/account_banking_pain_base/models/account_payment_line.py +++ b/account_banking_pain_base/models/account_payment_line.py @@ -13,9 +13,9 @@ class AccountPaymentLine(models.Model): ('NORM', 'Normal'), ('HIGH', 'High')], string='Priority', default='NORM', - help="This field will be used as the 'Instruction Priority' in " + help="This field will be used as 'Instruction Priority' in " "the generated PAIN file.") - # PAIN allows 140 caracters + # PAIN allows 140 characters communication = fields.Char(size=140) # The field struct_communication_type has been dropped in v9 # We now use communication_type ; you should add an option diff --git a/account_banking_pain_base/models/account_payment_method.py b/account_banking_pain_base/models/account_payment_method.py index 2d517e3db..9d9499036 100644 --- a/account_banking_pain_base/models/account_payment_method.py +++ b/account_banking_pain_base/models/account_payment_method.py @@ -12,9 +12,9 @@ class AccountPaymentMethod(models.Model): pain_version = fields.Selection([], string='PAIN Version') convert_to_ascii = fields.Boolean( string='Convert to ASCII', default=True, - help="If active, Odoo will convert each accented caracter to " - "the corresponding unaccented caracter, so that only ASCII " - "caracters are used in the generated PAIN file.") + help="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.") @api.multi def get_xsd_file_path(self): diff --git a/account_banking_sepa_credit_transfer/README.rst b/account_banking_sepa_credit_transfer/README.rst index 0e12698f5..6cdee145d 100644 --- a/account_banking_sepa_credit_transfer/README.rst +++ b/account_banking_sepa_credit_transfer/README.rst @@ -1,6 +1,7 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg :alt: License: AGPL-3 +==================================== Account Banking SEPA Credit Transfer ==================================== @@ -32,10 +33,12 @@ This module is part of the OCA/bank-payment suite. Configuration ============= -Create a Payment Mode dedicated to SEPA Credit Transfer and select -the Payment Method *SEPA Credit Transfer to suppliers* (which is -automatically created upon module installation) and check that this -payment method uses the proper version of PAIN. +* Create a Payment Mode dedicated to SEPA Credit Transfer. + +* Select the Payment Method *SEPA Credit Transfer to suppliers* (which is + automatically created upon module installation). + +* Check that this payment method uses the proper version of PAIN. Usage ===== @@ -59,11 +62,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed `feedback -`_. +help us smashing it by providing a detailed and welcomed feedback. Credits ======= diff --git a/account_banking_sepa_direct_debit/README.rst b/account_banking_sepa_direct_debit/README.rst index 000b0263d..22f07a8ad 100644 --- a/account_banking_sepa_direct_debit/README.rst +++ b/account_banking_sepa_direct_debit/README.rst @@ -1,6 +1,7 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg :alt: License: AGPL-3 +================================= Account Banking SEPA Direct Debit ================================= @@ -59,11 +60,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed `feedback -`_. +help us smashing it by providing a detailed and welcomed feedback. Credits ======= diff --git a/account_banking_sepa_direct_debit/models/common.py b/account_banking_sepa_direct_debit/models/common.py index 83f7bfa03..33712f3b3 100644 --- a/account_banking_sepa_direct_debit/models/common.py +++ b/account_banking_sepa_direct_debit/models/common.py @@ -21,7 +21,7 @@ def is_sepa_creditor_identifier_valid(sepa_creditor_identifier): sci = str(sepa_creditor_identifier).lower() except: logger.warning( - "SEPA Creditor ID should contain only ASCII caracters.") + "SEPA Creditor ID should contain only ASCII characters.") return False if len(sci) < 9: return False diff --git a/account_payment_mode/README.rst b/account_payment_mode/README.rst index c45ad9156..ac0f3a6e4 100644 --- a/account_payment_mode/README.rst +++ b/account_payment_mode/README.rst @@ -28,11 +28,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed `feedback -`_. +help us smashing it by providing a detailed and welcomed feedback. Credits ======= diff --git a/account_payment_order/README.rst b/account_payment_order/README.rst index 291febbc1..b752fee40 100644 --- a/account_payment_order/README.rst +++ b/account_payment_order/README.rst @@ -1,27 +1,11 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg :alt: License: AGPL-3 -Account Banking - Payments Export Infrastructure -================================================ +===================== +Account Payment Order +===================== -This module provide an infrastructure to export payment orders. -It includes some bug fixes and obvious enhancements to payment orders that will hopefully land in offical addons one -day. -This technical module provides the base infrastructure to export payment orders -for electronic banking. It provides the following technical features: - -* a new payment.mode.type model -* payment.mode now has a mandatory type -* a better implementation of payment_mode.suitable_bank_types() based on - payment.mode.type -* the "make payment" button launches a wizard depending on the - payment.mode.type -* a manual payment mode type is provided as an example, with a default "do - nothing" wizard - -To enable the use of payment order to collect money for customers, -it adds a payment_order_type (payment|debit) as a basis of direct debit support -(this field becomes visible when account_direct_debit is installed). +This module adds support for payment orders and debit orders. Installation ============ @@ -30,6 +14,7 @@ This module depends on: * account_payment_partner * base_iban +* document This modules is part of the OCA/bank-payment suite. @@ -62,11 +47,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed `feedback -`_. +help us smashing it by providing a detailed and welcomed feedback. Credits ======= diff --git a/account_payment_order/models/res_bank.py b/account_payment_order/models/res_bank.py index fa927bbd1..44dd6ecdb 100644 --- a/account_payment_order/models/res_bank.py +++ b/account_payment_order/models/res_bank.py @@ -15,8 +15,8 @@ class ResBank(models.Model): for bank in self: if bank.bic and len(bank.bic) not in (8, 11): raise ValidationError(_( - "A valid BIC contains 8 or 11 caracters. The BIC '%s' " - "contains %d caracters, so it is not valid.") + "A valid BIC contains 8 or 11 characters. The BIC '%s' " + "contains %d characters, so it is not valid.") % (bank.bic, len(bank.bic))) # in v9, on res.partner.bank bank_bic is a related of bank_id.bic diff --git a/account_payment_partner/README.rst b/account_payment_partner/README.rst index 4e4110e79..704ca358a 100644 --- a/account_payment_partner/README.rst +++ b/account_payment_partner/README.rst @@ -1,6 +1,7 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg :alt: License: AGPL-3 +======================= Account Payment Partner ======================= @@ -50,11 +51,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed `feedback -`_. +help us smashing it by providing a detailed and welcomed feedback. Credits ======= diff --git a/account_payment_sale/README.rst b/account_payment_sale/README.rst index 636eb219c..383837d56 100644 --- a/account_payment_sale/README.rst +++ b/account_payment_sale/README.rst @@ -1,6 +1,7 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg :alt: License: AGPL-3 +==================== Account Payment Sale ==================== @@ -50,11 +51,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed `feedback -`_. +help us smashing it by providing a detailed and welcomed feedback. Credits =======