From 269a59e11aa92d65e0ba352f661975a8bc9a164c Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Tue, 5 Aug 2014 14:17:29 +0200 Subject: [PATCH 1/3] Fix : warning was not calculated on the right date --- htdocs/commande/liste.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index 2e96a5451d4..64ac19fe1ad 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -334,7 +334,7 @@ if ($resql) print ''; print ''; - if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_valid),$db->jdate($objp->date_livraison)) < ($now - $conf->commande->client->warning_delay)) + if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_commande),$db->jdate($objp->date_livraison)) < ($now - $conf->commande->client->warning_delay)) print img_picto($langs->trans("Late"),"warning"); if(!empty($objp->note_private)) { From 3499c69b7d096b13b52e6292f33ffb397bba74dc Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Wed, 6 Aug 2014 08:54:22 +0200 Subject: [PATCH 2/3] Fix : search contact by phone was mistaking phone pro and phone perso --- htdocs/contact/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 1c735d787b4..234dff307a6 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -172,11 +172,11 @@ if (strlen($search_phone)) } if (strlen($search_phoneper)) { - $sql .= " AND p.phone LIKE '%".$db->escape($search_phoneper)."%'"; + $sql .= " AND p.phone_perso LIKE '%".$db->escape($search_phoneper)."%'"; } if (strlen($search_phonepro)) { - $sql .= " AND p.phone_perso LIKE '%".$db->escape($search_phonepro)."%'"; + $sql .= " AND p.phone LIKE '%".$db->escape($search_phonepro)."%'"; } if (strlen($search_phonemob)) { From 546b31b9d0921e5f66531bdc1d1dd72ed59fce80 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Wed, 6 Aug 2014 12:02:44 +0200 Subject: [PATCH 3/3] Fix : Filtering on fourn paiement list was not working --- htdocs/fourn/facture/paiement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 6f8c3bc1920..0a15fa1bdae 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -399,7 +399,7 @@ if (empty($action)) { $sql .= ' AND p.rowid='.$db->escape($search_ref); } - if (! empty($search_account)) + if (! empty($search_account) && $search_account > 0) { $sql .= ' AND b.fk_account='.$db->escape($search_account); }