Compare commits

..

No commits in common. "19.0" and "main" have entirely different histories.
19.0 ... main

16 changed files with 4 additions and 4 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -13,7 +13,7 @@ class AccountPayment(models.Model):
help="Account used for expense instead of the default payable/receivable account"
)
@api.depends('journal_id', 'partner_id', 'partner_type', 'payment_type', 'expense_account_id')
@api.depends('journal_id', 'partner_id', 'partner_type', 'is_internal_transfer', 'destination_journal_id', 'expense_account_id')
def _compute_destination_account_id(self):
''' Override to use expense account if defined '''
super()._compute_destination_account_id()

View File

@ -13,7 +13,7 @@ class AccountPaymentRegister(models.TransientModel):
help="Account used for expense instead of the default payable/receivable account"
)
@api.depends('journal_id', 'partner_type', 'payment_type', 'expense_account_id')
@api.depends('journal_id', 'partner_type', 'is_internal_transfer', 'destination_journal_id', 'expense_account_id')
def _compute_destination_account_id(self):
''' Override to use expense account if defined '''
super()._compute_destination_account_id()

View File

@ -8,14 +8,14 @@
<xpath expr="//page[@name='batch_content']" position="after">
<page string="Direct Payment Lines" name="direct_payment_lines">
<field name="direct_payment_line_ids">
<list editable="bottom">
<tree editable="bottom">
<field name="partner_id" domain="parent.batch_type == 'outbound' and [('supplier_rank', '>', 0)] or [('customer_rank', '>', 0)]" options="{'no_create': True}"/>
<field name="amount" sum="Total"/>
<field name="expense_account_id"/>
<field name="memo"/>
<field name="date"/>
<field name="payment_id" readonly="1"/>
</list>
</tree>
</field>
</page>
</xpath>