From 0025f49d5ed49d7dcc54598a3bd04fa884def764 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Oct 2004 14:12:28 +0000 Subject: [PATCH] =?UTF-8?q?Look:=20Uniformisation=20du=20style=20pour=20do?= =?UTF-8?q?nner=20la=20priorit=E9=20aux=20feuilles=20de=20style=20Doc:=20D?= =?UTF-8?q?ocumentation=20doxygen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/fourn/facture/fiche.php | 81 +++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index c913ab4bcb3..565b7cdf171 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -21,10 +21,22 @@ * $Source$ * */ + +/*! + \file htdocs/fourn/facture/fiche.php + \ingroup facture + \brief Page des la fiche facture fournisseur + \version $Revision$ +*/ + require("./pre.inc.php"); require("./paiementfourn.class.php"); require("../../facturefourn.class.php"); +$langs->load("bills"); +$langs->load("companies"); + + /* * Sécurité accés client */ @@ -174,9 +186,10 @@ llxHeader(); if ($mesg) { print "
$mesg
"; } + /* * - * Fiche de creation + * Fiche facture en mode creation * */ @@ -191,7 +204,7 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy') print '
'; print ''; - print ''; + print '
'; print ''; print ''; print ''; - print ''; + print ''; print ''; if ($_GET["action"] == 'copy') @@ -240,7 +253,7 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy') print ''; print "
Société'.$langs->trans("Comments").'
Numéro
'.$langs->trans("Ref").'
'.$langs->trans("Author").''.$user->fullname.'

"; - print ''; + print '
'; print ''; for ($i = 1 ; $i < 9 ; $i++) @@ -271,7 +284,7 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy') else { /* - * Visualisation + * Fiche facture en mode edition * */ if ($_GET["facid"] > 0) @@ -280,25 +293,21 @@ else $fac = new FactureFourn($db); $fac->fetch($_GET["facid"]); - /* - * Fiche facture en mode edition - * - */ if ($_GET["action"] == "edit") { - print_titre('Facture : '.$fac->ref); + print_titre($langs->trans("Bill").' : '.$fac->ref); print ''; print ''; - print '
 '.$langs->trans("Label").'P.U. HTQuantitéTx TVA
'; - print ""; + print '
Société
'; + print ''; print ''; print ''; - print "".''; print ''; - print "".''; + print ''; print ''; - print "
'.$langs->trans("Company").''.stripslashes($fac->socnom).''.$langs->trans("Comments").'
Numéro'; + print '
'.$langs->trans("Ref").''; print ''; @@ -308,9 +317,9 @@ else print '
'.$langs->trans("Label").''; print '
Montant HT
'.$langs->trans("AmountTTC").''.price($fac->total_ht).'
Date"; + print '
'.$langs->trans("Date").''; print_date_select($fac->datep); @@ -334,10 +343,10 @@ else * */ print "

id&action=add_ligne\" method=\"post\">"; - print ''; + print '
'; print ''; - print ''; - print ''; + print ''; + print ''; print ''; for ($i = 0 ; $i < sizeof($fac->lignes) ; $i++) { @@ -375,28 +384,29 @@ else } else { - /* - * Affichage en visu - * - */ + /* + * Fiche facture en mode edition + * + */ + $h=0; - $head[0][0] = "fiche.php?facid=".$fac->id; - $head[0][1] = 'Facture : '.$fac->ref; - $h = 1; - $a = 0; + $head[$h][0] = "fiche.php?facid=".$fac->id; + $head[$h][1] = $langs->trans("Bill").' : '.$fac->ref; + $hselected = $h; + $h++; - dolibarr_fiche_head($head, $a); + dolibarr_fiche_head($head, $hselected); - print "
'.$langs->trans("Label").'P.U. HTQuantitéTotal HTTaux TVATVA'.$langs->trans("VATRate").''.$langs->trans("VAT").''.$langs->trans("TotalTTC").' 
"; + print "
"; print '
'; /* * Facture */ - print ''; - print ""; + print '
Sociétésocidp\">$fac->socnom
'; + print ""; print "\n"; print ""; - print "\n"; + print '\n"; print '"; @@ -412,7 +422,7 @@ else print '"; print "".'"; - print '"; + print '"; print "".'"; if (strlen($fac->note)) { @@ -430,7 +440,7 @@ else $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 .= " WHERE p.fk_facture_fourn = ".$fac->id." AND p.fk_paiement = c.id"; - + $result = $db->query($sql); if ($result) @@ -438,9 +448,10 @@ else $num = $db->num_rows(); $i = 0; $total = 0; - echo '
".$langs->trans("Company")."socidp\">$fac->socnomsocidp\">Autres factures
Date".dolibarr_print_date($fac->datep,"%A %d %B %Y")."
'.$langs->trans("Date")."".dolibarr_print_date($fac->datep,"%A %d %B %Y")."
'.$langs->trans("Label").''; print $fac->libelle; print "
'.$langs->trans("Status").''.$fac->LibStatut($fac->paye,$fac->statut)."
 '.$langs->trans("TotalHT").''.price($fac->total_ht)."TVA'.price($fac->total_tva)."
'.$langs->trans("VAT").''.price($fac->total_tva)."
 '.$langs->trans("TotalTTC").''.price($fac->total_ttc)."
'; + echo '
'; + print ''; print ""; - print ""; + print ''; print ''; if ($fac->statut == 1 && $fac->paye == 0 && $user->societe_id == 0)
'.$langs->trans("Paiements").'
Date'.$langs->trans("Date").''.$langs->trans("Type").'