diff --git a/account_banking_sepa_credit_transfer/__init__.py b/account_banking_sepa_credit_transfer/__init__.py index f0e7fcb0b..207f87a21 100644 --- a/account_banking_sepa_credit_transfer/__init__.py +++ b/account_banking_sepa_credit_transfer/__init__.py @@ -20,6 +20,5 @@ # ############################################################################## -import wizard -import account_banking_sepa - +from . import wizard +from . import account_banking_sepa diff --git a/account_banking_sepa_credit_transfer/account_banking_sepa.py b/account_banking_sepa_credit_transfer/account_banking_sepa.py index 941abe413..ed41333fa 100644 --- a/account_banking_sepa_credit_transfer/account_banking_sepa.py +++ b/account_banking_sepa_credit_transfer/account_banking_sepa.py @@ -35,7 +35,7 @@ class banking_export_sepa(orm.Model): for sepa_file in self.browse(cr, uid, ids, context=context): ref = sepa_file.payment_order_ids[0].reference if ref: - label = ref.replace('/', '-') + label = unidecode(ref.replace('/', '-')) else: label = 'error' res[sepa_file.id] = 'sct_%s.xml' % label @@ -64,8 +64,7 @@ class banking_export_sepa(orm.Model): ('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', readonly=True), + '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', @@ -78,6 +77,5 @@ class banking_export_sepa(orm.Model): } _defaults = { - 'generation_date': fields.date.context_today, 'state': 'draft', } diff --git a/account_banking_sepa_credit_transfer/account_banking_sepa_view.xml b/account_banking_sepa_credit_transfer/account_banking_sepa_view.xml index 0f93f2a03..8e5421cc4 100644 --- a/account_banking_sepa_credit_transfer/account_banking_sepa_view.xml +++ b/account_banking_sepa_credit_transfer/account_banking_sepa_view.xml @@ -19,7 +19,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/account_banking_sepa_credit_transfer/wizard/__init__.py b/account_banking_sepa_credit_transfer/wizard/__init__.py index 239513358..05230383b 100644 --- a/account_banking_sepa_credit_transfer/wizard/__init__.py +++ b/account_banking_sepa_credit_transfer/wizard/__init__.py @@ -20,4 +20,4 @@ # ############################################################################## -import export_sepa +from . import export_sepa diff --git a/account_banking_sepa_credit_transfer/wizard/export_sepa.py b/account_banking_sepa_credit_transfer/wizard/export_sepa.py index b1f237c7b..00330fb1c 100644 --- a/account_banking_sepa_credit_transfer/wizard/export_sepa.py +++ b/account_banking_sepa_credit_transfer/wizard/export_sepa.py @@ -36,7 +36,7 @@ _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([ @@ -418,7 +418,7 @@ class banking_export_sepa_wizard(orm.TransientModel): }, context=context) action = { - 'name': 'SEPA Credit Transfer XML', + 'name': 'SEPA Credit Transfer File', 'type': 'ir.actions.act_window', 'view_type': 'form', 'view_mode': 'form,tree', diff --git a/account_banking_sepa_credit_transfer/wizard/export_sepa_view.xml b/account_banking_sepa_credit_transfer/wizard/export_sepa_view.xml index 39daa7c7e..5d1d846e9 100644 --- a/account_banking_sepa_credit_transfer/wizard/export_sepa_view.xml +++ b/account_banking_sepa_credit_transfer/wizard/export_sepa_view.xml @@ -1,6 +1,6 @@