diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 2bfcbf0a726..30aced500d7 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -1086,18 +1086,26 @@ else $productstatic=new Product($db); // Title line for service - print ''; // Array with (n*2)+1 lines + //print '
'; // Array with (n*2)+1 lines $cursorline=1; while ($cursorline <= $nbofservices) { - print ''; - print ''; + //print ''; + //print ''; - print ''; // End td if line is 1 + /* print ''; // End td if line is 1 print ''; - print ''; + print '';*/ + $cursorline++; } - print '
'; - print $langs->trans("ServiceNb",$cursorline).'
'; + //print $langs->trans("ServiceNb",$cursorline).''; + // print ''; + + + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; // Area with common detail of line - print ''; + print '
'; $sql = "SELECT cd.rowid, cd.statut, cd.label as label_det, cd.fk_product, cd.description, cd.price_ht, cd.qty,"; $sql.= " cd.tva_tx, cd.remise_percent, cd.info_bits, cd.subprice,"; @@ -1115,7 +1123,7 @@ else $total = 0; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -1230,13 +1238,7 @@ else } // Ligne en mode update else - { - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + { // Ligne carac print ""; print ''; print ''; - - print "\n"; } $db->free($result); } else - { + { dol_print_error($db); } @@ -1306,6 +1306,7 @@ else } print "
'.$langs->trans("Service").''.$langs->trans("ServiceNb",$cursorline).''.$langs->trans("VAT").''.$langs->trans("PriceUHT").''.$langs->trans("Qty").'
'; @@ -1287,14 +1289,12 @@ else $form->select_date($db->jdate($objp->date_fin),"date_end_update",$usehm,$usehm,($db->jdate($objp->date_fin)>0?0:1),"update"); print '
"; + print "\n"; /* @@ -1515,13 +1516,14 @@ else print ''; } - print '
 
 
'; + //print ''; // Form to add new line if ($user->rights->contrat->creer && ($object->statut >= 0))