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

On peut modifier date de valeur lors du rapprochement.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-10-11 19:45:41 +00:00
parent a6edad4ef8
commit 8cfbdb9df7
1 changed files with 113 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,18 +93,29 @@ if ($_POST["action"] == "update")
if ($objp->rappro) if ($objp->rappro)
die ("Vous ne pouvez pas modifier une écriture déjà rapprochée"); die ("Vous ne pouvez pas modifier une écriture déjà rapprochée");
} }
if (!empty($_POST['amount']))
{ $db->begin();
$amount = str_replace(' ','',$_POST['amount']); $amount = str_replace(' ','',$_POST['amount']);
$dateop = $_POST["reyear"].'-'.$_POST["remonth"].'-'.$_POST["reday"]; $amount = str_replace(',','.',$amount);
$sql = "UPDATE ".MAIN_DB_PREFIX."bank set label='".$_POST["label"]."', dateo = '".$dateop."', amount='$amount' WHERE rowid = $rowid;";
} $dateop = $_POST["doyear"].'-'.$_POST["domonth"].'-'.$_POST["doday"];
else $dateval= $_POST["dvyear"].'-'.$_POST["dvmonth"].'-'.$_POST["dvday"];
$sql = "UPDATE ".MAIN_DB_PREFIX."bank set label='".$_POST["label"]."', dateo = '".$dateop."' WHERE rowid = $rowid;"; $sql = "UPDATE ".MAIN_DB_PREFIX."bank";
$sql.= " SET label='".$_POST["label"]."',";
if (isset($_POST['amount'])) $sql.=" amount='$amount',";
$sql.= " dateo = '".$dateop."', datev = '".$dateval."',";
$sql.= " fk_account = ".$_POST['accountid'];
$sql.= " WHERE rowid = $rowid;";
$result = $db->query($sql); $result = $db->query($sql);
if (! $result) if ($result)
{ {
$db->commit();
}
else
{
$db->rollback();
dolibarr_print_error($db); dolibarr_print_error($db);
} }
} }
@ -186,43 +197,76 @@ if ($result)
$acct->fetch($objp->fk_account); $acct->fetch($objp->fk_account);
$account = $acct->id; $account = $acct->id;
// Account // Author
print "<tr><td>".$langs->trans("Account")."</td><td colspan=\"3\"><a href=\"account.php?account=$account\">".$acct->label."</a></td></tr>"; print "<tr><td>".$langs->trans("Author")."</td>";
if ($objp->fk_user_author)
{
$author=new User($db,$objp->fk_user_author);
$author->fetch();
print '<td colspan="3"><a href="'.DOL_URL_ROOT.'/user/fiche.php.id='.$author->id.'">';
print img_object($langs->trans("ShowUser"),'user').' '.$author->fullname.'</td>';
}
else
{
print "<td colspan=\"3\">&nbsp;</td>";
}
print "</tr>";
$i++;
}
print "<form method=\"post\" action=\"ligne.php?rowid=$objp->rowid\">"; print "<form method=\"post\" action=\"ligne.php?rowid=$objp->rowid\">";
print "<input type=\"hidden\" name=\"action\" value=\"update\">"; print "<input type=\"hidden\" name=\"action\" value=\"update\">";
// Date // Account
print "<tr><td>".$langs->trans("Account")."</td><td colspan=\"3\">";
if (! $objp->rappro) if (! $objp->rappro)
{ {
print "<tr><td>".$langs->trans("Date")."</td><td colspan=\"3\">"; $html->select_comptes($acct->id,'accountid',0);
$html->select_date($objp->do); print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></td>';
print '&nbsp; <input type="submit" class="button" value="'.$langs->trans("Update").'"></td>'; }
print "</tr>"; else
{
print "<a href=\"account.php?account=".$acct->id."\">".$acct->label."</a>";
}
print "</td></tr>";
// Date ope
if (! $objp->rappro)
{
print '<tr><td>'.$langs->trans("Date")."</td><td colspan=\"3\">";
$html->select_date($objp->do,'do');
print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></td>';
print '</tr>';
} }
// Value date // Value date
print "<tr>"; if (! $objp->rappro)
print '<td colspan="2">'.$langs->trans("DateValue").'</td><td colspan="2">'.strftime("%d %b %Y",$objp->dv)." &nbsp; "; {
print "<tr><td>".$langs->trans("DateValue")."</td><td colspan=\"3\">";
$html->select_date($objp->dv,'dv');
print ' &nbsp; ';
print '<a href="ligne.php?action=dvprev&amp;account='.$_GET["account"].'&amp;rowid='.$objp->rowid.'">'; print '<a href="ligne.php?action=dvprev&amp;account='.$_GET["account"].'&amp;rowid='.$objp->rowid.'">';
print img_edit_remove() . "</a> "; print img_edit_remove() . "</a> ";
print '<a href="ligne.php?action=dvnext&amp;account='.$_GET["account"].'&amp;rowid='.$objp->rowid.'">'; print '<a href="ligne.php?action=dvnext&amp;account='.$_GET["account"].'&amp;rowid='.$objp->rowid.'">';
print img_edit_add() ."</a></td>"; print img_edit_add() ."</a>";
print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></td>';
print '</tr>'; print '</tr>';
}
// Description // Description
print "<tr><td>".$langs->trans("Label")."</td><td colspan=\"3\">"; print "<tr><td>".$langs->trans("Label")."</td><td colspan=\"3\">";
print '<input name="label" class="flat" value="'.$objp->label.'" size="50">'; print '<input name="label" class="flat" value="'.$objp->label.'" size="50">';
print '&nbsp; <input type="submit" class="button" value="'.$langs->trans("Update").'"></td>'; print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></td>';
print "</tr>"; print '</tr>';
// Amount // Amount
if (! $objp->rappro) if (! $objp->rappro)
{ {
print "<tr><td>".$langs->trans("Amount")."</td><td colspan=\"3\">"; print "<tr><td>".$langs->trans("Amount")."</td><td colspan=\"3\">";
print '<input name="amount" class="flat" value="'.price($objp->amount).'">'; print '<input name="amount" class="flat" value="'.price($objp->amount).'">';
print '&nbsp; <input type="submit" class="button" value="'.$langs->trans("Update").'"></td>'; print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></td>';
print "</tr>"; print '</tr>';
} }
print "</form>"; print "</form>";
@ -233,24 +277,10 @@ if ($result)
print '<input type="hidden" name="action" value="type">'; print '<input type="hidden" name="action" value="type">';
print $html->select_types_paiements($objp->fk_type,"value",'',2); print $html->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).'">';
print '&nbsp; <input type="submit" class="button" value="'.$langs->trans("Update").'">'; print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'">';
print "</form>"; print "</form>";
print "</td></tr>"; print "</td></tr>";
// Author
print "<tr><td>".$langs->trans("Author")."</td>";
if ($objp->fk_user_author) {
$author=new User($db,$objp->fk_user_author);
$author->fetch();
print "<td colspan=\"3\">".$author->fullname."</td>";
} else {
print "<td colspan=\"3\">&nbsp;</td>";
}
print "</tr>";
$i++;
}
// Releve rappro // Releve rappro
if ($acct->rappro) if ($acct->rappro)
{ {
@ -258,9 +288,9 @@ if ($result)
print '<input type="hidden" name="action" value="num_releve">'; print '<input type="hidden" name="action" value="num_releve">';
print "<tr><td>".$langs->trans("Conciliation")."</td><td colspan=\"3\">"; print "<tr><td>".$langs->trans("Conciliation")."</td><td colspan=\"3\">";
print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'">'; print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'">';
print '&nbsp; <input type="submit" class="button" value="'.$langs->trans("Update").'"></td>'; print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></td>';
print "</tr>"; print '</tr>';
print "</form>"; print '</form>';
} }
print "</table>"; print "</table>";