diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index e05aeb678ee..9a8339e862f 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1931,10 +1931,10 @@ class Contrat extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
- * Renvoi label of a given contrat status
+ * Return the label of a given contrat status
*
* @param int $status Id status
- * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto, 7=Same than 6 with fixed length
+ * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label (status of services), 5=Short label + Picto, 6=Long label + Picto (status of services), 7=Same than 6 with fixed length (status of services)
* @return string Label
*/
public function LibStatut($status, $mode)
@@ -2859,14 +2859,15 @@ class Contrat extends CommonObject
$return .= '
';
$return .= '
'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).' ';
$return .= '
';
- if (property_exists($this, 'societe')) {
- $return .= '
'.$this->societe.' ';
+ if (!empty($arraydata['thirdparty'])) {
+ $tmpthirdparty = $arraydata['thirdparty'];
+ $return .= '
'.$tmpthirdparty->getNomUrl(1).'
';
}
if (property_exists($this, 'date_contrat')) {
$return .= '
'.$langs->trans("DateContract").' : '.dol_print_date($this->date_contrat, 'day').' ';
}
if (method_exists($this, 'getLibStatut')) {
- $return .= '
'.$this->getLibStatut(3).'
';
+ $return .= '
'.$this->getLibStatut(7).'
';
}
$return .= '
';
$return .= '';
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 50e26a55a68..15b4776c2b9 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -964,10 +964,12 @@ while ($i < $imaxinloop) {
$contracttmp->ref_customer = $obj->ref_customer;
$contracttmp->ref_supplier = $obj->ref_supplier;
- if ($obj->socid > 0) {
- $result = $socstatic->fetch($obj->socid);
- }
- /*$socstatic->id = $obj->socid;
+ $contracttmp->nbofserviceswait = $obj->nb_initial;
+ $contracttmp->nbofservicesopened = $obj->nb_running;
+ $contracttmp->nbofservicesexpired = $obj->nb_expired;
+ $contracttmp->nbofservicesclosed = $obj->nb_closed;
+
+ $socstatic->id = $obj->socid;
$socstatic->name = $obj->name;
$socstatic->name_alias = $obj->name_alias;
$socstatic->email = $obj->email;
@@ -975,7 +977,8 @@ while ($i < $imaxinloop) {
$socstatic->logo = $obj->logo;
$socstatic->country_id = $obj->country_id;
$socstatic->country_code = '';
- $socstatic->country = '';*/
+ $socstatic->country = '';
+
if ($obj->country_id > 0) {
if (!isset($cacheCountryIDCode[$obj->country_id]['code'])) {
$tmparray = getCountry($obj->country_id, 'all');
@@ -991,9 +994,9 @@ while ($i < $imaxinloop) {
print '';
}
// Output Kanban
- $contracttmp->societe = $socstatic->getNomUrl();
+ $arraydata['thirdparty'] = $socstatic;
$contracttmp->date_contrat = $obj->date_contrat;
- print $contracttmp->getKanbanView('');
+ print $contracttmp->getKanbanView('', $arraydata);
if ($i == ($imaxinloop - 1)) {
print '
';
print '';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 09627d5a3b0..0e10bb06f2a 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -905,8 +905,8 @@ ConfirmMassClone=Bulk clone confirmation
ConfirmMassCloneQuestion=Select project to clone to
ConfirmMassCloneToOneProject=Clone to project %s
RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-ClassifyUnbilled=Classify unbilled
+ClassifyBilled=Classify Billed
+ClassifyUnbilled=Classify Unbilled
Progress=Progress
ProgressShort=Progr.
FrontOffice=Front office
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index 8f10b1e9404..7850d7a3fd6 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -48,7 +48,7 @@ DateDeliveryPlanned=Planned date of delivery
RefDeliveryReceipt=Ref delivery receipt
StatusReceipt=Status delivery receipt
DateReceived=Date delivery received
-ClassifyReception=Classify reception
+ClassifyReception=Classify Received
SendShippingByEMail=Send shipment by email
SendShippingRef=Submission of shipment %s
ActionsOnShipping=Events on shipment