audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix spelling mistakes

Browse Source 
Simplify code using str.ljust and .join()
Better name for columns in m2m field
Add docstrings.
This commit is contained in:
Alexis de Lattre
2014-03-21 00:21:25 +01:00
parent 034e5732b4
commit fdc7d91987
6 changed files with 54 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_banking_fr_lcr/__init__.py
View File

@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# French LCR module for OpenERP
# French Letter of Change module for OpenERP
# Copyright (C) 2014 Akretion (http://www.akretion.com)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
#

10
account_banking_fr_lcr/__openerp__.py
View File

@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# French LCR module for OpenERP
# French Letter of Change module for OpenERP
# Copyright (C) 2014 Akretion (http://www.akretion.com)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
#
@@ -21,7 +21,7 @@
##############################################################################
{
'name': 'French LCR',
'name': 'French Letter of Change',
'summary': 'Create French LCR CFONB files',
'version': '0.1',
'license': 'AGPL-3',
@@ -40,10 +40,10 @@
],
'demo': ['lcr_demo.xml'],
'description': '''
French LCR
==========
French Letter of Change
=======================
This modules adds support for French LCR (Lettre de Change Relevés). This payment type is still in use in France and it is *not* replaced by SEPA one-off Direct Debits. With this module, you can generate a CFNOB file to send to your bank.
This module adds support for French Letters of Change (in French : Lettre de Change Relevé aka LCR). This payment type is still in use in France and it is *not* replaced by SEPA one-off Direct Debits. With this module, you can generate a CFONB file to send to your bank.
This module uses the framework provided by the banking addons, cf https://launchpad.net/banking-addons

4
account_banking_fr_lcr/account_banking_lcr.py
View File

@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# French LCR module for OpenERP
# French Letter of Change module for OpenERP
# Copyright (C) 2014 Akretion (http://www.akretion.com)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
#
@@ -46,7 +46,7 @@ class banking_export_lcr(orm.Model):
'payment_order_ids': fields.many2many(
'payment.order',
'account_payment_order_lcr_rel',
'banking_export_lcr_id', 'account_order_id',
'banking_export_lcr_id', 'payment_order_id',
'Payment Orders',
readonly=True),
'nb_transactions': fields.integer(

50
account_banking_fr_lcr/i18n/account_banking_fr_lcr.pot
View File

@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-03-12 21:33+0000\n"
"PO-Revision-Date: 2014-03-12 21:33+0000\n"
"POT-Creation-Date: 2014-03-20 23:15+0000\n"
"PO-Revision-Date: 2014-03-20 23:15+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -54,7 +54,7 @@ msgid "Sent"
msgstr ""
#. module: account_banking_fr_lcr
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:90
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:91
#, python-format
msgid "The field '%s' is empty or 0. It should have a non-null value."
msgstr ""
@@ -64,13 +64,25 @@ msgstr ""
msgid "Finish"
msgstr ""
#. module: account_banking_fr_lcr
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:124
#, python-format
msgid "For the bank account '%s' of partner '%s', the bank account type is 'RIB and optional IBAN' and the IBAN field is empty, but, starting from 2014, we consider that the IBAN is required. Please write the IBAN on this bank account."
msgstr ""
#. module: account_banking_fr_lcr
#: view:banking.export.lcr.wizard:0
msgid "LCR File Generation"
msgstr ""
#. module: account_banking_fr_lcr
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:294
#: field:banking.export.lcr,total_amount:0
#: field:banking.export.lcr.wizard,total_amount:0
msgid "Total Amount"
msgstr ""
#. module: account_banking_fr_lcr
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:296
#, python-format
msgid "The currency of payment line '%s' is '%s'. To be included in a French LCR, the currency must be EUR."
msgstr ""
@@ -106,34 +118,22 @@ msgid "LCR CFONB File"
msgstr ""
#. module: account_banking_fr_lcr
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:123
#, python-format
msgid "For the bank account '%s' of partner '%s', the Bank Account Type is 'RIB and optional IBAN' and the IBAN field is empty, but, starting from 2014, we consider that the IBAN is required. Please write the IBAN on this bank account."
msgstr ""
#. module: account_banking_fr_lcr
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:143
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:144
#, python-format
msgid "LCR are only for French bank accounts. The IBAN '%s' of partner '%s' is not a French IBAN."
msgstr ""
#. module: account_banking_fr_lcr
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:89
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:103
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:122
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:133
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:142
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:293
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:90
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:104
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:123
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:134
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:143
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:295
#, python-format
msgid "Error:"
msgstr ""
#. module: account_banking_fr_lcr
#: field:banking.export.lcr,total_amount:0
#: field:banking.export.lcr.wizard,total_amount:0
msgid "Total Amount"
msgstr ""
#. module: account_banking_fr_lcr
#: view:banking.export.lcr:0
#: model:ir.actions.act_window,name:account_banking_fr_lcr.banking_export_lcr_action
@@ -159,7 +159,7 @@ msgid "General Information"
msgstr ""
#. module: account_banking_fr_lcr
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:134
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:135
#, python-format
msgid "For the bank account '%s' of partner '%s', the Bank Account Type should be 'IBAN'."
msgstr ""
@@ -175,7 +175,7 @@ msgid "Cancel"
msgstr ""
#. module: account_banking_fr_lcr
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:104
#: code:addons/account_banking_fr_lcr/wizard/export_lcr.py:105
#, python-format
msgid "Cannot convert the field '%s' to ASCII"
msgstr ""

2
account_banking_fr_lcr/wizard/__init__.py
View File

@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# French LCR module for OpenERP
# French Letter of Change module for OpenERP
# Copyright (C) 2014 Akretion (http://www.akretion.com)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
#

42
account_banking_fr_lcr/wizard/export_lcr.py
View File

@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# French LCR module for OpenERP
# French Letter of Change module for OpenERP
# Copyright (C) 2014 Akretion (http://www.akretion.com)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
#
@@ -84,6 +84,7 @@ class banking_export_lcr_wizard(orm.TransientModel):
def _prepare_field(
self, cr, uid, field_name, field_value, size, context=None):
'''This function is designed to be inherited.'''
if not field_value:
raise orm.except_orm(
_('Error:'),
@@ -108,8 +109,8 @@ class banking_export_lcr_wizard(orm.TransientModel):
value = value[0:size]
# enlarge if too small
if len(value) < size:
value = '%s%s' % (value, ' ' * (size - len(value)))
assert len(value) == size, 'The lenght of the field is wrong'
value = value.ljust(size, ' ')
assert len(value) == size, 'The length of the field is wrong'
return value
def _get_rib_from_iban(self, cr, uid, partner_bank, context=None):
@@ -120,8 +121,8 @@ class banking_export_lcr_wizard(orm.TransientModel):
if partner_bank.state == 'rib' and not partner_bank.acc_number:
raise orm.except_orm(
_('Error:'),
_("For the bank account '%s' of partner '%s', the Bank "
"Account Type is 'RIB and optional IBAN' and the IBAN "
_("For the bank account '%s' of partner '%s', the bank "
"account type is 'RIB and optional IBAN' and the IBAN "
"field is empty, but, starting from 2014, we consider "
"that the IBAN is required. Please write the IBAN on "
"this bank account.")
@@ -153,6 +154,7 @@ class banking_export_lcr_wizard(orm.TransientModel):
def _prepare_first_cfonb_line(
self, cr, uid, lcr_export, context=None):
'''Generate the header line of the CFONB file'''
code_enregistrement = '03'
code_operation = '60'
numero_enregistrement = '00000001'
@@ -178,7 +180,7 @@ class banking_export_lcr_wizard(orm.TransientModel):
ref_remise = self._prepare_field(
cr, uid, u'Référence de la remise',
lcr_export.payment_order_ids[0].reference, 11, context=context)
cfonb_line = '%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s' % (
cfonb_line = ''.join([
code_enregistrement,
code_operation,
numero_enregistrement,
@@ -198,7 +200,7 @@ class banking_export_lcr_wizard(orm.TransientModel):
# "remise à l'escompte" and we do
# "Encaissement, crédit forfaitaire après l’échéance"
ref_remise,
)
])
assert len(cfonb_line) == 160, 'LCR CFONB line must have 160 chars'
cfonb_line += '\r\n'
return cfonb_line
@@ -206,6 +208,7 @@ class banking_export_lcr_wizard(orm.TransientModel):
def _prepare_cfonb_line(
self, cr, uid, line, requested_date, transactions_count,
context=None):
'''Generate each debit line of the CFONB file'''
# I use French variable names because the specs are in French
code_enregistrement = '06'
code_operation = '60'
@@ -231,7 +234,7 @@ class banking_export_lcr_wizard(orm.TransientModel):
date_echeance = requested_date_dt.strftime(LCR_DATE_FORMAT)
reference_tireur = reference_tire
cfonb_line = '%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s' % (
cfonb_line = ''.join([
code_enregistrement,
code_operation,
numero_enregistrement,
@@ -249,34 +252,33 @@ class banking_export_lcr_wizard(orm.TransientModel):
date_echeance,
date_creation,
' ' * (4 + 1 + 3 + 3 + 9),
reference_tireur
)
reference_tireur,
])
assert len(cfonb_line) == 160, 'LCR CFONB line must have 160 chars'
cfonb_line += '\r\n'
return cfonb_line
def _prepare_final_cfonb_line(
self, cr, uid, total_amount, transactions_count, context=None):
'''Generate the last line of the CFONB file'''
code_enregistrement = '08'
code_operation = '60'
numero_enregistrement = '%08d' % (transactions_count + 2)
montant_total_centimes = int(total_amount * 100)
zero_montant_total_centimes = ('%012d' % montant_total_centimes)
cfonb_line = '%s%s%s%s%s%s' % (
cfonb_line = ''.join([
code_enregistrement,
code_operation,
numero_enregistrement,
' ' * (6 + 12 + 24 + 24 + 1 + 2 + 5 + 5 + 11),
zero_montant_total_centimes,
' ' * (4 + 6 + 10 + 15 + 5 + 6)
)
' ' * (4 + 6 + 10 + 15 + 5 + 6),
])
assert len(cfonb_line) == 160, 'LCR CFONB line must have 160 chars'
return cfonb_line
def create_lcr(self, cr, uid, ids, context=None):
'''
Creates the LCR CFONB file.
'''
'''Creates the LCR CFONB file.'''
lcr_export = self.browse(cr, uid, ids[0], context=context)
today = fields.date.context_today(self, cr, uid, context=context)
@@ -335,18 +337,14 @@ class banking_export_lcr_wizard(orm.TransientModel):
return action
def cancel_lcr(self, cr, uid, ids, context=None):
'''
Cancel the CFONB file: just drop the file
'''
'''Cancel the CFONB file: just drop the file'''
lcr_export = self.browse(cr, uid, ids[0], context=context)
self.pool['banking.export.lcr'].unlink(
cr, uid, lcr_export.file_id.id, context=context)
return {'type': 'ir.actions.act_window_close'}
def save_lcr(self, cr, uid, ids, context=None):
'''
Mark the LCR file as 'sent' and the payment order as 'done'.
'''
'''Mark the LCR file as 'sent' and the payment order as 'done'.'''
lcr_export = self.browse(cr, uid, ids[0], context=context)
self.pool['banking.export.lcr'].write(
cr, uid, lcr_export.file_id.id, {'state': 'sent'},