Merge pull request #613 from FHenry/3.3

Fix bug 692, 681
This commit is contained in:
Laurent Destailleur 2013-01-15 14:14:49 -08:00
commit a92b1d8677
2 changed files with 1 additions and 2 deletions

View File

@ -2786,7 +2786,6 @@ class PropaleLigne
} }
$sql.= " , fk_product_fournisseur_price='".$this->fk_fournprice."'"; $sql.= " , fk_product_fournisseur_price='".$this->fk_fournprice."'";
$sql.= " , buy_price_ht='".price2num($this->pa_ht)."'"; $sql.= " , buy_price_ht='".price2num($this->pa_ht)."'";
$sql.= " , info_bits=".$this->info_bits;
if (strlen($this->special_code)) $sql.= " , special_code=".$this->special_code; if (strlen($this->special_code)) $sql.= " , special_code=".$this->special_code;
$sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null"); $sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
if (! empty($this->rang)) $sql.= ", rang=".$this->rang; if (! empty($this->rang)) $sql.= ", rang=".$this->rang;

View File

@ -126,7 +126,7 @@ if (GETPOST('filtre'))
if (GETPOST("search_ref")) if (GETPOST("search_ref"))
{ {
$sql .= " AND fac.rowid LIKE '%".$db->escape(GETPOST("search_ref"))."%'"; $sql .= " AND fac.rowid = ".$db->escape(GETPOST("search_ref"));
} }
if (GETPOST("search_ref_supplier")) if (GETPOST("search_ref_supplier"))
{ {