From bacee3c2980afb65b6fcf9b4f2f8f70634f1c35a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 7 Apr 2018 19:42:47 +0200 Subject: [PATCH 1/3] Translation --- htdocs/compta/bank/ligne.php | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 33621d4b9a9..5cb97be90bb 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -435,6 +435,7 @@ if ($result) // Type of payment / Number print "".$langs->trans("Type")." / ".$langs->trans("Numero"); + print ' ('.$langs->trans("ChequeOrTransferNumber").')'; print ""; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { @@ -457,22 +458,10 @@ if ($result) } print ""; - // Bank of cheque - print "".$langs->trans("Bank").""; - if ($user->rights->banque->modifier || $user->rights->banque->consolidate) - { - print ''; - print ''; - print ''; - } - else - { - print ''.$objp->banque.''; - } - print ""; - // Transmitter - print "".$langs->trans("CheckTransmitter").""; + print "".$langs->trans("CheckTransmitter"); + print ' ('.$langs->trans("ChequeMaker").')'; + print ""; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { print ''; @@ -485,6 +474,22 @@ if ($result) } print ""; + // Bank of cheque + print "".$langs->trans("Bank"); + print ' ('.$langs->trans("ChequeBank").')'; + print ""; + if ($user->rights->banque->modifier || $user->rights->banque->consolidate) + { + print ''; + print ''; + print ''; + } + else + { + print ''.$objp->banque.''; + } + print ""; + // Date ope print ''.$langs->trans("DateOperation").''; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) From 989d1c87c6e3c48c2c5ed825df8d05409fdbc664 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 7 Apr 2018 19:58:37 +0200 Subject: [PATCH 2/3] Fix link to reconcile --- htdocs/compta/bank/bankentries_list.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index d773d8ce8e4..f9c958207ff 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -384,7 +384,8 @@ if (dol_strlen($search_dv_start) > 0) $param .= '&search_start_dvmonth=' . GETPO if (dol_strlen($search_dv_end) > 0) $param .= '&search_end_dvmonth=' . GETPOST('search_end_dvmonth', 'int') . '&search_end_dvday=' . GETPOST('search_end_dvday', 'int') . '&search_end_dvyear=' . GETPOST('search_end_dvyear', 'int'); if ($search_req_nb) $param.='&req_nb='.urlencode($search_req_nb); if (GETPOST("search_thirdparty",'int')) $param.='&thirdparty='.urlencode(GETPOST("search_thirdparty",'int')); -if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss); +if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss); +if ($action == 'reconcile') $param.='&action=reconcile'; // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; @@ -423,19 +424,17 @@ if ($id > 0 || ! empty($ref)) if ($action != 'reconcile') { - //print '
'; - if ($object->canBeConciliated() > 0) { // If not cash account and can be reconciliate if ($user->rights->banque->consolidate) { - $buttonreconcile = ''.$langs->trans("Conciliate").''; + $newparam = $param; + $newparam = preg_replace('/search_conciliated=\d+/i','',$newparam); + $buttonreconcile = ''.$langs->trans("Conciliate").''; } else { $buttonreconcile = ''.$langs->trans("Conciliate").''; } } - - //print '
'; } } else From 304adff9739a24d07ad0915d82db63bde0807bae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 7 Apr 2018 21:45:06 +0200 Subject: [PATCH 3/3] FIX view of balance before field Conflicts: htdocs/compta/bank/bankentries_list.php --- htdocs/compta/bank/bankentries_list.php | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index f9c958207ff..f85e2a664fb 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -992,12 +992,12 @@ if ($resql) { $tmpnbfieldbeforebalance=0; $tmpnbfieldafterbalance=0; - $balancefieldfound=false; + $balancefieldfound=0; foreach($arrayfields as $key => $val) { if ($key == 'balancebefore' || $key == 'balance') { - $balancefieldfound=true; + $balancefieldfound++; continue; } if (! empty($arrayfields[$key]['checked'])) @@ -1028,10 +1028,22 @@ if ($resql) print ''; print ''; } - print ''; - print price(price2num($balance, 'MT'), 1, $langs); + if (! empty($arrayfields['balancebefore']['checked'])) + { + print ''; + print price(price2num($balance, 'MT'), 1, $langs); + print ''; + } + if (! empty($arrayfields['balance']['checked'])) + { + print ''; + print price(price2num($balance, 'MT'), 1, $langs); + print ''; + } + + print ''; print ''; - print ''; + print ''; print ''; print ''; } @@ -1456,7 +1468,7 @@ if ($resql) elseif ($totalarray['totalcredfield'] == $i) print ''.price($totalarray['totalcred']).''; elseif ($i == $posconciliatecol) { - print ''; + print ''; if ($user->rights->banque->consolidate && $action == 'reconcile') print ''; print ''; }