diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang index f69e9ea188d13e2fb0560bc353f9731e74eea657..39b2c76bea58ec980b3ce88f256a82252810e3cc 100644 --- a/htdocs/langs/ca_ES/contracts.lang +++ b/htdocs/langs/ca_ES/contracts.lang @@ -87,6 +87,7 @@ RelatedContracts=Contractes associats NoExpiredServices=Sense serveis actius expirats ListOfServicesToExpireWithDuration=Llistat de serveis actius a expirar en %s dies ListOfServicesToExpire=Llistat de serveis actius a expirar +Service=Servei ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Comercial signant del contracte diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang index 311c46bb089fa4c136cf08908c4380214c5456bc..78426092b1af3c44490db9771d36b1772adca131 100644 --- a/htdocs/langs/en_US/contracts.lang +++ b/htdocs/langs/en_US/contracts.lang @@ -88,6 +88,7 @@ RelatedContracts=Related contracts NoExpiredServices=No expired active services ListOfServicesToExpireWithDuration=List of Services to expire in %s days ListOfServicesToExpire=List of Services to expire +Service=Service ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang index 3e10374bf7bb3828924af647381712d008d3a2a7..55d8e11c86cf4efcb22b37f45525e23960ca9ee6 100644 --- a/htdocs/langs/es_ES/contracts.lang +++ b/htdocs/langs/es_ES/contracts.lang @@ -87,6 +87,7 @@ RelatedContracts=Contratos asociados NoExpiredServices=Sin servicios activos expirados ListOfServicesToExpireWithDuration=Listado de servicios activos a expirar en %s días ListOfServicesToExpire=Listado de servicios activos a expirar +Service=Servicio ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Comercial firmante del contrato diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang index f7f7b77987daddaab53879cb687658c8a6c5022b..9cef9326f8e0801554ed7df53ec6c9b7f3a548ea 100644 --- a/htdocs/langs/fr_FR/contracts.lang +++ b/htdocs/langs/fr_FR/contracts.lang @@ -88,6 +88,7 @@ RelatedContracts=Contrats associés NoExpiredServices=Pas de services actifs expirés ListOfServicesToExpireWithDuration=Liste des services actifs pour expirer à %s days ListOfServicesToExpire=Liste des services actifs pour expirer +Service=Service ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Commercial signataire du contrat diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php index 0c73b0a3725793bde23220afb01b3f69777ba60d..4a74218b843e95fbf339bf8171d1e38ba8fce539 100755 --- a/scripts/contracts/email_expire_services_to_customers.php +++ b/scripts/contracts/email_expire_services_to_customers.php @@ -74,7 +74,7 @@ $sql .= " WHERE s.rowid = c.fk_soc AND c.rowid = cd.fk_contrat AND c.statut > 0 if ($duration_value) $sql .= " AND cd.date_fin_validite < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'"; -$sql .= " ORDER BY s.email ASC, s.rowid ASC"; +$sql .= " ORDER BY cd.date_fin_validite ASC, s.rowid ASC"; print $sql; $resql=$db->query($sql); diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php index 42eec631d6b77e8169b61d7942659efe7e5a2b4e..249cfc3b195de5ea38c283ed3f54a1133f5a2adb 100755 --- a/scripts/contracts/email_expire_services_to_representatives.php +++ b/scripts/contracts/email_expire_services_to_representatives.php @@ -74,7 +74,7 @@ $sql .= " WHERE s.rowid = c.fk_soc AND c.rowid = cd.fk_contrat AND c.statut > 0 if ($duration_value) $sql .= " AND cd.date_fin_validite < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'"; $sql .= " AND sc.fk_soc = s.rowid AND sc.fk_user = u.rowid"; -$sql .= " ORDER BY u.email ASC, s.rowid ASC"; +$sql .= " ORDER BY cd.date_fin_validite ASC, s.rowid ASC"; //print $sql; $resql=$db->query($sql);