diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 1d9d7b34ebd63d22a72d35ce67ec19ee0b72b0a7..346fa21d480d6ddc9c078dcf78ab79be3e67fead 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -18,18 +18,18 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
+
/**
- \file htdocs/compta/bank/ligne.php
- \ingroup compta
- \brief Page edition d'une ecriture bancaire
- \version $Id$
-*/
+ \file htdocs/compta/bank/ligne.php
+ \ingroup compta
+ \brief Page edition d'une ecriture bancaire
+ \version $Id$
+ */
require("./pre.inc.php");
if (! $user->rights->banque->lire && ! $user->rights->banque->consolidate)
- accessforbidden();
+accessforbidden();
$langs->load("banks");
$langs->load("bills");
@@ -45,94 +45,94 @@ $html = new Form($db);
* Actions
*/
-if ($_GET["action"] == 'dvnext')
+if ($user->rights->banque->consolidate && $_GET["action"] == 'dvnext')
{
- $ac = new Account($db);
- $ac->datev_next($_GET["rowid"]);
+ $ac = new Account($db);
+ $ac->datev_next($_GET["rowid"]);
}
-if ($_GET["action"] == 'dvprev')
+if ($user->rights->banque->consolidate && $_GET["action"] == 'dvprev')
{
- $ac = new Account($db);
- $ac->datev_previous($_GET["rowid"]);
+ $ac = new Account($db);
+ $ac->datev_previous($_GET["rowid"]);
}
if ($_POST["action"] == 'confirm_delete_categ' && $_POST["confirm"] == "yes")
{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = $rowid AND fk_categ = ".$_GET["cat1"];
- if (! $db->query($sql))
- {
- dolibarr_print_error($db);
- }
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = $rowid AND fk_categ = ".$_GET["cat1"];
+ if (! $db->query($sql))
+ {
+ dolibarr_print_error($db);
+ }
}
if ($_POST["action"] == 'class')
{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = $rowid AND fk_categ = ".$_POST["cat1"];
- if (! $db->query($sql))
- {
- dolibarr_print_error($db);
- }
-
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (lineid, fk_categ) VALUES (".$_GET["rowid"].", ".$_POST["cat1"].")";
- if (! $db->query($sql))
- {
- dolibarr_print_error($db);
- }
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = $rowid AND fk_categ = ".$_POST["cat1"];
+ if (! $db->query($sql))
+ {
+ dolibarr_print_error($db);
+ }
+
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (lineid, fk_categ) VALUES (".$_GET["rowid"].", ".$_POST["cat1"].")";
+ if (! $db->query($sql))
+ {
+ dolibarr_print_error($db);
+ }
}
if ($_POST["action"] == "update")
{
- // Avant de modifier la date ou le montant, on controle si ce n'est pas encore rapproche
- $sql = "SELECT b.rappro FROM ".MAIN_DB_PREFIX."bank as b WHERE rowid=".$rowid;
- $result = $db->query($sql);
- if ($result)
- {
- $objp = $db->fetch_object($result);
- if ($objp->rappro)
- die ("Vous ne pouvez pas modifier une �criture d�j� rapproch�e");
- }
-
- $db->begin();
-
- $amount = price2num($_POST['amount']);
- $dateop = $_POST["dateoyear"].'-'.$_POST["dateomonth"].'-'.$_POST["dateoday"];
- $dateval= $_POST["datevyear"].'-'.$_POST["datevmonth"].'-'.$_POST["datevday"];
- $sql = "UPDATE ".MAIN_DB_PREFIX."bank";
- $sql.= " SET label='".addslashes($_POST["label"])."',"; // Todo: cr�er une classe pour s�parer les requ�tes sql
- 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);
- if ($result)
- {
- $db->commit();
- }
- else
- {
- $db->rollback();
- dolibarr_print_error($db);
- }
+ // Avant de modifier la date ou le montant, on controle si ce n'est pas encore rapproche
+ $sql = "SELECT b.rappro FROM ".MAIN_DB_PREFIX."bank as b WHERE rowid=".$rowid;
+ $result = $db->query($sql);
+ if ($result)
+ {
+ $objp = $db->fetch_object($result);
+ if ($objp->rappro)
+ die ("Vous ne pouvez pas modifier une �criture d�j� rapproch�e");
+ }
+
+ $db->begin();
+
+ $amount = price2num($_POST['amount']);
+ $dateop = $_POST["dateoyear"].'-'.$_POST["dateomonth"].'-'.$_POST["dateoday"];
+ $dateval= $_POST["datevyear"].'-'.$_POST["datevmonth"].'-'.$_POST["datevday"];
+ $sql = "UPDATE ".MAIN_DB_PREFIX."bank";
+ $sql.= " SET label='".addslashes($_POST["label"])."',"; // Todo: cr�er une classe pour s�parer les requ�tes sql
+ 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);
+ if ($result)
+ {
+ $db->commit();
+ }
+ else
+ {
+ $db->rollback();
+ dolibarr_print_error($db);
+ }
}
if ($_POST["action"] == 'type')
{
- $sql = "UPDATE ".MAIN_DB_PREFIX."bank set fk_type='".$_POST["value"]."', num_chq='".$_POST["num_chq"]."' WHERE rowid = $rowid;";
- $result = $db->query($sql);
+ $sql = "UPDATE ".MAIN_DB_PREFIX."bank set fk_type='".$_POST["value"]."', num_chq='".$_POST["num_chq"]."' WHERE rowid = $rowid;";
+ $result = $db->query($sql);
}
if ($_POST["action"] == 'banque')
{
- $sql = "UPDATE ".MAIN_DB_PREFIX."bank set banque='".addslashes($_POST["banque"])."' WHERE rowid = $rowid;";
- $result = $db->query($sql);
+ $sql = "UPDATE ".MAIN_DB_PREFIX."bank set banque='".addslashes($_POST["banque"])."' WHERE rowid = $rowid;";
+ $result = $db->query($sql);
}
if ($_POST["action"] == 'emetteur')
{
- $sql = "UPDATE ".MAIN_DB_PREFIX."bank set emetteur='".addslashes($_POST["emetteur"])."' WHERE rowid = $rowid;";
- $result = $db->query($sql);
+ $sql = "UPDATE ".MAIN_DB_PREFIX."bank set emetteur='".addslashes($_POST["emetteur"])."' WHERE rowid = $rowid;";
+ $result = $db->query($sql);
}
if ($_POST["action"] == 'num_releve')
@@ -152,7 +152,7 @@ if ($_POST["action"] == 'num_releve')
$db->commit();
}
else
- {
+ {
$db->rollback();
dolibarr_print_error($db);
}
@@ -162,7 +162,7 @@ if ($_POST["action"] == 'num_releve')
/*
* Affichage fiche ligne ecriture en mode edition
*/
-
+
llxHeader();
// On initialise la liste des categories
@@ -172,17 +172,17 @@ $sql.= " ORDER BY label";
$result = $db->query($sql);
if ($result)
{
- $var=True;
- $num = $db->num_rows($result);
- $i = 0;
- $options = "<option value=\"0\" selected=\"true\"> </option>";
- while ($i < $num)
- {
- $obj = $db->fetch_object($result);
- $options .= "<option value=\"$obj->rowid\">$obj->label</option>\n";
- $i++;
- }
- $db->free($result);
+ $var=True;
+ $num = $db->num_rows($result);
+ $i = 0;
+ $options = "<option value=\"0\" selected=\"true\"> </option>";
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($result);
+ $options .= "<option value=\"$obj->rowid\">$obj->label</option>\n";
+ $i++;
+ }
+ $db->free($result);
}
$var=False;
@@ -196,7 +196,7 @@ $h++;
$head[$h][0] = DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$_GET["rowid"];
$head[$h][1] = $langs->trans("Info");
-$h++;
+$h++;
dolibarr_fiche_head($head, $hselected, $langs->trans('LineRecord').': '.$_GET["rowid"]);
@@ -210,128 +210,130 @@ $sql.= " ORDER BY dateo ASC";
$result = $db->query($sql);
if ($result)
{
- $i = 0; $total = 0;
- if ($db->num_rows($result))
- {
-
- // Confirmations
- if ($_GET["action"] == 'delete_categ')
- {
+ $i = 0; $total = 0;
+ if ($db->num_rows($result))
+ {
+
+ // Confirmations
+ if ($_GET["action"] == 'delete_categ')
+ {
$html->form_confirm("ligne.php?rowid=".$_GET["rowid"]."&cat1=".$_GET["fk_categ"]."&orig_account=".$orig_account,$langs->trans("RemoveFromCategory"),$langs->trans("RemoveFromCategoryConfirm"),"confirm_delete_categ");
print '<br>';
- }
-
- print '<table class="border" width="100%">';
-
- $objp = $db->fetch_object($result);
- $total = $total + $objp->amount;
-
- $acct=new Account($db,$objp->fk_account);
- $acct->fetch($objp->fk_account);
- $account = $acct->id;
-
- $links=$acct->get_url($rowid);
-
- // Tableau sur 4 colonne si deja rapproche, sinon sur 5 colonnes
-
- // Author
- print '<tr><td width="20%">'.$langs->trans("Author")."</td>";
- if ($objp->fk_user_author)
- {
+ }
+
+ print '<table class="border" width="100%">';
+
+ $objp = $db->fetch_object($result);
+ $total = $total + $objp->amount;
+
+ $acct=new Account($db,$objp->fk_account);
+ $acct->fetch($objp->fk_account);
+ $account = $acct->id;
+
+ $links=$acct->get_url($rowid);
+
+ // Tableau sur 4 colonne si deja rapproche, sinon sur 5 colonnes
+
+ // Author
+ print '<tr><td width="20%">'.$langs->trans("Author")."</td>";
+ if ($objp->fk_user_author)
+ {
$author=new User($db,$objp->fk_user_author);
$author->fetch();
print '<td colspan="4"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$author->id.'">';
print img_object($langs->trans("ShowUser"),'user').' '.$author->fullname.'</a></td>';
- }
- else
- {
+ }
+ else
+ {
print '<td colspan="4"> </td>';
- }
- print "</tr>";
-
- $i++;
-
- print "<form name='update' method=\"post\" action=\"ligne.php?rowid=$objp->rowid\">";
- print "<input type=\"hidden\" name=\"action\" value=\"update\">";
- print "<input type=\"hidden\" name=\"orig_account\" value=\"".$orig_account."\">";
-
- // Account
- print "<tr><td>".$langs->trans("Account")."</td>";
- print '<td colspan="4">';
- print '<a href="account.php?account='.$acct->id.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$acct->label.'</a>';
- print '<input type="hidden" name="accountid" value="'.$acct->id.'">';
- print '</td>';
- print '</tr>';
-
- // Date ope
- print '<tr><td>'.$langs->trans("DateOperation").'</td>';
- if (! $objp->rappro && ($user->rights->banque->modifier || $user->rights->banque->consolidate))
- {
+ }
+ print "</tr>";
+
+ $i++;
+
+ print "<form name='update' method=\"post\" action=\"ligne.php?rowid=$objp->rowid\">";
+ print "<input type=\"hidden\" name=\"action\" value=\"update\">";
+ print "<input type=\"hidden\" name=\"orig_account\" value=\"".$orig_account."\">";
+
+ // Account
+ print "<tr><td>".$langs->trans("Account")."</td>";
+ print '<td colspan="4">';
+ print '<a href="account.php?account='.$acct->id.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$acct->label.'</a>';
+ print '<input type="hidden" name="accountid" value="'.$acct->id.'">';
+ print '</td>';
+ print '</tr>';
+
+ // Date ope
+ print '<tr><td>'.$langs->trans("DateOperation").'</td>';
+ if (! $objp->rappro && ($user->rights->banque->modifier || $user->rights->banque->consolidate))
+ {
print '<td colspan="3">';
$html->select_date($objp->do,'dateo','','','','update');
print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></td>';
- }
- else
- {
+ }
+ else
+ {
print '<td colspan="4">';
print dolibarr_print_date($objp->do);
- }
- print '</td></tr>';
-
- // Value date
- print "<tr><td>".$langs->trans("DateValue")."</td>";
- if (! $objp->rappro && ($user->rights->banque->modifier || $user->rights->banque->consolidate))
- {
- print '<td colspan="3">';
- $html->select_date($objp->dv,'datev','','','','update');
- print ' ';
- print '<a href="ligne.php?action=dvprev&account='.$_GET["account"].'&rowid='.$objp->rowid.'">';
- print img_edit_remove() . "</a> ";
- print '<a href="ligne.php?action=dvnext&account='.$_GET["account"].'&rowid='.$objp->rowid.'">';
- print img_edit_add() ."</a>";
- print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'">';
- }
- else
- {
- print '<td colspan="4">';
- print dolibarr_print_date($objp->dv);
- }
- print "</td></tr>";
-
- // Description
- print "<tr><td>".$langs->trans("Label")."</td>";
- if (! $objp->rappro && ($user->rights->banque->modifier || $user->rights->banque->consolidate))
- {
- print '<td colspan="3">';
- print '<input name="label" class="flat" value="';
- if (eregi('^\((.*)\)$',$objp->label,$reg))
- {
- // Label g�n�rique car entre parenth�ses. On l'affiche en le traduisant
- print $langs->trans($reg[1]);
- }
- else
- {
- print $objp->label;
- }
- print '" size="50">';
- print '</td>';
- print '<td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'">';
- }
- else
- {
- print '<td colspan="4">';
- if (eregi('^\((.*)\)$',$objp->label,$reg))
- {
- // Label g�n�rique car entre parenth�ses. On l'affiche en le traduisant
- print $langs->trans($reg[1]);
- }
- else
- {
- print $objp->label;
- }
- }
- print '</td></tr>';
-
+ }
+ print '</td></tr>';
+
+ // Value date
+ print "<tr><td>".$langs->trans("DateValue")."</td>";
+ if (! $objp->rappro && ($user->rights->banque->modifier || $user->rights->banque->consolidate))
+ {
+ print '<td colspan="3">';
+ $html->select_date($objp->dv,'datev','','','','update');
+ print ' ';
+ print '<a href="'.$_SERVER['PHP_SELF'].'?action=dvprev&account='.$_GET["account"].'&rowid='.$objp->rowid.'">';
+ print img_edit_remove() . "</a> ";
+ print '<a href="'.$_SERVER['PHP_SELF'].'?action=dvnext&account='.$_GET["account"].'&rowid='.$objp->rowid.'">';
+ print img_edit_add() ."</a>";
+ print '</td>';
+ print '<td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></td>';
+ }
+ else
+ {
+ print '<td colspan="4">';
+ print dolibarr_print_date($objp->dv,"day");
+ print '</td>';
+ }
+ print "</tr>";
+
+ // Description
+ print "<tr><td>".$langs->trans("Label")."</td>";
+ if (! $objp->rappro && ($user->rights->banque->modifier || $user->rights->banque->consolidate))
+ {
+ print '<td colspan="3">';
+ print '<input name="label" class="flat" value="';
+ if (eregi('^\((.*)\)$',$objp->label,$reg))
+ {
+ // Label g�n�rique car entre parenth�ses. On l'affiche en le traduisant
+ print $langs->trans($reg[1]);
+ }
+ else
+ {
+ print $objp->label;
+ }
+ print '" size="50">';
+ print '</td>';
+ print '<td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'">';
+ }
+ else
+ {
+ print '<td colspan="4">';
+ if (eregi('^\((.*)\)$',$objp->label,$reg))
+ {
+ // Label g�n�rique car entre parenth�ses. On l'affiche en le traduisant
+ print $langs->trans($reg[1]);
+ }
+ else
+ {
+ print $objp->label;
+ }
+ }
+ print '</td></tr>';
+
// Affiche liens
if (sizeof($links))
{
@@ -390,80 +392,80 @@ if ($result)
}
print '</td><td> </td></tr>';
}
-
- // Amount
- print "<tr><td>".$langs->trans("Amount")."</td>";
- if (! $objp->rappro && $user->rights->banque->modifier)
- {
+
+ // Amount
+ print "<tr><td>".$langs->trans("Amount")."</td>";
+ if (! $objp->rappro && $user->rights->banque->modifier)
+ {
print '<td colspan="3">';
print '<input name="amount" class="flat" size="10" value="'.price($objp->amount).'"> '.$langs->trans("Currency".$conf->monnaie);
print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'">';
- }
- else
- {
+ }
+ else
+ {
print '<td colspan="4">';
print price($objp->amount);
- }
- print "</td></tr>";
-
- print "</form>";
-
- // Type paiement
- print "<tr><td>".$langs->trans("Type")." / ".$langs->trans("Numero")."</td><td colspan=\"3\">";
- if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
- {
- print "<form method=\"post\" action=\"ligne.php?rowid=$objp->rowid\">";
- print '<input type="hidden" name="action" value="type">';
- print "<input type=\"hidden\" name=\"orig_account\" value=\"".$orig_account."\">";
- 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 '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'">';
- print "</form>";
+ }
+ print "</td></tr>";
+
+ print "</form>";
+
+ // Type paiement
+ print "<tr><td>".$langs->trans("Type")." / ".$langs->trans("Numero")."</td><td colspan=\"3\">";
+ if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+ {
+ print "<form method=\"post\" action=\"ligne.php?rowid=$objp->rowid\">";
+ print '<input type="hidden" name="action" value="type">';
+ print "<input type=\"hidden\" name=\"orig_account\" value=\"".$orig_account."\">";
+ 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 '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'">';
+ print "</form>";
}
else
{
print $objp->fk_type.' '.$objp->num_chq.'</td><td> </td>';
}
- print "</td></tr>";
-
- // Banque
- print "<tr><td>".$langs->trans("Bank")."</td><td colspan=\"3\">";
- if ($user->rights->banque->modifier)
- {
- print "<form method=\"post\" action=\"ligne.php?rowid=$objp->rowid\">";
- print '<input type="hidden" name="action" value="banque">';
- print "<input type=\"hidden\" name=\"orig_account\" value=\"".$orig_account."\">";
- print '<input type="text" class="flat" size="40" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">';
- print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'">';
- print "</form>";
+ print "</td></tr>";
+
+ // Banque
+ print "<tr><td>".$langs->trans("Bank")."</td><td colspan=\"3\">";
+ if ($user->rights->banque->modifier)
+ {
+ print "<form method=\"post\" action=\"ligne.php?rowid=$objp->rowid\">";
+ print '<input type="hidden" name="action" value="banque">';
+ print "<input type=\"hidden\" name=\"orig_account\" value=\"".$orig_account."\">";
+ print '<input type="text" class="flat" size="40" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">';
+ print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'">';
+ print "</form>";
}
else
{
print $objp->banque.' </td><td> </td>';
}
- print "</td></tr>";
+ print "</td></tr>";
- // Emetteur
- print "<tr><td>".$langs->trans("CheckTransmitter")."</td><td colspan=\"3\">";
- if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
- {
- print "<form method=\"post\" action=\"ligne.php?rowid=$objp->rowid\">";
- print '<input type="hidden" name="action" value="emetteur">';
- print "<input type=\"hidden\" name=\"orig_account\" value=\"".$orig_account."\">";
- print '<input type="text" class="flat" size="40" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">';
- print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'">';
- print "</form>";
- }
- else
- {
- print $objp->emetteur.' </td><td> </td>';
- }
- print "</td></tr>";
+ // Emetteur
+ print "<tr><td>".$langs->trans("CheckTransmitter")."</td><td colspan=\"3\">";
+ if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+ {
+ print "<form method=\"post\" action=\"ligne.php?rowid=$objp->rowid\">";
+ print '<input type="hidden" name="action" value="emetteur">';
+ print "<input type=\"hidden\" name=\"orig_account\" value=\"".$orig_account."\">";
+ print '<input type="text" class="flat" size="40" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">';
+ print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'">';
+ print "</form>";
+ }
+ else
+ {
+ print $objp->emetteur.' </td><td> </td>';
+ }
+ print "</td></tr>";
- // Releve rappro
- if ($acct->rappro) // Si compte rapprochable
- {
+ // Releve rappro
+ if ($acct->rappro) // Si compte rapprochable
+ {
print "<tr><td>".$langs->trans("Conciliation")."</td>";
if ($user->rights->banque->consolidate)
{
@@ -474,19 +476,19 @@ if ($result)
print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'">';
print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></td>';
print '</form>';
- }
- else
- {
- print '<td colspan="4">'.$objp->num_releve.' </td>';
- }
+ }
+ else
+ {
+ print '<td colspan="4">'.$objp->num_releve.' </td>';
+ }
print '</tr>';
- }
-
- print "</table>";
-
- }
-
- $db->free($result);
+ }
+
+ print "</table>";
+
+ }
+
+ $db->free($result);
}
print '</div>';
@@ -495,17 +497,17 @@ print '</div>';
* Boutons actions
*/
/*
-print '<div class="tabsAction">';
-
-if ($orig_account)
-{
- $acct=new Account($db,$orig_account);
- $acct->fetch($orig_account);
- print '<a class="butAction" href="rappro.php?account='.$orig_account.'">'.$langs->trans("BackToConciliate",$acct->label).'</a>';
-}
+ print '<div class="tabsAction">';
-print '</div>';
-*/
+ if ($orig_account)
+ {
+ $acct=new Account($db,$orig_account);
+ $acct->fetch($orig_account);
+ print '<a class="butAction" href="rappro.php?account='.$orig_account.'">'.$langs->trans("BackToConciliate",$acct->label).'</a>';
+ }
+
+ print '</div>';
+ */
// Liste les categories
@@ -528,24 +530,24 @@ $sql.= " ORDER BY c.label";
$result = $db->query($sql);
if ($result)
{
- $var=True;
- $num = $db->num_rows($result);
- $i = 0; $total = 0;
- while ($i < $num)
- {
- $objp = $db->fetch_object($result);
-
- $var=!$var;
- print "<tr $bc[$var]>";
-
- print "<td>$objp->label</td>";
- print "<td align=\"center\"><a href=\"budget.php?bid=$objp->rowid\">".$langs->trans("List")."</a></td>";
- print "<td align=\"center\"><a href=\"ligne.php?action=delete_categ&rowid=$rowid&fk_categ=$objp->rowid\">".img_delete($langs->trans("Remove"))."</a></td>";
- print "</tr>";
-
- $i++;
- }
- $db->free($result);
+ $var=True;
+ $num = $db->num_rows($result);
+ $i = 0; $total = 0;
+ while ($i < $num)
+ {
+ $objp = $db->fetch_object($result);
+
+ $var=!$var;
+ print "<tr $bc[$var]>";
+
+ print "<td>$objp->label</td>";
+ print "<td align=\"center\"><a href=\"budget.php?bid=$objp->rowid\">".$langs->trans("List")."</a></td>";
+ print "<td align=\"center\"><a href=\"ligne.php?action=delete_categ&rowid=$rowid&fk_categ=$objp->rowid\">".img_delete($langs->trans("Remove"))."</a></td>";
+ print "</tr>";
+
+ $i++;
+ }
+ $db->free($result);
}
print "</table>";
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index a8819216f1ee0aa40529561509af58b7ab92e08e..578eb427b9dd0897fad98bc38c8acb9b27d4cde5 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -15,15 +15,13 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
*/
/**
\file htdocs/compta/bank/rappro.php
\ingroup banque
\brief Page de rapprochement bancaire
- \version $Revision$
+ \version $Id$
*/
require("./pre.inc.php");
@@ -36,8 +34,22 @@ if (! $user->rights->banque->consolidate) accessforbidden();
/*
- * Action rapprochement
+ * Actions
*/
+
+if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $_GET["action"] == 'dvnext')
+{
+ $ac = new Account($db);
+ $ac->datev_next($_GET["rowid"]);
+}
+
+if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $_GET["action"] == 'dvprev')
+{
+ $ac = new Account($db);
+ $ac->datev_previous($_GET["rowid"]);
+}
+
+// Conciliation
if ($user->rights->banque->consolidate && $_POST["action"] == 'rappro')
{
// Definition, nettoyage parametres
@@ -120,12 +132,13 @@ if ($resql) {
}
+/*
+ * View
+ */
+$form=new Form($db);
llxHeader();
-/*
- * Affichage liste des transactions � rapprocher
- */
$acct = new Account($db);
$acct->fetch($_GET["account"]);
@@ -133,7 +146,7 @@ $sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do, ".$db->pdate("b.datev").
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
$sql.= " WHERE rappro=0 AND fk_account=".$_GET["account"];
$sql.= " ORDER BY dateo ASC";
-$sql.= " LIMIT 1000"; // Limite juste pour eviter saturation page.
+$sql.= " LIMIT 1000"; // Limit to avoid page overload
$resql = $db->query($sql);
if ($resql)
@@ -204,9 +217,30 @@ if ($resql)
print "<input type=\"hidden\" name=\"account\" value=\"".$_GET["account"]."\">";
print "<input type=\"hidden\" name=\"rowid\" value=\"".$objp->rowid."\">";
+ // Date op
print '<td align="center" nowrap="nowrap">'.dolibarr_print_date($objp->do,"day").'</td>';
- print '<td align="center" nowrap="nowrap">'.dolibarr_print_date($objp->dv,"day").'</td>';
- print '<td nowrap="nowrap">'.$objp->type.($objp->num_chq?' '.$objp->num_chq:'').'</td>';
+
+ // Date value
+ if (! $objp->rappro && ($user->rights->banque->modifier || $user->rights->banque->consolidate))
+ {
+ print '<td align="center">';
+ print dolibarr_print_date($objp->dv,"day");
+ print ' ';
+ print '<a href="'.$_SERVER['PHP_SELF'].'?action=dvprev&account='.$_GET["account"].'&rowid='.$objp->rowid.'">';
+ print img_edit_remove() . "</a> ";
+ print '<a href="'.$_SERVER['PHP_SELF'].'?action=dvnext&account='.$_GET["account"].'&rowid='.$objp->rowid.'">';
+ print img_edit_add() ."</a>";
+ print '</td>';
+ }
+ else
+ {
+ print '<td align="center">';
+ print dolibarr_print_date($objp->dv,"day");
+ print '</td>';
+ }
+
+ // Number
+ print '<td nowrap="nowrap">'.$objp->type.($objp->num_chq?' '.$objp->num_chq:'').'</td>';
// Description
print '<td valign="center"><a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&account='.$acct->id.'">';