Move fields mandate_required and export_ascii from payment mode to payment method

Display chatter on payment orders
Several small usability improvements
This commit is contained in:
Alexis de Lattre
2016-05-10 23:16:31 +02:00
committed by Enric Tobella
parent 7c3a7892a6
commit 71d1e3883d
5 changed files with 14 additions and 10 deletions

View File

@@ -10,6 +10,11 @@ class AccountPaymentMethod(models.Model):
_inherit = 'account.payment.method'
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.")
@api.multi
def get_xsd_file_path(self):

View File

@@ -10,11 +10,6 @@ from openerp import models, fields
class AccountPaymentMode(models.Model):
_inherit = 'account.payment.mode'
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.")
initiating_party_issuer = fields.Char(
string='Initiating Party Issuer', size=35,
help="This will be used as the 'Initiating Party Issuer' in the "

View File

@@ -10,14 +10,15 @@ class AccountPaymentOrder(models.Model):
_inherit = 'account.payment.order'
sepa = fields.Boolean(
compute='compute_sepa', readonly=True,
string="SEPA Payment")
compute='compute_sepa', readonly=True, string="SEPA Payment")
charge_bearer = fields.Selection([
('SLEV', 'Following Service Level'),
('SHAR', 'Shared'),
('CRED', 'Borne by Creditor'),
('DEBT', 'Borne by Debtor')], string='Charge Bearer',
default='SLEV',
default='SLEV', readonly=True,
states={'draft': [('readonly', False)], 'open': [('readonly', False)]},
track_visibility='onchange',
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 : "
@@ -28,7 +29,9 @@ class AccountPaymentOrder(models.Model):
"by debtor : all transaction charges are to be borne by the "
"debtor.")
batch_booking = fields.Boolean(
string='Batch Booking',
string='Batch Booking', readonly=True,
states={'draft': [('readonly', False)], 'open': [('readonly', False)]},
track_visibility='onchange',
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 "

View File

@@ -10,6 +10,8 @@
<field name="arch" type="xml">
<field name="payment_type" position="after">
<field name="pain_version"/>
<field name="convert_to_ascii"
attrs="{'invisible': [('pain_version', '=', False)]}"/>
</field>
</field>
</record>

View File

@@ -16,7 +16,6 @@
<field name="arch" type="xml">
<group name="payment_order_options" position="after">
<group name="pain_options" string="Options for PAIN">
<field name="convert_to_ascii"/>
<!-- To be set visible in the localisation modules that need it -->
<field name="initiating_party_identifier" invisible="1"/>
<field name="initiating_party_issuer" invisible="1"/>