diff --git a/ChangeLog b/ChangeLog index 1e2a7c68edb..ae894779cce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ -------------------------------------------------------------- English Dolibarr ChangeLog -$Id: ChangeLog,v 1.427 2011/08/20 23:57:09 eldy Exp $ +$Id: ChangeLog,v 1.428 2011/08/27 15:40:08 eldy Exp $ -------------------------------------------------------------- ***** ChangeLog for 3.2 compared to 3.1 ***** @@ -10,6 +10,7 @@ For users: - New: Task #10500: Option to choose if professionnal id are unique - New: Add hide option FOURN_PRODUCT_AVAILABILITY - New: task #11123: Add best supplier price +- New: Enhancement in styles. For developers: - Qual: Removed no more used external libraries diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 723e821fa96..a68e3541cbf 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -214,8 +214,7 @@ if ($_GET["action"] == 'create') print ''; print ''.$langs->trans("DefaultModel").''; print ''; - $model=new ModelePDFPropales(); - $liste=$model->liste_modeles($db); + $liste=ModelePDFPropales::liste_modeles($db); print $html->selectarray('model',$liste,$conf->global->PROPALE_ADDON_PDF); print ""; @@ -236,7 +235,7 @@ if ($_GET["action"] == 'create') print ''; print ''; } - + // Insert hooks $parameters=array(); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index b6ae15904c7..fe9850c8ec8 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1276,7 +1276,7 @@ if ($action == 'create' && $user->rights->commande->creer) } print ''; } - + // Insert hooks $parameters=array(); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook @@ -1285,8 +1285,7 @@ if ($action == 'create' && $user->rights->commande->creer) print ''; // pdf include_once(DOL_DOCUMENT_ROOT.'/includes/modules/commande/modules_commande.php'); - $model=new ModelePDFCommandes(); - $liste=$model->liste_modeles($db); + $liste=ModelePDFCommandes::liste_modeles($db); print $html->selectarray('model',$liste,$conf->global->COMMANDE_ADDON_PDF); print ""; @@ -1770,7 +1769,7 @@ else } print ''; } - + // Insert hooks $parameters=array('colspan'=>' colspan="2"'); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index db2fafa7716..7f9b035687b 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1689,7 +1689,7 @@ if ($action == 'create') select_projects($soc->id, $projectid, 'projectid'); print ''; } - + // Insert hooks $parameters=array(); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook @@ -1698,8 +1698,7 @@ if ($action == 'create') print ''.$langs->trans('Model').''; print ''; include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); - $model=new ModelePDFFactures(); - $liste=$model->liste_modeles($db); + $liste=ModelePDFFactures::liste_modeles($db); print $html->selectarray('model',$liste,$conf->global->FACTURE_ADDON_PDF); print ""; @@ -2543,7 +2542,7 @@ else print ''; print ''; } - + // Insert hooks $parameters=array('colspan'=>' colspan="3"'); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 0cfbab579e8..e33db60cb78 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -284,8 +284,10 @@ class Conf if (empty($this->global->SOCIETE_CODECLIENT_ADDON)) $this->global->SOCIETE_CODECLIENT_ADDON="mod_codeclient_leopard"; if (empty($this->global->SOCIETE_CODEFOURNISSEUR_ADDON)) $this->global->SOCIETE_CODEFOURNISSEUR_ADDON=$this->global->SOCIETE_CODECLIENT_ADDON; if (empty($this->global->SOCIETE_CODECOMPTA_ADDON)) $this->global->SOCIETE_CODECOMPTA_ADDON="mod_codecompta_panicum"; + if (empty($this->global->COMPANY_AQUARIUM_MASK_SUPPLIER)) $this->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401'; + if (empty($this->global->COMPANY_AQUARIUM_MASK_CUSTOMER)) $this->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411'; - // Security + // Security if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED='standard'; // Default password generator if (empty($this->global->MAIN_UMASK)) $this->global->MAIN_UMASK='0664'; // Default mask diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 197ffadf0d6..3f538a58b7e 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -220,8 +220,7 @@ class FormFile else { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/societe/modules_societe.class.php'); - $model=new ModeleThirdPartyDoc(); - $modellist=$model->liste_modeles($this->db); + $modellist=ModeleThirdPartyDoc::liste_modeles($this->db); } } else if ($modulepart == 'propal') @@ -230,8 +229,7 @@ class FormFile else { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php'); - $model=new ModelePDFPropales(); - $modellist=$model->liste_modeles($this->db); + $modellist=ModelePDFPropales::liste_modeles($this->db); } } else if ($modulepart == 'commande') @@ -240,8 +238,7 @@ class FormFile else { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/commande/modules_commande.php'); - $model=new ModelePDFCommandes(); - $modellist=$model->liste_modeles($this->db); + $modellist=ModelePDFCommandes::liste_modeles($this->db); } } elseif ($modulepart == 'expedition') @@ -250,8 +247,7 @@ class FormFile else { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/expedition/pdf/ModelePdfExpedition.class.php'); - $model=new ModelePDFExpedition(); - $modellist=$model->liste_modeles($this->db); + $modellist=ModelePDFExpedition::liste_modeles($this->db); } } elseif ($modulepart == 'livraison') @@ -260,8 +256,7 @@ class FormFile else { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/livraison/modules_livraison.php'); - $model=new ModelePDFDeliveryOrder(); - $modellist=$model->liste_modeles($this->db); + $modellist=ModelePDFDeliveryOrder::liste_modeles($this->db); } } else if ($modulepart == 'ficheinter') @@ -270,8 +265,7 @@ class FormFile else { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/fichinter/modules_fichinter.php'); - $model=new ModelePDFFicheinter(); - $modellist=$model->liste_modeles($this->db); + $modellist=ModelePDFFicheinter::liste_modeles($this->db); } } elseif ($modulepart == 'facture') @@ -280,8 +274,7 @@ class FormFile else { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); - $model=new ModelePDFFactures(); - $modellist=$model->liste_modeles($this->db); + $modellist=ModelePDFFactures::liste_modeles($this->db); // This is to allow to join external files to invoices if (! empty($conf->concatpdf->enabled)) @@ -301,8 +294,7 @@ class FormFile else { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/project/modules_project.php'); - $model=new ModelePDFProjects(); - $modellist=$model->liste_modeles($this->db); + $modellist=ModelePDFProjects::liste_modeles($this->db); } } elseif ($modulepart == 'export') @@ -311,8 +303,7 @@ class FormFile else { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/export/modules_export.php'); - $model=new ModeleExports(); - $modellist=$model->liste_modeles($this->db); + $modellist=ModeleExports::liste_modeles($this->db); } } else if ($modulepart == 'commande_fournisseur') @@ -321,8 +312,7 @@ class FormFile else { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_commandefournisseur.php'); - $model=new ModelePDFSuppliersOrders(); - $modellist=$model->liste_modeles($this->db); + $modellist=ModelePDFSuppliersOrders::liste_modeles($this->db); } } else if ($modulepart == 'facture_fournisseur') @@ -331,8 +321,7 @@ class FormFile else { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_invoice/modules_facturefournisseur.php'); - $model=new ModelePDFSuppliersInvoices(); - $modellist=$model->liste_modeles($this->db); + $modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db); } } else if ($modulepart == 'remisecheque') @@ -341,8 +330,7 @@ class FormFile else { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/cheque/pdf/modules_chequereceipts.php'); - $model=new ModeleChequeReceipts(); - $modellist=$model->liste_modeles($this->db); + $modellist=ModeleChequeReceipts::liste_modeles($this->db); } } elseif ($modulepart == 'donation') @@ -351,8 +339,7 @@ class FormFile else { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/dons/modules_don.php'); - $model=new ModeleDon(); - $modellist=$model->liste_modeles($this->db); + $modellist=ModeleDon::liste_modeles($this->db); } } else if ($modulepart == 'unpaid') @@ -370,8 +357,7 @@ class FormFile $class='Modele'.ucfirst($modulepart); if (class_exists($class)) { - $model=new $class(); - $modellist=$model->liste_modeles($this->db); + $modellist=$class::liste_modeles($this->db); } else { diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index e0c2365c5e1..7c3ba3b792d 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2011 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index 5e9a85c096f..1a5644d96e3 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -66,7 +66,7 @@ print ''; include_once(DOL_DOCUMENT_ROOT.'/includes/modules/export/modules_export.php'); $model=new ModeleExports(); -$liste=$model->liste_modeles($db); +$liste=$model->liste_modeles($db); // This is not a static method for exports because method load non static properties $var=true; foreach($liste as $key => $val) diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 995e6db9d8b..a892246ef75 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -708,8 +708,7 @@ if ($action == 'create') print ''; print ''.$langs->trans("DefaultModel").''; print ''; - $model=new ModelePDFFicheinter(); - $liste=$model->liste_modeles($db); + $liste=ModelePDFFicheinter::liste_modeles($db); print $html->selectarray('model',$liste,$conf->global->FICHEINTER_ADDON_PDF); print ""; diff --git a/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php b/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php index 99803015c20..56ebe50e211 100644 --- a/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php +++ b/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php @@ -23,10 +23,10 @@ * \file htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php * \ingroup facture * \brief File with parent class of check receipt document generators - * \version $Id: modules_chequereceipts.php,v 1.7 2011/08/11 12:14:03 eldy Exp $ + * \version $Id: modules_chequereceipts.php,v 1.8 2011/08/27 15:40:10 eldy Exp $ */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Requis car utilise dans les classes qui heritent @@ -35,7 +35,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Req * \class ModeleChequeReceipts * \brief Classe mere des modeles de facture */ -class ModeleChequeReceipts +abstract class ModeleChequeReceipts extends CommonDocGenerator { var $error=''; diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php index 92047b54c3e..98ae43eff54 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/includes/modules/commande/modules_commande.php @@ -25,10 +25,9 @@ * \ingroup commande * \brief Fichier contenant la classe mere de generation des commandes en PDF * et la classe mere de numerotation des commandes - * \version $Id: modules_commande.php,v 1.51 2011/08/11 12:14:00 eldy Exp $ */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // requis car utilise par les classes qui heritent require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); @@ -37,7 +36,7 @@ require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); * \class ModelePDFCommandes * \brief Classe mere des modeles de commandes */ -class ModelePDFCommandes +abstract class ModelePDFCommandes extends CommonDocGenerator { var $error=''; @@ -171,8 +170,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0 // Si model pas encore bon if (! $modelisok) { - $model=new ModelePDFCommandes(); - $liste=$model->liste_modeles($db); + $liste=ModelePDFCommandes::liste_modeles($db); $modele=key($liste); // Renvoie premiere valeur de cle trouvee dans le tableau $file = "pdf_".$modele.".modules.php"; // On verifie l'emplacement du modele diff --git a/htdocs/includes/modules/dons/modules_don.php b/htdocs/includes/modules/dons/modules_don.php index c87ea245fea..f8d43388231 100644 --- a/htdocs/includes/modules/dons/modules_don.php +++ b/htdocs/includes/modules/dons/modules_don.php @@ -23,9 +23,9 @@ * \file htdocs/includes/modules/dons/modules_don.php * \ingroup don * \brief File of class to manage donation document generation - * \version $Id: modules_don.php,v 1.23 2011/08/11 12:14:02 eldy Exp $ + * \version $Id: modules_don.php,v 1.24 2011/08/27 15:40:09 eldy Exp $ */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); @@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); * \class ModeleDon * \brief Classe mere des modeles de dons */ -class ModeleDon +abstract class ModeleDon extends CommonDocGenerator { var $error=''; diff --git a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php b/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php index 3a13c10ea8d..ac0d8d378d9 100644 --- a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php +++ b/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php @@ -22,17 +22,15 @@ * \file htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php * \ingroup shipping * \brief Fichier contenant la classe mere de generation des expeditions - * \version $Id: ModelePdfExpedition.class.php,v 1.18 2011/08/11 12:14:00 eldy Exp $ */ - -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); /** * \class ModelePdfExpedition * \brief Parent class of sending receipts models */ -class ModelePdfExpedition +abstract class ModelePdfExpedition extends CommonDocGenerator { var $error=''; @@ -93,9 +91,7 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs) // Si model pas encore bon if (! $modelisok) { - $liste=array(); - $model=new ModelePDFExpedition(); - $liste=$model->liste_modeles($db); + $liste=ModelePDFExpedition::liste_modeles($db); $modele=key($liste); // Renvoie premiere valeur de cle trouve dans le tableau $file = "pdf_expedition_".$modele.".modules.php"; // On verifie l'emplacement du modele diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index 7055bef4b69..53c518b7029 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -20,17 +20,17 @@ * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ + * \version $Id: modules_export.php,v 1.26 2011/08/27 15:40:11 eldy Exp $ */ -require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); /** * \class ModeleExports * \brief Parent class for export modules */ -class ModeleExports +class ModeleExports extends CommondocGenerator // This class can't be abstract as there is instance propreties loaded by liste_modeles { var $error=''; @@ -41,13 +41,6 @@ class ModeleExports var $libversion=array(); - /** - * \brief Constructeur - */ - function ModeleExports() - { - } - /** * \brief Charge en memoire et renvoie la liste des modeles actifs * \param db Handler de base diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php index 89e29ee24b5..583298de3a0 100644 --- a/htdocs/includes/modules/facture/modules_facture.php +++ b/htdocs/includes/modules/facture/modules_facture.php @@ -24,19 +24,19 @@ * \ingroup facture * \brief Fichier contenant la classe mere de generation des factures en PDF * et la classe mere de numerotation des factures - * \version $Id: modules_facture.php,v 1.96 2011/08/11 12:14:04 eldy Exp $ + * \version $Id: modules_facture.php,v 1.97 2011/08/27 15:40:09 eldy Exp $ */ +require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Requis car utilise dans les classes qui heritent -require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); /** * \class ModelePDFFactures * \brief Classe mere des modeles de facture */ -class ModelePDFFactures extends CommonDocGenerator +abstract class ModelePDFFactures extends CommonDocGenerator { var $error=''; diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/includes/modules/fichinter/modules_fichinter.php index ea9a3373352..8dc595800e6 100644 --- a/htdocs/includes/modules/fichinter/modules_fichinter.php +++ b/htdocs/includes/modules/fichinter/modules_fichinter.php @@ -23,27 +23,20 @@ * \ingroup ficheinter * \brief Fichier contenant la classe mere de generation des fiches interventions en PDF * et la classe mere de numerotation des fiches interventions - * \version $Id: modules_fichinter.php,v 1.44 2011/08/11 12:14:03 eldy Exp $ + * \version $Id: modules_fichinter.php,v 1.45 2011/08/27 15:40:11 eldy Exp $ */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); /** * \class ModelePDFFicheinter * \brief Classe mere des modeles de fiche intervention */ -class ModelePDFFicheinter +abstract class ModelePDFFicheinter extends CommonDocGenerator { var $error=''; - /** - * \brief Constructeur - */ - function ModelePDFFicheinter() - { - - } /** * \brief Return list of active generation modules diff --git a/htdocs/includes/modules/import/modules_import.php b/htdocs/includes/modules/import/modules_import.php index f1836e0eb8c..9ff2837fae1 100644 --- a/htdocs/includes/modules/import/modules_import.php +++ b/htdocs/includes/modules/import/modules_import.php @@ -21,7 +21,6 @@ * \file htdocs/includes/modules/import/modules_import.php * \ingroup export * \brief File of parent class for import file readers - * \version $Id: modules_import.php,v 1.9 2011/07/31 23:28:17 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/livraison/modules_livraison.php b/htdocs/includes/modules/livraison/modules_livraison.php index 8777355e416..cac8691c108 100644 --- a/htdocs/includes/modules/livraison/modules_livraison.php +++ b/htdocs/includes/modules/livraison/modules_livraison.php @@ -24,17 +24,17 @@ * \ingroup expedition * \brief Fichier contenant la classe mere de generation de bon de livraison en PDF * et la classe mere de numerotation des bons de livraisons - * \version $Id: modules_livraison.php,v 1.20 2011/08/11 12:14:02 eldy Exp $ + * \version $Id: modules_livraison.php,v 1.21 2011/08/27 15:40:10 eldy Exp $ */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); /** * \class ModelePDFDeliveryOrder * \brief Classe mere des modeles de bon de livraison */ -class ModelePDFDeliveryOrder +abstract class ModelePDFDeliveryOrder extends CommonDocGenerator { var $error=''; diff --git a/htdocs/includes/modules/project/modules_project.php b/htdocs/includes/modules/project/modules_project.php index 9d574ebe143..cf42c9c9e14 100644 --- a/htdocs/includes/modules/project/modules_project.php +++ b/htdocs/includes/modules/project/modules_project.php @@ -21,16 +21,16 @@ * \ingroup project * \brief File that contain parent class for projects models * and parent class for projects numbering models - * \version $Id: modules_project.php,v 1.14 2011/08/11 12:14:01 eldy Exp $ + * \version $Id: modules_project.php,v 1.15 2011/08/27 15:40:09 eldy Exp $ */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); /** * \class ModelePDFProjects * \brief Parent class for projects models */ -class ModelePDFProjects +abstract class ModelePDFProjects extends CommonDocGenerator { var $error=''; diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php index 5c57ca2f476..536066a3f18 100644 --- a/htdocs/includes/modules/propale/modules_propale.php +++ b/htdocs/includes/modules/propale/modules_propale.php @@ -23,10 +23,9 @@ * \ingroup propale * \brief Fichier contenant la classe mere de generation des propales en PDF * et la classe mere de numerotation des propales - * \version $Id: modules_propale.php,v 1.66 2011/08/11 12:14:03 eldy Exp $ */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Requis car utilise dans les classes qui heritent @@ -34,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Req * \class ModelePDFPropales * \brief Classe mere des modeles de propale */ -class ModelePDFPropales +abstract class ModelePDFPropales extends CommonDocGenerator { var $error=''; @@ -169,9 +168,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, // Si model pas encore bon if (! $modelisok) { - $liste=array(); - $model=new ModelePDFPropales(); - $liste=$model->liste_modeles($db); + $liste=ModelePDFPropales::liste_modeles($db); $modele=key($liste); // Renvoie premiere valeur de cle trouve dans le tableau $file = "pdf_propale_".$modele.".modules.php"; $file = dol_buildpath($dir.$file); diff --git a/htdocs/includes/modules/societe/mod_codeclient_elephant.php b/htdocs/includes/modules/societe/mod_codeclient_elephant.php index 2a4f13c863b..6bf107fb5fc 100644 --- a/htdocs/includes/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/includes/modules/societe/mod_codeclient_elephant.php @@ -22,7 +22,7 @@ * \file htdocs/includes/modules/societe/mod_codeclient_elephant.php * \ingroup societe * \brief File of class to manage third party code with elephant rule - * \version $Id: mod_codeclient_elephant.php,v 1.16 2011/08/27 13:15:38 eldy Exp $ + * \version $Id: mod_codeclient_elephant.php,v 1.17 2011/08/27 15:40:08 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); @@ -67,7 +67,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode */ function info($langs) { - global $conf,$langs; + global $conf; $langs->load("companies"); @@ -172,7 +172,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode } else return -1; - $now=gmmktime(); + $now=dol_now(); $numFinal=get_next_value($db,$mask,'societe',$field,$where,'',$now); @@ -181,7 +181,9 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode /** - * Verifie si le mask utilise le prefix + * Check if mask/numbering use prefix + * + * @param int 0=no, 1=yes */ function verif_prefixIsUsed() { diff --git a/htdocs/includes/modules/societe/mod_codecompta_aquarium.php b/htdocs/includes/modules/societe/mod_codecompta_aquarium.php index 95cbd8c4861..320a89fe699 100644 --- a/htdocs/includes/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/includes/modules/societe/mod_codecompta_aquarium.php @@ -22,7 +22,7 @@ * \file htdocs/includes/modules/societe/mod_codecompta_aquarium.php * \ingroup societe * \brief File of class to manage accountancy code of thirdparties with Panicum rules - * \version $Id: mod_codecompta_aquarium.php,v 1.18 2011/08/27 13:15:38 eldy Exp $ + * \version $Id: mod_codecompta_aquarium.php,v 1.19 2011/08/27 15:40:08 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); @@ -36,8 +36,8 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode var $nom='Aquarium'; var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' - var $prefixcodecomptacustomer='411'; - var $prefixcodecomptasupplier='401'; + var $prefixcustomeraccountancycode='411'; + var $prefixsupplieraccountancycode='401'; /** @@ -45,6 +45,9 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode */ function mod_codecompta_aquarium() { + global $conf; + $this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER; + $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER; } @@ -55,7 +58,28 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode */ function info($langs) { - return $langs->trans("ModuleCompanyCode".$this->nom); + global $conf; + + $langs->load("companies"); + + $form = new Form($db); + + $tooltip=''; + $texte = '
'; + $texte.= ''; + $texte.= ''; + $texte.= ''; + $texte.= ''; + $texte.= ''; + $s1= $form->textwithpicto('',$tooltip,1,1); + $s2= $form->textwithpicto('',$tooltip,1,1); + $texte.= ''; + $texte.= ''; + $texte.= '
'.$langs->trans("ModuleCompanyCode".$this->nom,$s1,$s2)."
\n"; + $texte.= '		 
'; + $texte.= '
'; + + return $texte; } /** Return an example of result returned by getNextValue @@ -66,7 +90,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode */ function getExample($langs,$objsoc=0,$type=-1) { - return $this->prefixcodecomptacustomer.'MYTHIRDPARTY'; + return $this->prefixsupplieraccountancycode.'MYSUPPLIERCODE'."
\n".$this->prefixcustomeraccountancycode.'MYCUSTOMERCODE'; } @@ -87,8 +111,8 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode // Regle gestion compte compta $codetouse=''; - if ($type == 'customer') $codetouse = $this->prefixcodecomptacustomer; - if ($type == 'supplier') $codetouse = $this->prefixcodecomptasupplier; + if ($type == 'customer') $codetouse = $this->prefixcustomeraccountancycode; + if ($type == 'supplier') $codetouse = $this->prefixsupplieraccountancycode; if ($type == 'customer') $codetouse.= ($societe->code_client?$societe->code_client:'CustomerCode'); if ($type == 'supplier') $codetouse.= ($societe->code_fournisseur?$societe->code_fournisseur:'SupplierCode'); $codetouse=strtoupper(preg_replace('/([^a-z0-9])/i','',$codetouse)); diff --git a/htdocs/includes/modules/societe/modules_societe.class.php b/htdocs/includes/modules/societe/modules_societe.class.php index 541c5ea49e1..847ce2be69f 100644 --- a/htdocs/includes/modules/societe/modules_societe.class.php +++ b/htdocs/includes/modules/societe/modules_societe.class.php @@ -225,9 +225,14 @@ abstract class ModeleThirdPartyCode return $s; } + /** + * Check if mask/numbering use prefix + * + * @param int 0=no, 1=yes + */ function verif_prefixIsUsed() { - return false; + return 0; } } diff --git a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php index 78e13367d44..f880ee6d63e 100755 --- a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php @@ -20,16 +20,16 @@ * \file htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php * \ingroup facture fourniseur * \brief File that contain parent class for supplier invoices models - * \version $Id: modules_facturefournisseur.php,v 1.11 2011/08/11 12:14:04 eldy Exp $ + * \version $Id: modules_facturefournisseur.php,v 1.12 2011/08/27 15:40:10 eldy Exp $ */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); /** * \class ModelePDFSuppliersInvoices * \brief Parent class for supplier invoices models */ -class ModelePDFSuppliersInvoices +abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator { var $error=''; diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php index 2e4f206a5a6..743d2f9bd45 100644 --- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php @@ -26,9 +26,8 @@ * \ingroup commande * \brief File that contain parent class for supplier orders models * and parent class for supplier orders numbering models - * \version $Id: modules_commandefournisseur.php,v 1.24 2011/08/11 12:14:04 eldy Exp $ */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // requis car utilise par les classes qui heritent @@ -36,7 +35,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // requi * \class ModelePDFSuppliersOrders * \brief Parent class for supplier orders models */ -class ModelePDFSuppliersOrders +abstract class ModelePDFSuppliersOrders extends CommonDocGenerator { var $error=''; @@ -171,8 +170,7 @@ function supplier_order_pdf_create($db, $object, $model, $outputlangs, $hidedeta // Si model pas encore bon if (! $modelisok) { - $modele=new ModelePDFSuppliersOrders(); - $liste=$modele->liste_modeles($db); + $liste=ModelePDFSuppliersOrders::liste_modeles($db); $modele=key($liste); // Renvoie la premiere valeur de cle trouvee dans le tableau $file = "pdf_".$model.".modules.php"; // On verifie l'emplacement du modele diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index deba4bb2031..3523bf24551 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -1706,8 +1706,7 @@ function migrate_modeles($db,$langs,$conf) if (! empty($conf->facture->enabled)) { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); - $model=new ModelePDFFactures(); - $modellist=$model->liste_modeles($db); + $modellist=ModelePDFFactures::liste_modeles($db); if (sizeof($modellist)==0) { // Aucun model par defaut. @@ -1720,8 +1719,7 @@ function migrate_modeles($db,$langs,$conf) if (! empty($conf->commande->enabled)) { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/commande/modules_commande.php'); - $model=new ModelePDFCommandes(); - $modellist=$model->liste_modeles($db); + $modellist=ModelePDFCommandes::liste_modeles($db); if (sizeof($modellist)==0) { // Aucun model par defaut. @@ -1734,8 +1732,7 @@ function migrate_modeles($db,$langs,$conf) if (! empty($conf->expedition->enabled)) { include_once(DOL_DOCUMENT_ROOT.'/includes/modules/expedition/pdf/ModelePdfExpedition.class.php'); - $model=new ModelePDFExpedition(); - $modellist=$model->liste_modeles($db); + $modellist=ModelePDFExpedition::liste_modeles($db); if (sizeof($modellist)==0) { // Aucun model par defaut.