diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 73bc21c85f9..bbc7e4a5d47 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -164,14 +164,14 @@ if ( $db->query($sql) ) print_barre_liste("Liste des actions commerciales réalisées ou à faire", $page, $PHP_SELF,'',$sortfield,$sortorder,'',$num); } $i = 0; - print ""; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ""; + print "
DateAvancementActionSociétéContactCommentairesAuteur
"; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ""; print "\n"; $var=True; while ($i < min($num,$limit)) @@ -180,7 +180,7 @@ if ( $db->query($sql) ) $var=!$var; - print ""; + print ""; if ($oldyear == strftime("%Y",$obj->da) ) { @@ -188,7 +188,7 @@ if ( $db->query($sql) ) } else { - print "\n"; + print "\n"; $oldyear = strftime("%Y",$obj->da); } @@ -198,19 +198,19 @@ if ( $db->query($sql) ) } else { - print "\n"; + print "\n"; $oldmonth = strftime("%Y%b",$obj->da); } - print "\n"; - print "\n"; + print "\n"; + print "\n"; if ($obj->percent < 100) { - print ""; + print ""; } else { - print ""; + print ""; } - print ''; + print ''; print ''; - print "\n"; + print "\n"; - print "\n"; + print "\n"; $i++; } - print "
DateAvancementActionSociétéContactCommentairesAuteur
" .strftime("%Y",$obj->da)."" .strftime("%Y",$obj->da)."" .strftime("%b",$obj->da)."" .strftime("%b",$obj->da)."" .strftime("%d",$obj->da)."" .strftime("%H:%M",$obj->da)."" .strftime("%d",$obj->da)."" .strftime("%H:%M",$obj->da)."".$obj->percent."%".$obj->percent."%réaliséréalisé'.$obj->libelle.''.$obj->libelle.''; @@ -245,12 +245,12 @@ if ( $db->query($sql) ) * */ print ''.substr($obj->note, 0, 20).' ...$obj->code$obj->code
"; + print ""; $db->free(); } else diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index be8037d2ec4..5b97f0e6d76 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,7 +34,7 @@ print ''; * */ print '
'; -print ''; +print '
'; print ''; print "'; diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index db94e1394c2..201bd098b35 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -82,9 +83,9 @@ if ( $db->query($sql) ) print_barre_liste("Commandes", $_GET["page"], $PHP_SELF,"&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; - print '
Rechercher une commande
"; print 'Num. :
'; + print '
'; - print ''; + print ''; print_liste_field_titre_new ("Réf",$PHP_SELF,"c.ref","","&socidp=$socidp",'width="15%"',$sortfield); diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 59b93a97afc..9be4b534ab8 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -38,7 +38,7 @@ $month=$_GET["month"]; if (! $year) { $year = strftime("%Y", time()); } -print_titre("Résultat comptable".($year?" année $year":"").", détail par client/fournisseur"); +print_titre("Détail recettes-dépenses par client/fournisseur.".($year?"  ".img_previous()." Année $year ".img_next()."":"")); print '
'; @@ -48,7 +48,11 @@ print '"; print "\n"; -/* Factures clients */ + +/* + * Factures clients + * + */ $sql = "SELECT s.nom,s.idp,sum(f.total) as amount"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.idp AND f.fk_statut = 1"; @@ -87,11 +91,12 @@ if ($result) { print $db->error(); } print ''; + /* * Frais, factures fournisseurs. * - * */ + $sql = "SELECT s.nom,s.idp,sum(f.total_ht) as amount"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f WHERE f.fk_soc = s.idp"; if ($year) { @@ -133,6 +138,7 @@ print ''; * Charges sociales * */ + $subtotal = 0; print ''; @@ -167,10 +173,12 @@ if ( $db->query($sql) ) { print ''; print ''; + /* * Charges sociales non déductibles * */ + $subtotal = 0; print ''; diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 76d9ed2d0b3..5c4f5a216ee 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -66,23 +67,23 @@ if ( $db->query($sql) ) print_barre_liste("Liste des contrats", $page, $PHP_SELF, "&sref=$sref&snom=$snom", $sortfield, $sortorder,'',$num); - print '
 El print "Montant HT
'.price($total).'
'.price($subtotal).'
Prestations/Charges déductibles
'.price($subtotal).'
Résultat'.price($total).'
Prestations/Charges NON déductibles
'; + print '
'; - print ''; - print "\n"; + print "\n"; $var=True; while ($i < min($num,$limit)) { $obj = $db->fetch_object( $i); $var=!$var; - print ""; - print "\n"; - print "\n"; + print ""; + print "\n"; + print "\n"; print '"; } - print "\n"; + print "\n"; $i++; } $db->free(); diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php index 49bcec4f6c5..c651f14886c 100644 --- a/htdocs/expedition/liste.php +++ b/htdocs/expedition/liste.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -85,9 +86,9 @@ if ( $db->query($sql) ) print_barre_liste("Expeditions", $_GET["page"], $PHP_SELF,"&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; - print '
'; + print '
'; print_liste_field_titre("Libellé",$PHP_SELF, "p.label"); print ""; print_liste_field_titre("Société",$PHP_SELF, "s.nom"); print 'Etat
cid\">$obj->labelsidp\">$obj->nom
cid\">$obj->labelsidp\">$obj->nom'; if ($obj->enservice == 1) { @@ -96,7 +97,7 @@ if ( $db->query($sql) ) { print "A mettre en service
'; + print '
'; - print ''; + print ''; print_liste_field_titre_new ("Réf",$PHP_SELF,"e.ref","","&socidp=$socidp",'width="15%"',$sortfield); @@ -102,8 +103,8 @@ if ( $db->query($sql) ) $objp = $db->fetch_object( $i); $var=!$var; - print ""; - print "\n"; + print ""; + print "\n"; $now = time(); $lim = 3600 * 24 * 15 ; @@ -117,7 +118,7 @@ if ( $db->query($sql) ) print ""; } - print "
rowid\">$objp->ref
rowid\">$objp->ref "; + print ""; $y = strftime("%Y",$objp->date_expedition); $m = strftime("%m",$objp->date_expedition); diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php index ecb181020c4..06c56472549 100644 --- a/htdocs/fichinter/index.php +++ b/htdocs/fichinter/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -68,37 +69,37 @@ if ( $db->query($sql) ) print_barre_liste("Liste des fiches d'intervention", $page, $PHP_SELF,"&socid=$socid",$sortfield,$sortorder,'',$num); $i = 0; - print ''; - print ""; + print '
'; + print ""; print_liste_field_titre_new ("Num",$PHP_SELF,"f.ref","","&socid=$socid",'width="15%"',$sortfield); print_liste_field_titre_new ("Société",$PHP_SELF,"s.nom","","&socid=$socid",'',$sortfield); print_liste_field_titre_new ("Date",$PHP_SELF,"f.datei","","&socid=$socid",'',$sortfield); - print ''; - print ''; - print "\n"; + print ''; + print ''; + print "\n"; $var=True; while ($i < $num) { $objp = $db->fetch_object( $i); $var=!$var; - print ""; - print "\n"; + print ""; + print "\n"; print '\n"; - print "\n"; - print ''; - print ''; + print "idp\">$objp->nom\n"; + print "\n"; + print ''; + print ''; if ($user->societe_id == 0) { - print ''; + print ''; } else { print ""; } - print "\n"; + print "\n"; $i++; } diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index d5f9676daa5..51afa2f3d1a 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -74,8 +75,9 @@ $pagenext = $page + 1; * * */ -print '

DuréeStatut 
DuréeStatut 
fichid\">$objp->ref
fichid\">$objp->ref '; - print "idp\">$objp->nom".strftime("%d %B %Y",$objp->dp)."'.sprintf("%.1f",$objp->duree).''.$objp->fk_statut.'".strftime("%d %B %Y",$objp->dp)."'.sprintf("%.1f",$objp->duree).''.$objp->fk_statut.'[Fiche Inter][Fiche Inter] 
'; -print '
'; +print '
'; +print ''; +print '"; - print "\n"; - print "\n"; + print ""; + print "\n"; + print "\n"; if ($obj->client == 1) { print '';
'; print_liste_field_titre("Titre",$PHP_SELF,"p.title"); print "Réf"; print_liste_field_titre("Société",$PHP_SELF,"s.nom"); @@ -101,9 +103,9 @@ if ( $db->query($sql) ) { $objp = $db->fetch_object( $i); $var=!$var; - print "
projectid\">$objp->titleprojectid\">$objp->ref
projectid\">$objp->titleprojectid\">$objp->ref'.$objp->nom.'