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

Fix: If a transaction was reconciliated and should not, there was no way to reverse error.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-12-27 23:51:20 +00:00
parent e9b48f8b0b
commit a718555a77
1 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,8 +402,7 @@ if ($result)
if ($user->rights->banque->modifier || $user->rights->banque->consolidate) if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{ {
print '<td colspan="3">'; print '<td colspan="3">';
if ($objp->rappro) print dol_print_date($db->jdate($objp->do),"day"); print $html->select_date($db->jdate($objp->do),'dateo','','','','update',1,0,1,$objp->rappro);
else $html->select_date($db->jdate($objp->do),'dateo','','','','update');
print '</td><td align="center" rowspan="4" width="20%"><input type="submit" class="button" value="'.$langs->trans("Update").'"'.($objp->rappro?' disabled="true"':'').'></td>'; print '</td><td align="center" rowspan="4" width="20%"><input type="submit" class="button" value="'.$langs->trans("Update").'"'.($objp->rappro?' disabled="true"':'').'></td>';
} }
else else
@ -418,10 +417,9 @@ if ($result)
if ($user->rights->banque->modifier || $user->rights->banque->consolidate) if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{ {
print '<td colspan="3">'; print '<td colspan="3">';
if ($objp->rappro) print dol_print_date($db->jdate($objp->dv),"day"); print $html->select_date($db->jdate($objp->dv),'datev','','','','update',1,0,1,$objp->rappro);
else if (! $objp->rappro)
{ {
$html->select_date($db->jdate($objp->dv),'datev','','','','update');
print ' &nbsp; '; print ' &nbsp; ';
print '<a href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;account='.$_GET["account"].'&amp;rowid='.$objp->rowid.'">'; print '<a href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;account='.$_GET["account"].'&amp;rowid='.$objp->rowid.'">';
print img_edit_remove() . "</a> "; print img_edit_remove() . "</a> ";
@ -442,32 +440,17 @@ if ($result)
if ($user->rights->banque->modifier || $user->rights->banque->consolidate) if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{ {
print '<td colspan="3">'; print '<td colspan="3">';
if ($objp->rappro) print '<input name="label" class="flat" '.($objp->rappro?' disabled="true"':'').' value="';
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
{ print $langs->trans($reg[1]);
// Label generique car entre parentheses. On l'affiche en le traduisant
print $langs->trans($reg[1]);
}
else
{
print $objp->label;
}
} }
else else
{ {
print '<input name="label" class="flat" value="'; print $objp->label;
if (preg_match('/^\((.*)\)$/i',$objp->label,$reg))
{
// Label generique car entre parentheses. On l'affiche en le traduisant
print $langs->trans($reg[1]);
}
else
{
print $objp->label;
}
print '" size="50">';
} }
print '" size="50">';
} }
else else
{ {
@ -489,8 +472,7 @@ if ($result)
if ($user->rights->banque->modifier || $user->rights->banque->consolidate) if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{ {
print '<td colspan="3">'; print '<td colspan="3">';
if ($objp->rappro) print price($objp->amount); print '<input name="amount" class="flat" size="10" '.($objp->rappro?' disabled="true"':'').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$conf->monnaie);
else print '<input name="amount" class="flat" size="10" value="'.price($objp->amount).'"> '.$langs->trans("Currency".$conf->monnaie);
print '</td>'; print '</td>';
} }
else else
@ -519,7 +501,15 @@ if ($result)
if ($user->rights->banque->consolidate) if ($user->rights->banque->consolidate)
{ {
print '<td colspan="3">'; print '<td colspan="3">';
print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'">'; if ($objp->rappro)
{
print $langs->trans("AccountStatement").' <input name="num_rel_bis" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro?' disabled="true"':'').'>';
print '<input name="num_rel" type="hidden" value="'.$objp->num_releve.'">';
}
else
{
print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro?' disabled="true"':'').'>';
}
print '</td><td align="center" rowspan="2" width="20%"><input type="submit" class="button" value="'.$langs->trans("Update").'"></td>'; print '</td><td align="center" rowspan="2" width="20%"><input type="submit" class="button" value="'.$langs->trans("Update").'"></td>';
} }
else else