pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] account: Set 'move_id.ref' as payment memo with vendor bill

Browse Source 
The current behavior was to set the label as memo in the payment register wizard.
However, this is to restrictive when a vendor bill hasn't any payment reference but a bill reference.
In that case, the user is expecting to have the bill 'ref' in the payment 'memo'.

Since the matching rules in the reconciliation widget are matching line.name, then line.move_id.ref and then line.move_id.name, the same logic is applied here to construct the payment 'memo'.

closes odoo/odoo#68004

Opw: 2440389
X-original-commit: 92ceb86d58f4d78c8a4256f29d101d3730517b93
Signed-off-by: oco-odoo <oco-odoo@users.noreply.github.com>
This commit is contained in:
Laurent Smet
2021-03-17 11:08:05 +00:00
parent e5cf8cc8b7
commit fbe1cca0d6
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/tests/test_account_payment_register.py
+34 -7
View File
@@ -119,6 +119,7 @@ class TestAccountPaymentRegister(AccountTestInvoicingCommon):
})._create_payments()
self.assertRecordValues(payments, [{
'ref': 'INV/2017/01/0001 INV/2017/01/0002',
'payment_method_id': self.custom_payment_method_in.id,
}])
self.assertRecordValues(payments.line_ids.sorted('balance'), [
@@ -152,6 +153,7 @@ class TestAccountPaymentRegister(AccountTestInvoicingCommon):
})._create_payments()
self.assertRecordValues(payments, [{
'ref': 'INV/2017/01/0001 INV/2017/01/0002',
'payment_method_id': self.custom_payment_method_in.id,
}])
self.assertRecordValues(payments.line_ids.sorted('balance'), [
@@ -186,6 +188,7 @@ class TestAccountPaymentRegister(AccountTestInvoicingCommon):
})._create_payments()
self.assertRecordValues(payments, [{
'ref': 'INV/2017/01/0001 INV/2017/01/0002',
'payment_method_id': self.custom_payment_method_in.id,
}])
self.assertRecordValues(payments.line_ids.sorted('balance'), [
@@ -228,6 +231,7 @@ class TestAccountPaymentRegister(AccountTestInvoicingCommon):
})._create_payments()
self.assertRecordValues(payments, [{
'ref': 'INV/2017/01/0001 INV/2017/01/0002',
'payment_method_id': self.custom_payment_method_in.id,
}])
self.assertRecordValues(payments.line_ids.sorted('balance'), [
@@ -270,6 +274,7 @@ class TestAccountPaymentRegister(AccountTestInvoicingCommon):
})._create_payments()
self.assertRecordValues(payments, [{
'ref': 'BILL/2017/01/0001 BILL/2017/01/0002',
'payment_method_id': self.custom_payment_method_in.id,
}])
self.assertRecordValues(payments.line_ids.sorted('balance'), [
@@ -312,6 +317,7 @@ class TestAccountPaymentRegister(AccountTestInvoicingCommon):
})._create_payments()
self.assertRecordValues(payments, [{
'ref': 'BILL/2017/01/0001 BILL/2017/01/0002',
'payment_method_id': self.custom_payment_method_in.id,
}])
self.assertRecordValues(payments.line_ids.sorted('balance'), [
@@ -349,8 +355,14 @@ class TestAccountPaymentRegister(AccountTestInvoicingCommon):
})._create_payments()
self.assertRecordValues(payments, [
{'payment_method_id': self.manual_payment_method_in.id},
{'payment_method_id': self.manual_payment_method_in.id},
{
'ref': 'INV/2017/01/0001',
'payment_method_id': self.manual_payment_method_in.id,
},
{
'ref': 'INV/2017/01/0002',
'payment_method_id': self.manual_payment_method_in.id,
},
])
self.assertRecordValues(payments[0].line_ids.sorted('balance') + payments[1].line_ids.sorted('balance'), [
# == Payment 1: to pay out_invoice_1 ==
@@ -399,8 +411,14 @@ class TestAccountPaymentRegister(AccountTestInvoicingCommon):
})._create_payments()
self.assertRecordValues(payments, [
{'payment_method_id': self.manual_payment_method_out.id},
{'payment_method_id': self.manual_payment_method_out.id},
{
'ref': 'BILL/2017/01/0001 BILL/2017/01/0002',
'payment_method_id': self.manual_payment_method_out.id,
},
{
'ref': 'BILL/2017/01/0003',
'payment_method_id': self.manual_payment_method_out.id,
},
])
self.assertRecordValues(payments[0].line_ids.sorted('balance') + payments[1].line_ids.sorted('balance'), [
# == Payment 1: to pay in_invoice_1 & in_invoice_2 ==
@@ -449,9 +467,18 @@ class TestAccountPaymentRegister(AccountTestInvoicingCommon):
})._create_payments()
self.assertRecordValues(payments, [
{'payment_method_id': self.manual_payment_method_out.id},
{'payment_method_id': self.manual_payment_method_out.id},
{'payment_method_id': self.manual_payment_method_out.id},
{
'ref': 'BILL/2017/01/0001',
'payment_method_id': self.manual_payment_method_out.id,
},
{
'ref': 'BILL/2017/01/0002',
'payment_method_id': self.manual_payment_method_out.id,
},
{
'ref': 'BILL/2017/01/0003',
'payment_method_id': self.manual_payment_method_out.id,
},
])
self.assertRecordValues(payments[0].line_ids.sorted('balance') + payments[1].line_ids.sorted('balance') + payments[2].line_ids.sorted('balance'), [
# == Payment 1: to pay in_invoice_1 ==
addons/account/wizard/account_payment_register.py
+2 -1
View File
@@ -115,7 +115,8 @@ class AccountPaymentRegister(models.TransientModel):
:param batch_result: A batch returned by '_get_batches'.
:return: A string representing a communication to be set on payment.
'''
return ' '.join(label for label in batch_result['lines'].mapped('name') if label)
labels = set(line.name or line.move_id.ref or line.move_id.name for line in batch_result['lines'])
return ' '.join(sorted(labels))
@api.model
def _get_line_batch_key(self, line):