From 51b1f05ee746e73ff531fadc3a87409015377846 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 23 Aug 2005 21:44:45 +0000
Subject: [PATCH] =?UTF-8?q?Si=20SIRET=20renseign=E9,=20on=20affiche=20pas?=
 =?UTF-8?q?=20SIREN=20(c'est=20inclus=20dans=20SIRET)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/includes/modules/facture/pdf_crabe.modules.php     | 8 ++++----
 htdocs/includes/modules/propale/modules_propale.php       | 1 +
 .../includes/modules/propale/pdf_propale_azur.modules.php | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index ec9c9c5d3c0..f481af883c2 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -784,14 +784,14 @@ class pdf_crabe extends ModelePDFFactures
         {
             $ligne.=($ligne?" - ":"").$langs->trans("CapitalOf",$conf->global->MAIN_INFO_CAPITAL)." ".$langs->trans("Currency".$conf->monnaie);
         }
-        if ($conf->global->MAIN_INFO_SIREN)
-        {
-            $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId1",$this->code_pays).": ".$conf->global->MAIN_INFO_SIREN;
-        }
         if ($conf->global->MAIN_INFO_SIRET)
         {
             $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId2",$this->code_pays).": ".$conf->global->MAIN_INFO_SIRET;
         }
+        elseif ($conf->global->MAIN_INFO_SIREN)
+        {
+            $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId1",$this->code_pays).": ".$conf->global->MAIN_INFO_SIREN;
+        }
         if ($conf->global->MAIN_INFO_APE)
         {
             $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId3",$this->code_pays).": ".MAIN_INFO_APE;
diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php
index 845e0e8dc28..97460f52d21 100644
--- a/htdocs/includes/modules/propale/modules_propale.php
+++ b/htdocs/includes/modules/propale/modules_propale.php
@@ -71,6 +71,7 @@ class ModelePDFPropales extends FPDF
         }
         else
         {
+            $this->error=$db->error();
             return -1;
         }
         return $liste;
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index 1d7b04c960b..49d637d2355 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -705,14 +705,14 @@ class pdf_propale_azur extends ModelePDFPropales
         {
             $ligne.=($ligne?" - ":"").$langs->trans("CapitalOf",$conf->global->MAIN_INFO_CAPITAL)." ".$langs->trans("Currency".$conf->monnaie);
         }
-        if ($conf->global->MAIN_INFO_SIREN)
-        {
-            $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId1",$this->code_pays).": ".$conf->global->MAIN_INFO_SIREN;
-        }
         if ($conf->global->MAIN_INFO_SIRET)
         {
             $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId2",$this->code_pays).": ".$conf->global->MAIN_INFO_SIRET;
         }
+        elseif ($conf->global->MAIN_INFO_SIREN)
+        {
+            $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId1",$this->code_pays).": ".$conf->global->MAIN_INFO_SIREN;
+        }
         if ($conf->global->MAIN_INFO_APE)
         {
             $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId3",$this->code_pays).": ".MAIN_INFO_APE;