From 7358faeb96228d847e66316d37624174a42f39d1 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Thu, 9 May 2013 09:41:32 +0200
Subject: [PATCH] New: [ task #812 ] Add more Scripts. expire contract services
 ordered by date end

---
 htdocs/langs/ca_ES/contracts.lang                              | 1 +
 htdocs/langs/en_US/contracts.lang                              | 1 +
 htdocs/langs/es_ES/contracts.lang                              | 1 +
 htdocs/langs/fr_FR/contracts.lang                              | 1 +
 scripts/contracts/email_expire_services_to_customers.php       | 2 +-
 scripts/contracts/email_expire_services_to_representatives.php | 2 +-
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index f69e9ea188d..39b2c76bea5 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 311c46bb089..78426092b1a 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 3e10374bf7b..55d8e11c86c 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 f7f7b77987d..9cef9326f8e 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 0c73b0a3725..4a74218b843 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 42eec631d6b..249cfc3b195 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);
-- 
GitLab