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

Ajout statut

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2005-03-01 16:06:16 +00:00
parent 4de5587651
commit ed543bc789
2 changed files with 196 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/prelevement/fiche.php
View File

@ -124,6 +124,10 @@ if ($_GET["id"])
print '</td></tr>'; 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) if($bon->date_trans <> 0)
{ {
$muser = new User($db, $bon->user_trans); $muser = new User($db, $bon->user_trans);

174
htdocs/compta/prelevement/ligne.php
View File

@ -20,7 +20,7 @@
* *
*/ */
require("./pre.inc.php"); 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."/compta/prelevement/rejet-prelevement.class.php";
require_once DOL_DOCUMENT_ROOT."/paiement.class.php"; require_once DOL_DOCUMENT_ROOT."/paiement.class.php";
require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.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["confirm"] == 'yes')
{ {
$lipre = new LignePrelevement($db, $user);
if ($lipre->fetch($_GET["id"]) == 0)
{
if ($_POST["motif"] > 0) if ($_POST["motif"] > 0)
{ {
$rej = new RejetPrelevement($db, $user); $rej = new RejetPrelevement($db, $user);
$rej->create($user, $_GET["id"], $_GET["socid"], $_GET["previd"], $_POST["motif"]); $rej->create($user, $_GET["id"], $_POST["motif"], $lipre->bon_rowid);
Header("Location: lignes.php?id=".$_GET["id"]); Header("Location: ligne.php?id=".$_GET["id"]);
} }
else else
{ {
Header("Location: lignes.php?id=".$_GET["id"]."&action=rejet&socid=".$_GET["socid"]."&previd=".$_GET["previd"]); Header("Location: ligne.php?id=".$_GET["id"]."&action=rejet&socid=".$_GET["socid"]."&previd=".$_GET["previd"]);
}
} }
} }
else else
{ {
Header("Location: lignes.php?id=".$_GET["id"]); Header("Location: ligne.php?id=".$_GET["id"]);
} }
} }
@ -57,36 +64,50 @@ if ($_POST["action"] == 'confirm_rejet')
llxHeader('','Prélèvement'); llxHeader('','Prélèvement');
$h = 0; $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"); $head[$h][1] = $langs->trans("Fiche");
$hselected = $h; $hselected = $h;
$h++; $h++;
if ($_GET["id"]) if ($_GET["id"])
{ {
dolibarr_fiche_head($head, $hselected, 'Prélèvement : '. $bon->ref); $lipre = new LignePrelevement($db, $user);
if ($lipre->fetch($_GET["id"]) == 0)
{
$bon = new BonPrelevement($db);
$bon->fetch($lipre->bon_rowid);
dolibarr_fiche_head($head, $hselected, 'Prélèvement : '. $lipre->bon_ref);
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="20%">Référence</td><td>'.$bon->ref.'</td></tr>'; print '<tr><td width="20%">Bons de prélèvement</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 />'; print '</table><br />';
}
else
{
print "Erreur";
}
}
if ($_GET["action"] == 'rejet')
{ if ($_GET["action"] == 'rejet')
{
$html = new Form($db); $html = new Form($db);
$soc = new Societe($db); $soc = new Societe($db);
$soc->fetch($_GET["socid"]); $soc->fetch($lipre->socid);
//$html->form_confirm("factures.php"."?id=".$_GET["id"]."&amp;socid=".$_GET["socid"]."&amp;previd=".$_GET["previd"],"Rejet de prélèvement","Etes-vous sûr de vouloir saisir un rejet de prélèvement pour la société ".$soc->nom." ?","confirm_rejet");
$rej = new RejetPrelevement($db, $user); $rej = new RejetPrelevement($db, $user);
print '<form method="post" action="lignes.php?id='.$_GET["id"]."&amp;socid=".$_GET["socid"]."&amp;previd=".$_GET["previd"].'">'; print '<form method="post" action="ligne.php?id='.$_GET["id"].'">';
print '<input type="hidden" name="action" value="confirm_rejet">'; print '<input type="hidden" name="action" value="confirm_rejet">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td colspan="3">Rejet de prélèvement</td></tr>'; print '<tr><td colspan="3">Rejet de prélèvement</td></tr>';
@ -114,63 +135,51 @@ if ($_GET["action"] == 'rejet')
print '</table></form>'; print '</table></form>';
}
$page = $_GET["page"];
$sortorder = $_GET["sortorder"];
$sortfield = $_GET["sortfield"];
if ($page == -1) { $page = 0 ; }
print '<table class="border" width="100%">'; $offset = $conf->liste_limit * $page ;
$pageprev = $page - 1;
$pagenext = $page + 1;
print '<tr><td width="20%">Référence</td><td>'.$bon->ref.'</td></tr>'; if ($sortorder == "") $sortorder="DESC";
if ($sortfield == "") $sortfield="pl.fk_soc";
print '</table><br />'; /*
}
$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 * Liste des factures
* *
* *
*/ */
$sql = "SELECT pf.rowid"; $sql = "SELECT pf.rowid";
$sql .= " ,f.rowid as facid, f.facnumber as ref, f.total_ttc"; $sql .= " ,f.rowid as facid, f.facnumber as ref, f.total_ttc";
$sql .= " , s.idp, s.nom"; $sql .= " , s.idp, s.nom";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture as pf"; $sql .= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
$sql .= " , ".MAIN_DB_PREFIX."facture as f"; $sql .= " , ".MAIN_DB_PREFIX."facture as f";
$sql .= " , ".MAIN_DB_PREFIX."societe as s"; $sql .= " , ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE pf.fk_prelevement_lignes = pl.rowid"; $sql .= " WHERE pf.fk_prelevement_lignes = pl.rowid";
$sql .= " AND pl.fk_prelevement_bons = p.rowid"; $sql .= " AND pl.fk_prelevement_bons = p.rowid";
$sql .= " AND f.fk_soc = s.idp"; $sql .= " AND f.fk_soc = s.idp";
$sql .= " AND pf.fk_facture = f.rowid"; $sql .= " AND pf.fk_facture = f.rowid";
$sql .= " AND pl.rowid=".$_GET["id"]; $sql .= " AND pl.rowid=".$_GET["id"];
if ($_GET["socid"]) if ($_GET["socid"])
{ {
$sql .= " AND s.idp = ".$_GET["socid"]; $sql .= " AND s.idp = ".$_GET["socid"];
} }
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset); $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
@ -183,7 +192,7 @@ if ($result)
print_liste_field_titre("Facture","factures.php","p.ref",'',$urladd); print_liste_field_titre("Facture","factures.php","p.ref",'',$urladd);
print_liste_field_titre("Société","factures.php","s.nom",'',$urladd); print_liste_field_titre("Société","factures.php","s.nom",'',$urladd);
print_liste_field_titre("Montant","factures.php","f.total_ttc","",$urladd,'align="center"'); print_liste_field_titre("Montant","factures.php","f.total_ttc","",$urladd,'align="center"');
print '<td colspan="2">&nbsp;</td></tr>'; print '<td>&nbsp;</td></tr>';
$var=True; $var=True;
@ -206,22 +215,8 @@ if ($result)
print '<td align="center">'.price($obj->total_ttc)."</td>\n"; print '<td align="center">'.price($obj->total_ttc)."</td>\n";
print '<td>';
if ($obj->statut == 0) print "</tr>\n";
{
print '-';
}
elseif ($obj->statut == 1)
{
print 'Crédité';
}
elseif ($obj->statut == 2)
{
print '<b>Rejeté</b>';
}
print "</td></tr>\n";
$i++; $i++;
} }
@ -229,13 +224,34 @@ if ($result)
print "</table>"; print "</table>";
$db->free(); $db->free();
} }
else else
{ {
print $db->error() . ' ' . $sql; print $db->error() . ' ' . $sql;
} }
$db->close(); $db->close();
/* ************************************************************************** */
/* */
/* Barre d'action */
/* */
/* ************************************************************************** */
print "\n</div>\n<div class=\"tabsAction\">\n";
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 "</div>";
}
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
?> ?>