diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index c83cdcfb288..a25f1b9e584 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1588,7 +1588,7 @@ else
if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
{
- print '
';
+ print '
';
// Label
if ($objp->fk_product > 0)
{
@@ -1684,7 +1684,7 @@ else
$colspan = 7;
}
- print '
';
+ print '
';
print '| ';
// Date planned
@@ -1721,14 +1721,14 @@ else
if (is_array($extralabelslines) && count($extralabelslines)>0) {
$line = new ContratLigne($db);
$line->fetch_optionals($objp->rowid);
- print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bcnd[$var], 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+ print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
}
}
// Ligne en mode update
else
{
// Ligne carac
- print " |
";
+ print '
';
print '| ';
if ($objp->fk_product)
{
@@ -1783,7 +1783,7 @@ else
if($conf->global->PRODUCT_USE_UNITS) $colspan++;
// Ligne dates prevues
- print " |
";
+ print '
';
print '| ';
print $langs->trans("DateStartPlanned").' ';
$form->select_date($db->jdate($objp->date_debut),"date_start_update",$usehm,$usehm,($db->jdate($objp->date_debut)>0?0:1),"update");
@@ -1795,7 +1795,7 @@ else
if (is_array($extralabelslines) && count($extralabelslines)>0) {
$line = new ContratLigne($db);
$line->fetch_optionals($objp->rowid);
- print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+ print $line->showOptionals($extrafieldsline, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
}
}
@@ -1808,7 +1808,7 @@ else
if ($object->statut > 0)
{
- print ' |
';
+ print '
';
print '
| ';
print "
\n";
}
@@ -1886,7 +1886,7 @@ else
{
print '';
- print '';
+ print '
';
print '| '.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).' | ';
print '';
if ($user->societe_id == 0)
@@ -1913,7 +1913,7 @@ else
print ' | ';
print "
\n";
- print '';
+ print '
';
print '| ';
// Si pas encore active
@@ -1969,7 +1969,7 @@ else
}
}
- print ' |
';
+ print '
';
print '| '.$langs->trans("DateServiceActivate").' | ';
print $form->select_date($dateactstart,'',$usehm,$usehm,'',"active",1,0,1);
print ' | ';
@@ -1981,7 +1981,7 @@ else
print '
';
- print '';
+ print '
';
print '| '.$langs->trans("Comment").' | | ';
print '';
print ' ';
@@ -2026,7 +2026,7 @@ else
$now=dol_now();
if ($dateactend > $now) $dateactend=$now;
- print ' |
| ';
+ print ' |
| ';
if ($objp->statut >= 4)
{
if ($objp->statut == 4)
@@ -2039,7 +2039,7 @@ else
print ' | ';
print ' |
';
- print '';
+ print '
';
print '| '.$langs->trans("Comment").' | | ';
print '';
print ' ';
@@ -2079,8 +2079,6 @@ else
// Form to add new line
if ($action != 'editline')
{
- $var = true;
-
$forcetoshowtitlelines=1;
// Add free products/services
@@ -2201,8 +2199,7 @@ else
$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
$genallowed = $user->rights->contrat->lire;
$delallowed = $user->rights->contrat->creer;
-
- $var = true;
+
print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
|