From 677c31a4a968a95724c64829f7ad9992d8081263 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 23 Jun 2006 16:35:23 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20probl=E8me=20avec=20le=20code=5Fpays?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/facture/pdf_huitre.modules.php | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/htdocs/includes/modules/facture/pdf_huitre.modules.php b/htdocs/includes/modules/facture/pdf_huitre.modules.php index 93b014416b0..c35a56fa172 100644 --- a/htdocs/includes/modules/facture/pdf_huitre.modules.php +++ b/htdocs/includes/modules/facture/pdf_huitre.modules.php @@ -60,6 +60,20 @@ class pdf_huitre extends ModelePDFFactures { $this->page_largeur = 210; $this->page_hauteur = 297; $this->format = array($this->page_largeur,$this->page_hauteur); + + // Recupere code pays de l'emmetteur + $this->emetteur->code_pays=substr($langs->defaultlang,-2); // Par defaut, si on trouve pas + $sql = "SELECT code from ".MAIN_DB_PREFIX."c_pays"; + $sql .= " WHERE rowid = '".$conf->global->MAIN_INFO_SOCIETE_PAYS."'"; + $result=$this->db->query($sql); + if ($result) { + $obj = $this->db->fetch_object($result); + if ($obj->code) $this->emetteur->code_pays=$obj->code; + } + else { + dolibarr_print_error($this->db); + } + $this->db->free($result); } @@ -580,13 +594,13 @@ class pdf_huitre extends ModelePDFFactures { $ligne=$langs->trans('LimitedLiabilityCompanyCapital').' '. MAIN_INFO_CAPITAL." ".$langs->trans("Currency".$conf->monnaie); } if (defined('MAIN_INFO_SIREN') && MAIN_INFO_SIREN) { - $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId1",$this->code_pays).": ".MAIN_INFO_SIREN; + $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId1",$this->emetteur->code_pays).": ".MAIN_INFO_SIREN; } if (defined('MAIN_INFO_SIRET') && MAIN_INFO_SIRET) { - $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId2",$this->code_pays).": ".MAIN_INFO_SIRET; + $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId2",$this->emetteur->code_pays).": ".MAIN_INFO_SIRET; } if (defined('MAIN_INFO_RCS') && MAIN_INFO_RCS) { - $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId4",$this->code_pays).": ".MAIN_INFO_RCS; + $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId4",$this->emetteur->code_pays).": ".MAIN_INFO_RCS; } if ($ligne) { $pdf->SetY(-$footy);