diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 8cd9d6c002d..2185940b16c 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -1,9 +1,10 @@ - * Copyright (C) 2004-2006 Laurent Destailleur - * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier - * Copyright (C) 2004 Eric Seigne + * Copyright (C) 2004-2006 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2004 Eric Seigne + * Copyright (C) 2005-2006 Regis Houssin * * 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 @@ -107,23 +108,31 @@ if ($_GET["action"] == 'setmod') /* - * + * Affiche page */ -llxHeader(); +llxHeader("",""); $dir = DOL_DOCUMENT_ROOT."/expedition/mods/"; $html=new Form($db); +$h = 0; + +$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php"; +$head[$h][1] = $langs->trans("Sending"); +$hselected=$h; +$h++; + +$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php"; +$head[$h][1] = $langs->trans("Delivery"); +$h++; + +dolibarr_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); // Méthode de livraison $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."expedition_methode WHERE statut = 1"; $db->fetch_all_rows($sql, $mods); -print_titre($langs->trans("SendingsSetup")); - -print "
"; - print_titre($langs->trans("SendingMethod")); print ''; diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php index 5c6c161166b..9eceb0ef982 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/includes/modules/commande/modules_commande.php @@ -151,7 +151,7 @@ function commande_pdf_create($db, $id, $modele='', $outputlangs='') $dir = DOL_DOCUMENT_ROOT."/includes/modules/commande/"; - // Positionne modele sur le nom du modele de facture à utiliser + // Positionne modele sur le nom du modele de commande à utiliser if (! strlen($modele)) { if ($conf->global->COMMANDE_ADDON_PDF) diff --git a/htdocs/includes/modules/modExpedition.class.php b/htdocs/includes/modules/modExpedition.class.php index 9b6fecf0856..8ce88c16bac 100644 --- a/htdocs/includes/modules/modExpedition.class.php +++ b/htdocs/includes/modules/modExpedition.class.php @@ -71,6 +71,17 @@ class modExpedition extends DolibarrModules // Constantes $this->const = array(); + $this->const[0][0] = "LIVRAISON_ADDON_PDF"; + $this->const[0][1] = "chaine"; + $this->const[0][2] = "typhon"; + $this->const[0][3] = 'Nom du gestionnaire de génération des commandes en PDF'; + $this->const[0][4] = 0; + + $this->const[1][0] = "LIVRAISON_ADDON"; + $this->const[1][1] = "chaine"; + $this->const[1][2] = "mod_livraison_jade"; + $this->const[1][3] = 'Nom du gestionnaire de numérotation des bons de livraison'; + $this->const[1][4] = 0; // Boxes $this->boxes = array(); @@ -102,6 +113,30 @@ class modExpedition extends DolibarrModules $this->rights[4][2] = 'd'; $this->rights[4][3] = 0; $this->rights[4][4] = 'supprimer'; + + $this->rights[1][0] = 1101; + $this->rights[1][1] = 'Lire les bons de livraison'; + $this->rights[1][2] = 'r'; + $this->rights[1][3] = 1; + $this->rights[1][4] = 'lire'; + + $this->rights[2][0] = 1102; + $this->rights[2][1] = 'Créer modifier les bons de livraison'; + $this->rights[2][2] = 'w'; + $this->rights[2][3] = 0; + $this->rights[2][4] = 'creer'; + + $this->rights[3][0] = 1104; + $this->rights[3][1] = 'Valider les bons de livraison'; + $this->rights[3][2] = 'd'; + $this->rights[3][3] = 0; + $this->rights[3][4] = 'valider'; + + $this->rights[4][0] = 1109; + $this->rights[4][1] = 'Supprimer les bons de livraison'; + $this->rights[4][2] = 'd'; + $this->rights[4][3] = 0; + $this->rights[4][4] = 'supprimer'; } diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 8b2218ca991..10f17c117ff 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -244,6 +244,10 @@ Permission1002=Create/modify stocks Permission1003=Delete stocks Permission1004=Read stock's movements Permission1005=Create/modify stock's movements +Permission1101=Read delivery orders +Permission1102=Create/modify delivery orders +Permission1104=Validate delivery orders +Permission1109=Delete delivery orders DictionnaryCompanyType=Company types DictionnaryCompanyJuridicalType=Juridical kinds of company DictionnaryCanton=Cantons @@ -470,3 +474,6 @@ NewRSS=New RSS ##### Mailing ##### MailingSetup=Mailing module setup MailingEMailFrom=Sender EMail (From) for emails sent by emailing module +##### Deliveries ##### +DeliveryOrderNumberingModules=Delivery order numbering module +DeliveryOrderModel=Delivery order model \ No newline at end of file diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index cb939a0e7ee..07075115e65 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -244,6 +244,10 @@ Permission1002=Cr Permission1003=Supprimer les stocks Permission1004=Consulter les mouvements de stocks Permission1005=Créer/modifier les mouvements de stocks +Permission1101=Consulter les bons de livraison +Permission1102=Créer/modifier les bons de livraison +Permission1104=Valider les bons de livraison +Permission1109=Supprimer les bons de livraison DictionnaryCompanyType=Types de sociétés DictionnaryCompanyJuridicalType=Formes juridiques DictionnaryCanton=Départements/Provinces/Cantons @@ -470,5 +474,6 @@ NewRSS=Syndication d'un nouveau flux RSS ##### Mailing ##### MailingSetup=Configuration du module EMailing MailingEMailFrom=Email emetteur (From) des mails envoyés par EMailing - - +##### Deliveries ##### +DeliveryOrderNumberingModules=Module de numérotation des bons de livraison +DeliveryOrderModel=Modèle de bon de livraison diff --git a/htdocs/livraison/mods/index.php b/htdocs/livraison/mods/index.php new file mode 100644 index 00000000000..e8534d391a5 --- /dev/null +++ b/htdocs/livraison/mods/index.php @@ -0,0 +1,23 @@ + + * + * 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. + * + * $Id$ + * $Source$ + */ + +Header("Location: ../index.php"); +?> diff --git a/htdocs/livraison/mods/mod_livraison_jade.php b/htdocs/livraison/mods/mod_livraison_jade.php new file mode 100644 index 00000000000..17999d05811 --- /dev/null +++ b/htdocs/livraison/mods/mod_livraison_jade.php @@ -0,0 +1,120 @@ + + * Copyright (C) 2005-2006 Regis Houssin + * + * 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/commande/mod_livraison_jade.php + \ingroup livraison + \brief Fichier contenant la classe du modèle de numérotation de référence de bon de livraison Jade + \version $Revision$ +*/ + +include_once("modules_livraison.php"); + + +/** + \class mod_livraison_jade + \brief Classe du modèle de numérotation de référence de bon de livraison Jade +*/ + +class mod_livraison_jade extends ModeleNumRefCommandes +{ + + /** \brief Constructeur + */ + function mod_livraison_jade() + { + $this->nom = "Jade"; + } + + + /** \brief Renvoi la description du modele de numérotation + * \return string Texte descripif + */ + function info() + { + return "Renvoie le numéro sous la forme numérique BLYY00001, BLYY00002, BLYY00003, ... où YY représente l'année. Le numéro d'incrément qui suit l'année n'est PAS remis à zéro en début d'année."; + } + + /** \brief Renvoi un exemple de numérotation + * \return string Example + */ + function getExample() + { + return "BL0600001"; + } + + /** \brief Renvoi prochaine valeur attribuée + * \return string Valeur + */ + function getNextValue() + { + global $db; + + // D'abord on récupère la valeur max (réponse immédiate car champ indéxé) + $blyy=''; + $sql = "SELECT MAX(ref)"; + $sql.= " FROM ".MAIN_DB_PREFIX."livraison"; + $resql=$db->query($sql); + if ($resql) + { + $row = $db->fetch_row($resql); + if ($row) $blyy = substr($row[0],0,4); + } + + // Si au moins un champ respectant le modèle a été trouvée + if (eregi('BL[0-9][0-9]',$blyy)) + { + // Recherche rapide car restreint par un like sur champ indexé + $posindice=4; + $sql = "SELECT MAX(0+SUBSTRING(ref,$posindice))"; + $sql.= " FROM ".MAIN_DB_PREFIX."livraison"; + $sql.= " WHERE ref like '${blyy}%'"; + $resql=$db->query($sql); + if ($resql) + { + $row = $db->fetch_row($resql); + $max = $row[0]; + } + } + else + { + $max=0; + } + $yy = strftime("%y",time()); + $num = sprintf("%05s",$max+1); + + return "BL$yy$num"; + } + + + /** \brief Renvoie la référence de commande suivante non utilisée + * \param objsoc Objet société + * \return string Texte descripif + */ + function livraison_get_num($objsoc=0) + { + return $this->getNextValue(); + } +} +?> diff --git a/htdocs/livraison/mods/modules_livraison.php b/htdocs/livraison/mods/modules_livraison.php new file mode 100644 index 00000000000..6bc690b2bc8 --- /dev/null +++ b/htdocs/livraison/mods/modules_livraison.php @@ -0,0 +1,211 @@ + + * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004 Eric Seigne + * Copyright (C) 2006 Regis Houssin + * + * 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/expedition/mods/modules_livraison.php + \ingroup expedition + \brief Fichier contenant la classe mère de generation de bon de livraison en PDF + et la classe mère de numérotation des bons de livraisons + \version $Revision$ +*/ + +require_once(FPDF_PATH.'fpdf.php'); + + +/** + \class ModelePDFDeliveryOrder + \brief Classe mère des modèles de bon de livraison +*/ + +class ModelePDFDeliveryOrder extends FPDF +{ + var $error=''; + + /** + \brief Renvoi le dernier message d'erreur de création de PDF de bon de livraison + */ + function pdferror() + { + return $this->error; + } + + /** + * \brief Renvoi la liste des modèles actifs + */ + function liste_modeles($db) + { + $type='delivery'; + $liste=array(); + $sql ="SELECT nom as id, nom as lib"; + $sql.=" FROM ".MAIN_DB_PREFIX."document_model"; + $sql.=" WHERE type = '".$type."'"; + + $resql = $db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; + while ($i < $num) + { + $row = $db->fetch_row($resql); + $liste[$row[0]]=$row[1]; + $i++; + } + } + else + { + $this->error=$db->error(); + return -1; + } + return $liste; + } + +} + + + +/** + \class ModeleNumRefDeliveryOrder + \brief Classe mère des modèles de numérotation des références de bon de livraison +*/ + +class ModeleNumRefDeliveryOrder +{ + var $error=''; + + /** \brief Renvoi la description par defaut du modele de numérotation + * \return string Texte descripif + */ + function info() + { + global $langs; + $langs->load("sendings"); + return $langs->trans("NoDescription"); + } + + /** \brief Renvoi un exemple de numérotation + * \return string Example + */ + function getExample() + { + global $langs; + $langs->load("sendings"); + return $langs->trans("NoExample"); + } + + /** \brief Test si les numéros déjà en vigueur dans la base ne provoquent pas de + * de conflits qui empechera cette numérotation de fonctionner. + * \return boolean false si conflit, true si ok + */ + function canBeActivated() + { + return true; + } + + /** \brief Renvoi prochaine valeur attribuée + * \return string Valeur + */ + function getNextValue() + { + global $langs; + return $langs->trans("NotAvailable"); + } + +} +function delivery_order_pdf_create($db, $deliveryid, $modele='') +{ + global $langs; + $langs->load("sendings"); + + $dir = DOL_DOCUMENT_ROOT."/livraison/mods/pdf/"; + + // Positionne modele sur le nom du modele de bon de livraison à utiliser + if (! strlen($modele)) + { + if (defined("LIVRAISON_ADDON_PDF") && LIVRAISON_ADDON_PDF) + { + $modele = LIVRAISON_ADDON_PDF; + } + else + { + print $langs->trans("Error")." ".$langs->trans("Error_LIVRAISON_ADDON_PDF_NotDefined"); + return 0; + } + } + // Charge le modele + $file = "pdf_".$modele.".modules.php"; + if (file_exists($dir.$file)) + { + $classname = "pdf_".$modele; + require_once($dir.$file); + + $obj = new $classname($db); + + if ( $obj->write_pdf_file($deliveryid) > 0) + { + // on supprime l'image correspondant au preview + delivery_order_delete_preview($db, $deliveryid); + return 1; + } + else + { + dolibarr_syslog("Erreur dans delivery_order_pdf_create"); + dolibarr_print_error($db,$obj->pdferror()); + return 0; + } + } + else + { + print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$dir.$file); + return 0; + } +} +function delivery_order_delete_preview($db, $deliveryid) +{ + global $langs,$conf; + + $delivery = new Livraison($db,"",$deliveryid); + $delivery->fetch($deliveryid); + $client = new Societe($db); + $client->fetch($delivery->soc_id); + + if ($conf->livraison->dir_output) + { + $deliveryref = sanitize_string($delivery->ref); + $dir = $conf->livraison->dir_output . "/" . $deliveryref ; + $file = $dir . "/" . $deliveryref . ".pdf.png"; + + if ( file_exists( $file ) && is_writable( $file ) ) + { + if ( ! unlink($file) ) + { + $this->error=$langs->trans("ErrorFailedToOpenFile",$file); + return 0; + } + } + } +} +?> diff --git a/htdocs/livraison/mods/pdf/index.php b/htdocs/livraison/mods/pdf/index.php new file mode 100644 index 00000000000..1b779722569 --- /dev/null +++ b/htdocs/livraison/mods/pdf/index.php @@ -0,0 +1,23 @@ + + * + * 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. + * + * $Id$ + * $Source$ + */ + +Header("Location: ../../index.php"); +?> diff --git a/htdocs/livraison/mods/pdf/pdf_sirocco.modules.php b/htdocs/livraison/mods/pdf/pdf_sirocco.modules.php new file mode 100644 index 00000000000..07964e4d2e9 --- /dev/null +++ b/htdocs/livraison/mods/pdf/pdf_sirocco.modules.php @@ -0,0 +1,333 @@ + + * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2005-2006 Regis Houssin + * + * 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/commande/pdf_sirocco.modules.php + \ingroup livraison + \brief Fichier de la classe permettant de générer les bons de livraison au modèle Sirocco + \version $Revision$ +*/ + +require_once(DOL_DOCUMENT_ROOT ."/livraison/mods/modules_livraison.php"); + + +/** + \class pdf_sirocco + \brief Classe permettant de générer les bons de livraison au modèle Sirocco +*/ + +class pdf_sirocco extends ModelePDFCommandes +{ + + /** \brief Constructeur + \param db handler accès base de donnée + */ + function pdf_sirocco($db=0) + { + $this->db = $db; + $this->name = "sirocco"; + $this->description = "Modèle de bon de livraison simple"; + + // Dimension page pour format A4 + $this->type = 'pdf'; + $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 le bon de livraison sur le disque + \param id id du bon de livraison à générer + \return int 1=ok, 0=ko + */ + function write_pdf_file($id) + { + global $user,$conf,$langs; + + $delivery = new Livraison($this->db); + if ($delivery->fetch($id)) + { + $deliveryref = sanitize_string($delivery->ref); + $deliveryref = str_replace("(","",$deliveryref); + $deliveryref = str_replace(")","",$deliveryref); + if ($conf->livraison->dir_output) + { + + $dir = $conf->livraison->dir_output . "/" . $deliveryref ; + + if (! file_exists($dir)) + { + if (create_exdir($dir) < 0) + { + $this->error=$langs->trans("ErrorCanNotCreateDir",$dir); + return 0; + } + } + } + else + { + $this->error=$langs->trans("ErrorConstantNotDefined","LIVRAISON_OUTPUTDIR"); + return 0; + } + + $file = $dir . "/" . $deliveryref . ".pdf"; + + if (file_exists($dir)) + { + + $pdf=new FPDF('P','mm',$this->format); + $pdf->Open(); + $pdf->AddPage(); + + $pdf->SetTitle($delivery->ref); + $pdf->SetSubject($langs->trans("DeliveryOrder")); + $pdf->SetCreator("Dolibarr ".DOL_VERSION); + $pdf->SetAuthor($user->fullname); + + $this->_pagehead($pdf, $delivery); + + /* + */ + $tab_top = 100; + $tab_height = 140; + /* + * + */ + + $pdf->SetFillColor(220,220,220); + + $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($delivery->lignes); + + for ($i = 0 ; $i < $nblignes ; $i++) + { + + $curY = $nexY; + + $pdf->SetXY (30, $curY ); + + $pdf->MultiCell(100, 5, $delivery->lignes[$i]->desc, 0, 'J', 0); + + $nexY = $pdf->GetY(); + + $pdf->SetXY (10, $curY ); + + $pdf->MultiCell(20, 5, $delivery->lignes[$i]->ref, 0, 'C'); + + $pdf->SetXY (133, $curY ); + $pdf->MultiCell(10, 5, $delivery->lignes[$i]->tva_tx, 0, 'C'); + + $pdf->SetXY (145, $curY ); + $pdf->MultiCell(10, 5, $delivery->lignes[$i]->qty, 0, 'C'); + + $pdf->SetXY (156, $curY ); + $pdf->MultiCell(18, 5, price($delivery->lignes[$i]->price), 0, 'R', 0); + + $pdf->SetXY (174, $curY ); + $total = price($delivery->lignes[$i]->price * $delivery->lignes[$i]->qty); + $pdf->MultiCell(26, 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, $delivery); + $pdf->SetTextColor(0,0,0); + $pdf->SetFont('Arial','', 10); + } + } + + $this->_tableau($pdf, $tab_top, $tab_height, $nexY); + /* + * + */ + $tab2_top = 241; + $tab2_lh = 7; + $tab2_height = $tab2_lh * 4; + + $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, $langs->trans("TotalHT"), 0, 'R', 0); + + $pdf->SetXY (132, $tab2_top + $tab2_lh); + $pdf->MultiCell(42, $tab2_lh, $langs->trans("Discount"), 0, 'R', 0); + + $pdf->SetXY (132, $tab2_top + $tab2_lh*2); + $pdf->MultiCell(42, $tab2_lh, "Total HT après remise", 0, 'R', 0); + + $pdf->SetXY (132, $tab2_top + $tab2_lh*3); + $pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalVAT"), 0, 'R', 0); + + $pdf->SetXY (132, $tab2_top + ($tab2_lh*4)); + $pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalTTC"), 1, 'R', 1); + + $pdf->SetXY (174, $tab2_top + 0); + $pdf->MultiCell(26, $tab2_lh, price($delivery->total_ht + $delivery->remise), 0, 'R', 0); + + $pdf->SetXY (174, $tab2_top + $tab2_lh); + $pdf->MultiCell(26, $tab2_lh, price($delivery->remise), 0, 'R', 0); + + $pdf->SetXY (174, $tab2_top + $tab2_lh*2); + $pdf->MultiCell(26, $tab2_lh, price($delivery->total_ht), 0, 'R', 0); + + $pdf->SetXY (174, $tab2_top + $tab2_lh*3); + $pdf->MultiCell(26, $tab2_lh, price($delivery->total_tva), 0, 'R', 0); + + $pdf->SetXY (174, $tab2_top + ($tab2_lh*4)); + $pdf->MultiCell(26, $tab2_lh, price($delivery->total_ttc), 1, 'R', 1); + + + $pdf->Output($file); + return 1; + } + } + } + + function _tableau(&$pdf, $tab_top, $tab_height, $nexY) + { + global $langs,$conf; + $langs->load("main"); + $langs->load("bills"); + + $pdf->SetFont('Arial','',11); + + $pdf->Text(30,$tab_top + 5,$langs->trans("Designation")); + + $pdf->line(132, $tab_top, 132, $tab_top + $tab_height); + $pdf->Text(134,$tab_top + 5,$langs->trans("VAT")); + + $pdf->line(144, $tab_top, 144, $tab_top + $tab_height); + $pdf->Text(147,$tab_top + 5,$langs->trans("Qty")); + + $pdf->line(156, $tab_top, 156, $tab_top + $tab_height); + $pdf->Text(160,$tab_top + 5,$langs->trans("PriceU")); + + $pdf->line(174, $tab_top, 174, $tab_top + $tab_height); + $pdf->Text(187,$tab_top + 5,$langs->trans("Total")); + + // $pdf->Rect(10, $tab_top, 190, $nexY - $tab_top); + $pdf->Rect(10, $tab_top, 190, $tab_height); + + + $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); + + } + + function _pagehead(&$pdf, $delivery) + { + global $langs; + $langs->load("sendings"); + $pdf->SetXY(10,5); + if (defined("MAIN_INFO_SOCIETE_NOM")) + { + $pdf->SetTextColor(0,0,200); + $pdf->SetFont('Arial','B',14); + $pdf->MultiCell(76, 8, MAIN_INFO_SOCIETE_NOM, 0, 'L'); + } + + $pdf->SetTextColor(70,70,170); + if (defined("FAC_PDF_ADRESSE")) + { + $pdf->SetFont('Arial','',12); + $pdf->MultiCell(76, 5, FAC_PDF_ADRESSE); + } + if (defined("FAC_PDF_TEL")) + { + $pdf->SetFont('Arial','',10); + $pdf->MultiCell(76, 5, "Tél : ".FAC_PDF_TEL); + } + if (defined("MAIN_INFO_SIREN")) + { + $pdf->SetFont('Arial','',10); + $pdf->MultiCell(76, 5, "SIREN : ".MAIN_INFO_SIREN); + } + + if (defined("FAC_PDF_INTITULE2")) + { + $pdf->SetXY(100,5); + $pdf->SetFont('Arial','B',14); + $pdf->SetTextColor(0,0,200); + $pdf->MultiCell(100, 10, FAC_PDF_INTITULE2, '' , 'R'); + } + /* + * Adresse Client + */ + $pdf->SetTextColor(0,0,0); + $pdf->SetFont('Arial','B',12); + $client = new Societe($this->db); + $client->fetch($delivery->soc_id); + $delivery->client = $client; + $pdf->SetXY(102,42); + $pdf->MultiCell(96,5, $delivery->client->nom); + $pdf->SetFont('Arial','B',11); + $pdf->SetXY(102,47); + $pdf->MultiCell(96,5, $delivery->client->adresse . "\n" . $delivery->client->cp . " " . $delivery->client->ville); + $pdf->rect(100, 40, 100, 40); + + + $pdf->SetTextColor(200,0,0); + $pdf->SetFont('Arial','B',12); + $pdf->Text(11, 88, "Date : " . strftime("%d %b %Y", $delivery->date)); + $pdf->Text(11, 94, $langs->trans("DeliveryOrder")." ".$delivery->ref); + + + } + +} + +?> diff --git a/htdocs/livraison/mods/pdf/pdf_typhon.modules.php b/htdocs/livraison/mods/pdf/pdf_typhon.modules.php new file mode 100644 index 00000000000..1c13fd8dd7d --- /dev/null +++ b/htdocs/livraison/mods/pdf/pdf_typhon.modules.php @@ -0,0 +1,831 @@ + + * Copyright (C) 2005-2006 Regis Houssin + * + * 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/livraison/mods/pdf/pdf_typhon.modules.php + \ingroup livraison + \brief Fichier de la classe permettant de générer les bons de livraison au modèle Typhon + \author Laurent Destailleur + \version $Revision$ +*/ + +require_once(DOL_DOCUMENT_ROOT ."/livraison/mods/modules_commande.php"); +require_once(DOL_DOCUMENT_ROOT."/livraison/livraison.class.php"); + + +/** + \class pdf_typhon + \brief Classe permettant de générer les bons de livraison au modèle Typhon +*/ + +class pdf_typhon extends ModelePDFCommandes +{ + + /** + \brief Constructeur + \param db Handler accès base de donnée + */ + function pdf_typhon($db) + { + global $conf,$langs; + + $this->db = $db; + $this->name = "typhon"; + $this->description = "Modèle de bon de livraison complet (logo...)"; + + // Dimension page pour format A4 + $this->type = 'pdf'; + $this->page_largeur = 210; + $this->page_hauteur = 297; + $this->format = array($this->page_largeur,$this->page_hauteur); + $this->marge_gauche=10; + $this->marge_droite=10; + $this->marge_haute=10; + $this->marge_basse=10; + + $this->option_logo = 1; // Affiche logo FAC_PDF_LOGO + $this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION + $this->option_modereg = 1; // Gere choix mode règlement FACTURE_CHQ_NUMBER, FACTURE_RIB_NUMBER + $this->option_codeproduitservice = 1; // Affiche code produit-service + if (defined("FACTURE_TVAOPTION") && FACTURE_TVAOPTION == 'franchise') + $this->franchise=1; + + // 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); + + $this->tva=array(); + + // Defini position des colonnes + $this->posxdesc=$this->marge_gauche+1; + $this->posxtva=121; + $this->posxup=132; + $this->posxqty=151; + $this->posxdiscount=162; + $this->postotalht=177; + + $this->atleastoneratenotnull=0; + $this->atleastonediscount=0; + } + + /** + \brief Renvoi dernière erreur + \return string Dernière erreur + */ + function pdferror() + { + return $this->error; + } + + /** + \brief Fonction générant la commande sur le disque + \param id Id de la commande à générer + \return int 1=ok, 0=ko + \remarks Variables utilisées + \remarks MAIN_INFO_SOCIETE_NOM + \remarks MAIN_INFO_ADRESSE + \remarks MAIN_INFO_CP + \remarks MAIN_INFO_VILLE + \remarks MAIN_INFO_TEL + \remarks MAIN_INFO_FAX + \remarks MAIN_INFO_WEB + \remarks MAIN_INFO_SIRET + \remarks MAIN_INFO_SIREN + \remarks MAIN_INFO_RCS + \remarks MAIN_INFO_CAPITAL + \remarks MAIN_INFO_TVAINTRA + \remarks MAIN_INFO_LOGO + */ + function write_pdf_file($id) + { + global $user,$langs,$conf; + + $langs->load("main"); + $langs->load("bills"); + $langs->load("products"); + $langs->load("sendings"); + + if ($conf->livraison->dir_output) + { + $delivery = new Livraison($this->db); + $ret=$delivery->fetch($id); + $nblignes = sizeof($delivery->lignes); + + $deliveryref = sanitize_string($delivery->ref); + $deliveryref = str_replace("(","",$deliveryref); + $deliveryref = str_replace(")","",$deliveryref); + $dir = $conf->livraison->dir_output . "/" . $deliveryref; + $file = $dir . "/" . $deliveryref . ".pdf"; + + if (! file_exists($dir)) + { + if (create_exdir($dir) < 0) + { + $this->error=$langs->trans("ErrorCanNotCreateDir",$dir); + return 0; + } + + } + + if (file_exists($dir)) + { + // Initialisation document vierge + $pdf=new FPDF('P','mm',$this->format); + $pdf->Open(); + $pdf->AddPage(); + + $pdf->SetDrawColor(128,128,128); + + $pdf->SetTitle($delivery->ref); + $pdf->SetSubject($langs->trans("DeliveryOrder")); + $pdf->SetCreator("Dolibarr ".DOL_VERSION); + $pdf->SetAuthor($user->fullname); + + $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right + $pdf->SetAutoPageBreak(1,0); + + // Positionne $this->atleastonediscount si on a au moins une remise + for ($i = 0 ; $i < $nblignes ; $i++) + { + if ($delivery->lignes[$i]->remise_percent) + { + $this->atleastonediscount++; + } + } + + $this->_pagehead($pdf, $delivery); + + $pagenb = 1; + $tab_top = 90; + $tab_top_newpage = 50; + $tab_height = 110; + + $iniY = $tab_top + 8; + $curY = $tab_top + 8; + $nexY = $tab_top + 8; + + // Boucle sur les lignes + for ($i = 0 ; $i < $nblignes ; $i++) + { + $curY = $nexY; + + // Description de la ligne produit + $libelleproduitservice=$delivery->lignes[$i]->libelle; + if ($delivery->lignes[$i]->desc&&$delivery->lignes[$i]->desc!=$delivery->lignes[$i]->libelle) + { + if ($libelleproduitservice) $libelleproduitservice.="\n"; + $libelleproduitservice.=$delivery->lignes[$i]->desc; + } + // Si ligne associée à un code produit + if ($delivery->lignes[$i]->product_id) + { + $prodser = new Product($this->db); + + $prodser->fetch($delivery->lignes[$i]->product_id); + if ($prodser->ref) + { + $libelleproduitservice=$langs->trans("Product")." ".$prodser->ref." - ".$libelleproduitservice; + } + + // Ajoute description du produit + if ($conf->global->COM_ADD_PROD_DESC && !$conf->global->CHANGE_PROD_DESC) + { + if ($delivery->lignes[$i]->product_desc&&$delivery->lignes[$i]->product_desc!=$fac->lignes[$i]->libelle&&$delivery->lignes[$i]->product_desc!=$delivery->lignes[$i]->desc) + { + if ($libelleproduitservice) $libelleproduitservice.="\n"; + $libelleproduitservice.=$delivery->lignes[$i]->product_desc; + } + } + } + if ($delivery->lignes[$i]->date_start && $delivery->lignes[$i]->date_end) + { + // Affichage durée si il y en a une + $libelleproduitservice.="\n(".$langs->trans("From")." ".dolibarr_print_date($delivery->lignes[$i]->date_start)." ".$langs->trans("to")." ".dolibarr_print_date($delivery->lignes[$i]->date_end).")"; + } + + $pdf->SetFont('Arial','', 9); // Dans boucle pour gérer multi-page + + $pdf->SetXY ($this->posxdesc-1, $curY); + $pdf->MultiCell(108, 4, $libelleproduitservice, 0, 'J'); + + $nexY = $pdf->GetY(); + + // TVA + $pdf->SetXY ($this->posxtva, $curY); + $pdf->MultiCell(10, 4, ($delivery->lignes[$i]->tva_tx < 0 ? '*':'').abs($delivery->lignes[$i]->tva_tx), 0, 'R'); + + // Prix unitaire HT avant remise + $pdf->SetXY ($this->posxup, $curY); + $pdf->MultiCell(18, 4, price($delivery->lignes[$i]->subprice), 0, 'R', 0); + + // Quantité + $pdf->SetXY ($this->posxqty, $curY); + $pdf->MultiCell(10, 4, $delivery->lignes[$i]->qty, 0, 'R'); + + // Remise sur ligne + $pdf->SetXY ($this->posxdiscount, $curY); + if ($delivery->lignes[$i]->remise_percent) + { + $pdf->MultiCell(14, 4, $delivery->lignes[$i]->remise_percent."%", 0, 'R'); + } + + // Total HT ligne + $pdf->SetXY ($this->postotalht, $curY); + $total = price($delivery->lignes[$i]->price * $delivery->lignes[$i]->qty); + $pdf->MultiCell(23, 4, $total, 0, 'R', 0); + + // Collecte des totaux par valeur de tva + // dans le tableau tva["taux"]=total_tva + $tvaligne=$delivery->lignes[$i]->price * $delivery->lignes[$i]->qty; + if ($delivery->remise_percent) $tvaligne-=($tvaligne*$delivery->remise_percent)/100; + $this->tva[ (string)$delivery->lignes[$i]->tva_tx ] += $tvaligne; + + $nexY+=2; // Passe espace entre les lignes + + if ($nexY > 200 && $i < ($nblignes - 1)) + { + $this->_tableau($pdf, $tab_top, $tab_height + 20, $nexY); + $this->_pagefoot($pdf); + + // Nouvelle page + $pdf->AddPage(); + $pagenb++; + $this->_pagehead($pdf, $delivery, 0); + + $nexY = $tab_top_newpage + 8; + $pdf->SetTextColor(0,0,0); + $pdf->SetFont('Arial','', 10); + } + + } + // Affiche cadre tableau + if ($pagenb == 1) + { + $this->_tableau($pdf, $tab_top, $tab_height, $nexY); + $bottomlasttab=$tab_top + $tab_height + 1; + } + else + { + $this->_tableau($pdf, $tab_top_newpage, $tab_height, $nexY); + $bottomlasttab=$tab_top_newpage + $tab_height + 1; + } + + $deja_regle = ""; + + $posy=$this->_tableau_tot($pdf, $delivery, $deja_regle, $bottomlasttab); + + if ($deja_regle) { + $this->_tableau_versements($pdf, $fac, $posy); + } + + /* + * Mode de règlement + */ + if ((! defined("FACTURE_CHQ_NUMBER") || ! FACTURE_CHQ_NUMBER) && (! defined("FACTURE_RIB_NUMBER") || ! FACTURE_RIB_NUMBER)) + { + $pdf->SetXY ($this->marge_gauche, 228); + $pdf->SetTextColor(200,0,0); + $pdf->SetFont('Arial','B',8); + $pdf->MultiCell(90, 3, $langs->trans("ErrorNoPaiementModeConfigured"),0,'L',0); + $pdf->MultiCell(90, 3, $langs->trans("ErrorCreateBankAccount"),0,'L',0); + $pdf->SetTextColor(0,0,0); + } + + /* + * Propose mode règlement par CHQ + */ + /* + if (defined("FACTURE_CHQ_NUMBER")) + { + if (FACTURE_CHQ_NUMBER > 0) + { + $account = new Account($this->db); + $account->fetch(FACTURE_CHQ_NUMBER); + + $pdf->SetXY ($this->marge_gauche, 227); + $pdf->SetFont('Arial','B',8); + $pdf->MultiCell(90, 3, "Règlement par chèque à l'ordre de ".$account->proprio." envoyé à:",0,'L',0); + $pdf->SetXY ($this->marge_gauche, 231); + $pdf->SetFont('Arial','',8); + $pdf->MultiCell(80, 3, $account->adresse_proprio, 0, 'L', 0); + } + } + */ + + /* + * Propose mode règlement par RIB + */ + /* + if (defined("FACTURE_RIB_NUMBER")) + { + if (FACTURE_RIB_NUMBER > 0) + { + $account = new Account($this->db); + $account->fetch(FACTURE_RIB_NUMBER); + + $this->marges['g']=$this->marge_gauche; + + $cury=242; + $pdf->SetXY ($this->marges['g'], $cury); + $pdf->SetFont('Arial','B',8); + $pdf->MultiCell(90, 3, "Règlement par virement sur le compte bancaire suivant:", 0, 'L', 0); + $cury+=4; + $pdf->SetFont('Arial','B',6); + $pdf->line($this->marges['g']+1, $cury, $this->marges['g']+1, $cury+10 ); + $pdf->SetXY ($this->marges['g'], $cury); + $pdf->MultiCell(18, 3, "Code banque", 0, 'C', 0); + $pdf->line($this->marges['g']+18, $cury, $this->marges['g']+18, $cury+10 ); + $pdf->SetXY ($this->marges['g']+18, $cury); + $pdf->MultiCell(18, 3, "Code guichet", 0, 'C', 0); + $pdf->line($this->marges['g']+36, $cury, $this->marges['g']+36, $cury+10 ); + $pdf->SetXY ($this->marges['g']+36, $cury); + $pdf->MultiCell(24, 3, "Numéro compte", 0, 'C', 0); + $pdf->line($this->marges['g']+60, $cury, $this->marges['g']+60, $cury+10 ); + $pdf->SetXY ($this->marges['g']+60, $cury); + $pdf->MultiCell(13, 3, "Clé RIB", 0, 'C', 0); + $pdf->line($this->marges['g']+73, $cury, $this->marges['g']+73, $cury+10 ); + + $pdf->SetFont('Arial','',8); + $pdf->SetXY ($this->marges['g'], $cury+5); + $pdf->MultiCell(18, 3, $account->code_banque, 0, 'C', 0); + $pdf->SetXY ($this->marges['g']+18, $cury+5); + $pdf->MultiCell(18, 3, $account->code_guichet, 0, 'C', 0); + $pdf->SetXY ($this->marges['g']+36, $cury+5); + $pdf->MultiCell(24, 3, $account->number, 0, 'C', 0); + $pdf->SetXY ($this->marges['g']+60, $cury+5); + $pdf->MultiCell(13, 3, $account->cle_rib, 0, 'C', 0); + + $pdf->SetXY ($this->marges['g'], $cury+12); + $pdf->MultiCell(90, 3, "Domiciliation : " . $account->domiciliation, 0, 'L', 0); + $pdf->SetXY ($this->marges['g'], $cury+22); + $pdf->MultiCell(90, 3, "Prefix IBAN : " . $account->iban_prefix, 0, 'L', 0); + $pdf->SetXY ($this->marges['g'], $cury+25); + $pdf->MultiCell(90, 3, "BIC : " . $account->bic, 0, 'L', 0); + + } + } + */ + + /* + * Conditions de règlements + */ + /* Pour l'instant les conditions de règlement ne sont pas gérées sur les propales */ + /* + $pdf->SetFont('Arial','B',10); + $pdf->SetXY($this->marge_gauche, 217); + $titre = "Conditions de réglement:"; + $pdf->MultiCell(80, 5, $titre, 0, 'L'); + $pdf->SetFont('Arial','',10); + $pdf->SetXY(54, 217); + $pdf->MultiCell(80, 5, $prop->cond_reglement_facture,0,'L'); + */ + + /* + * Pied de page + */ + $this->_pagefoot($pdf); + $pdf->AliasNbPages(); + + $pdf->Close(); + + $pdf->Output($file); + + return 1; // Pas d'erreur + } + else + { + $this->error=$langs->trans("ErrorCanNotCreateDir",$dir); + return 0; + } + } + else + { + $this->error=$langs->trans("ErrorConstantNotDefined","PROP_OUTPUTDIR"); + return 0; + } + $this->error=$langs->trans("ErrorUnknown"); + return 0; // Erreur par defaut + } + + /* + * \brief Affiche le total à payer + * \param pdf Objet PDF + * \param prop Objet propale + * \param deja_regle Montant deja regle + * \return y Position pour suite + */ + function _tableau_tot(&$pdf, $delivery, $deja_regle, $posy) + { + global $langs; + $langs->load("main"); + $langs->load("bills"); + + $tab2_top = $posy; + $tab2_hl = 5; + $tab2_height = $tab2_hl * 4; + $pdf->SetFont('Arial','', 9); + + // Affiche la mention TVA non applicable selon option + $pdf->SetXY ($this->marge_gauche, $tab2_top + 0); + if ($this->franchise==1) + { + $pdf->MultiCell(100, $tab2_hl, "* TVA non applicable art-293B du CGI", 0, 'L', 0); + } + + // Tableau total + $lltot = 200; $col1x = 120; $col2x = 182; $largcol2 = $lltot - $col2x; + + // Total HT + $pdf->SetFillColor(256,256,256); + $pdf->SetXY ($col1x, $tab2_top + 0); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("TotalHT"), 0, 'L', 1); + + $pdf->SetXY ($col2x, $tab2_top + 0); + $pdf->MultiCell($largcol2, $tab2_hl, price($delivery->total_ht +$delivery->remise), 0, 'R', 1); + + // Remise globale + if ($delivery->remise > 0) + { + $pdf->SetXY ($col1x, $tab2_top + $tab2_hl); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("GlobalDiscount"), 0, 'L', 1); + + $pdf->SetXY ($col2x, $tab2_top + $tab2_hl); + $pdf->MultiCell($largcol2, $tab2_hl, "-".$delivery->remise_percent."%", 0, 'R', 1); + + $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * 2); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, "Total HT après remise", 0, 'L', 1); + + $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * 2); + $pdf->MultiCell($largcol2, $tab2_hl, price($delivery->total_ht), 0, 'R', 0); + + $index = 2; + } + else + { + $index = 0; + } + + // Affichage des totaux de TVA par taux (conformément à réglementation) + $pdf->SetFillColor(248,248,248); + foreach( $this->tva as $tvakey => $tvaval ) + { + if ($tvakey) // On affiche pas taux 0 + { + $this->atleastoneratenotnull++; + + $index++; + $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); + $tvacompl = ( (float)$tvakey < 0 ) ? " (".$langs->trans("NonPercuRecuperable").")" : '' ; + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("TotalVAT").' '.abs($tvakey).'%'.$tvacompl, 0, 'L', 1); + + $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); + $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval * abs((float)$tvakey) / 100 ), 0, 'R', 1); + } + } + if (! $this->atleastoneratenotnull) + { + $index++; + $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("TotalVAT"), 0, 'L', 1); + + $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); + $pdf->MultiCell($largcol2, $tab2_hl, price($delivery->total_tva), 0, 'R', 1); + } + + $useborder=0; + + $index++; + $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); + $pdf->SetTextColor(0,0,60); + $pdf->SetFillColor(224,224,224); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("TotalTTC"), $useborder, 'L', 1); + + $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); + $pdf->MultiCell($largcol2, $tab2_hl, price($delivery->total_ttc), $useborder, 'R', 1); + $pdf->SetFont('Arial','', 9); + $pdf->SetTextColor(0,0,0); + + if ($deja_regle > 0) + { + $index++; + + $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("AlreadyPayed"), 0, 'L', 0); + + $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); + $pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', 0); + + $index++; + $pdf->SetTextColor(0,0,60); + //$pdf->SetFont('Arial','B', 9); + $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("RemainderToPay"), $useborder, 'L', 1); + + $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); + $pdf->MultiCell($largcol2, $tab2_hl, price($delivery->total_ttc - $deja_regle), $useborder, 'R', 1); + $pdf->SetFont('Arial','', 9); + $pdf->SetTextColor(0,0,0); + } + + $index++; + return ($tab2_top + ($tab2_hl * $index)); + } + + /* + * \brief Affiche la grille des lignes de propales + * \param pdf objet PDF + */ + function _tableau(&$pdf, $tab_top, $tab_height, $nexY) + { + global $langs,$conf; + $langs->load("main"); + $langs->load("bills"); + + // Montants exprimés en (en tab_top - 1) + $pdf->SetTextColor(0,0,0); + $pdf->SetFont('Arial','',8); + $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie)); + $pdf->Text($this->page_largeur - $this->marge_droite - $pdf->GetStringWidth($titre), $tab_top-1, $titre); + + $pdf->SetDrawColor(128,128,128); + + // Rect prend une longueur en 3eme param + $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height); + // line prend une position y en 3eme param + $pdf->line($this->marge_gauche, $tab_top+6, $this->page_largeur-$this->marge_droite, $tab_top+6); + + $pdf->SetFont('Arial','',10); + + $pdf->SetXY ($this->posxdesc-1, $tab_top+2); + $pdf->MultiCell(108,2, $langs->trans("Designation"),'','L'); + + $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height); + $pdf->SetXY ($this->posxtva-1, $tab_top+2); + $pdf->MultiCell(12,2, $langs->trans("VAT"),'','C'); + + $pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height); + $pdf->SetXY ($this->posxup-1, $tab_top+2); + $pdf->MultiCell(18,2, $langs->trans("PriceUHT"),'','C'); + + $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height); + $pdf->SetXY ($this->posxqty-1, $tab_top+2); + $pdf->MultiCell(11,2, $langs->trans("Qty"),'','C'); + + $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height); + if ($this->atleastonediscount) + { + $pdf->SetXY ($this->posxdiscount-1, $tab_top+2); + $pdf->MultiCell(16,2, $langs->trans("Discount"),'','C'); + } + + if ($this->atleastonediscount) + { + $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height); + } + $pdf->SetXY ($this->postotalht-1, $tab_top+2); + $pdf->MultiCell(23,2, $langs->trans("TotalHT"),'','C'); + + } + + /* + * \brief Affiche en-tête propale + * \param pdf objet PDF + * \param fac objet propale + * \param showadress 0=non, 1=oui + */ + function _pagehead(&$pdf, $delivery, $showadress=1) + { + global $langs,$conf,$mysoc; + + $langs->load("main"); + $langs->load("bills"); + $langs->load("orders"); + $langs->load("companies"); + + $pdf->SetTextColor(0,0,60); + $pdf->SetFont('Arial','B',13); + + $posy=$this->marge_haute; + + $pdf->SetXY($this->marge_gauche,$posy); + + // Logo + $logo=$mysoc->logo; + if (defined("FAC_PDF_LOGO") && FAC_PDF_LOGO) $logo=DOL_DATA_ROOT.FAC_PDF_LOGO; + if ($logo) + { + if (is_readable($logo)) + { + $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24); + } + else + { + $pdf->SetTextColor(200,0,0); + $pdf->SetFont('Arial','B',8); + $pdf->MultiCell(100, 3, $langs->trans("ErrorLogoFileNotFound",$logo), 0, 'L'); + $pdf->MultiCell(100, 3, $langs->trans("ErrorGoToModuleSetup"), 0, 'L'); + } + } + else if(defined("MAIN_INFO_SOCIETE_NOM") && FAC_PDF_SOCIETE_NOM) + { + $pdf->MultiCell(100, 4, MAIN_INFO_SOCIETE_NOM, 0, 'L'); + } + + $pdf->SetFont('Arial','B',13); + $pdf->SetXY(100,$posy); + $pdf->SetTextColor(0,0,60); + $pdf->MultiCell(100, 4, $langs->trans("DeliveryOrder")." ".$delivery->ref, '' , 'R'); + $pdf->SetFont('Arial','',12); + + $posy+=6; + $pdf->SetXY(100,$posy); + $pdf->SetTextColor(0,0,60); + $pdf->MultiCell(100, 4, $langs->trans("Date")." : " . dolibarr_print_date($delivery->date,"%d %b %Y"), '', 'R'); + + if ($showadress) + { + // Emetteur + $posy=42; + $hautcadre=40; + $pdf->SetTextColor(0,0,0); + $pdf->SetFont('Arial','',8); + $pdf->SetXY($this->marge_gauche,$posy-5); + $pdf->MultiCell(66,5, $langs->trans("BillFrom").":"); + + + $pdf->SetXY($this->marge_gauche,$posy); + $pdf->SetFillColor(230,230,230); + $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1); + + + $pdf->SetXY($this->marge_gauche+2,$posy+3); + + // Nom emetteur + $pdf->SetTextColor(0,0,60); + $pdf->SetFont('Arial','B',11); + if (defined("FAC_PDF_SOCIETE_NOM") && FAC_PDF_SOCIETE_NOM) $pdf->MultiCell(80, 4, FAC_PDF_SOCIETE_NOM, 0, 'L'); + else $pdf->MultiCell(80, 4, $mysoc->nom, 0, 'L'); + + // Caractéristiques emetteur + $carac_emetteur = ''; + if (defined("FAC_PDF_ADRESSE") && FAC_PDF_ADRESSE) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).FAC_PDF_ADRESSE; + else { + $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$mysoc->adresse; + $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$mysoc->cp.' '.$mysoc->ville; + } + $carac_emetteur .= "\n"; + // Tel + if (defined("FAC_PDF_TEL") && FAC_PDF_TEL) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Phone").": ".FAC_PDF_TEL; + elseif ($mysoc->tel) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Phone").": ".$mysoc->tel; + // Fax + if (defined("FAC_PDF_FAX") && FAC_PDF_FAX) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Fax").": ".FAC_PDF_FAX; + elseif ($mysoc->fax) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Fax").": ".$mysoc->fax; + // EMail + if (defined("FAC_PDF_MEL") && FAC_PDF_MEL) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Email").": ".FAC_PDF_MEL; + elseif ($mysoc->email) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Email").": ".$mysoc->email; + // Web + if (defined("FAC_PDF_WWW") && FAC_PDF_WWW) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Web").": ".FAC_PDF_WWW; + elseif ($mysoc->url) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Web").": ".$mysoc->url; + + $pdf->SetFont('Arial','',9); + $pdf->SetXY($this->marge_gauche+2,$posy+8); + $pdf->MultiCell(80,4, $carac_emetteur); + + // Client destinataire + $posy=42; + $pdf->SetTextColor(0,0,0); + $pdf->SetFont('Arial','',8); + $pdf->SetXY(102,$posy-5); + $pdf->MultiCell(80,5, $langs->trans("BillTo").":"); + // + $client = new Societe($this->db); + $client->fetch($delivery->soc_id); + $delivery->client = $client; + // + + // Cadre client destinataire + $pdf->rect(100, $posy, 100, $hautcadre); + + // Nom client + $pdf->SetXY(102,$posy+3); + $pdf->SetFont('Arial','B',11); + $pdf->MultiCell(106,4, $delivery->client->nom, 0, 'L'); + + // Caractéristiques client + $carac_client=$delivery->client->adresse; + $carac_client.="\n".$delivery->client->cp . " " . $delivery->client->ville."\n"; + if ($delivery->client->tva_intra) $carac_client.="\n".$langs->trans("VATIntraShort").': '.$delivery->client->tva_intra; + $pdf->SetFont('Arial','',9); + $pdf->SetXY(102,$posy+8); + $pdf->MultiCell(86,4, $carac_client); + } + + } + + /* + * \brief Affiche le pied de page + * \param pdf objet PDF + */ + function _pagefoot(&$pdf) + { + global $langs, $conf; + $langs->load("main"); + $langs->load("bills"); + $langs->load("companies"); + + $html=new Form($this->db); + + // Premiere ligne d'info réglementaires + $ligne1=""; + if ($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE) + { + $ligne1.=($ligne1?" - ":"").$html->forme_juridique_name($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE); + } + if ($conf->global->MAIN_INFO_CAPITAL) + { + $ligne1.=($ligne1?" - ":"").$langs->trans("CapitalOf",$conf->global->MAIN_INFO_CAPITAL)." ".$langs->trans("Currency".$conf->monnaie); + } + if ($conf->global->MAIN_INFO_SIRET) + { + $ligne1.=($ligne1?" - ":"").$langs->transcountry("ProfId2",$this->emetteur->code_pays).": ".$conf->global->MAIN_INFO_SIRET; + } + if ($conf->global->MAIN_INFO_SIREN && (! $conf->global->MAIN_INFO_SIRET || $this->emetteur->code_pays != 'FR')) + { + $ligne1.=($ligne1?" - ":"").$langs->transcountry("ProfId1",$this->emetteur->code_pays).": ".$conf->global->MAIN_INFO_SIREN; + } + if ($conf->global->MAIN_INFO_APE) + { + $ligne1.=($ligne1?" - ":"").$langs->transcountry("ProfId3",$this->emetteur->code_pays).": ".MAIN_INFO_APE; + } + + // Deuxieme ligne d'info réglementaires + $ligne2=""; + if ($conf->global->MAIN_INFO_RCS) + { + $ligne2.=($ligne2?" - ":"").$langs->transcountry("ProfId4",$this->emetteur->code_pays).": ".$conf->global->MAIN_INFO_RCS; + } + if ($conf->global->MAIN_INFO_TVAINTRA != '') + { + $ligne2.=($ligne2?" - ":"").$langs->trans("VATIntraShort").": ".$conf->global->MAIN_INFO_TVAINTRA; + } + + $pdf->SetFont('Arial','',8); + $pdf->SetDrawColor(224,224,224); + + // On positionne le debut du bas de page selon nbre de lignes de ce bas de page + $posy=$this->marge_basse + 1 + ($ligne1?3:0) + ($ligne2?3:0); + + $pdf->SetY(-$posy); + $pdf->line($this->marge_gauche, $this->page_hauteur-$posy, 200, $this->page_hauteur-$posy); + $posy--; + + if ($ligne1) + { + $pdf->SetXY($this->marge_gauche,-$posy); + $pdf->MultiCell(200, 2, $ligne1, 0, 'C', 0); + } + + if ($ligne2) + { + $posy-=3; + $pdf->SetXY($this->marge_gauche,-$posy); + $pdf->MultiCell(200, 2, $ligne2, 0, 'C', 0); + } + + $pdf->SetXY(-20,-$posy); + $pdf->MultiCell(10, 2, $pdf->PageNo().'/{nb}', 0, 'R', 0); + } + +} + +?> diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 91b10d95b15..b661dd57dc4 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -224,6 +224,10 @@ $conf->commande->dir_images=DOL_DATA_ROOT."/commande/images"; $conf->expedition->enabled=defined("MAIN_MODULE_EXPEDITION")?MAIN_MODULE_EXPEDITION:0; $conf->expedition->dir_output=DOL_DATA_ROOT."/expedition"; $conf->expedition->dir_images=DOL_DATA_ROOT."/expedition/images"; +// Module expeditions +$conf->livraison->enabled=defined("MAIN_MODULE_EXPEDITION")?MAIN_MODULE_EXPEDITION:0; +$conf->livraison->dir_output=DOL_DATA_ROOT."/livraison"; +$conf->livraison->dir_images=DOL_DATA_ROOT."/livraison/images"; // Module societe $conf->societe->enabled=defined("MAIN_MODULE_SOCIETE")?MAIN_MODULE_SOCIETE:0; $conf->societe->dir_output=DOL_DATA_ROOT."/societe"; diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql index f607b3f87d8..0a21fec40e3 100644 --- a/mysql/migration/2.0.0-2.1.0.sql +++ b/mysql/migration/2.0.0-2.1.0.sql @@ -185,3 +185,41 @@ ALTER TABLE llx_facture_rec ADD CONSTRAINT fk_facture_rec_fk_projet FORE ALTER TABLE llx_facture_rec ADD UNIQUE INDEX idx_facture_rec_uk_titre (titre); alter table llx_commandedet add column coef real; + +create table llx_livraison +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_soc integer NOT NULL, + fk_soc_contact integer, + fk_commande integer DEFAULT 0, + ref varchar(30) NOT NULL, + date_creation datetime, + date_valid datetime, + fk_user_author integer, + fk_user_valid integer, + fk_statut smallint default 0, + total_ht real default 0, + total_ttc real default 0, + note text, + note_public text, + model_pdf varchar(50), + date_livraison date default NULL, + fk_adresse_livraison integer, + + UNIQUE INDEX (ref) +)type=innodb; + +create table llx_livraisondet +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + fk_livraison integer, + fk_product integer, + label varchar(255), + description text, + qty real, -- quantité + price real -- prix final +)type=innodb; + +ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_soc (fk_soc); +ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_societe FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); \ No newline at end of file