Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-23 09:51:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Qual: Uniformisation du code

Browse Source
This commit is contained in:
Laurent Destailleur
2005-09-10 12:55:32 +00:00
parent e8d900b28c
commit c5992d42af
1 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/compta/facture/prelevement.php
View File

@@ -36,6 +36,7 @@ if (!$user->rights->facture->lire)
$langs->load("bills"); $langs->load("bills");
$langs->load("banks"); $langs->load("banks");
$langs->load("withdrawals");
require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
@@ -57,10 +58,14 @@ if ($_GET["action"] == "new")
if ($fact->fetch($_GET["facid"])) if ($fact->fetch($_GET["facid"]))
{ {
$result = $fact->demande_prelevement($user); $result = $fact->demande_prelevement($user);
if ($result == 0) if ($result > 0)
{ {
Header("Location: prelevement.php?facid=".$fact->id); Header("Location: prelevement.php?facid=".$fact->id);
} }
else
{
$mesg='<div class="error">'.$fact->error.'</div>';
}
} }
} }
@@ -94,6 +99,9 @@ if ($_GET["facid"] > 0)
$fac = New Facture($db); $fac = New Facture($db);
if ( $fac->fetch($_GET["facid"], $user->societe_id) > 0) if ( $fac->fetch($_GET["facid"], $user->societe_id) > 0)
{ {
if ($mesg) print $mesg.'<br>';
$soc = new Societe($db, $fac->socidp); $soc = new Societe($db, $fac->socidp);
$soc->fetch($fac->socidp); $soc->fetch($fac->socidp);
$author = new User($db); $author = new User($db);
@@ -176,7 +184,7 @@ if ($_GET["facid"] > 0)
$sql = "SELECT pfd.rowid, pfd.traite,".$db->pdate("pfd.date_demande")." as date_demande"; $sql = "SELECT pfd.rowid, pfd.traite,".$db->pdate("pfd.date_demande")." as date_demande";
$sql .= " ,".$db->pdate("pfd.date_traite")." as date_traite"; $sql .= " ,".$db->pdate("pfd.date_traite")." as date_traite";
$sql .= " , pfd.amount"; $sql .= " , pfd.amount";
$sql .= " , u.name, u.firstname"; $sql .= " , u.rowid as user_id, u.name, u.firstname, u.code";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd"; $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
$sql .= " , ".MAIN_DB_PREFIX."user as u"; $sql .= " , ".MAIN_DB_PREFIX."user as u";
$sql .= " WHERE fk_facture = ".$fac->id; $sql .= " WHERE fk_facture = ".$fac->id;
@@ -203,16 +211,17 @@ if ($_GET["facid"] > 0)
} }
print "</div><br/>"; print "</div><br/>";
/* /*
* Pr<50>l<EFBFBD>vement * Pr<50>l<EFBFBD>vement
*/ */
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td align="center">Date demande</td>'; print '<td align="center">'.$langs->trans("DateRequest").'</td>';
print '<td align="center">Date traitement</td>'; print '<td align="center">'.$langs->trans("DateProcess").'</td>';
print '<td align="center">'.$langs->trans("Amount").'</td>'; print '<td align="center">'.$langs->trans("Amount").'</td>';
print '<td align="center">Bon pr<70>l<EFBFBD>vement</td>'; print '<td align="center">'.$langs->trans("WithdrawalReceipt").'</td>';
print '<td align="center">'.$langs->trans("User").'</td><td>&nbsp;</td><td>&nbsp;</td>'; print '<td align="center">'.$langs->trans("User").'</td><td>&nbsp;</td><td>&nbsp;</td>';
print '</tr>'; print '</tr>';
$var=True; $var=True;
@@ -227,11 +236,12 @@ if ($_GET["facid"] > 0)
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td align="center">'.strftime("%d/%m/%Y",$obj->date_demande)."</td>\n"; print '<td align="center">'.dolibarr_print_date($obj->date_demande)."</td>\n";
print '<td align="center">En attente de traitement</td>'; print '<td align="center">En attente de traitement</td>';
print '<td align="center">'.price($obj->amount).'</td>'; print '<td align="center">'.price($obj->amount).'</td>';
print '<td align="center">-</td>'; print '<td align="center">-</td>';
print '<td align="center" colspan="2">'.$obj->firstname." ".$obj->name.'</td>'; print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->code.'</a></td>';
print '<td>&nbsp;</td>';
print '<td>'; print '<td>';
print '<a href="prelevement.php?facid='.$fac->id.'&amp;action=delete&amp;did='.$obj->rowid.'">'; print '<a href="prelevement.php?facid='.$fac->id.'&amp;action=delete&amp;did='.$obj->rowid.'">';
print img_delete(); print img_delete();
@@ -250,7 +260,7 @@ if ($_GET["facid"] > 0)
$sql = "SELECT pfd.rowid, pfd.traite,".$db->pdate("pfd.date_demande")." as date_demande"; $sql = "SELECT pfd.rowid, pfd.traite,".$db->pdate("pfd.date_demande")." as date_demande";
$sql .= " ,".$db->pdate("pfd.date_traite")." as date_traite"; $sql .= " ,".$db->pdate("pfd.date_traite")." as date_traite";
$sql .= " , pfd.fk_prelevement_bons, pfd.amount"; $sql .= " , pfd.fk_prelevement_bons, pfd.amount";
$sql .= " , u.name, u.firstname"; $sql .= " , u.rowid as user_id, u.name, u.firstname, u.code";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd"; $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
$sql .= " , ".MAIN_DB_PREFIX."user as u"; $sql .= " , ".MAIN_DB_PREFIX."user as u";
$sql .= " WHERE fk_facture = ".$fac->id; $sql .= " WHERE fk_facture = ".$fac->id;
@@ -271,17 +281,20 @@ if ($_GET["facid"] > 0)
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td align="center">'.strftime("%d/%m/%Y",$obj->date_demande)."</td>\n"; print '<td align="center">'.dolibarr_print_date($obj->date_demande)."</td>\n";
print '<td align="center">'.dolibarr_print_date($obj->date_traite)."</td>\n";
print '<td align="center">'.strftime("%d/%m/%Y",$obj->date_traite)."</td>\n";
print '<td align="center">'.price($obj->amount).'</td>'; print '<td align="center">'.price($obj->amount).'</td>';
print '<td align="center">'; print '<td align="center">';
print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$obj->fk_prelevement_bons; print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$obj->fk_prelevement_bons;
print '">'.$obj->fk_prelevement_bons."</a></td>\n"; print '">'.$obj->fk_prelevement_bons."</a></td>\n";
print '<td align="center" colspan="2">'.$obj->firstname." ".$obj->name.'</td>'; print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->code.'</a></td>';
print '<td>-</td>'; print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
$i++; $i++;