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 6b5bcebe88
commit b4f90385fd
2 changed files with 13 additions and 5 deletions

View File

@@ -16,8 +16,7 @@ class AccountPaymentOrder(models.Model):
_order = 'id desc'
name = fields.Char(
string='Number', readonly=True, copy=False,
track_visibility='onchange') # v8 field : name
string='Number', readonly=True, copy=False) # v8 field : name
payment_mode_id = fields.Many2one(
'account.payment.mode', 'Payment Method', required=True,
ondelete='restrict', track_visibility='onchange',
@@ -35,7 +34,8 @@ class AccountPaymentOrder(models.Model):
related='payment_mode_id.bank_account_link', readonly=True)
journal_id = fields.Many2one(
'account.journal', string='Bank Journal', ondelete='restrict',
readonly=True, states={'draft': [('readonly', False)]})
readonly=True, states={'draft': [('readonly', False)]},
track_visibility='onchange')
allowed_journal_ids = fields.Many2many(
'account.journal', compute='_compute_allowed_journals', readonly=True,
string='Selectable Bank Journals')
@@ -200,7 +200,11 @@ class AccountPaymentOrder(models.Model):
for order in self:
if not order.journal_id:
raise UserError(_(
'Missing Bank Journal on payment order %s') % order.name)
'Missing Bank Journal on payment order %s.') % order.name)
if not order.payment_line_ids:
raise UserError(_(
'There are no transactions on payment order %s.')
% order.name)
# Delete existing bank payment lines
order.bank_line_ids.unlink()
# Create the bank payment lines from the payment lines

View File

@@ -46,7 +46,7 @@
<group name="head-right">
<field name="date_prefered"/>
<field name="date_scheduled"
attrs="{'readonly': [('date_prefered', '!=', 'fixed')]}"/>
attrs="{'invisible': [('date_prefered', '!=', 'fixed')], 'required': [('date_prefered', '=', 'fixed')]}"/>
<field name="date_generated"/>
<field name="generated_user_id"/>
<field name="date_uploaded"/>
@@ -66,6 +66,10 @@
</page>
</notebook>
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" widget="mail_thread"/>
</div>
</form>
</field>
</record>