Compare commits
No commits in common. "19.0" and "main" have entirely different histories.
BIN
__pycache__/__init__.cpython-310.pyc
Normal file
BIN
__pycache__/__init__.cpython-310.pyc
Normal file
Binary file not shown.
BIN
__pycache__/__init__.cpython-312.pyc
Normal file
BIN
__pycache__/__init__.cpython-312.pyc
Normal file
Binary file not shown.
BIN
data/__pycache__/__init__.cpython-310.pyc
Normal file
BIN
data/__pycache__/__init__.cpython-310.pyc
Normal file
Binary file not shown.
BIN
data/__pycache__/__init__.cpython-312.pyc
Normal file
BIN
data/__pycache__/__init__.cpython-312.pyc
Normal file
Binary file not shown.
BIN
doc/__pycache__/__init__.cpython-310.pyc
Normal file
BIN
doc/__pycache__/__init__.cpython-310.pyc
Normal file
Binary file not shown.
BIN
doc/__pycache__/__init__.cpython-312.pyc
Normal file
BIN
doc/__pycache__/__init__.cpython-312.pyc
Normal file
Binary file not shown.
BIN
models/__pycache__/__init__.cpython-310.pyc
Normal file
BIN
models/__pycache__/__init__.cpython-310.pyc
Normal file
Binary file not shown.
BIN
models/__pycache__/__init__.cpython-312.pyc
Normal file
BIN
models/__pycache__/__init__.cpython-312.pyc
Normal file
Binary file not shown.
BIN
models/__pycache__/account_batch_payment.cpython-310.pyc
Normal file
BIN
models/__pycache__/account_batch_payment.cpython-310.pyc
Normal file
Binary file not shown.
BIN
models/__pycache__/account_batch_payment.cpython-312.pyc
Normal file
BIN
models/__pycache__/account_batch_payment.cpython-312.pyc
Normal file
Binary file not shown.
BIN
models/__pycache__/account_payment.cpython-310.pyc
Normal file
BIN
models/__pycache__/account_payment.cpython-310.pyc
Normal file
Binary file not shown.
BIN
models/__pycache__/account_payment.cpython-312.pyc
Normal file
BIN
models/__pycache__/account_payment.cpython-312.pyc
Normal file
Binary file not shown.
BIN
models/__pycache__/account_payment_register.cpython-310.pyc
Normal file
BIN
models/__pycache__/account_payment_register.cpython-310.pyc
Normal file
Binary file not shown.
@ -13,7 +13,7 @@ class AccountPayment(models.Model):
|
|||||||
help="Account used for expense instead of the default payable/receivable account"
|
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):
|
def _compute_destination_account_id(self):
|
||||||
''' Override to use expense account if defined '''
|
''' Override to use expense account if defined '''
|
||||||
super()._compute_destination_account_id()
|
super()._compute_destination_account_id()
|
||||||
|
|||||||
@ -13,7 +13,7 @@ class AccountPaymentRegister(models.TransientModel):
|
|||||||
help="Account used for expense instead of the default payable/receivable account"
|
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):
|
def _compute_destination_account_id(self):
|
||||||
''' Override to use expense account if defined '''
|
''' Override to use expense account if defined '''
|
||||||
super()._compute_destination_account_id()
|
super()._compute_destination_account_id()
|
||||||
|
|||||||
@ -8,14 +8,14 @@
|
|||||||
<xpath expr="//page[@name='batch_content']" position="after">
|
<xpath expr="//page[@name='batch_content']" position="after">
|
||||||
<page string="Direct Payment Lines" name="direct_payment_lines">
|
<page string="Direct Payment Lines" name="direct_payment_lines">
|
||||||
<field name="direct_payment_line_ids">
|
<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="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="amount" sum="Total"/>
|
||||||
<field name="expense_account_id"/>
|
<field name="expense_account_id"/>
|
||||||
<field name="memo"/>
|
<field name="memo"/>
|
||||||
<field name="date"/>
|
<field name="date"/>
|
||||||
<field name="payment_id" readonly="1"/>
|
<field name="payment_id" readonly="1"/>
|
||||||
</list>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
</page>
|
</page>
|
||||||
</xpath>
|
</xpath>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user