From 1cb71674d70d58da1515e67c17e82126fd69679e Mon Sep 17 00:00:00 2001 From: kaos Date: Sat, 15 Mar 2014 11:06:50 +0100 Subject: [PATCH 1/3] fixes #1300 --- htdocs/holiday/fiche.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php index 01c2e1fb5a1..959811aa5a2 100644 --- a/htdocs/holiday/fiche.php +++ b/htdocs/holiday/fiche.php @@ -1039,7 +1039,7 @@ else $idGroupValid = $cp->getConfCP('userGroup'); $validator = new UserGroup($db,$idGroupValid); - $valideur = $validator->listUsersForGroup(); + $valideur = $validator->listUsersForGroup(,'',1); print ''; $form->select_users($cp->fk_validator,"valideur",1,"",0,$valideur,''); From f55bdc64bd03d708f2d5731bad721de587baa979 Mon Sep 17 00:00:00 2001 From: kaos Date: Sat, 15 Mar 2014 11:10:20 +0100 Subject: [PATCH 2/3] fixes #1300 --- htdocs/holiday/fiche.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php index 959811aa5a2..0ff0194d5cf 100644 --- a/htdocs/holiday/fiche.php +++ b/htdocs/holiday/fiche.php @@ -1039,7 +1039,7 @@ else $idGroupValid = $cp->getConfCP('userGroup'); $validator = new UserGroup($db,$idGroupValid); - $valideur = $validator->listUsersForGroup(,'',1); + $valideur = $validator->listUsersForGroup('',1); print ''; $form->select_users($cp->fk_validator,"valideur",1,"",0,$valideur,''); From 4db8af8a53ef0cf093e18d884727c189fc243038 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 15 Mar 2014 15:10:03 +0100 Subject: [PATCH 3/3] Fix: sql syntax error with pgsql --- scripts/contracts/email_expire_services_to_representatives.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php index 76489bebcf2..da16a328bcf 100755 --- a/scripts/contracts/email_expire_services_to_representatives.php +++ b/scripts/contracts/email_expire_services_to_representatives.php @@ -75,7 +75,7 @@ print $script_file." launched with mode ".$mode." default lang=".$langs->default if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1; -$sql = "SELECT DISTINCT c.ref, c.fk_soc, cd.date_fin_validite, cd.total_ttc, cd.description as description, p.label as plabel, s.nom as name, s.email, s.default_lang,"; +$sql = "SELECT DISTINCT c.ref, c.fk_soc, cd.date_fin_validite, cd.total_ttc, cd.description as description, p.label as plabel, s.rowid, s.nom as name, s.email, s.default_lang,"; $sql.= " u.rowid as uid, u.lastname, u.firstname, u.email, u.lang"; $sql.= " FROM ".MAIN_DB_PREFIX."societe AS s, ".MAIN_DB_PREFIX."contrat AS c, ".MAIN_DB_PREFIX."contratdet AS cd"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product AS p ON p.rowid = cd.fk_product, ".MAIN_DB_PREFIX."societe_commerciaux AS sc, ".MAIN_DB_PREFIX."user AS u";