diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 51af75d9591..154b886ae0e 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -3260,7 +3260,7 @@ class Adherent extends CommonObject
$return .= '
'.$this->getmorphylib('', 2).'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 4832a4242e7..19fdae122eb 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -1025,7 +1025,7 @@ class AdherentType extends CommonObject
}
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 0dccb4b74e0..9c89778d555 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1656,7 +1656,7 @@ class BOM extends CommonObject
$return .= '
'.$prod->getNomUrl(1).'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index e94eb3f0990..3e8a0c4dab2 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -855,7 +855,7 @@ class Availabilities extends CommonObject
$return .= ''.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index 2b1cf06d779..4490852b2a8 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -844,7 +844,7 @@ class Calendar extends CommonObject
$return .= ''.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 6a2233cee9e..1481678a06c 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -507,7 +507,7 @@ class CashControl extends CommonObject
$return .= '
'.$langs->trans("Year").' : '.$this->year_close.'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 0a1877d49b6..aa20ebe69c0 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -2169,7 +2169,7 @@ class Contact extends CommonObject
}
$return .= '';
$return .= '';
- $return .= '
'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'
';
+ $return .= '
'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'
';
if ($selected >= 0) {
$return .= '
';
}
@@ -2185,7 +2185,7 @@ class Contact extends CommonObject
$return .= '
: '.$this->LibPubPriv($this->priv).'';
}*/
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '
';
$return .= '';
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 8cbf96992c9..d524c6973a1 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2943,7 +2943,7 @@ class Contrat extends CommonObject
$return .= '
'.$langs->trans("DateContract").' : '.dol_print_date($this->date_contrat, 'day').'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(7).'
';
+ $return .= '
'.$this->getLibStatut(7).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php
index e5f92cf14d2..dc5de2b9863 100644
--- a/htdocs/core/class/commonorder.class.php
+++ b/htdocs/core/class/commonorder.class.php
@@ -63,7 +63,7 @@ abstract class CommonOrder extends CommonObject
$return .= ''.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency).' '.$langs->trans('HT').'
';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= ''.$this->getLibStatut(3).'
';
+ $return .= ''.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index a820be9e668..9484c0e3f58 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -825,7 +825,7 @@ class TimeSpent extends CommonObject
$return .= ''.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(5).'
';
+ $return .= '
'.$this->getLibStatut(5).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 738c39a10d0..7dd88929a48 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -705,7 +705,7 @@ class ConferenceOrBooth extends ActionComm
$return .= ''.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 08aec707687..2e6f3ffb4f7 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1843,7 +1843,7 @@ class Expedition extends CommonObject
*/
public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $notooltip = 0, $save_lastsearch_value = -1)
{
- global $langs, $conf, $hookmanager;
+ global $langs, $hookmanager;
$result = '';
$params = [
@@ -1954,6 +1954,44 @@ class Expedition extends CommonObject
return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
}
+ /**
+ * Return clicable link of object (with eventually picto)
+ *
+ * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+ * @param array $arraydata Array of data
+ * @return string HTML Code for Kanban thumb.
+ */
+ public function getKanbanView($option = '', $arraydata = null)
+ {
+ global $langs, $conf;
+
+ $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']);
+
+ $return = '';
+ $return .= '
';
+ $return .= '
';
+ $return .= img_picto('', 'order');
+ $return .= '
';
+ $return .= '
';
+ $return .= '
'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'';
+ if ($selected >= 0) {
+ $return .= '
';
+ }
+ if (property_exists($this, 'thirdparty') && is_object($this->thirdparty)) {
+ $return .= '
'.$this->thirdparty->getNomUrl(1).'
';
+ }
+ if (property_exists($this, 'total_ht')) {
+ $return .= '
'.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency).' '.$langs->trans('HT').'
';
+ }
+ if (method_exists($this, 'getLibStatut')) {
+ $return .= '
'.$this->getLibStatut(3).'
';
+ }
+ $return .= '
';
+ $return .= '
';
+ $return .= '
';
+ return $return;
+ }
+
/**
* Initialise an instance with random values.
* Used to build previews or test instances.
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 1740360148e..f021e7ee9c7 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2801,7 +2801,7 @@ class ExpenseReport extends CommonObject
$return .= ''.dol_print_date($this->date_fin, 'day').'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 9f197da98c3..e4e46088221 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -760,7 +760,7 @@ class PaymentExpenseReport extends CommonObject
$return .= '
'.$langs->trans("Amount").' : '.price($this->amount).'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index c838b7033cf..a0c336b546f 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1591,7 +1591,7 @@ class Fichinter extends CommonObject
$return .= '
'.$langs->trans("Duration").' : '.convertSecondToTime($this->duration, 'allhourmin').'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 6df974c0b6a..d17e76a0b5f 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3619,7 +3619,7 @@ class CommandeFournisseur extends CommonOrder
$return .= '
'.$langs->trans("Billed").' : '.yn($this->billed).'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 5e845cf951e..ec8edbed091 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -2490,7 +2490,7 @@ class Holiday extends CommonObject
}
}
if (method_exists($this, 'getLibStatut')) {
- $return .= ''.$this->getLibStatut(3).'
';
+ $return .= ''.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 0214c2f51f1..5e8cd595229 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -1091,7 +1091,7 @@ class Evaluation extends CommonObject
$return .= '
'.$arraydata['job'].'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 3fcc370b0dd..390ccf22287 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -1158,7 +1158,7 @@ class KnowledgeRecord extends CommonObject
$return .= ''.dolGetFirstLineOfText($this->question).'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 4b4c55df998..b35a4ae989d 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -973,7 +973,7 @@ class MyObject extends CommonObject
$return .= ''.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 4d9f5a2529d..476abd4ede8 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1964,7 +1964,7 @@ class Mo extends CommonObject
$return .= '
'.$langs->trans('Quantity').' : '.$this->qty.'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 4c54741c94d..bd402f916d2 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -1325,7 +1325,7 @@ class Partnership extends CommonObject
$return .= '
'.$this->thirdparty->getNomUrl(1).'
';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index bcdd89b806b..ac36d79fc05 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -6560,11 +6560,17 @@ class Product extends CommonObject
}
}
}
- if (property_exists($this, 'stock_reel')) {
- $return .= '
'.$langs->trans('PhysicalStock').' : '.$this->stock_reel.'';
+ $br = 1;
+ if (property_exists($this, 'stock_reel') && $this->isProduct()) {
+ $return .= '
'.img_picto($langs->trans('PhysicalStock'), 'stock').'
'.$this->stock_reel.'
';
+ $br = 0;
}
if (method_exists($this, 'getLibStatut')) {
- $return .='
'.$this->getLibStatut(3, 1).' '.$this->getLibStatut(3, 0).'';
+ if ($br) {
+ $return .= '
'.$this->getLibStatut(3, 1).' '.$this->getLibStatut(3, 0).'
';
+ } else {
+ $return .= ''.$this->getLibStatut(3, 1).' '.$this->getLibStatut(3, 0).'
';
+ }
}
$return .= '';
$return .= '';
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 735e7bc6b96..06db36dda41 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -693,7 +693,7 @@ class Inventory extends CommonObject
$return .= ''.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 837cdcdc981..ee61c220a12 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -1008,7 +1008,7 @@ class Entrepot extends CommonObject
$return .= '
'.price($this->sellvalue).'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 372e3510fcf..67ec7156867 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2514,7 +2514,7 @@ class Project extends CommonObject
$return .= ' '.price($this->opp_amount).'
';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= ''.$this->getLibStatut(3).'
';
+ $return .= ''.$this->getLibStatut(3).'
';
}
$return .= ''; // end div line status
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 24a91e4785b..333e350a560 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -1251,7 +1251,8 @@ class Reception extends CommonObject
*/
public function getNomUrl($withpicto = 0, $option = 0, $max = 0, $short = 0, $notooltip = 0)
{
- global $conf, $langs, $hookmanager;
+ global $langs, $hookmanager;
+
$result = '';
$label = img_picto('', $this->picto).' '.$langs->trans("Reception").'';
$label .= '
'.$langs->trans('Ref').': '.$this->ref;
@@ -1356,6 +1357,44 @@ class Reception extends CommonObject
return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
}
+ /**
+ * Return clicable link of object (with eventually picto)
+ *
+ * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+ * @param array $arraydata Array of data
+ * @return string HTML Code for Kanban thumb.
+ */
+ public function getKanbanView($option = '', $arraydata = null)
+ {
+ global $langs, $conf;
+
+ $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']);
+
+ $return = '';
+ $return .= '
';
+ $return .= '
';
+ $return .= img_picto('', 'order');
+ $return .= '
';
+ $return .= '
';
+ $return .= '
'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'';
+ if ($selected >= 0) {
+ $return .= '
';
+ }
+ if (property_exists($this, 'thirdparty') && is_object($this->thirdparty)) {
+ $return .= '
'.$this->thirdparty->getNomUrl(1).'
';
+ }
+ if (property_exists($this, 'total_ht')) {
+ $return .= '
'.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency).' '.$langs->trans('HT').'
';
+ }
+ if (method_exists($this, 'getLibStatut')) {
+ $return .= '
'.$this->getLibStatut(3).'
';
+ }
+ $return .= '
';
+ $return .= '
';
+ $return .= '
';
+ return $return;
+ }
+
/**
* Initialise an instance with random values.
* Used to build previews or test instances.
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index e2404de315f..0fc4e0d6bf2 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -1088,7 +1088,7 @@ class RecruitmentCandidature extends CommonObject
$return .= '
'.$langs->trans("phone").' : '.$this->phone.'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 131533908e4..77454f09ce3 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -1149,7 +1149,7 @@ class RecruitmentJobPosition extends CommonObject
$return .= ' | '.$langs->trans("Remuneration").' : '.$this->remuneration_suggested.'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).' |
'.$langs->trans("RecruitmentCandidatures", '', '', '', '', 5).' :
';
+ $return .= '
'.$this->getLibStatut(3).' | '.$langs->trans("RecruitmentCandidatures", '', '', '', '', 5).' : ';
$return .= $arraydata['nbapplications'];
$return .= '
';
}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ae4fe3dd971..0f70260d99f 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -5321,7 +5321,7 @@ class Societe extends CommonObject
$return .= '
'.$this->code_client.'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= ' ';
$return .= '';
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 0b893ccfe28..ae3818239c4 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2783,7 +2783,7 @@ class SupplierProposal extends CommonObject
$return .='
'.$langs->trans("AmountHT").' : '.price($this->total_ttc).'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index f3974f89023..c22454f83a7 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -245,6 +245,10 @@ input[type=submit], input[type=submit]:hover {
input[type=checkbox], input[type=radio] {
margin: 0 3px 0 3px;
}
+.kanban input.checkforselect {
+ margin-right: 0px;
+ margin-top: 5px;
+}
input {
line-height: 1.3em;
padding: 4px;
@@ -3982,7 +3986,7 @@ table.liste th, table.noborder th, table.noborder tr.liste_titre td, table.nobor
padding: 7px 8px 7px 8px; /* t r b l */
}
table.liste td, table.noborder td, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td {
- padding: 7px 8px 7px 8px; /* t r b l */
+ padding: 8px 6px 8px 6px; /* t r b l */
/* line-height: 22px; This create trouble on cell login on list of last events of a contract*/
height: 22px;
}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 1ac5ebf93fe..7934e918686 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -827,6 +827,10 @@ input:-webkit-autofill {
input[type=checkbox], input[type=radio] {
margin: 0 3px 0 3px;
}
+.kanban input.checkforselect {
+ margin-right: 0px;
+ margin-top: 5px;
+}
/* CSS for placeholder */
.placeholder { color: #ccc; }
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 198d8f7ce3c..fe35dfb4b0a 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -3128,7 +3128,7 @@ class Ticket extends CommonObject
$return .= ''.$langs->getLabelFromKey($this->db, 'TicketTypeShort'.$this->type_code, 'c_ticket_type', 'code', 'label', $this->type_code).'
';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 251e06f6390..a0eed471a0b 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -3203,7 +3203,7 @@ class User extends CommonObject
$return .= '
'.img_picto('', 'email').' '.$this->email.'';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(3).'
';
}
$return .= '';
$return .= '';