diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 2be63038f82..3b0dc563e9f 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -361,14 +361,14 @@ if ($propalid) $var=!$var; print ""; print "[$objp->ref]\n"; - print ''.$objp->product.''; + print ''.$objp->product.''; print ''.$objp->tva_tx.' %'; print "".$objp->qty."\n"; print ''.$objp->remise_percent.' %'; print ''.price($objp->subprice).''; if ($obj->statut == 0 && $user->rights->propale->creer) { - print 'Supprimer'; + print 'Supprimer'; } else { @@ -399,7 +399,7 @@ if ($propalid) print "".price($objp->subprice).""; if ($obj->statut == 0 && $user->rights->propale->creer) { - print 'Supprimer'; + print 'Supprimer'; } else { @@ -493,7 +493,7 @@ if ($propalid) { if ($user->rights->propale->supprimer) { - print "[Supprimer]"; + print "[Supprimer]"; } else { @@ -504,7 +504,7 @@ if ($propalid) { if ($obj->statut == 1 && $user->rights->propale->cloturer) { - print "[Cloturer]"; + print "[Cloturer]"; } else { @@ -517,7 +517,7 @@ if ($propalid) */ if ($obj->statut < 2 && $user->rights->propale->creer) { - print '[Générer]"; + print '[Générer]"; } else { @@ -535,7 +535,7 @@ if ($propalid) if ($user->rights->propale->envoyer) { print ""; - print "[Envoyer la proposition]"; + print "[Envoyer la proposition]"; } else { @@ -558,7 +558,7 @@ if ($propalid) { if ($user->rights->propale->valider) { - print "[Valider]"; + print "[Valider]"; } else { @@ -569,7 +569,7 @@ if ($propalid) { if ($user->rights->propale->creer) { - print "[Modifier]"; + print "[Modifier]"; } else { @@ -636,7 +636,7 @@ if ($propalid) $file = PROPALE_OUTPUTDIR . "/$obj->ref/$obj->ref.pdf"; if (file_exists($file)) { - print "Propale PDF"; + print "Propale PDF"; print ''.$propal->ref.'.pdf'; print ''.filesize($file). ' bytes'; print ''.strftime("%d %b %Y %H:%M:%S",filemtime($file)).''; @@ -715,7 +715,7 @@ if ($propalid) $from_name = $user->fullname ; //$conf->propal->fromtoname; $from_mail = $user->email; //conf->propal->fromtomail; - print "
\n"; + print "\n"; print "\n"; print "\n"; @@ -840,7 +840,7 @@ if ($propalid) if ( $db->query($sql) ) { $num = $db->num_rows(); - print_barre_liste("Propositions commerciales", $page, $PHP_SELF,"&socidp=$socidp",$sortfield,$sortorder,'',$num); + print_barre_liste("Propositions commerciales", $page, $PHP_SELF,"&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; @@ -848,14 +848,14 @@ if ($propalid) print ''; - print_liste_field_titre_new ("Réf",$PHP_SELF,"p.ref","","&socidp=$socidp",'width="15%"',$sortfield); + print_liste_field_titre_new ("Réf",$PHP_SELF,"p.ref","","&socidp=$socidp",'width="15%"',$sortfield); - print_liste_field_titre_new ("Société",$PHP_SELF,"s.nom","","&socidp=$socidp",'width="30%"',$sortfield); + print_liste_field_titre_new ("Société",$PHP_SELF,"s.nom","","&socidp=$socidp",'width="30%"',$sortfield); - print_liste_field_titre_new ("Date",$PHP_SELF,"p.datep","","&socidp=$socidp", 'width="25%" align="right" colspan="2"',$sortfield); - print_liste_field_titre_new ("Prix",$PHP_SELF,"p.price","","&socidp=$socidp", ' width="20%" align="right"',$sortfield); + print_liste_field_titre_new ("Date",$PHP_SELF,"p.datep","","&socidp=$socidp", 'width="25%" align="right" colspan="2"',$sortfield); + print_liste_field_titre_new ("Prix",$PHP_SELF,"p.price","","&socidp=$socidp", ' width="20%" align="right"',$sortfield); - print_liste_field_titre_new ("Statut",$PHP_SELF,"p.fk_statut","","&socidp=$socidp",'width="10%" align="center"',$sortfield); + print_liste_field_titre_new ("Statut",$PHP_SELF,"p.fk_statut","","&socidp=$socidp",'width="10%" align="center"',$sortfield); print "\n"; $var=True; @@ -885,7 +885,7 @@ if ($propalid) $m = strftime("%m",$objp->dp); print strftime("%d",$objp->dp)."\n"; - print " "; + print " "; print strftime("%B",$objp->dp)."\n"; print " "; print strftime("%Y",$objp->dp)."\n"; diff --git a/htdocs/product/index.php b/htdocs/product/index.php index 7810748c7c6..1e10b2839bc 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -40,24 +40,24 @@ llxHeader("","","Accueil Produits et services"); print_titre("Produits et services"); -print ''; +print '
'; print '"; - +print ""; +print ''; +print ""; +print '
'; - -print ''; +/* + * Produits en ventes et hors vente + */ +print '
'; print ''; -print ""; -print ''; -print ""; -print '
Hors vente
Produits hors vente
Services hors vente
'; - - -print "
Produits hors vente
Services hors vente
'; print ''; - +/* + * Derniers produits + */ $sql = "SELECT p.rowid, p.label, p.price, p.ref FROM llx_product as p WHERE envente=1"; $sql .= " ORDER BY p.datec DESC "; $sql .= $db->plimit(15 ,0); @@ -71,7 +71,7 @@ if ($result) if ($num > 0) { - print ''; + print '
'; print ''; @@ -80,7 +80,7 @@ if ($result) { $objp = $db->fetch_object( $i); $var=!$var; - print ""; + print ""; print "\n"; print "\n"; $i++; @@ -95,7 +95,7 @@ else print $db->error() . "
" .$sql; } -print '
Derniers produits et services
rowid\">$objp->ref$objp->label
'; +print ''; $db->close(); diff --git a/htdocs/theme/cdg/cdg.css b/htdocs/theme/cdg/cdg.css index 9272b3d2074..24e83b4834f 100644 --- a/htdocs/theme/cdg/cdg.css +++ b/htdocs/theme/cdg/cdg.css @@ -20,6 +20,7 @@ body { background: #fce8fd; + margin: 0px; text-decoration: none ; color:black; font-family: Verdana, Arial, Helvetica; diff --git a/htdocs/theme/dolibarr/dolibarr.css b/htdocs/theme/dolibarr/dolibarr.css index d6e792ccf90..0ab4292c8a2 100644 --- a/htdocs/theme/dolibarr/dolibarr.css +++ b/htdocs/theme/dolibarr/dolibarr.css @@ -19,6 +19,7 @@ */ body { background: #e0ebeb; + margin: 0px; font-family: sans-serif; font-size: 0.9em; } /* diff --git a/htdocs/theme/freelug/freelug.css b/htdocs/theme/freelug/freelug.css index 792e07015d2..8c7f7d4e340 100644 --- a/htdocs/theme/freelug/freelug.css +++ b/htdocs/theme/freelug/freelug.css @@ -21,6 +21,7 @@ body { background: #EEEEEE; + margin: 0px; background-image: url("/theme/freelug/img/background.png"); font-family: Helvetica, Verdana; font-size: 12px; text-decoration: none ; diff --git a/htdocs/theme/rhizomes/rhizomes.css b/htdocs/theme/rhizomes/rhizomes.css index 497be986604..54923bdf811 100644 --- a/htdocs/theme/rhizomes/rhizomes.css +++ b/htdocs/theme/rhizomes/rhizomes.css @@ -21,6 +21,7 @@ body { background: #eae0ff; + margin: 0px; font-family: Helvetica, Verdana; font-size: 12px; } /* diff --git a/htdocs/theme/rodolphe/rodolphe.css b/htdocs/theme/rodolphe/rodolphe.css index dff47a1af49..f0b2bdca8bb 100644 --- a/htdocs/theme/rodolphe/rodolphe.css +++ b/htdocs/theme/rodolphe/rodolphe.css @@ -21,6 +21,7 @@ body { background: #ebe0eb; + margin: 0px; font-family: sans-serif; font-size: 0.9em; } /*