From a3b070d641bbc433e3aef4b845fa0763d0cde44a Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 10 Dec 2016 16:17:15 +0100 Subject: [PATCH 1/2] Responsive --- 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 ead01e9c6d7..fff2cf7a03d 100644 --- a/htdocs/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -170,7 +170,7 @@ if ($action == 'create') print ''.$langs->trans("Loan").''; - print ''.$langs->trans("Ref").''.$chid.''; + print ''.$langs->trans("Ref").''.$chid.''; print ''.$langs->trans("DateStart").''.dol_print_date($loan->datestart,'day')."\n"; print ''.$langs->trans("Label").''.$loan->label."\n"; print ''.$langs->trans("Amount").''.price($loan->capital,0,$outputlangs,1,-1,-1,$conf->currency).''; @@ -198,7 +198,7 @@ if ($action == 'create') print ''.$langs->trans("Payment").''; print ''; - print ''.$langs->trans("Date").''; + print ''.$langs->trans("Date").''; $datepaid = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int')); $datepayment = empty($conf->global->MAIN_AUTOFILL_DATE)?(empty($_POST["remonth"])?-1:$datepaye):0; $form->select_date($datepayment, '', '', '', '', "add_payment", 1, 1); From a75000715536fbf2e8b9e11d4d535770802e60d0 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 10 Dec 2016 16:17:52 +0100 Subject: [PATCH 2/2] Fix Loan - Register a payment with a comma --- htdocs/loan/class/paymentloan.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php index 5a0ad6b14fd..52c822e54c1 100644 --- a/htdocs/loan/class/paymentloan.class.php +++ b/htdocs/loan/class/paymentloan.class.php @@ -87,9 +87,9 @@ class PaymentLoan extends CommonObject // Clean parameters if (isset($this->fk_loan)) $this->fk_loan = trim($this->fk_loan); - if (isset($this->amount_capital)) $this->amount_capital = trim($this->amount_capital?$this->amount_capital:0); - if (isset($this->amount_insurance)) $this->amount_insurance = trim($this->amount_insurance?$this->amount_insurance:0); - if (isset($this->amount_interest)) $this->amount_interest = trim($this->amount_interest?$this->amount_interest:0); + if (isset($this->amount_capital)) $this->amount_capital = price2num($this->amount_capital?$this->amount_capital:0); + if (isset($this->amount_insurance)) $this->amount_insurance = price2num($this->amount_insurance?$this->amount_insurance:0); + if (isset($this->amount_interest)) $this->amount_interest = price2num($this->amount_interest?$this->amount_interest:0); if (isset($this->fk_typepayment)) $this->fk_typepayment = trim($this->fk_typepayment); if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment); if (isset($this->note_private)) $this->note_private = trim($this->note_private);