From acaca341ab15a4b0a7bba5b3ec35f8bea140bb2a Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 21 Jul 2014 17:00:59 +0200 Subject: [PATCH] Fix: [ bug #1521 ] The second order's page from a provider shows all orders Conflicts: ChangeLog --- ChangeLog | 4 ++++ htdocs/fourn/commande/liste.php | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc29d46bd26..a7523a1b33d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -134,6 +134,10 @@ For users: - Fix: [ bug #1477 ] Several customer invoice triggers do not show trigger error messages - Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE trigger. - Fix: [ bug #1517 ] Packages sizes. +- Fix: [ bug #1521 ] The second order's page from a provider shows all orders + +TODO +- New: Predefined product and free product use same form. For translators: - Update language files. diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php index 9ecbf0e0c17..c02ab0685f7 100644 --- a/htdocs/fourn/commande/liste.php +++ b/htdocs/fourn/commande/liste.php @@ -4,6 +4,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2014 Marcos García + * Copyright (C) 2014 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -151,11 +152,12 @@ if ($resql) $i = 0; $param=""; - if ($search_ref) $param.="&search_ref=".$search_ref; - if ($search_nom) $param.="&search_nom=".$search_nom; - if ($search_user) $param.="&search_user=".$search_user; - if ($search_ttc) $param.="&search_ttc=".$search_ttc; + if ($search_ref) $param.="&search_ref=".$search_ref; + if ($search_nom) $param.="&search_nom=".$search_nom; + if ($search_user) $param.="&search_user=".$search_user; + if ($search_ttc) $param.="&search_ttc=".$search_ttc; if ($search_refsupp) $param.="&search_refsupp=".$search_refsupp; + if ($socid) $param.="&socid=".$socid; if ($search_status >= 0) $param.="&search_status=".$search_status; print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords); print '
';