From 1035f4f7af98825885fb3df4a35b5224031e3171 Mon Sep 17 00:00:00 2001
From: activdev <activdev>
Date: Sun, 2 Apr 2006 14:27:02 +0000
Subject: [PATCH] =?UTF-8?q?Fix=20bug=20#16196=20:=20D=E9signation=20sur=20?=
 =?UTF-8?q?facture.=20Dans=20la=20colonne=20D=E9signation=20on=20pr=E9fixe?=
 =?UTF-8?q?=20le=20code=20et=20le=20libelle=20d'un=20produit/service=20par?=
 =?UTF-8?q?=20"Produit"=20si=20c'est=20un=20produit,=20"Service"=20si=20c'?=
 =?UTF-8?q?est=20un=20service.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/includes/modules/facture/pdf_crabe.modules.php     | 8 +++++++-
 .../includes/modules/propale/pdf_propale_azur.modules.php | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index 3f5e84d824a..50e1c6b1300 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -227,7 +227,13 @@ class pdf_crabe extends ModelePDFFactures
 
                         $prodser->fetch($fac->lignes[$i]->produit_id);
                         if ($prodser->ref) {
-                            $libelleproduitservice=$langs->trans("Product")." ".$prodser->ref." - ".$libelleproduitservice;
+                        	$prefix_prodserv = "";
+                        	if($prodser->type == 0)
+                        		$prefix_prodserv = $langs->trans("Product")." ";
+                        	if($prodser->type == 1)
+                        		$prefix_prodserv = $langs->trans("Service")." ";
+                        		
+                            $libelleproduitservice=$prefix_prodserv.$prodser->ref." - ".$libelleproduitservice;
                         }
 
                         // Ajoute description du produit
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index 57a138edb9a..b23e271160e 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -236,7 +236,13 @@ class pdf_propale_azur extends ModelePDFPropales
                         $prodser->fetch($prop->lignes[$i]->product_id);
                         if ($prodser->ref)
                         {
-                            $libelleproduitservice=$langs->trans("Product")." ".$prodser->ref." - ".$libelleproduitservice;
+                        	$prefix_prodserv = "";
+                        	if($prodser->type == 0)
+                        		$prefix_prodserv = $langs->trans("Product")." ";
+                        	if($prodser->type == 1)
+                        		$prefix_prodserv = $langs->trans("Service")." ";
+                        		
+                            $libelleproduitservice=$prefix_prodserv.$prodser->ref." - ".$libelleproduitservice;
                         }
 
                         // Ajoute description du produit