From 0ae24f6f9e50c03546d7c37d0f54b3f7d21b3626 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Feb 2009 17:37:32 +0000 Subject: [PATCH] Add country in address if country differs from country user --- htdocs/compta/facture.php | 2 +- .../modules/commande/pdf_einstein.modules.php | 9 ++----- .../pdf/pdf_expedition_merou.modules.php | 24 ++++++++----------- .../modules/facture/pdf_crabe.modules.php | 13 ++-------- .../modules/facture/pdf_oursin.modules.php | 13 ++-------- .../livraison/pdf/pdf_typhon.modules.php | 7 +----- .../propale/pdf_propale_azur.modules.php | 13 ++-------- .../propale/pdf_propale_jaune.modules.php | 13 ++-------- .../pdf/pdf_muscadet.modules.php | 17 ++++++------- 9 files changed, 31 insertions(+), 80 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index ca4be05aeb8..9c1494489d1 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1,7 +1,7 @@ * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2007 Regis Houssin * Copyright (C) 2006 Andre Cianfarani diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index e7d5431ab9f..54d478a4011 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -876,15 +876,10 @@ class pdf_einstein extends ModelePDFCommandes } } - // Caract�ristiques client + // Caracteristiques client $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->adresse); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; - - //Pays si different de l'emetteur - if ($this->emetteur->pays_code != $object->client->pays_code) - { - $carac_client.=$outputlangs->convToOutputCharset($object->client->pays)."\n"; - } + if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n"; } // Numero TVA intracom if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($object->client->tva_intra); diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php index ddeb08098bb..b833acad6c4 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -104,7 +104,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition //Creation de l expediteur $this->expediteur = $mysoc; - + //Creation du destinataire $this->destinataire = new Contact($this->db); // $pdf->expe->commande->fetch($pdf->commande->id); @@ -332,7 +332,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition $Xoff = 90; $Yoff = 0; - + $tab4_top = 60; $tab4_hl = 6; $tab4_sl = 4; @@ -393,7 +393,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition $pdf->SetXY($blSocX,$blSocY); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->SetTextColor(0,0,0); - + // Caracteristiques emetteur $carac_emetteur = ''; $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->adresse); @@ -463,10 +463,10 @@ Class pdf_expedition_merou extends ModelePdfExpedition $pdf->SetFont('Arial','',7); $pdf->MultiCell($blW,3, $outputlangs->transnoentities("Tel")." : ".$outputlangs->convToOutputCharset($this->expediteur->tel), 0, 'L'); } - - + + $object->fetch_client(); - + /**********************************/ //Emplacement Informations Destinataire /**********************************/ @@ -494,11 +494,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition // Customer properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->cp) . " " . $outputlangs->convToOutputCharset($object->contact->ville)."\n"; - //Pays si different de l'emetteur - if ($this->emetteur->pays_code != $object->contact->pays_code) - { - $carac_client.=$outputlangs->convToOutputCharset($object->contact->pays)."\n"; - } + if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n"; } else { @@ -529,14 +525,14 @@ Class pdf_expedition_merou extends ModelePdfExpedition } // Numero TVA intracom if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($object->client->tva_intra); - - + + $blDestX=$blExpX+55; $blW=50; $Yoff = $Ydef +1; $pdf->Rect($blDestX, $Yoff-1, $blW, 20); - + //Titre $pdf->SetFont('Arial','B',7); $pdf->SetXY($blDestX,$Yoff-4); diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index ae27bbc1d05..cda714bac95 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -1070,11 +1070,7 @@ class pdf_crabe extends ModelePDFFactures // Customer properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->cp) . " " . $outputlangs->convToOutputCharset($object->contact->ville)."\n"; - //Pays si different de l'emetteur - if ($this->emetteur->pays_code != $object->contact->pays_code) - { - $carac_client.=$outputlangs->convToOutputCharset($object->contact->pays)."\n"; - } + if ($object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->contact->pays_code)."\n"; } else { @@ -1096,12 +1092,7 @@ class pdf_crabe extends ModelePDFFactures // Caracteristiques client $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->adresse); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; - - //Pays si different de l'emetteur - if ($this->emetteur->pays_code != $object->client->pays_code) - { - $carac_client.=$outputlangs->convToOutputCharset($object->client->pays)."\n"; - } + if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n"; } // Numero TVA intracom if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($object->client->tva_intra); diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index 59a81633282..5b9dc820525 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -892,11 +892,7 @@ class pdf_oursin extends ModelePDFFactures // Customer properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->cp) . " " . $outputlangs->convToOutputCharset($object->contact->ville)."\n"; - //Pays si different de l'emetteur - if ($this->emetteur->pays_code != $object->contact->pays_code) - { - $carac_client.=$outputlangs->convToOutputCharset($object->contact->pays)."\n"; - } + if ($object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->contact->pays_code)."\n"; } else { @@ -918,12 +914,7 @@ class pdf_oursin extends ModelePDFFactures // Caracteristiques client $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->adresse); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; - - //Pays si different de l'emetteur - if ($this->emetteur->pays_code != $object->client->pays_code) - { - $carac_client.=$outputlangs->convToOutputCharset($object->client->pays)."\n"; - } + if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n"; } // Numero TVA intracom if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($object->client->tva_intra); diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index 3217d80a36c..d9017e10ee6 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -557,12 +557,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder // Caracteristiques client $carac_client=$outputlangs->convToOutputCharset($delivery->client->adresse)."\n"; $carac_client.=$outputlangs->convToOutputCharset($delivery->client->cp) . " " . $outputlangs->convToOutputCharset($delivery->client->ville)."\n"; - - // Pays si different de l'emetteur - if ($this->emetteur->pays_code != $delivery->client->pays_code) - { - $carac_client.=$delivery->client->pays."\n"; - } + if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n"; // Tva intracom if ($delivery->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$delivery->client->tva_intra; diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 1dd50833f75..50259f579ca 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -895,11 +895,7 @@ class pdf_propale_azur extends ModelePDFPropales // Caractéristiques client $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->cp) . " " . $outputlangs->convToOutputCharset($object->contact->ville)."\n"; - //Pays si different de l'emetteur - if ($this->emetteur->pays_code != $object->contact->pays_code) - { - $carac_client.=$outputlangs->convToOutputCharset($object->contact->pays)."\n"; - } + if ($object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->contact->pays_code)."\n"; } else { @@ -921,12 +917,7 @@ class pdf_propale_azur extends ModelePDFPropales // Caractéristiques client $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->adresse); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; - - //Pays si different de l'emetteur - if ($this->emetteur->pays_code != $object->client->pays_code) - { - $carac_client.=$outputlangs->convToOutputCharset($object->client->pays)."\n"; - } + if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n"; } // Numéro TVA intracom if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$object->client->tva_intra; diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index 1cd5acee787..d3dc6fa5fc3 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -452,11 +452,7 @@ class pdf_propale_jaune extends ModelePDFPropales // Caractéristiques client $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->cp) . " " . $outputlangs->convToOutputCharset($object->contact->ville)."\n"; - //Pays si different de l'emetteur - if ($this->emetteur->pays_code != $object->contact->pays_code) - { - $carac_client.=$outputlangs->convToOutputCharset($object->contact->pays)."\n"; - } + if ($object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->contact->pays_code)."\n"; } else { @@ -480,12 +476,7 @@ class pdf_propale_jaune extends ModelePDFPropales // Caractéristiques client $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->adresse); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; - - //Pays si different de l'emetteur - if ($this->emetteur->pays_code != $object->client->pays_code) - { - $carac_client.=$outputlangs->convToOutputCharset($object->client->pays)."\n"; - } + if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n"; } // Numéro TVA intracom if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$object->client->tva_intra; diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php index f0a0c4aebe5..b6e8a785616 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2005-2008 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke * @@ -263,7 +263,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->SetXY ($this->posxup, $curY); $pdf->MultiCell(18, 3, price($com->lignes[$i]->subprice), 0, 'R', 0); - // Quantit� + // Quantity $pdf->SetXY ($this->posxqty, $curY); $pdf->MultiCell(10, 3, $com->lignes[$i]->qty, 0, 'R'); @@ -638,12 +638,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1); - $pdf->SetXY($this->marge_gauche+2,$posy+3); // Nom emetteur + $carac_emetteur_name=$outputlangs->convToOutputCharset($mysoc->nom); $pdf->SetTextColor(0,0,60); $pdf->SetFont('Arial','B',11); - $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($mysoc->nom), 0, 'L'); + $pdf->SetXY($this->marge_gauche+2,$posy+3); + $pdf->MultiCell(80, 4, $carac_emetteur_name, 0, 'L'); // Caracteristiques emetteur $carac_emetteur = ''; @@ -668,7 +669,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->SetTextColor(0,0,0); $pdf->SetFont('Arial','',8); $pdf->SetXY(100,$posy-5); - $pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":"); + $pdf->MultiCell(96,5, $outputlangs->transnoentities("BillTo").":"); // $client = new Societe($this->db); $client->fetch($object->socid); @@ -682,6 +683,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $carac_client=$outputlangs->convToOutputCharset($object->client->adresse); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; + if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n"; // Numero TVA intracom if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($object->client->tva_intra); @@ -692,9 +694,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->MultiCell(96,4, $carac_client_name, 0, 'L'); $pdf->SetFont('Arial','',9); - $posy=$pdf->GetY()-9; //Auto Y coord readjust for multiline name - $pdf->SetXY(102,$posy+6); - $pdf->MultiCell(86,4, $carac_client); + $pdf->SetXY(102,$posy+8); + $pdf->MultiCell(96,4, $carac_client); } }