Merge pull request #1325 from FHenry/3.5

[ bug #1153 ] SQL Error on the VAT main screen (with pgsql)
Dolibarr · Nov 28, 2013 · 74d6698 · 74d6698
2 parents c3af8b6 + 5f8e896
commit 74d6698
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
@@ -222,7 +222,7 @@ function pt ($db, $sql, $date)
 $sql.= " WHERE f.entity = ".$conf->entity;
 $sql.= " AND f.datev >= '".$db->idate(dol_get_first_day($y,1,false))."'";
 $sql.= " AND f.datev <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-$sql.= " GROUP BY dm ASC";
+$sql.= " GROUP BY dm  ORDER BY dm ASC";
 
 pt($db, $sql,$langs->trans("Year")." $y");
 

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
@@ -2089,7 +2089,7 @@ function update($user, $notrigger=0)
 		$sql.= " total_localtax1='".$this->total_localtax1."',";
 		$sql.= " total_localtax2='".$this->total_localtax2."',";
 		$sql.= " total_ttc='".$this->total_ttc."',";
-		$sql.= " fk_product_fournisseur_price='".$this->fk_fournprice."',";
+		$sql.= " fk_product_fournisseur_price=".(!empty($this->fk_fournprice)?$this->fk_fournprice:"NULL").",";
 		$sql.= " buy_price_ht='".price2num($this->pa_ht)."',";
 		$sql.= " info_bits='".$this->info_bits."',";
 		$sql.= " fk_user_author=".($this->fk_user_author >= 0?$this->fk_user_author:"NULL").",";