From bc2c794484976ab424113ab029317a0251002c6f Mon Sep 17 00:00:00 2001 From: philippe-opendsi Date: Sat, 10 Dec 2016 19:57:11 +0100 Subject: [PATCH 1/4] FIX : Display invalid message when save payment in invoice currency Display Payment higher than to pay --- htdocs/compta/paiement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index a1f50959aa4..82749f4949f 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -138,7 +138,7 @@ if (empty($reshook)) if (! empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++; $result=$tmpinvoice->fetch($cursorfacid); if ($result <= 0) dol_print_error($db); - $multicurrency_amountsresttopay[$cursorfacid]=price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement(1)); + $multicurrency_amountsresttopay[$cursorfacid]=price2num($tmpinvoice->multicurrency_total_ttc - $tmpinvoice->getSommePaiement(1)); if ($multicurrency_amounts[$cursorfacid]) { // Check amount From 896fbfe2ca7b2372137b58a5b5e364c170312053 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 10 Dec 2016 20:59:25 +0100 Subject: [PATCH 2/4] Bank : Detail of a banking writing more responsive (Remove rowspan) --- htdocs/compta/bank/ligne.php | 63 ++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index f02b4326a31..609a3f47bd1 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -4,7 +4,7 @@ * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2004 Christophe Combelles * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2015 Alexandre Spangaro + * Copyright (C) 2015-2016 Alexandre Spangaro * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2016 Marcos García * @@ -274,8 +274,8 @@ if ($result) $linkback = ''.$langs->trans("BackToList").''; // Ref - print ''.$langs->trans("Ref").""; - print ''; + print ''.$langs->trans("Ref").""; + print ''; print $form->showrefnav($bankline, 'rowid', $linkback, 1, 'rowid', 'rowid'); print ''; print ''; @@ -285,7 +285,7 @@ if ($result) // Bank account print "".$langs->trans("Account").""; - print ''; + print ''; print $acct->getNomUrl(1,'transactions'); print ''; print ''; @@ -294,7 +294,7 @@ if ($result) if (count($links)) { print "".$langs->trans("Links").""; - print ''; + print ''; foreach($links as $key=>$val) { if ($key) print '
'; @@ -389,8 +389,6 @@ if ($result) print ''; } - $rowspan=0; - //$user->rights->banque->modifier=false; //$user->rights->banque->consolidate=true; @@ -399,7 +397,7 @@ if ($result) print ""; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { - print ''; + print ''; $form->select_types_paiements($objp->fk_type,"value",'',2); print ''; if ($objp->receiptid) @@ -411,13 +409,10 @@ if ($result) } print ''; - $rowspan=7; - print ''; - print ''; } else { - print ''.$objp->fk_type.' '.$objp->num_chq.''; + print ''.$objp->fk_type.' '.$objp->num_chq.''; } print ""; @@ -425,13 +420,13 @@ if ($result) print "".$langs->trans("Bank").""; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { - print ''; + print ''; print ''; print ''; } else { - print ''.$objp->banque.''; + print ''.$objp->banque.''; } print ""; @@ -439,13 +434,13 @@ if ($result) print "".$langs->trans("CheckTransmitter").""; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { - print ''; + print ''; print ''; print ''; } else { - print ''.$objp->emetteur.''; + print ''.$objp->emetteur.''; } print ""; @@ -453,13 +448,13 @@ if ($result) print ''.$langs->trans("DateOperation").''; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { - print ''; + print ''; print $form->select_date($db->jdate($objp->do),'dateo','','','','update',1,0,1,$objp->rappro); print ''; } else { - print ''; + print ''; print dol_print_date($db->jdate($objp->do),"day"); print ''; } @@ -469,7 +464,7 @@ if ($result) print "".$langs->trans("DateValue").""; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { - print ''; + print ''; print $form->select_date($db->jdate($objp->dv),'datev','','','','update',1,0,1,$objp->rappro); if (! $objp->rappro) { @@ -483,7 +478,7 @@ if ($result) } else { - print ''; + print ''; print dol_print_date($db->jdate($objp->dv),"day"); print ''; } @@ -493,7 +488,7 @@ if ($result) print "".$langs->trans("Label").""; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { - print ''; + print ''; print 'rappro?' disabled':'').' value="'; if (preg_match('/^\((.*)\)$/i',$objp->label,$reg)) { @@ -509,7 +504,7 @@ if ($result) } else { - print ''; + print ''; if (preg_match('/^\((.*)\)$/i',$objp->label,$reg)) { // Label generique car entre parentheses. On l'affiche en le traduisant @@ -527,19 +522,22 @@ if ($result) print "".$langs->trans("Amount").""; if ($user->rights->banque->modifier) { - print ''; + print ''; print 'rappro?' disabled':'').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code); print ''; } else { - print ''; + print ''; print price($objp->amount); print ''; } print ""; print ""; + + print '
'; + print ""; // Releve rappro @@ -554,10 +552,10 @@ if ($result) print ''; - print '"; + print '"; if ($user->rights->banque->consolidate) { - print ''; + print ''; } else { - print ''; + print ''; } print ''; print ""; if ($user->rights->banque->consolidate) { - print ''; } else { - print ''; + print ''; } print ''; + print '
'.$langs->trans("Conciliation")."
'.$langs->trans("Conciliation")."'; + print ''; if ($objp->rappro) { print $langs->trans("AccountStatement").' rappro?' disabled':'').'>'; @@ -568,28 +566,31 @@ if ($result) print $langs->trans("AccountStatement").' rappro?' disabled':'').'>'; } if ($objp->num_releve) print '   ('.$langs->trans("AccountStatement").' '.$objp->num_releve.')'; - print ''.$objp->num_releve.' '.$objp->num_releve.' 
".$langs->trans("BankLineConciliated")."'; + print ''; print 'rappro?' checked="checked"':'')).'">'; print ''.yn($objp->rappro).''.yn($objp->rappro).'
'; - print ''; + print '
'; + + print ''; } } From 14ce1bf3a6ad7ce1e3030edcd54240641db4b91c Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 10 Dec 2016 21:52:33 +0100 Subject: [PATCH 3/4] Add information on bank payment tab Need fk_user_modif and dater in 6.0 --- htdocs/compta/bank/class/account.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index d4a69d13a5b..139f578c5d6 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -1931,7 +1931,7 @@ class AccountLine extends CommonObject */ function info($id) { - $sql = 'SELECT b.rowid, b.datec,'; + $sql = 'SELECT b.rowid, b.datec, b.tms as datem,'; $sql.= ' b.fk_user_author, b.fk_user_rappro'; $sql.= ' FROM '.MAIN_DB_PREFIX.'bank as b'; $sql.= ' WHERE b.rowid = '.$id; @@ -1958,6 +1958,7 @@ class AccountLine extends CommonObject } $this->date_creation = $this->db->jdate($obj->datec); + $this->date_modification = $this->db->jdate($obj->datem); //$this->date_rappro = $obj->daterappro; // Not yet managed } $this->db->free($result); From b23667b2e68aa366430c85155de6a5676c10728b Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 10 Dec 2016 21:53:24 +0100 Subject: [PATCH 4/4] Fix presentation on loan payment card --- htdocs/loan/payment/card.php | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php index cd98bb75b5b..41f332e5dd0 100644 --- a/htdocs/loan/payment/card.php +++ b/htdocs/loan/payment/card.php @@ -148,30 +148,27 @@ if ($action == 'valide') print ''; // Ref -print ''; -print ''; +print ''; // Date -print ''; +print ''; // Mode -print ''; - -// Number -print ''; +print ''; // Amount -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; // Note Private -print ''; +print ''; // Note Public -print ''; +print ''; // Bank account if (! empty($conf->banque->enabled)) @@ -183,7 +180,7 @@ if (! empty($conf->banque->enabled)) print ''; print ''; - print ''; print ''; @@ -288,7 +285,7 @@ if (empty($action) && ! empty($user->rights->loan->delete)) { if (! $disable_delete) { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } else {
'.$langs->trans('Ref').''; +print '
'.$langs->trans('Ref').''; print $form->showrefnav($payment,'id','',1,'rowid','id'); print '
'.$langs->trans('Date').''.dol_print_date($payment->datep,'day').'
'.$langs->trans('Date').''.dol_print_date($payment->datep,'day').'
'.$langs->trans('Mode').''.$langs->trans("PaymentType".$payment->type_code).'
'.$langs->trans('Number').''.$payment->num_payment.'
'.$langs->trans('Mode').''.$langs->trans("PaymentType".$payment->type_code).'
'.$langs->trans('LoanCapital').''.price($payment->amount_capital, 0, $outputlangs, 1, -1, -1, $conf->currency).'
'.$langs->trans('Insurance').''.price($payment->amount_insurance, 0, $outputlangs, 1, -1, -1, $conf->currency).'
'.$langs->trans('Interest').''.price($payment->amount_interest, 0, $outputlangs, 1, -1, -1, $conf->currency).'
'.$langs->trans('LoanCapital').''.price($payment->amount_capital, 0, $outputlangs, 1, -1, -1, $conf->currency).'
'.$langs->trans('Insurance').''.price($payment->amount_insurance, 0, $outputlangs, 1, -1, -1, $conf->currency).'
'.$langs->trans('Interest').''.price($payment->amount_interest, 0, $outputlangs, 1, -1, -1, $conf->currency).'
'.$langs->trans('NotePrivate').''.nl2br($payment->note_private).'
'.$langs->trans('NotePrivate').''.nl2br($payment->note_private).'
'.$langs->trans('NotePublic').''.nl2br($payment->note_public).'
'.$langs->trans('NotePublic').''.nl2br($payment->note_public).'
'.$langs->trans('BankTransactionLine').''; + print ''; print $bankline->getNomUrl(1,0,'showall'); print '