Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 08:51:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

css

Browse Source
This commit is contained in:
Laurent Destailleur
2020-08-07 20:10:31 +02:00
parent 9876e37309
commit aa699bacc6
3 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/product/list.php
View File

@@ -647,7 +647,7 @@ if ($resql)
// Type // Type
if (!empty($arrayfields['p.fk_product_type']['checked'])) if (!empty($arrayfields['p.fk_product_type']['checked']))
{ {
print '<td class="liste_titre left">'; print '<td class="liste_titre center">';
$array = array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service')); $array = array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
print $form->selectarray('search_type', $array, $search_type); print $form->selectarray('search_type', $array, $search_type);
print '</td>'; print '</td>';
@@ -875,7 +875,7 @@ if ($resql)
print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], "p.label", "", $param, "", $sortfield, $sortorder); print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], "p.label", "", $param, "", $sortfield, $sortorder);
} }
if (!empty($arrayfields['p.fk_product_type']['checked'])) { if (!empty($arrayfields['p.fk_product_type']['checked'])) {
print_liste_field_titre($arrayfields['p.fk_product_type']['label'], $_SERVER["PHP_SELF"], "p.fk_product_type", "", $param, "", $sortfield, $sortorder); print_liste_field_titre($arrayfields['p.fk_product_type']['label'], $_SERVER["PHP_SELF"], "p.fk_product_type", "", $param, "", $sortfield, $sortorder, 'center ');
} }
if (!empty($arrayfields['p.barcode']['checked'])) { if (!empty($arrayfields['p.barcode']['checked'])) {
print_liste_field_titre($arrayfields['p.barcode']['label'], $_SERVER["PHP_SELF"], "p.barcode", "", $param, "", $sortfield, $sortorder); print_liste_field_titre($arrayfields['p.barcode']['label'], $_SERVER["PHP_SELF"], "p.barcode", "", $param, "", $sortfield, $sortorder);
@@ -1086,9 +1086,19 @@ if ($resql)
// Type // Type
if (!empty($arrayfields['p.fk_product_type']['checked'])) if (!empty($arrayfields['p.fk_product_type']['checked']))
{ {
print '<td>'; print '<td class="center">';
if ($obj->fk_product_type == 0) print $langs->trans("Product"); $s = '';
else print $langs->trans("Service"); if ($obj->fk_product_type == 0)
{
$s .= '<a class="product-type-back" title="'.$langs->trans("Product").'">';
$s .= dol_substr($langs->trans("Product"), 0, 1);
$s .= '</a>';
} else {
$s .= '<span class="service-type-back" title="'.$langs->trans("Service").'">';
$s .= dol_substr($langs->trans("Service"), 0, 1);
$s .= '</a>';
}
print $s;
print '</td>'; print '</td>';
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
} }
@@ -1323,7 +1333,7 @@ if ($resql)
print '</td>'; print '</td>';
} }
// Sell Tax Rate // VAT or Sell Tax Rate
if (!empty($arrayfields['p.tva_tx']['checked'])) if (!empty($arrayfields['p.tva_tx']['checked']))
{ {
print '<td class="right">'; print '<td class="right">';
@@ -1339,7 +1349,7 @@ if ($resql)
print price($product_static->pmp, 1, $langs); print price($product_static->pmp, 1, $langs);
print '</td>'; print '</td>';
} }
// cost_price // Cost price
if (!empty($arrayfields['p.cost_price']['checked'])) if (!empty($arrayfields['p.cost_price']['checked']))
{ {
print '<td class="nowrap right">'; print '<td class="nowrap right">';

1
htdocs/societe/list.php
View File

@@ -1196,6 +1196,7 @@ while ($i < min($num, $limit))
print "<td>".$obj->idprof6."</td>\n"; print "<td>".$obj->idprof6."</td>\n";
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
} }
// VAT
if (!empty($arrayfields['s.tva_intra']['checked'])) if (!empty($arrayfields['s.tva_intra']['checked']))
{ {
print "<td>"; print "<td>";

18
htdocs/theme/eldy/info-box.inc.php
View File

@@ -263,6 +263,24 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
border-radius: 3px; border-radius: 3px;
} }
.product-type-back {
background-color: #a6c974 !important;
color: #FFF !important;
padding: 2px;
margin: 2px;
border-bottom-left-radius: 5px;
border-top-right-radius: 5px;
}
.service-type-back {
background-color: #979c01 !important;
color: #FFF !important;
padding: 2px;
margin: 2px;
border-bottom-right-radius: 5px;
border-top-left-radius: 5px;
}
.bg-infobox-project{ .bg-infobox-project{
<?php echo $prefix; ?>color: #6c6aa8 !important; <?php echo $prefix; ?>color: #6c6aa8 !important;
} }