From 247daaabc5ce0fede2be9bc2459d4bb636ae43dc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Feb 2009 00:52:30 +0000 Subject: [PATCH] Fix: Can find product with ajax on product ref even in supplier objects --- htdocs/html.form.class.php | 2 +- htdocs/html.formproduct.class.php | 14 +++++++------- htdocs/product/ajaxproducts.php | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index 46ae1199da7..578cb72b766 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -941,7 +941,7 @@ class Form if ($socid) $sql.= " AND pf.fk_soc = ".$socid; if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$filtertype; if (! empty($filtre)) $sql.=" ".$filtre; - if ($ajaxkeysearch && $ajaxkeysearch != '') $sql.=" AND (pf.ref_fourn like '%".$ajaxkeysearch."%' OR p.label like '%".$ajaxkeysearch."%')"; + if ($ajaxkeysearch && $ajaxkeysearch != '') $sql.=" AND (pf.ref_fourn like '%".$ajaxkeysearch."%' OR p.ref like '%".$ajaxkeysearch."%' OR p.label like '%".$ajaxkeysearch."%')"; $sql.= " ORDER BY pf.ref_fourn DESC"; dolibarr_syslog("Form::select_produits_fournisseurs_do sql=".$sql,LOG_DEBUG); diff --git a/htdocs/html.formproduct.class.php b/htdocs/html.formproduct.class.php index dca536b0366..4609421b90a 100644 --- a/htdocs/html.formproduct.class.php +++ b/htdocs/html.formproduct.class.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2008-2009 Laurent Destailleur * * 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 @@ -18,14 +18,14 @@ /** * \file htdocs/html.formproduct.class.php - * \brief Fichier de la classe des fonctions prédéfinie de composants html + * \brief Fichier de la classe des fonctions pr�d�finie de composants html * \version $Id$ */ /** * \class FormProduct - * \brief Classe permettant la génération de composants html + * \brief Class with static methods for buildinf HTML components related to products * \remarks Only common components must be here. */ class FormProduct @@ -41,8 +41,8 @@ class FormProduct /** - \brief Constructeur - \param DB handler d'accès base de donnée + * \brief Constructeur + * \param DB Database handler */ function FormProduct($DB) { @@ -91,7 +91,7 @@ class FormProduct /** * \brief Retourne la liste des modes de paiements possibles - * \param selected Id du mode de paiement pré-sélectionné + * \param selected Id du mode de paiement pr�-s�lectionn� * \param htmlname Nom de la zone select * \param filtertype Pour filtre * \param empty 1=peut etre vide, 0 sinon @@ -123,7 +123,7 @@ class FormProduct * \brief Selection des unites de mesure * \param name Nom champ html * \param measuring_style Le style de mesure : weight, volume,... - * \param default Forçage de l'unite + * \param default For�age de l'unite * \remarks pour l'instant on ne definit pas les unites dans la base */ function select_measuring_units($name='measuring_units', $measuring_style='', $default='0', $adddefault=0) diff --git a/htdocs/product/ajaxproducts.php b/htdocs/product/ajaxproducts.php index c99094aaccb..d309b6b6ffb 100644 --- a/htdocs/product/ajaxproducts.php +++ b/htdocs/product/ajaxproducts.php @@ -1,7 +1,7 @@ * Copyright (C) 2005-2007 Regis Houssin - * Copyright (C) 2007-2008 Laurent Destailleur + * Copyright (C) 2007-2009 Laurent Destailleur * * 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 @@ -19,10 +19,10 @@ */ /** - \file htdocs/product/ajaxproducts.php - \brief Fichier de reponse sur evenement Ajax - \version $Id$ -*/ + * \file htdocs/product/ajaxproducts.php + * \brief Fichier de reponse sur evenement Ajax + * \version $Id$ + */ require('../main.inc.php');