Skip to content
Snippets Groups Projects
Commit ed543bc7 authored by Rodolphe Quiedeville's avatar Rodolphe Quiedeville
Browse files

Ajout statut

parent 4de55876
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
htdocs/compta/prelevement/fiche.php
+ 4
− 0
View file @ ed543bc7
......@@ -124,6 +124,10 @@ if ($_GET["id"])
print '</td></tr>';
print '<tr><td width="20%">Statut</td><td>';
print '<img src="./statut'.$bon->statut.'.png">&nbsp;';
print $lipre->statuts[$lipre->statut].'</td></tr>';
if($bon->date_trans <> 0)
{
$muser = new User($db, $bon->user_trans);
......
htdocs/compta/prelevement/ligne.php
+ 164
− 148
View file @ ed543bc7
......@@ -20,7 +20,7 @@
*
*/
require("./pre.inc.php");
require_once DOL_DOCUMENT_ROOT."/compta/prelevement/ligne-prelevement.class.php";
require_once DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php";
require_once DOL_DOCUMENT_ROOT."/paiement.class.php";
require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php";
......@@ -34,22 +34,29 @@ if ($_POST["action"] == 'confirm_rejet')
{
if ( $_POST["confirm"] == 'yes')
{
if ($_POST["motif"] > 0)
$lipre = new LignePrelevement($db, $user);
if ($lipre->fetch($_GET["id"]) == 0)
{
$rej = new RejetPrelevement($db, $user);
$rej->create($user, $_GET["id"], $_GET["socid"], $_GET["previd"], $_POST["motif"]);
Header("Location: lignes.php?id=".$_GET["id"]);
}
else
{
Header("Location: lignes.php?id=".$_GET["id"]."&action=rejet&socid=".$_GET["socid"]."&previd=".$_GET["previd"]);
if ($_POST["motif"] > 0)
{
$rej = new RejetPrelevement($db, $user);
$rej->create($user, $_GET["id"], $_POST["motif"], $lipre->bon_rowid);
Header("Location: ligne.php?id=".$_GET["id"]);
}
else
{
Header("Location: ligne.php?id=".$_GET["id"]."&action=rejet&socid=".$_GET["socid"]."&previd=".$_GET["previd"]);
}
}
}
else
{
Header("Location: lignes.php?id=".$_GET["id"]);
Header("Location: ligne.php?id=".$_GET["id"]);
}
}
......@@ -57,185 +64,194 @@ if ($_POST["action"] == 'confirm_rejet')
llxHeader('','Prlvement');
$h = 0;
$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$_GET["id"];
$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$_GET["id"];
$head[$h][1] = $langs->trans("Fiche");
$hselected = $h;
$h++;
if ($_GET["id"])
{
dolibarr_fiche_head($head, $hselected, 'Prlvement : '. $bon->ref);
$lipre = new LignePrelevement($db, $user);
print '<table class="border" width="100%">';
print '<tr><td width="20%">Rfrence</td><td>'.$bon->ref.'</td></tr>';
print '</table><br />';
}
if ($_GET["action"] == 'rejet')
{
$html = new Form($db);
if ($lipre->fetch($_GET["id"]) == 0)
{
$bon = new BonPrelevement($db);
$bon->fetch($lipre->bon_rowid);
dolibarr_fiche_head($head, $hselected, 'Prlvement : '. $lipre->bon_ref);
print '<table class="border" width="100%">';
print '<tr><td width="20%">Bons de prlvement</td><td>';
print '<a href="fiche.php?id='.$lipre->bon_rowid.'">'.$lipre->bon_ref.'</a></td></tr>';
print '<tr><td width="20%">Montant</td><td>'.price($lipre->amount).'</td></tr>';
print '<tr><td width="20%">Statut</td><td>';
print '<img src="./statut'.$lipre->statut.'.png">&nbsp;';
print $lipre->statuts[$lipre->statut].'</td></tr>';
print '</table><br />';
}
else
{
print "Erreur";
}
$soc = new Societe($db);
$soc->fetch($_GET["socid"]);
//$html->form_confirm("factures.php"."?id=".$_GET["id"]."&amp;socid=".$_GET["socid"]."&amp;previd=".$_GET["previd"],"Rejet de prlvement","Etes-vous sr de vouloir saisir un rejet de prlvement pour la socit ".$soc->nom." ?","confirm_rejet");
$rej = new RejetPrelevement($db, $user);
if ($_GET["action"] == 'rejet')
{
$html = new Form($db);
$soc = new Societe($db);
$soc->fetch($lipre->socid);
$rej = new RejetPrelevement($db, $user);
print '<form method="post" action="ligne.php?id='.$_GET["id"].'">';
print '<input type="hidden" name="action" value="confirm_rejet">';
print '<table class="border" width="100%">';
print '<tr><td colspan="3">Rejet de prlvement</td></tr>';
print '<tr><td class="valid">Etes-vous sr de vouloir saisir un rejet de prlvement pour la socit '.$soc->nom.' ?</td>';
print '<td colspan="2" class="valid">';
print '<select name="confirm">';
print '<option value="yes">oui</option>';
print '<option value="no" selected>non</option>';
print '</select>';
print '</td></tr>';
print '<tr><td class="valid">Motif du rejet</td>';
print '<td class="valid">';
print '<select name="motif">';
print '<option value="0">(Motif du Rejet)</option>';
foreach($rej->motifs as $key => $value)
{
print '<option value="'.$key.'">'.$value.'</option>';
}
print '</select>';
print '</td>';
print '<td class="valid" align="center">';
print '<input type="submit" value="Confirmer"></td></tr>';
print '<form method="post" action="lignes.php?id='.$_GET["id"]."&amp;socid=".$_GET["socid"]."&amp;previd=".$_GET["previd"].'">';
print '<input type="hidden" name="action" value="confirm_rejet">';
print '<table class="border" width="100%">';
print '<tr><td colspan="3">Rejet de prlvement</td></tr>';
print '<tr><td class="valid">Etes-vous sr de vouloir saisir un rejet de prlvement pour la socit '.$soc->nom.' ?</td>';
print '<td colspan="2" class="valid">';
print '<select name="confirm">';
print '<option value="yes">oui</option>';
print '<option value="no" selected>non</option>';
print '</select>';
print '</td></tr>';
print '</table></form>';
print '<tr><td class="valid">Motif du rejet</td>';
print '<td class="valid">';
print '<select name="motif">';
print '<option value="0">(Motif du Rejet)</option>';
}
foreach($rej->motifs as $key => $value)
$page = $_GET["page"];
$sortorder = $_GET["sortorder"];
$sortfield = $_GET["sortfield"];
if ($page == -1) { $page = 0 ; }
$offset = $conf->liste_limit * $page ;
$pageprev = $page - 1;
$pagenext = $page + 1;
if ($sortorder == "") $sortorder="DESC";
if ($sortfield == "") $sortfield="pl.fk_soc";
/*
* Liste des factures
*
*
*/
$sql = "SELECT pf.rowid";
$sql .= " ,f.rowid as facid, f.facnumber as ref, f.total_ttc";
$sql .= " , s.idp, s.nom";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
$sql .= " , ".MAIN_DB_PREFIX."facture as f";
$sql .= " , ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE pf.fk_prelevement_lignes = pl.rowid";
$sql .= " AND pl.fk_prelevement_bons = p.rowid";
$sql .= " AND f.fk_soc = s.idp";
$sql .= " AND pf.fk_facture = f.rowid";
$sql .= " AND pl.rowid=".$_GET["id"];
if ($_GET["socid"])
{
print '<option value="'.$key.'">'.$value.'</option>';
$sql .= " AND s.idp = ".$_GET["socid"];
}
print '</select>';
print '</td>';
print '<td class="valid" align="center">';
print '<input type="submit" value="Confirmer"></td></tr>';
print '</table></form>';
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
$result = $db->query($sql);
print '<table class="border" width="100%">';
if ($result)
{
$num = $db->num_rows();
$i = 0;
print '<tr><td width="20%">Rfrence</td><td>'.$bon->ref.'</td></tr>';
print '</table><br />';
}
$urladd = "&amp;id=".$_GET["id"];
$page = $_GET["page"];
$sortorder = $_GET["sortorder"];
$sortfield = $_GET["sortfield"];
print_barre_liste("Factures", $page, "factures.php", $urladd, $sortfield, $sortorder, '', $num);
print"\n<!-- debut table -->\n";
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
print '<tr class="liste_titre">';
print_liste_field_titre("Facture","factures.php","p.ref",'',$urladd);
print_liste_field_titre("Socit","factures.php","s.nom",'',$urladd);
print_liste_field_titre("Montant","factures.php","f.total_ttc","",$urladd,'align="center"');
print '<td>&nbsp;</td></tr>';
if ($page == -1) { $page = 0 ; }
$var=True;
$offset = $conf->liste_limit * $page ;
$pageprev = $page - 1;
$pagenext = $page + 1;
$total = 0;
if ($sortorder == "") {
$sortorder="DESC";
}
if ($sortfield == "") {
$sortfield="pl.fk_soc";
}
while ($i < min($num,$conf->liste_limit))
{
$obj = $db->fetch_object($i);
/*
* Liste des factures
*
*
*/
$sql = "SELECT pf.rowid";
$sql .= " ,f.rowid as facid, f.facnumber as ref, f.total_ttc";
$sql .= " , s.idp, s.nom";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
$sql .= " , ".MAIN_DB_PREFIX."facture as f";
$sql .= " , ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE pf.fk_prelevement_lignes = pl.rowid";
$sql .= " AND pl.fk_prelevement_bons = p.rowid";
$sql .= " AND f.fk_soc = s.idp";
$sql .= " AND pf.fk_facture = f.rowid";
$sql .= " AND pl.rowid=".$_GET["id"];
if ($_GET["socid"])
{
$sql .= " AND s.idp = ".$_GET["socid"];
}
print "<tr $bc[$var]><td>";
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">';
print img_object($langs->trans("ShowBill"),"bill");
print '</a>&nbsp;';
$result = $db->query($sql);
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->ref."</a></td>\n";
if ($result)
{
$num = $db->num_rows();
$i = 0;
$urladd = "&amp;id=".$_GET["id"];
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$obj->idp.'">';
print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."</a></td>\n";
print_barre_liste("Factures", $page, "factures.php", $urladd, $sortfield, $sortorder, '', $num);
print"\n<!-- debut table -->\n";
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
print '<tr class="liste_titre">';
print_liste_field_titre("Facture","factures.php","p.ref",'',$urladd);
print_liste_field_titre("Socit","factures.php","s.nom",'',$urladd);
print_liste_field_titre("Montant","factures.php","f.total_ttc","",$urladd,'align="center"');
print '<td colspan="2">&nbsp;</td></tr>';
print '<td align="center">'.price($obj->total_ttc)."</td>\n";
$var=True;
$total = 0;
print "</tr>\n";
while ($i < min($num,$conf->liste_limit))
{
$obj = $db->fetch_object($i);
$i++;
}
print "<tr $bc[$var]><td>";
print "</table>";
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">';
print img_object($langs->trans("ShowBill"),"bill");
print '</a>&nbsp;';
$db->free();
}
else
{
print $db->error() . ' ' . $sql;
}
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->ref."</a></td>\n";
$db->close();
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$obj->idp.'">';
print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."</a></td>\n";
print '<td align="center">'.price($obj->total_ttc)."</td>\n";
/* ************************************************************************** */
/* */
/* Barre d'action */
/* */
/* ************************************************************************** */
print '<td>';
print "\n</div>\n<div class=\"tabsAction\">\n";
if ($obj->statut == 0)
{
print '-';
}
elseif ($obj->statut == 1)
{
print 'Crdit';
}
elseif ($obj->statut == 2)
{
print '<b>Rejet</b>';
if ($_GET["action"] == '')
{
if ($bon->credite == 1 && $lipre->statut == 2)
{
print "<a class=\"tabAction\" href=\"ligne.php?action=rejet&amp;id=$lipre->id\">".$langs->trans("Emmetre un rejet")."</a>";
}
print "</td></tr>\n";
$i++;
}
print "</table>";
$db->free();
print "</div>";
}
else
{
print $db->error() . ' ' . $sql;
}
$db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
?>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment