Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Qual: Call static methods as static with no need to create instance

Browse Source
This commit is contained in:
Laurent Destailleur
2011-08-27 15:40:08 +00:00
parent 2ecc03104c
commit ab953d6501
26 changed files with 112 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,6 +1,6 @@
-------------------------------------------------------------- --------------------------------------------------------------
English Dolibarr ChangeLog 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 ***** ***** 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: Task #10500: Option to choose if professionnal id are unique
- New: Add hide option FOURN_PRODUCT_AVAILABILITY - New: Add hide option FOURN_PRODUCT_AVAILABILITY
- New: task #11123: Add best supplier price - New: task #11123: Add best supplier price
- New: Enhancement in styles.
For developers: For developers:
- Qual: Removed no more used external libraries - Qual: Removed no more used external libraries

3
htdocs/comm/addpropal.php
View File

@@ -214,8 +214,7 @@ if ($_GET["action"] == 'create')
print '<tr>'; print '<tr>';
print '<td>'.$langs->trans("DefaultModel").'</td>'; print '<td>'.$langs->trans("DefaultModel").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
$model=new ModelePDFPropales(); $liste=ModelePDFPropales::liste_modeles($db);
$liste=$model->liste_modeles($db);
print $html->selectarray('model',$liste,$conf->global->PROPALE_ADDON_PDF); print $html->selectarray('model',$liste,$conf->global->PROPALE_ADDON_PDF);
print "</td></tr>"; print "</td></tr>";

3
htdocs/commande/fiche.php
View File

@@ -1285,8 +1285,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '<td colspan="2">'; print '<td colspan="2">';
// pdf // pdf
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/commande/modules_commande.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/commande/modules_commande.php');
$model=new ModelePDFCommandes(); $liste=ModelePDFCommandes::liste_modeles($db);
$liste=$model->liste_modeles($db);
print $html->selectarray('model',$liste,$conf->global->COMMANDE_ADDON_PDF); print $html->selectarray('model',$liste,$conf->global->COMMANDE_ADDON_PDF);
print "</td></tr>"; print "</td></tr>";

3
htdocs/compta/facture.php
View File

@@ -1698,8 +1698,7 @@ if ($action == 'create')
print '<tr><td>'.$langs->trans('Model').'</td>'; print '<tr><td>'.$langs->trans('Model').'</td>';
print '<td>'; print '<td>';
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php');
$model=new ModelePDFFactures(); $liste=ModelePDFFactures::liste_modeles($db);
$liste=$model->liste_modeles($db);
print $html->selectarray('model',$liste,$conf->global->FACTURE_ADDON_PDF); print $html->selectarray('model',$liste,$conf->global->FACTURE_ADDON_PDF);
print "</td></tr>"; print "</td></tr>";

2
htdocs/core/class/conf.class.php
View File

@@ -284,6 +284,8 @@ class Conf
if (empty($this->global->SOCIETE_CODECLIENT_ADDON)) $this->global->SOCIETE_CODECLIENT_ADDON="mod_codeclient_leopard"; 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_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->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->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED='standard'; // Default password generator

42
htdocs/core/class/html.formfile.class.php
View File

@@ -220,8 +220,7 @@ class FormFile
else else
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/societe/modules_societe.class.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/societe/modules_societe.class.php');
$model=new ModeleThirdPartyDoc(); $modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
$modellist=$model->liste_modeles($this->db);
} }
} }
else if ($modulepart == 'propal') else if ($modulepart == 'propal')
@@ -230,8 +229,7 @@ class FormFile
else else
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php');
$model=new ModelePDFPropales(); $modellist=ModelePDFPropales::liste_modeles($this->db);
$modellist=$model->liste_modeles($this->db);
} }
} }
else if ($modulepart == 'commande') else if ($modulepart == 'commande')
@@ -240,8 +238,7 @@ class FormFile
else else
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/commande/modules_commande.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/commande/modules_commande.php');
$model=new ModelePDFCommandes(); $modellist=ModelePDFCommandes::liste_modeles($this->db);
$modellist=$model->liste_modeles($this->db);
} }
} }
elseif ($modulepart == 'expedition') elseif ($modulepart == 'expedition')
@@ -250,8 +247,7 @@ class FormFile
else else
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/expedition/pdf/ModelePdfExpedition.class.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/expedition/pdf/ModelePdfExpedition.class.php');
$model=new ModelePDFExpedition(); $modellist=ModelePDFExpedition::liste_modeles($this->db);
$modellist=$model->liste_modeles($this->db);
} }
} }
elseif ($modulepart == 'livraison') elseif ($modulepart == 'livraison')
@@ -260,8 +256,7 @@ class FormFile
else else
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/livraison/modules_livraison.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/livraison/modules_livraison.php');
$model=new ModelePDFDeliveryOrder(); $modellist=ModelePDFDeliveryOrder::liste_modeles($this->db);
$modellist=$model->liste_modeles($this->db);
} }
} }
else if ($modulepart == 'ficheinter') else if ($modulepart == 'ficheinter')
@@ -270,8 +265,7 @@ class FormFile
else else
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/fichinter/modules_fichinter.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/fichinter/modules_fichinter.php');
$model=new ModelePDFFicheinter(); $modellist=ModelePDFFicheinter::liste_modeles($this->db);
$modellist=$model->liste_modeles($this->db);
} }
} }
elseif ($modulepart == 'facture') elseif ($modulepart == 'facture')
@@ -280,8 +274,7 @@ class FormFile
else else
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php');
$model=new ModelePDFFactures(); $modellist=ModelePDFFactures::liste_modeles($this->db);
$modellist=$model->liste_modeles($this->db);
// This is to allow to join external files to invoices // This is to allow to join external files to invoices
if (! empty($conf->concatpdf->enabled)) if (! empty($conf->concatpdf->enabled))
@@ -301,8 +294,7 @@ class FormFile
else else
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/project/modules_project.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/project/modules_project.php');
$model=new ModelePDFProjects(); $modellist=ModelePDFProjects::liste_modeles($this->db);
$modellist=$model->liste_modeles($this->db);
} }
} }
elseif ($modulepart == 'export') elseif ($modulepart == 'export')
@@ -311,8 +303,7 @@ class FormFile
else else
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/export/modules_export.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/export/modules_export.php');
$model=new ModeleExports(); $modellist=ModeleExports::liste_modeles($this->db);
$modellist=$model->liste_modeles($this->db);
} }
} }
else if ($modulepart == 'commande_fournisseur') else if ($modulepart == 'commande_fournisseur')
@@ -321,8 +312,7 @@ class FormFile
else else
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_commandefournisseur.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_commandefournisseur.php');
$model=new ModelePDFSuppliersOrders(); $modellist=ModelePDFSuppliersOrders::liste_modeles($this->db);
$modellist=$model->liste_modeles($this->db);
} }
} }
else if ($modulepart == 'facture_fournisseur') else if ($modulepart == 'facture_fournisseur')
@@ -331,8 +321,7 @@ class FormFile
else else
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_invoice/modules_facturefournisseur.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_invoice/modules_facturefournisseur.php');
$model=new ModelePDFSuppliersInvoices(); $modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db);
$modellist=$model->liste_modeles($this->db);
} }
} }
else if ($modulepart == 'remisecheque') else if ($modulepart == 'remisecheque')
@@ -341,8 +330,7 @@ class FormFile
else else
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/cheque/pdf/modules_chequereceipts.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/cheque/pdf/modules_chequereceipts.php');
$model=new ModeleChequeReceipts(); $modellist=ModeleChequeReceipts::liste_modeles($this->db);
$modellist=$model->liste_modeles($this->db);
} }
} }
elseif ($modulepart == 'donation') elseif ($modulepart == 'donation')
@@ -351,8 +339,7 @@ class FormFile
else else
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/dons/modules_don.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/dons/modules_don.php');
$model=new ModeleDon(); $modellist=ModeleDon::liste_modeles($this->db);
$modellist=$model->liste_modeles($this->db);
} }
} }
else if ($modulepart == 'unpaid') else if ($modulepart == 'unpaid')
@@ -370,8 +357,7 @@ class FormFile
$class='Modele'.ucfirst($modulepart); $class='Modele'.ucfirst($modulepart);
if (class_exists($class)) if (class_exists($class))
{ {
$model=new $class(); $modellist=$class::liste_modeles($this->db);
$modellist=$model->liste_modeles($this->db);
} }
else else
{ {

2
htdocs/exports/export.php
View File

@@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

2
htdocs/exports/index.php
View File

@@ -66,7 +66,7 @@ print '</tr>';
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/export/modules_export.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/export/modules_export.php');
$model=new ModeleExports(); $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; $var=true;
foreach($liste as $key => $val) foreach($liste as $key => $val)

3
htdocs/fichinter/fiche.php
View File

@@ -708,8 +708,7 @@ if ($action == 'create')
print '<tr>'; print '<tr>';
print '<td>'.$langs->trans("DefaultModel").'</td>'; print '<td>'.$langs->trans("DefaultModel").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
$model=new ModelePDFFicheinter(); $liste=ModelePDFFicheinter::liste_modeles($db);
$liste=$model->liste_modeles($db);
print $html->selectarray('model',$liste,$conf->global->FICHEINTER_ADDON_PDF); print $html->selectarray('model',$liste,$conf->global->FICHEINTER_ADDON_PDF);
print "</td></tr>"; print "</td></tr>";

6
htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php
View File

@@ -23,10 +23,10 @@
* \file htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php * \file htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php
* \ingroup facture * \ingroup facture
* \brief File with parent class of check receipt document generators * \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."/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."/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 * \class ModeleChequeReceipts
* \brief Classe mere des modeles de facture * \brief Classe mere des modeles de facture
*/ */
class ModeleChequeReceipts abstract class ModeleChequeReceipts extends CommonDocGenerator
{ {
var $error=''; var $error='';

8
htdocs/includes/modules/commande/modules_commande.php
View File

@@ -25,10 +25,9 @@
* \ingroup commande * \ingroup commande
* \brief Fichier contenant la classe mere de generation des commandes en PDF * \brief Fichier contenant la classe mere de generation des commandes en PDF
* et la classe mere de numerotation des commandes * 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."/compta/bank/class/account.class.php"); // requis car utilise par les classes qui heritent
require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); 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 * \class ModelePDFCommandes
* \brief Classe mere des modeles de commandes * \brief Classe mere des modeles de commandes
*/ */
class ModelePDFCommandes abstract class ModelePDFCommandes extends CommonDocGenerator
{ {
var $error=''; var $error='';
@@ -171,8 +170,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0
// Si model pas encore bon // Si model pas encore bon
if (! $modelisok) if (! $modelisok)
{ {
$model=new ModelePDFCommandes(); $liste=ModelePDFCommandes::liste_modeles($db);
$liste=$model->liste_modeles($db);
$modele=key($liste); // Renvoie premiere valeur de cle trouvee dans le tableau $modele=key($liste); // Renvoie premiere valeur de cle trouvee dans le tableau
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
// On verifie l'emplacement du modele // On verifie l'emplacement du modele

6
htdocs/includes/modules/dons/modules_don.php
View File

@@ -23,9 +23,9 @@
* \file htdocs/includes/modules/dons/modules_don.php * \file htdocs/includes/modules/dons/modules_don.php
* \ingroup don * \ingroup don
* \brief File of class to manage donation document generation * \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"); 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 * \class ModeleDon
* \brief Classe mere des modeles de dons * \brief Classe mere des modeles de dons
*/ */
class ModeleDon abstract class ModeleDon extends CommonDocGenerator
{ {
var $error=''; var $error='';

10
htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
View File

@@ -22,17 +22,15 @@
* \file htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php * \file htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
* \ingroup shipping * \ingroup shipping
* \brief Fichier contenant la classe mere de generation des expeditions * \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."/core/class/commondocgenerator.class.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
/** /**
* \class ModelePdfExpedition * \class ModelePdfExpedition
* \brief Parent class of sending receipts models * \brief Parent class of sending receipts models
*/ */
class ModelePdfExpedition abstract class ModelePdfExpedition extends CommonDocGenerator
{ {
var $error=''; var $error='';
@@ -93,9 +91,7 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs)
// Si model pas encore bon // Si model pas encore bon
if (! $modelisok) if (! $modelisok)
{ {
$liste=array(); $liste=ModelePDFExpedition::liste_modeles($db);
$model=new ModelePDFExpedition();
$liste=$model->liste_modeles($db);
$modele=key($liste); // Renvoie premiere valeur de cle trouve dans le tableau $modele=key($liste); // Renvoie premiere valeur de cle trouve dans le tableau
$file = "pdf_expedition_".$modele.".modules.php"; $file = "pdf_expedition_".$modele.".modules.php";
// On verifie l'emplacement du modele // On verifie l'emplacement du modele

13
htdocs/includes/modules/export/modules_export.php
View File

@@ -20,17 +20,17 @@
* \file htdocs/includes/modules/export/modules_export.php * \file htdocs/includes/modules/export/modules_export.php
* \ingroup export * \ingroup export
* \brief File of parent class for export modules * \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 * \class ModeleExports
* \brief Parent class for export modules * \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=''; var $error='';
@@ -41,13 +41,6 @@ class ModeleExports
var $libversion=array(); var $libversion=array();
/**
* \brief Constructeur
*/
function ModeleExports()
{
}
/** /**
* \brief Charge en memoire et renvoie la liste des modeles actifs * \brief Charge en memoire et renvoie la liste des modeles actifs
* \param db Handler de base * \param db Handler de base

6
htdocs/includes/modules/facture/modules_facture.php
View File

@@ -24,19 +24,19 @@
* \ingroup facture * \ingroup facture
* \brief Fichier contenant la classe mere de generation des factures en PDF * \brief Fichier contenant la classe mere de generation des factures en PDF
* et la classe mere de numerotation des factures * 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."/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."/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 * \class ModelePDFFactures
* \brief Classe mere des modeles de facture * \brief Classe mere des modeles de facture
*/ */
class ModelePDFFactures extends CommonDocGenerator abstract class ModelePDFFactures extends CommonDocGenerator
{ {
var $error=''; var $error='';

13
htdocs/includes/modules/fichinter/modules_fichinter.php
View File

@@ -23,27 +23,20 @@
* \ingroup ficheinter * \ingroup ficheinter
* \brief Fichier contenant la classe mere de generation des fiches interventions en PDF * \brief Fichier contenant la classe mere de generation des fiches interventions en PDF
* et la classe mere de numerotation des fiches interventions * 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 * \class ModelePDFFicheinter
* \brief Classe mere des modeles de fiche intervention * \brief Classe mere des modeles de fiche intervention
*/ */
class ModelePDFFicheinter abstract class ModelePDFFicheinter extends CommonDocGenerator
{ {
var $error=''; var $error='';
/**
* \brief Constructeur
*/
function ModelePDFFicheinter()
{
}
/** /**
* \brief Return list of active generation modules * \brief Return list of active generation modules

1
htdocs/includes/modules/import/modules_import.php
View File

@@ -21,7 +21,6 @@
* \file htdocs/includes/modules/import/modules_import.php * \file htdocs/includes/modules/import/modules_import.php
* \ingroup export * \ingroup export
* \brief File of parent class for import file readers * \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'); require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');

6
htdocs/includes/modules/livraison/modules_livraison.php
View File

@@ -24,17 +24,17 @@
* \ingroup expedition * \ingroup expedition
* \brief Fichier contenant la classe mere de generation de bon de livraison en PDF * \brief Fichier contenant la classe mere de generation de bon de livraison en PDF
* et la classe mere de numerotation des bons de livraisons * 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 * \class ModelePDFDeliveryOrder
* \brief Classe mere des modeles de bon de livraison * \brief Classe mere des modeles de bon de livraison
*/ */
class ModelePDFDeliveryOrder abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
{ {
var $error=''; var $error='';

6
htdocs/includes/modules/project/modules_project.php
View File

@@ -21,16 +21,16 @@
* \ingroup project * \ingroup project
* \brief File that contain parent class for projects models * \brief File that contain parent class for projects models
* and parent class for projects numbering 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 * \class ModelePDFProjects
* \brief Parent class for projects models * \brief Parent class for projects models
*/ */
class ModelePDFProjects abstract class ModelePDFProjects extends CommonDocGenerator
{ {
var $error=''; var $error='';

9
htdocs/includes/modules/propale/modules_propale.php
View File

@@ -23,10 +23,9 @@
* \ingroup propale * \ingroup propale
* \brief Fichier contenant la classe mere de generation des propales en PDF * \brief Fichier contenant la classe mere de generation des propales en PDF
* et la classe mere de numerotation des propales * 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 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 * \class ModelePDFPropales
* \brief Classe mere des modeles de propale * \brief Classe mere des modeles de propale
*/ */
class ModelePDFPropales abstract class ModelePDFPropales extends CommonDocGenerator
{ {
var $error=''; var $error='';
@@ -169,9 +168,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
// Si model pas encore bon // Si model pas encore bon
if (! $modelisok) if (! $modelisok)
{ {
$liste=array(); $liste=ModelePDFPropales::liste_modeles($db);
$model=new ModelePDFPropales();
$liste=$model->liste_modeles($db);
$modele=key($liste); // Renvoie premiere valeur de cle trouve dans le tableau $modele=key($liste); // Renvoie premiere valeur de cle trouve dans le tableau
$file = "pdf_propale_".$modele.".modules.php"; $file = "pdf_propale_".$modele.".modules.php";
$file = dol_buildpath($dir.$file); $file = dol_buildpath($dir.$file);

10
htdocs/includes/modules/societe/mod_codeclient_elephant.php
View File

@@ -22,7 +22,7 @@
* \file htdocs/includes/modules/societe/mod_codeclient_elephant.php * \file htdocs/includes/modules/societe/mod_codeclient_elephant.php
* \ingroup societe * \ingroup societe
* \brief File of class to manage third party code with elephant rule * \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"); 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) function info($langs)
{ {
global $conf,$langs; global $conf;
$langs->load("companies"); $langs->load("companies");
@@ -172,7 +172,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
} }
else return -1; else return -1;
$now=gmmktime(); $now=dol_now();
$numFinal=get_next_value($db,$mask,'societe',$field,$where,'',$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() function verif_prefixIsUsed()
{ {

38
htdocs/includes/modules/societe/mod_codecompta_aquarium.php
View File

@@ -22,7 +22,7 @@
* \file htdocs/includes/modules/societe/mod_codecompta_aquarium.php * \file htdocs/includes/modules/societe/mod_codecompta_aquarium.php
* \ingroup societe * \ingroup societe
* \brief File of class to manage accountancy code of thirdparties with Panicum rules * \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"); 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 $nom='Aquarium';
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefixcodecomptacustomer='411'; var $prefixcustomeraccountancycode='411';
var $prefixcodecomptasupplier='401'; var $prefixsupplieraccountancycode='401';
/** /**
@@ -45,6 +45,9 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
*/ */
function mod_codecompta_aquarium() 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) function info($langs)
{ {
return $langs->trans("ModuleCompanyCode".$this->nom); global $conf;
$langs->load("companies");
$form = new Form($db);
$tooltip='';
$texte = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
$texte.= '<input type="hidden" name="param1" value="COMPANY_AQUARIUM_MASK_SUPPLIER">';
$texte.= '<input type="hidden" name="param2" value="COMPANY_AQUARIUM_MASK_CUSTOMER">';
$texte.= '<table class="nobordernopadding" width="100%">';
$s1= $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER.'">',$tooltip,1,1);
$s2= $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER.'">',$tooltip,1,1);
$texte.= '<tr><td>'.$langs->trans("ModuleCompanyCode".$this->nom,$s1,$s2)."<br>\n";
$texte.= '</td>';
$texte.= '<td align="left">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
$texte.= '</tr></table>';
$texte.= '</form>';
return $texte;
} }
/** Return an example of result returned by getNextValue /** 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) function getExample($langs,$objsoc=0,$type=-1)
{ {
return $this->prefixcodecomptacustomer.'MYTHIRDPARTY'; return $this->prefixsupplieraccountancycode.'MYSUPPLIERCODE'."<br>\n".$this->prefixcustomeraccountancycode.'MYCUSTOMERCODE';
} }
@@ -87,8 +111,8 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
// Regle gestion compte compta // Regle gestion compte compta
$codetouse=''; $codetouse='';
if ($type == 'customer') $codetouse = $this->prefixcodecomptacustomer; if ($type == 'customer') $codetouse = $this->prefixcustomeraccountancycode;
if ($type == 'supplier') $codetouse = $this->prefixcodecomptasupplier; if ($type == 'supplier') $codetouse = $this->prefixsupplieraccountancycode;
if ($type == 'customer') $codetouse.= ($societe->code_client?$societe->code_client:'CustomerCode'); if ($type == 'customer') $codetouse.= ($societe->code_client?$societe->code_client:'CustomerCode');
if ($type == 'supplier') $codetouse.= ($societe->code_fournisseur?$societe->code_fournisseur:'SupplierCode'); if ($type == 'supplier') $codetouse.= ($societe->code_fournisseur?$societe->code_fournisseur:'SupplierCode');
$codetouse=strtoupper(preg_replace('/([^a-z0-9])/i','',$codetouse)); $codetouse=strtoupper(preg_replace('/([^a-z0-9])/i','',$codetouse));

7
htdocs/includes/modules/societe/modules_societe.class.php
View File

@@ -225,9 +225,14 @@ abstract class ModeleThirdPartyCode
return $s; return $s;
} }
/**
* Check if mask/numbering use prefix
*
* @param int 0=no, 1=yes
*/
function verif_prefixIsUsed() function verif_prefixIsUsed()
{ {
return false; return 0;
} }
} }

6
htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
View File

@@ -20,16 +20,16 @@
* \file htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php * \file htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
* \ingroup facture fourniseur * \ingroup facture fourniseur
* \brief File that contain parent class for supplier invoices models * \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 * \class ModelePDFSuppliersInvoices
* \brief Parent class for supplier invoices models * \brief Parent class for supplier invoices models
*/ */
class ModelePDFSuppliersInvoices abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
{ {
var $error=''; var $error='';

8
htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
View File

@@ -26,9 +26,8 @@
* \ingroup commande * \ingroup commande
* \brief File that contain parent class for supplier orders models * \brief File that contain parent class for supplier orders models
* and parent class for supplier orders numbering 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 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 * \class ModelePDFSuppliersOrders
* \brief Parent class for supplier orders models * \brief Parent class for supplier orders models
*/ */
class ModelePDFSuppliersOrders abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
{ {
var $error=''; var $error='';
@@ -171,8 +170,7 @@ function supplier_order_pdf_create($db, $object, $model, $outputlangs, $hidedeta
// Si model pas encore bon // Si model pas encore bon
if (! $modelisok) if (! $modelisok)
{ {
$modele=new ModelePDFSuppliersOrders(); $liste=ModelePDFSuppliersOrders::liste_modeles($db);
$liste=$modele->liste_modeles($db);
$modele=key($liste); // Renvoie la premiere valeur de cle trouvee dans le tableau $modele=key($liste); // Renvoie la premiere valeur de cle trouvee dans le tableau
$file = "pdf_".$model.".modules.php"; $file = "pdf_".$model.".modules.php";
// On verifie l'emplacement du modele // On verifie l'emplacement du modele

9
htdocs/install/upgrade2.php
View File

@@ -1706,8 +1706,7 @@ function migrate_modeles($db,$langs,$conf)
if (! empty($conf->facture->enabled)) if (! empty($conf->facture->enabled))
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php');
$model=new ModelePDFFactures(); $modellist=ModelePDFFactures::liste_modeles($db);
$modellist=$model->liste_modeles($db);
if (sizeof($modellist)==0) if (sizeof($modellist)==0)
{ {
// Aucun model par defaut. // Aucun model par defaut.
@@ -1720,8 +1719,7 @@ function migrate_modeles($db,$langs,$conf)
if (! empty($conf->commande->enabled)) if (! empty($conf->commande->enabled))
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/commande/modules_commande.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/commande/modules_commande.php');
$model=new ModelePDFCommandes(); $modellist=ModelePDFCommandes::liste_modeles($db);
$modellist=$model->liste_modeles($db);
if (sizeof($modellist)==0) if (sizeof($modellist)==0)
{ {
// Aucun model par defaut. // Aucun model par defaut.
@@ -1734,8 +1732,7 @@ function migrate_modeles($db,$langs,$conf)
if (! empty($conf->expedition->enabled)) if (! empty($conf->expedition->enabled))
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/expedition/pdf/ModelePdfExpedition.class.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/expedition/pdf/ModelePdfExpedition.class.php');
$model=new ModelePDFExpedition(); $modellist=ModelePDFExpedition::liste_modeles($db);
$modellist=$model->liste_modeles($db);
if (sizeof($modellist)==0) if (sizeof($modellist)==0)
{ {
// Aucun model par defaut. // Aucun model par defaut.