update with html5 compliant code
This commit is contained in:
parent
8a3f621981
commit
bd929c2d1e
@ -353,7 +353,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
|
|||||||
$companystatic->name=$obj->socname;
|
$companystatic->name=$obj->socname;
|
||||||
$companystatic->client=$obj->client;
|
$companystatic->client=$obj->client;
|
||||||
$companystatic->canvas=$obj->canvas;
|
$companystatic->canvas=$obj->canvas;
|
||||||
print '<td align="left">'.$companystatic->getNomUrl(1,'customer',44).'</td>'."\n";
|
print '<td class="left">'.$companystatic->getNomUrl(1,'customer',44).'</td>'."\n";
|
||||||
|
|
||||||
print '<td align="right">';
|
print '<td align="right">';
|
||||||
print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
|
print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
|
||||||
|
|||||||
@ -1030,8 +1030,8 @@ if ($resql)
|
|||||||
$i++;
|
$i++;
|
||||||
if ($i == 1)
|
if ($i == 1)
|
||||||
{
|
{
|
||||||
if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
|
if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
|
||||||
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
|
else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
|
||||||
}
|
}
|
||||||
elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
|
elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
|
||||||
elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
|
elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
|
||||||
|
|||||||
@ -251,20 +251,20 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
|
|||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
|
print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
|
||||||
// Company
|
// Company
|
||||||
print '<tr><td align="left">'.$langs->trans("ThirdParty").'</td><td align="left">';
|
print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td align="left">';
|
||||||
$filter='s.client in (1,2,3)';
|
$filter='s.client in (1,2,3)';
|
||||||
print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
|
print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
// User
|
// User
|
||||||
print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
|
print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
|
||||||
print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
|
print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
// Status
|
// Status
|
||||||
print '<tr><td align="left">'.$langs->trans("Status").'</td><td align="left">';
|
print '<tr><td class="left">'.$langs->trans("Status").'</td><td align="left">';
|
||||||
$formpropal->selectProposalStatus(($object_status!=''?$object_status:-1),0,0,1,$mode,'object_status');
|
$formpropal->selectProposalStatus(($object_status!=''?$object_status:-1),0,0,1,$mode,'object_status');
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
// Year
|
// Year
|
||||||
print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
|
print '<tr><td class="left">'.$langs->trans("Year").'</td><td align="left">';
|
||||||
if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
|
if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
|
||||||
if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
|
if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
|
||||||
arsort($arrayyears);
|
arsort($arrayyears);
|
||||||
|
|||||||
@ -227,7 +227,7 @@ if ($socid > 0)
|
|||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td width="160">'.$langs->trans("Date").'</td>';
|
print '<td width="160">'.$langs->trans("Date").'</td>';
|
||||||
print '<td width="160" align="center">'.$langs->trans("CustomerRelativeDiscountShort").'</td>';
|
print '<td width="160" align="center">'.$langs->trans("CustomerRelativeDiscountShort").'</td>';
|
||||||
print '<td align="left">'.$langs->trans("NoteReason").'</td>';
|
print '<td class="left">'.$langs->trans("NoteReason").'</td>';
|
||||||
print '<td align="center">'.$langs->trans("User").'</td>';
|
print '<td align="center">'.$langs->trans("User").'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
$num = $db->num_rows($resql);
|
$num = $db->num_rows($resql);
|
||||||
@ -240,7 +240,7 @@ if ($socid > 0)
|
|||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td>'.dol_print_date($db->jdate($obj->dc),"dayhour").'</td>';
|
print '<td>'.dol_print_date($db->jdate($obj->dc),"dayhour").'</td>';
|
||||||
print '<td align="center">'.price2num($obj->remise_percent).'%</td>';
|
print '<td align="center">'.price2num($obj->remise_percent).'%</td>';
|
||||||
print '<td align="left">'.$obj->note.'</td>';
|
print '<td class="left">'.$obj->note.'</td>';
|
||||||
print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
|
print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
$i++;
|
$i++;
|
||||||
@ -286,7 +286,7 @@ if ($socid > 0)
|
|||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td width="160">'.$langs->trans("Date").'</td>';
|
print '<td width="160">'.$langs->trans("Date").'</td>';
|
||||||
print '<td width="160" align="center">'.$langs->trans("CustomerRelativeDiscountShort").'</td>';
|
print '<td width="160" align="center">'.$langs->trans("CustomerRelativeDiscountShort").'</td>';
|
||||||
print '<td align="left">'.$langs->trans("NoteReason").'</td>';
|
print '<td class="left">'.$langs->trans("NoteReason").'</td>';
|
||||||
print '<td align="center">'.$langs->trans("User").'</td>';
|
print '<td align="center">'.$langs->trans("User").'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
$num = $db->num_rows($resql);
|
$num = $db->num_rows($resql);
|
||||||
@ -299,7 +299,7 @@ if ($socid > 0)
|
|||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td>'.dol_print_date($db->jdate($obj->dc),"dayhour").'</td>';
|
print '<td>'.dol_print_date($db->jdate($obj->dc),"dayhour").'</td>';
|
||||||
print '<td align="center">'.price2num($obj->remise_percent).'%</td>';
|
print '<td align="center">'.price2num($obj->remise_percent).'%</td>';
|
||||||
print '<td align="left">'.$obj->note.'</td>';
|
print '<td class="left">'.$obj->note.'</td>';
|
||||||
print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
|
print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
$i++;
|
$i++;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user