lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6122 from aspangaro/5.0-b4

Browse Source 
Bank : Detail of a banking writing more responsive (Remove rowspan)
This commit is contained in:
Laurent Destailleur 2016-12-10 21:58:08 +01:00 committed by GitHub
commit 0486815403
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
htdocs/compta/bank/ligne.php
View File

@ -4,7 +4,7 @@
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Christophe Combelles <ccomb@free.fr> * Copyright (C) 2004 Christophe Combelles <ccomb@free.fr>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com> * Copyright (C) 2015-2016 Alexandre Spangaro <aspangaro@zendsi.com>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr> * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2016 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2016 Marcos García <marcosgdf@gmail.com>
* *
@ -274,8 +274,8 @@ if ($result)
$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries.php">'.$langs->trans("BackToList").'</a>'; $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries.php">'.$langs->trans("BackToList").'</a>';
// Ref // Ref
print '<tr><td width="20%">'.$langs->trans("Ref")."</td>"; print '<tr><td class="titlefield">'.$langs->trans("Ref")."</td>";
print '<td colspan="4">'; print '<td>';
print $form->showrefnav($bankline, 'rowid', $linkback, 1, 'rowid', 'rowid'); print $form->showrefnav($bankline, 'rowid', $linkback, 1, 'rowid', 'rowid');
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
@ -285,7 +285,7 @@ if ($result)
// Bank account // Bank account
print "<tr><td>".$langs->trans("Account")."</td>"; print "<tr><td>".$langs->trans("Account")."</td>";
print '<td colspan="4">'; print '<td>';
print $acct->getNomUrl(1,'transactions'); print $acct->getNomUrl(1,'transactions');
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
@ -294,7 +294,7 @@ if ($result)
if (count($links)) if (count($links))
{ {
print "<tr><td>".$langs->trans("Links")."</td>"; print "<tr><td>".$langs->trans("Links")."</td>";
print '<td colspan="4">'; print '<td>';
foreach($links as $key=>$val) foreach($links as $key=>$val)
{ {
if ($key) print '<br>'; if ($key) print '<br>';
@ -389,8 +389,6 @@ if ($result)
print '</td></tr>'; print '</td></tr>';
} }
$rowspan=0;
//$user->rights->banque->modifier=false; //$user->rights->banque->modifier=false;
//$user->rights->banque->consolidate=true; //$user->rights->banque->consolidate=true;
@ -399,7 +397,7 @@ if ($result)
print "</td>"; print "</td>";
if ($user->rights->banque->modifier || $user->rights->banque->consolidate) if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{ {
print '<td colspan="3">'; print '<td>';
$form->select_types_paiements($objp->fk_type,"value",'',2); $form->select_types_paiements($objp->fk_type,"value",'',2);
print '<input type="text" class="flat" name="num_chq" value="'.(empty($objp->num_chq) ? '' : $objp->num_chq).'">'; print '<input type="text" class="flat" name="num_chq" value="'.(empty($objp->num_chq) ? '' : $objp->num_chq).'">';
if ($objp->receiptid) if ($objp->receiptid)
@ -411,13 +409,10 @@ if ($result)
} }
print '</td>'; print '</td>';
$rowspan=7;
print '<td align="center" rowspan="'.$rowspan.'" width="20%"><input type="submit" class="button" value="'.$langs->trans("Update").'">';
print '</td>';
} }
else else
{ {
print '<td colspan="4">'.$objp->fk_type.' '.$objp->num_chq.'</td>'; print '<td>'.$objp->fk_type.' '.$objp->num_chq.'</td>';
} }
print "</tr>"; print "</tr>";
@ -425,13 +420,13 @@ if ($result)
print "<tr><td>".$langs->trans("Bank")."</td>"; print "<tr><td>".$langs->trans("Bank")."</td>";
if ($user->rights->banque->modifier || $user->rights->banque->consolidate) if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{ {
print '<td colspan="3">'; print '<td>';
print '<input type="text" class="flat" size="40" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">'; print '<input type="text" class="flat" size="40" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">';
print '</td>'; print '</td>';
} }
else else
{ {
print '<td colspan="'.($rowspan?'3':'4').'">'.$objp->banque.'</td>'; print '<td>'.$objp->banque.'</td>';
} }
print "</tr>"; print "</tr>";
@ -439,13 +434,13 @@ if ($result)
print "<tr><td>".$langs->trans("CheckTransmitter")."</td>"; print "<tr><td>".$langs->trans("CheckTransmitter")."</td>";
if ($user->rights->banque->modifier || $user->rights->banque->consolidate) if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{ {
print '<td colspan="3">'; print '<td>';
print '<input type="text" class="flat" size="40" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">'; print '<input type="text" class="flat" size="40" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">';
print '</td>'; print '</td>';
} }
else else
{ {
print '<td colspan="'.($rowspan?'3':'4').'">'.$objp->emetteur.'</td>'; print '<td>'.$objp->emetteur.'</td>';
} }
print "</tr>"; print "</tr>";
@ -453,13 +448,13 @@ if ($result)
print '<tr><td>'.$langs->trans("DateOperation").'</td>'; print '<tr><td>'.$langs->trans("DateOperation").'</td>';
if ($user->rights->banque->modifier || $user->rights->banque->consolidate) if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{ {
print '<td colspan="3">'; print '<td>';
print $form->select_date($db->jdate($objp->do),'dateo','','','','update',1,0,1,$objp->rappro); print $form->select_date($db->jdate($objp->do),'dateo','','','','update',1,0,1,$objp->rappro);
print '</td>'; print '</td>';
} }
else else
{ {
print '<td colspan="'.($rowspan?'3':'4').'">'; print '<td>';
print dol_print_date($db->jdate($objp->do),"day"); print dol_print_date($db->jdate($objp->do),"day");
print '</td>'; print '</td>';
} }
@ -469,7 +464,7 @@ if ($result)
print "<tr><td>".$langs->trans("DateValue")."</td>"; print "<tr><td>".$langs->trans("DateValue")."</td>";
if ($user->rights->banque->modifier || $user->rights->banque->consolidate) if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{ {
print '<td colspan="3">'; print '<td>';
print $form->select_date($db->jdate($objp->dv),'datev','','','','update',1,0,1,$objp->rappro); print $form->select_date($db->jdate($objp->dv),'datev','','','','update',1,0,1,$objp->rappro);
if (! $objp->rappro) if (! $objp->rappro)
{ {
@ -483,7 +478,7 @@ if ($result)
} }
else else
{ {
print '<td colspan="'.($rowspan?'3':'4').'">'; print '<td>';
print dol_print_date($db->jdate($objp->dv),"day"); print dol_print_date($db->jdate($objp->dv),"day");
print '</td>'; print '</td>';
} }
@ -493,7 +488,7 @@ if ($result)
print "<tr><td>".$langs->trans("Label")."</td>"; print "<tr><td>".$langs->trans("Label")."</td>";
if ($user->rights->banque->modifier || $user->rights->banque->consolidate) if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{ {
print '<td colspan="3">'; print '<td>';
print '<input name="label" class="flat" '.($objp->rappro?' disabled':'').' value="'; print '<input name="label" class="flat" '.($objp->rappro?' disabled':'').' value="';
if (preg_match('/^\((.*)\)$/i',$objp->label,$reg)) if (preg_match('/^\((.*)\)$/i',$objp->label,$reg))
{ {
@ -509,7 +504,7 @@ if ($result)
} }
else else
{ {
print '<td colspan="'.($rowspan?'3':'4').'">'; print '<td>';
if (preg_match('/^\((.*)\)$/i',$objp->label,$reg)) if (preg_match('/^\((.*)\)$/i',$objp->label,$reg))
{ {
// Label generique car entre parentheses. On l'affiche en le traduisant // Label generique car entre parentheses. On l'affiche en le traduisant
@ -527,19 +522,22 @@ if ($result)
print "<tr><td>".$langs->trans("Amount")."</td>"; print "<tr><td>".$langs->trans("Amount")."</td>";
if ($user->rights->banque->modifier) if ($user->rights->banque->modifier)
{ {
print '<td colspan="3">'; print '<td>';
print '<input name="amount" class="flat" size="10" '.($objp->rappro?' disabled':'').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code); print '<input name="amount" class="flat" size="10" '.($objp->rappro?' disabled':'').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code);
print '</td>'; print '</td>';
} }
else else
{ {
print '<td colspan="'.($rowspan?'3':'4').'">'; print '<td>';
print price($objp->amount); print price($objp->amount);
print '</td>'; print '</td>';
} }
print "</tr>"; print "</tr>";
print "</table>"; print "</table>";
print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div>';
print "</form>"; print "</form>";
// Releve rappro // Releve rappro
@ -554,10 +552,10 @@ if ($result)
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Conciliation")."</td>"; print '<tr><td class="titlefield">'.$langs->trans("Conciliation")."</td>";
if ($user->rights->banque->consolidate) if ($user->rights->banque->consolidate)
{ {
print '<td colspan="3">'; print '<td>';
if ($objp->rappro) if ($objp->rappro)
{ {
print $langs->trans("AccountStatement").' <input name="num_rel_bis" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro?' disabled':'').'>'; print $langs->trans("AccountStatement").' <input name="num_rel_bis" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro?' disabled':'').'>';
@ -568,28 +566,31 @@ if ($result)
print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro?' disabled':'').'>'; print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro?' disabled':'').'>';
} }
if ($objp->num_releve) print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?num='.$objp->num_releve.'&account='.$acct->id.'">'.$langs->trans("AccountStatement").' '.$objp->num_releve.')</a>'; if ($objp->num_releve) print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?num='.$objp->num_releve.'&account='.$acct->id.'">'.$langs->trans("AccountStatement").' '.$objp->num_releve.')</a>';
print '</td><td align="center" rowspan="2" width="20%"><input type="submit" class="button" value="'.$langs->trans("Update").'"></td>'; print '</td>';
} }
else else
{ {
print '<td colspan="4">'.$objp->num_releve.'&nbsp;</td>'; print '<td>'.$objp->num_releve.'&nbsp;</td>';
} }
print '</tr>'; print '</tr>';
print "<tr><td>".$langs->trans("BankLineConciliated")."</td>"; print "<tr><td>".$langs->trans("BankLineConciliated")."</td>";
if ($user->rights->banque->consolidate) if ($user->rights->banque->consolidate)
{ {
print '<td colspan="3">'; print '<td>';
print '<input type="checkbox" name="reconciled" class="flat" '.(isset($_POST["reconciled"])?($_POST["reconciled"]?' checked="checked"':''):($objp->rappro?' checked="checked"':'')).'">'; print '<input type="checkbox" name="reconciled" class="flat" '.(isset($_POST["reconciled"])?($_POST["reconciled"]?' checked="checked"':''):($objp->rappro?' checked="checked"':'')).'">';
print '</td>'; print '</td>';
} }
else else
{ {
print '<td colspan="4">'.yn($objp->rappro).'</td>'; print '<td>'.yn($objp->rappro).'</td>';
} }
print '</tr>'; print '</tr>';
print '</table>';
print '</table></form>'; print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div>';
print '</form>';
} }
} }