This commit is contained in:
Laurent Destailleur 2018-06-24 11:30:44 +02:00
parent 1b5c5cfafb
commit 5819333b80
2 changed files with 55 additions and 18 deletions

View File

@ -679,7 +679,8 @@ if ($object->id > 0)
$num = $db->num_rows($resql);
if ($num > 0)
{
print '<table class="noborder" width="100%">';
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->id.'">'.$langs->trans("AllPropals").' <span class="badge">'.$num.'</span></a></td>';
@ -712,7 +713,11 @@ if ($object->id > 0)
}
$db->free($resql);
if ($num > 0) print "</table>";
if ($num > 0)
{
print "</table>";
print '</div>';
}
}
else
{
@ -759,6 +764,7 @@ if ($object->id > 0)
$orders2invoice = $db->num_rows($resql2);
$db->free($resql2);
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@ -793,7 +799,11 @@ if ($object->id > 0)
}
$db->free($resql);
if ($num >0) print "</table>";
if ($num >0)
{
print "</table>";
print '</div>';
}
}
else
{
@ -830,7 +840,8 @@ if ($object->id > 0)
$num = $db->num_rows($resql);
if ($num > 0) {
print '<table class="noborder" width="100%">';
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastSendings",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/expedition/list.php?socid='.$object->id.'">'.$langs->trans("AllSendings").' <span class="badge">'.$num.'</span></a></td>';
@ -864,7 +875,10 @@ if ($object->id > 0)
$db->free($resql);
if ($num > 0)
{
print "</table>";
print '</div>';
}
} else {
dol_print_error($db);
}
@ -890,7 +904,8 @@ if ($object->id > 0)
$num = $db->num_rows($resql);
if ($num >0)
{
print '<table class="noborder" width="100%">';
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="6"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastContracts",($num<=$MAXLIST?"":$MAXLIST)).'</td>';
@ -909,6 +924,7 @@ if ($object->id > 0)
$contrat->ref=$objp->ref?$objp->ref:$objp->id;
$contrat->ref_customer=$objp->refcus;
$contrat->ref_supplier=$objp->refsup;
$contrat->fetch_lines();
print '<tr class="oddeven">';
print '<td class="nowrap">';
@ -918,8 +934,7 @@ if ($object->id > 0)
print '<td align="right" width="80px">'.dol_print_date($db->jdate($objp->dc),'day')."</td>\n";
print '<td align="right" width="80px">'.dol_print_date($db->jdate($objp->dcon),'day')."</td>\n";
print '<td width="20">&nbsp;</td>';
print '<td align="right" class="nowrap">';
$contrat->fetch_lines();
print '<td align="right" class="nowraponall">';
print $contrat->getLibStatut(4);
print "</td>\n";
print '</tr>';
@ -927,7 +942,11 @@ if ($object->id > 0)
}
$db->free($resql);
if ($num > 0) print "</table>";
if ($num > 0)
{
print "</table>";
print '</div>';
}
}
else
{
@ -955,7 +974,8 @@ if ($object->id > 0)
$num = $db->num_rows($resql);
if ($num > 0)
{
print '<table class="noborder" width="100%">';
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="3"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastInterventions",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fichinter/list.php?socid='.$object->id.'">'.$langs->trans("AllInterventions").' <span class="badge">'.$num.'</span></td>';
@ -983,7 +1003,11 @@ if ($object->id > 0)
}
$db->free($resql);
if ($num > 0) print "</table>";
if ($num > 0)
{
print "</table>";
print '</div>';
}
}
else
{
@ -1023,6 +1047,7 @@ if ($object->id > 0)
$num = $db->num_rows($resql);
if ($num > 0)
{
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@ -1086,7 +1111,11 @@ if ($object->id > 0)
}
$db->free($resql);
if ($num > 0) print "</table>";
if ($num > 0)
{
print "</table>";
print '</div>';
}
}
else
{
@ -1123,7 +1152,8 @@ if ($object->id > 0)
$num = $db->num_rows($resql);
if ($num > 0)
{
print '<table class="noborder" width="100%">';
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="5"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllBills").' <span class="badge">'.$num.'</span></a></td>';
@ -1173,7 +1203,11 @@ if ($object->id > 0)
}
$db->free($resql);
if ($num > 0) print "</table>";
if ($num > 0)
{
print "</table>";
print '</div>';
}
}
else
{

View File

@ -2415,8 +2415,8 @@ span.butAction, span.butActionDelete {
text-transform: uppercase;
font-weight: bold;
margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em !important;
padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
margin: 0em <?php echo ($dol_optimize_smallscreen?'0.6':'0.9'); ?>em !important;
padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.6':'0.7'); ?>em;
font-family: <?php print $fontlist ?>;
display: inline-block;
text-align: center;
@ -2479,14 +2479,17 @@ a.butActionNewRefused>span.fa-plus-circle, a.butActionNewRefused>span.fa-plus-ci
white-space: nowrap !important;
cursor: not-allowed !important;
margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
margin: 0em <?php echo ($dol_optimize_smallscreen?'0.6':'0.9'); ?>em;
padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.6':'0.7'); ?>em;
font-family: <?php print $fontlist ?> !important;
display: inline-block;
text-align: center;
cursor: pointer;
color: #999 !important;
border: 1px solid #bbb;
border: 1px solid #ccc;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.butActionNewRefused, .butActionNewRefused:link, .butActionNewRefused:visited, .butActionNewRefused:hover, .butActionNewRefused:active {
text-decoration: none !important;