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

Look: Uniformisation onglet facture fournisseur

Browse Source
This commit is contained in:
Laurent Destailleur 2005-08-14 03:49:10 +00:00
parent 95239fcd48
commit a27d69264b
1 changed files with 423 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/fourn/facture/fiche.php
View File

@ -39,9 +39,7 @@ $langs->load("bills");
$langs->load("suppliers"); $langs->load("suppliers");
$langs->load("companies"); $langs->load("companies");
/* // Sécurité accés client
* Sécurité accés client
*/
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$action = ''; $action = '';
@ -248,8 +246,6 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy')
{ {
$sql .= " AND s.idp =".$_GET["socid"]; $sql .= " AND s.idp =".$_GET["socid"];
} }
$sql .= " ORDER BY s.nom ASC"; $sql .= " ORDER BY s.nom ASC";
if ( $db->query($sql) ) if ( $db->query($sql) )
@ -495,7 +491,7 @@ else
print "</tr>"; print "</tr>";
print '<tr><td>'.$langs->trans("Date")."</td><td colspan=\"3\">"; print '<tr><td>'.$langs->trans("Date")."</td><td colspan=\"3\">";
print dolibarr_print_date($fac->datep,"%A %e %B %Y")."</td></tr>\n"; print dolibarr_print_date($fac->datep,"%A %d %B %Y")."</td></tr>\n";
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">';
print $fac->libelle; print $fac->libelle;
print '</td>'; print '</td>';
@ -526,11 +522,16 @@ else
/* /*
* Paiements * Liste des paiements
*/ */
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td>';
print '<tr>';
print '<td>'.$langs->trans("DateEcheance").'</td><td>';
print dolibarr_print_date($fac->date_echeance,"%A %d %B %Y")."</td></tr>\n";
print '<tr><td colspan="2">'.$langs->trans("Payments").'</td></tr>';
$sql = "SELECT ".$db->pdate("datep")." as dp, p.amount, c.libelle as paiement_type, p.num_paiement, p.rowid"; $sql = "SELECT ".$db->pdate("datep")." as dp, p.amount, c.libelle as paiement_type, p.num_paiement, p.rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p, ".MAIN_DB_PREFIX."c_paiement as c "; $sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p, ".MAIN_DB_PREFIX."c_paiement as c ";
@ -542,10 +543,9 @@ else
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $total = 0; $i = 0; $total = 0;
print '<tr><td colspan="2">';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr><td>'.$langs->trans("Payments").' :</td>';
print '<td>'.$langs->trans("DateEcheance")." : ";
print dolibarr_print_date($fac->date_echeance,"%A %e %B %Y")."</td></tr>\n";
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print '<td>'.$langs->trans("Date").'</td>'; print '<td>'.$langs->trans("Date").'</td>';
print '<td>'.$langs->trans("Type").'</td>'; print '<td>'.$langs->trans("Type").'</td>';
@ -563,7 +563,7 @@ else
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td>".img_object($langs->trans("Payment"),"payment").' '.dolibarr_print_date($objp->dp)."</td>\n"; print "<td nowrap>".img_object($langs->trans("Payment"),"payment").' '.dolibarr_print_date($objp->dp)."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n"; print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
print "<td align=\"right\">".price($objp->amount)."</td><td>".$langs->trans("Currency".$conf->monnaie)."</td>\n"; print "<td align=\"right\">".price($objp->amount)."</td><td>".$langs->trans("Currency".$conf->monnaie)."</td>\n";