From 433ddd61a7a02ca7c8cfdc389bdf4d0ce3093425 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Mon, 4 Jan 2021 06:57:10 +0100 Subject: [PATCH 1/2] FIX: Loan - Missing fk_bank when we add payment with schedule --- htdocs/loan/payment/payment.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php index 1793854631e..8eb8f1b61fc 100644 --- a/htdocs/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -155,11 +155,12 @@ if ($action == 'add_payment') $payment->chid = $chid; $payment->datep = $datepaid; $payment->label = $loan->label; - $payment->amount_capital = $pay_amount_capital; - $payment->amount_insurance = $pay_amount_interest; - $payment->amount_interest = $pay_amount_insurance; + $payment->amount_capital = $pay_amount_capital; + $payment->amount_insurance = $pay_amount_interest; + $payment->amount_interest = $pay_amount_insurance; + $payment->fk_bank = GETPOST('accountid', 'int'); $payment->paymenttype = GETPOST('paymenttype', 'int'); - $payment->num_payment = GETPOST('num_payment'); + $payment->num_payment = GETPOST('num_payment'); $payment->note_private = GETPOST('note_private', 'restricthtml'); $payment->note_public = GETPOST('note_public', 'restricthtml'); From 8f4fc046ec3d9221175e30cd80b899adc8e80da1 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Mon, 4 Jan 2021 06:57:56 +0100 Subject: [PATCH 2/2] FIX: Loan - amount insurance / interest is inverted --- htdocs/loan/payment/payment.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php index 8eb8f1b61fc..8a6e1e9c9ba 100644 --- a/htdocs/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -156,8 +156,8 @@ if ($action == 'add_payment') $payment->datep = $datepaid; $payment->label = $loan->label; $payment->amount_capital = $pay_amount_capital; - $payment->amount_insurance = $pay_amount_interest; - $payment->amount_interest = $pay_amount_insurance; + $payment->amount_insurance = $pay_amount_insurance; + $payment->amount_interest = $pay_amount_interest; $payment->fk_bank = GETPOST('accountid', 'int'); $payment->paymenttype = GETPOST('paymenttype', 'int'); $payment->num_payment = GETPOST('num_payment');