lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look and feel v6 - Show status of thirdparty in dol_banner

Browse Source
This commit is contained in:
Laurent Destailleur 2017-11-18 01:29:42 +01:00
parent 03cc685037
commit 742bf29c65
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/lib/functions.lib.php
View File

@ -1433,6 +1433,9 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
{ {
$morehtmlstatus.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased'); $morehtmlstatus.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
} }
else {
$morehtmlstatus.=$object->getLibStatut(5);
}
} }
elseif ($object->element == 'product') elseif ($object->element == 'product')
{ {
@ -1458,13 +1461,13 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
} }
elseif ($object->element == 'contrat' || $object->element == 'contract') elseif ($object->element == 'contrat' || $object->element == 'contract')
{ {
if ($object->statut==0) $morehtmlstatus.=$object->getLibStatut(2); if ($object->statut == 0) $morehtmlstatus.=$object->getLibStatut(5);
else $morehtmlstatus.=$object->getLibStatut(4); else $morehtmlstatus.=$object->getLibStatut(4);
} }
elseif ($object->element == 'facturerec') elseif ($object->element == 'facturerec')
{ {
if ($object->frequency==0) $morehtmlstatus.=$object->getLibStatut(2); if ($object->frequency == 0) $morehtmlstatus.=$object->getLibStatut(2);
else $morehtmlstatus.=$object->getLibStatut(4); else $morehtmlstatus.=$object->getLibStatut(5);
} }
else { // Generic case else { // Generic case
$tmptxt=$object->getLibStatut(6); $tmptxt=$object->getLibStatut(6);

2
htdocs/societe/class/societe.class.php
View File

@ -2021,7 +2021,7 @@ class Societe extends CommonObject
/** /**
* Return label of status (activity, closed) * Return label of status (activity, closed)
* *
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
* @return string Libelle * @return string Libelle
*/ */
function getLibStatut($mode=0) function getLibStatut($mode=0)

2
htdocs/theme/eldy/style.css.php
View File

@ -1280,6 +1280,8 @@ div.statusref {
} }
div.statusref img { div.statusref img {
padding-left: 8px; padding-left: 8px;
padding-right: 9px;
vertical-align: text-bottom;
} }
img.photoref, div.photoref { img.photoref, div.photoref {
border: 1px solid #CCC; border: 1px solid #CCC;

2
htdocs/theme/md/style.css.php
View File

@ -1306,6 +1306,8 @@ div.statusref {
} }
div.statusref img { div.statusref img {
padding-left: 8px; padding-left: 8px;
padding-right: 9px;
vertical-align: text-bottom;
} }
img.photoref, div.photoref { img.photoref, div.photoref {
border: 1px solid #CCC; border: 1px solid #CCC;