diff --git a/htdocs/includes/modules/propale/pdf_propale_orange.modules.php b/htdocs/includes/modules/propale/pdf_propale_orange.modules.php deleted file mode 100644 index f2b6037e36e..00000000000 --- a/htdocs/includes/modules/propale/pdf_propale_orange.modules.php +++ /dev/null @@ -1,399 +0,0 @@ - - * Copyright (C) 2004-2005 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * or see http://www.gnu.org/ - * - * $Id$ - * $Source$ - */ - -/** \file htdocs/includes/modules/propale/pdf_propale_Orange.modules.php - \ingroup propale - \brief Fichier de la classe permettant de générer les propales au modèle Orange - \version $Revision$ -*/ - -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php"); - - -/** \class pdf_propale_Orange - \brief Classe permettant de générer les propales au modèle orange -*/ - -class pdf_propale_orange extends ModelePDFPropales -{ - - /** \brief Constructeur - \param db handler accès base de donnée - */ - function pdf_propale_orange($db=0) - { - $this->db = $db; - $this->name = "orange"; - $this->description = "Modèle de proposition Orange ancien Adytek"; - - // Dimension page pour format A4 - $this->page_largeur = 210; - $this->page_hauteur = 297; - $this->format = array($this->page_largeur,$this->page_hauteur); - - $this->error = ""; - } - - - /** \brief Renvoi dernière erreur - \return string Dernière erreur - */ - function pdferror() - { - return $this->error; - } - - - /** - \brief Fonction générant la propale sur le disque - \param id id de la propale à générer - \return int 1=ok, 0=ko - */ - function write_pdf_file($id) - { - global $user,$conf,$langs; - - $propale = new Propal($this->db,"",$id); - if ($propale->fetch($id)) - { - - if ($conf->propal->dir_output) - { - $propref = sanitize_string($propale->ref); - $dir = $conf->propal->dir_output . "/" . $propref ; - - if (! file_exists($dir)) - { - if (create_exdir($dir) < 0) - { - $this->error=$langs->trans("ErrorCanNotCreateDir",$dir); - return 0; - } - } - } - else - { - $this->error=$langs->trans("ErrorConstantNotDefined","PROPALE_OUTPUTDIR"); - return 0; - } - - $propref = sanitize_string($propale->ref); - $file = $dir . "/" . $propref . ".pdf"; - - if (file_exists($dir)) - { - - $pdf=new FPDF('P','mm',$this->format); - $pdf->Open(); - - $pdf->SetTitle($fac->ref); - $pdf->SetSubject("Proposition commerciale"); - $pdf->SetCreator("Orange Dolibarr ".DOL_VERSION); - $pdf->SetAuthor($user->fullname); - - - $pdf->AddPage(); - $pdf->SetMargins(10, 10, 10); - $pdf->SetAutoPageBreak(1,0); - - $this->_pagehead($pdf, $propale); - - /* - */ - $tab_top = 100; - $tab_height = 150; - /* - * - */ - - $pdf->SetFillColor(242,239,119); - - $pdf->SetTextColor(0,0,0); - $pdf->SetFont('Arial','', 10); - - $pdf->SetXY (10, $tab_top + 10 ); - - $iniY = $pdf->GetY(); - $curY = $pdf->GetY(); - $nexY = $pdf->GetY(); - $nblignes = sizeof($propale->lignes); - - for ($i = 0 ; $i < $nblignes ; $i++) - { - $curY = $nexY; - $total = price($propale->lignes[$i]->price * $propale->lignes[$i]->qty); - - $pdf->SetXY (30, $curY ); - $pdf->MultiCell(102, 5, $propale->lignes[$i]->libelle, 0, 'J', 0); - - $pdf->SetFont('Arial','', 8); - $nexY = $pdf->GetY(); - - $pdf->SetXY (10, $curY ); - $pdf->MultiCell(20, 5, $propale->lignes[$i]->ref, 0, 'C', 0); - $pdf->SetFont('Arial','', 10); - $pdf->SetXY (132, $curY ); - $pdf->MultiCell(12, 5, $propale->lignes[$i]->tva_tx, 0, 'C', 0); - - $pdf->SetXY (144, $curY ); - $pdf->MultiCell(10, 5, $propale->lignes[$i]->qty, 0, 'C', 0); - - $pdf->SetXY (154, $curY ); - $pdf->MultiCell(22, 5, price($propale->lignes[$i]->price), 0, 'R', 0); - - $pdf->SetXY (176, $curY ); - $pdf->MultiCell(24, 5, $total, 0, 'R', 0); - - $pdf->line(10, $curY, 200, $curY ); - - if ($nexY > 240 && $i < $nblignes - 1) - { - $this->_tableau($pdf, $tab_top, $tab_height, $nexY); - $pdf->AddPage(); - $nexY = $iniY; - $this->_pagehead($pdf, $propale); - $pdf->SetTextColor(0,0,0); - $pdf->SetFont('Arial','', 10); - } - } - - $this->_tableau($pdf, $tab_top, $tab_height, $nexY); - /* - * - */ - $tab2_top = 254; - $tab2_lh = 7; - $tab2_height = $tab2_lh * 3; - - $pdf->SetFont('Arial','', 11); - - $pdf->Rect(132, $tab2_top, 68, $tab2_height); - - $pdf->line(132, $tab2_top + $tab2_height - ($tab2_lh*3), 200, $tab2_top + $tab2_height - ($tab2_lh*3) ); - $pdf->line(132, $tab2_top + $tab2_height - ($tab2_lh*2), 200, $tab2_top + $tab2_height - ($tab2_lh*2) ); - $pdf->line(132, $tab2_top + $tab2_height - $tab2_lh, 200, $tab2_top + $tab2_height - $tab2_lh ); - - $pdf->line(174, $tab2_top, 174, $tab2_top + $tab2_height); - - $pdf->SetXY (132, $tab2_top + 0); - $pdf->MultiCell(42, $tab2_lh, "Total HT", 0, 'R', 0); - - $pdf->SetXY (132, $tab2_top + $tab2_lh); - $pdf->MultiCell(42, $tab2_lh, "Total TVA", 0, 'R', 0); - - $pdf->SetXY (132, $tab2_top + ($tab2_lh*2)); - $pdf->MultiCell(42, $tab2_lh, "Total TTC", 1, 'R', 1); - - $pdf->SetXY (174, $tab2_top + 0); - $pdf->MultiCell(26, $tab2_lh, price($propale->total_ht), 0, 'R', 0); - - $pdf->SetXY (174, $tab2_top + $tab2_lh); - $pdf->MultiCell(26, $tab2_lh, price($propale->total_tva), 0, 'R', 0); - - $pdf->SetXY (174, $tab2_top + ($tab2_lh*2)); - $pdf->MultiCell(26, $tab2_lh, price($propale->total_ttc), 1, 'R', 1); - - /* - * - */ - $pdf->SetFont('Arial','',7); - $pdf->SetXY(10, 250); - $note = "Note : ".$propale->note; - $pdf->MultiCell(110, 3, $note, 0, 'J'); - - - - $this->_pagefoot($pdf, $propale); - $pdf->AliasNbPages(); - - $pdf->Close(); - - - $pdf->Output($file); - - return 1; - } - } - } - - function _tableau(&$pdf, $tab_top, $tab_height, $nexY) - { - global $langs; - $langs->load("main"); - $langs->load("bills"); - - $pdf->SetFont('Arial','',11); - - $pdf->SetXY(10,$tab_top); - $pdf->MultiCell(20,10,$langs->trans("Ref"),0,'C',1); - - $pdf->SetXY(30,$tab_top); - $pdf->MultiCell(102,10,$langs->trans("Designation"),0,'L',1); - - $pdf->line(132, $tab_top, 132, $tab_top + $tab_height); - $pdf->SetXY(132,$tab_top); - $pdf->MultiCell(12, 10,$langs->trans("VAT"),0,'C',1); - - $pdf->line(144, $tab_top, 144, $tab_top + $tab_height); - $pdf->SetXY(144,$tab_top); - $pdf->MultiCell(10,10,$langs->trans("Qty"),0,'C',1); - - $pdf->line(154, $tab_top, 154, $tab_top + $tab_height); - $pdf->SetXY(154,$tab_top); - $pdf->MultiCell(22,10,$langs->trans("PriceU"),0,'R',1); - - $pdf->line(176, $tab_top, 176, $tab_top + $tab_height); - $pdf->SetXY(176,$tab_top); - $pdf->MultiCell(24,10,$langs->trans("Total"),0,'R',1); - - $pdf->Rect(10, $tab_top, 190, $tab_height); - - } - function _pagefoot(&$pdf, $propale) - { - $pdf->SetFont('Arial','I',8); - // FAC_PDF_ADRESSE FAC_PDF_TEL - - $pdf->SetFont('Arial','',8); - $pdf->SetY(-13); - $pdf->MultiCell(190, 3, FAC_PDF_INTITULE . " - SARL au Capital de " . MAIN_INFO_CAPITAL . " - " . MAIN_INFO_RCS." " . MAIN_INFO_SIREN , 0, 'C'); - $pdf->SetY(-10); - $pdf->MultiCell(190, 3, "N° TVA Intracommunautaire : " . MAIN_INFO_TVAINTRA , 0, 'C'); - $pdf->SetXY(-10,-10); - $pdf->MultiCell(10, 3, $pdf->PageNo().'/{nb}', 0, 'R'); - - } - - function _pagehead(&$pdf, $propale) - { - global $langs,$conf; - $langs->load("main"); - $langs->load("bills"); - - $tab4_top = 60; - $tab4_hl = 6; - $tab4_sl = 4; - $ligne = 2; - - if (defined("FAC_PDF_LOGO") && FAC_PDF_LOGO) $logo=DOL_DATA_ROOT.FAC_PDF_LOGO; - if ($logo) - { - $pdf->SetXY(10,5); - if (is_readable($logo)) - { - $pdf->Image($logo, 10, 5,45.0, 25.0, 'PNG'); - } - else { - $pdf->SetTextColor(200,0,0); - $pdf->SetFont('Arial','B',8); - $pdf->MultiCell(80, 3, $langs->trans("ErrorLogoFileNotFound",$logo), 0, 'L'); - $pdf->MultiCell(80, 3, $langs->trans("ErrorGoToModuleSetup"), 0, 'L'); - } - } - else if (defined("FAC_PDF_INTITULE")) - { - $pdf->MultiCell(80, 6, FAC_PDF_INTITULE, 0, 'L'); - } - - $pdf->SetDrawColor(192,192,192); - $pdf->line(9, 5, 200, 5 ); - $pdf->line(9, 30, 200, 30 ); - - $pdf->SetFont('Arial','B',7); - $pdf->SetTextColor(128,128,128); - - if (defined("FAC_PDF_ADRESSE")) - { - $pdf->SetXY( $tab4_top , $tab4_hl ); - $pdf->MultiCell(40, 3, FAC_PDF_ADRESSE, '' , 'L'); - } - $pdf->SetFont('Arial','',7); - if (defined("FAC_PDF_TEL")) - { - $pdf->SetXY( $tab4_top , $tab4_hl + 2*$tab4_sl ); - $pdf->MultiCell(40, 3, "Téléphone : " . FAC_PDF_TEL, '' , 'L'); - } - if (defined("FAC_PDF_FAX")) - { - $pdf->SetXY( $tab4_top , $tab4_hl + 3*$tab4_sl ); - $pdf->MultiCell(40, 3, "Télécopie : " . FAC_PDF_FAX, '' , 'L'); - } - if (defined("FAC_PDF_MEL")) - { - $pdf->SetXY( $tab4_top , $tab4_hl + 4*$tab4_sl ); - $pdf->MultiCell(40, 3, "E-mail : " . FAC_PDF_MEL, '' , 'L'); - } - if (defined("FAC_PDF_WWW")) - { - $pdf->SetXY( $tab4_top , $tab4_hl + 5*$tab4_sl ); - $pdf->MultiCell(40, 3, "Internet : " . FAC_PDF_WWW, '' , 'L'); - } - $pdf->SetTextColor(70,70,170); - - /* - * Definition du document - */ - $pdf->SetXY(10,50); - $pdf->SetFont('Arial','B',16); - $pdf->SetTextColor(0,0,200); - $pdf->MultiCell(50, 8, "PROPOSITION COMMERCIALE", '' , 'C'); - - /* - * Adresse Client - */ - $pdf->SetTextColor(0,0,0); - $pdf->SetFillColor(242,239,119); - $pdf->rect(100, 40, 100, 40, 'F'); - $pdf->SetFont('Arial','B',12); - $propale->fetch_client(); - $pdf->SetXY(102,42); - $pdf->MultiCell(86,5, $propale->client->nom, 0, 'C'); - $pdf->SetFont('Arial','B',11); - $pdf->SetXY(102,50); - $pdf->MultiCell(86,5, $propale->client->adresse . "\n\n" . $propale->client->cp . " " . $propale->client->ville, 0, 'C'); - - - - $pdf->SetTextColor(200,0,0); - $pdf->SetFont('Arial','B',14); - //$pdf->Text(11, 88, "Date : " . strftime("%d %b %Y", $propale->date)); - //$pdf->Text(11, 94, "Numéro : ".$propale->ref); - $pdf->Text(11, 88, $langs->trans("Date")); - $pdf->Text(35, 88, ": " . strftime("%d %b %Y", $propale->date)); - $pdf->Text(11, 94, $langs->trans("Ref")); - $pdf->Text(35, 94, ": ".$propale->ref); - /* - */ - $pdf->SetTextColor(0,0,0); - $pdf->SetFont('Arial','',10); - $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie)); - $pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre); - /* - */ - - } - -} - -?> - diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql index 020608e6d11..c20ba5ef8ea 100644 --- a/mysql/migration/2.0.0-2.1.0.sql +++ b/mysql/migration/2.0.0-2.1.0.sql @@ -160,4 +160,5 @@ delete from llx_document_model where nom='rouge' and type='order'; delete from llx_document_model where nom='azur' and type='order'; -update llx_const set value='neptune' where value='pluton' and name = 'FACTURE_ADDON'; \ No newline at end of file +update llx_const set value='neptune' where value='pluton' and name = 'FACTURE_ADDON'; +update llx_const set value='azur' where value='orange' and name = 'PROPALE_ADDON'; \ No newline at end of file