This commit is contained in:
Laurent Destailleur 2016-07-29 11:06:03 +02:00
parent 7b04dc9760
commit 834c10a1f4
3 changed files with 13 additions and 5 deletions

View File

@ -377,7 +377,7 @@ if ($id > 0)
print '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
}
print '</td></tr></table>';
print '</td><td colspan="3">'.($object->remise_percent?'<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_percent.'%</a>':$langs->trans("DiscountNone")).'</td>';
print '</td><td colspan="3">'.($object->remise_percent?'<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_percent.'%</a>':'').'</td>';
print '</tr>';
// Absolute discounts (Discounts-Drawbacks-Rebates)
@ -396,7 +396,7 @@ if ($id > 0)
$amount_discount=$object->getAvailableDiscounts();
if ($amount_discount < 0) dol_print_error($db,$object->error);
if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount,1,$langs,1,-1,-1,$conf->currency).'</a>';
else print $langs->trans("DiscountNone");
//else print $langs->trans("DiscountNone");
print '</td>';
print '</tr>';
@ -408,7 +408,7 @@ if ($id > 0)
print '</td><td colspan="3">';
$limit_field_type = (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
print $form->editfieldval("OutstandingBill",'outstanding_limit',$object->outstanding_limit,$object,$user->rights->societe->creer,$limit_field_type,($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
if (empty($object->outstanding_limit)) print $langs->trans("NoLimit");
//if (empty($object->outstanding_limit)) print $langs->trans("NoLimit");
print '</td>';
print '</tr>';

View File

@ -2324,7 +2324,7 @@ table.liste, table.noborder, table.formdoc, div.noborder {
}
.liste_titre_add td, .liste_titre_add .tagtd
{
border-top-width: 1px;
border-top-width: 2px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid;
}

View File

@ -2223,11 +2223,12 @@ table.liste, table.noborder, table.formdoc, div.noborder {
-webkit-border-radius: 0.1em;
border-radius: 0.1em;
}
/*
#tablelines tr.liste_titre:first-child td, form.formnoborder, tr.liste_titre.trnoborder td {
border-top-width: 1px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid;
}
}*/
table.noborder tr, div.noborder form {
border-top-color: #FEFEFE;
@ -2241,6 +2242,13 @@ table.noborder tr, div.noborder form {
min-height: 26px;
}
.liste_titre_add td, .liste_titre_add .tagtd
{
border-top-width: 2px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid;
}
table.liste th, table.noborder th, table.noborder tr.liste_titre td {
padding: 8px 2px 8px 3px; /* t r b l */
}