From fb0a99cb55f75eae9efa6b9679222649c9e16864 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Thu, 13 Jun 2013 15:05:19 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20[=20bug=20#934=20]=20Impossible=20de=20cr?=
 =?UTF-8?q?=C3=A9er=20une=20facture=20pr=C3=A9d=C3=A9finie=20(pgsql)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ChangeLog                                         | 1 +
 htdocs/compta/facture/class/facture-rec.class.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ddafb08d110..5ef0217d077 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ English Dolibarr ChangeLog
 ***** ChangeLog for 3.3.3 compared to 3.3.2 *****
 
 - Fix: [ bug #903 ] Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php
+- Fix: [ bug #934 ] Error on proformat invoice creation (pgsql)
 
 ***** ChangeLog for 3.3.2 compared to 3.3.1 *****
 
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index b41fa735e7c..105885bfe1f 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -122,8 +122,8 @@ class FactureRec extends Facture
 			$sql.= ", '".$facsrc->socid."'";
 			$sql.= ", ".$conf->entity;
 			$sql.= ", ".$this->db->idate($now);
-			$sql.= ", '".$facsrc->amount."'";
-			$sql.= ", '".$facsrc->remise."'";
+			$sql.= ", ".(!empty($facsrc->amount)?$facsrc->amount:'0');
+			$sql.= ", ".(!empty($facsrc->remise)?$this->remise:'0');
 			$sql.= ", '".$this->db->escape($this->note)."'";
 			$sql.= ", '".$user->id."'";
 			$sql.= ", ".(! empty($facsrc->fk_project)?"'".$facsrc->fk_project."'":"null");