Qual: Reduce quantity of code. Make code simpler

This commit is contained in:
Laurent Destailleur 2009-05-04 11:40:00 +00:00
parent 7697a914d1
commit 754041115f
52 changed files with 659 additions and 971 deletions

View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Eric Seigne <erics@rycks.com> * Copyright (C) 2003 Eric Seigne <erics@rycks.com>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -107,7 +107,7 @@ if ($resql)
$name = "actions-".$obj->month."-".$obj->year.".pdf"; $name = "actions-".$obj->month."-".$obj->year.".pdf";
$relativepath= $name; $relativepath= $name;
$file = $conf->commercial->dir_actions_temp."/".$name; $file = $conf->agenda->dir_temp."/".$name;
if (file_exists($file)) if (file_exists($file))
{ {

View File

@ -830,7 +830,7 @@ class BonPrelevement extends CommonObject
{ {
$prev_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_bons"); $prev_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_bons");
$dir=$conf->prelevement->dir_bon; $dir=$conf->prelevement->dir_output.'/receipts';
$file=$filebonprev; $file=$filebonprev;
if (! is_dir($dir)) create_exdir($dir); if (! is_dir($dir)) create_exdir($dir);

View File

@ -58,7 +58,7 @@ if ($_POST["action"] == 'infotrans')
if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $bon->ref) if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $bon->ref)
{ {
$dir = $conf->prelevement->dir_bon; $dir = $conf->prelevement->dir_output.'/receipts';
if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $dir . "/" . $_FILES['userfile']['name'],1) > 0) if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $dir . "/" . $_FILES['userfile']['name'],1) > 0)
{ {

View File

@ -61,19 +61,7 @@ class modAdherent extends DolibarrModules
$this->picto='user'; $this->picto='user';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/adherent/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/adherent";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/adherent/temp";
$r++;
$this->dirs[$r][0] = "photos";
$this->dirs[$r][1] = "/adherent/photos";
// Config pages // Config pages
//------------- //-------------

View File

@ -21,177 +21,169 @@
*/ */
/** \defgroup banque Module banque /** \defgroup banque Module banque
\brief Module pour gérer la tenue d'un compte bancaire et rapprochements \brief Module pour gérer la tenue d'un compte bancaire et rapprochements
\version $Id$ \version $Id$
*/ */
/** /**
\file htdocs/includes/modules/modBanque.class.php \file htdocs/includes/modules/modBanque.class.php
\ingroup banque \ingroup banque
\brief Fichier de description et activation du module Banque \brief Fichier de description et activation du module Banque
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
/** \class modBanque /** \class modBanque
\brief Classe de description et activation du module Banque \brief Classe de description et activation du module Banque
*/ */
class modBanque extends DolibarrModules class modBanque extends DolibarrModules
{ {
/** /**
* \brief Constructeur. Definit les noms, constantes et boites * \brief Constructeur. Definit les noms, constantes et boites
* \param DB handler d'accès base * \param DB handler d'accès base
*/ */
function modBanque($DB) function modBanque($DB)
{ {
global $conf; global $conf;
$this->db = $DB ; $this->db = $DB ;
$this->numero = 85 ; $this->numero = 85 ;
$this->family = "financial"; $this->family = "financial";
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = eregi_replace('^mod','',get_class($this)); $this->name = eregi_replace('^mod','',get_class($this));
$this->description = "Gestion des comptes financiers de type Comptes bancaires ou postaux"; $this->description = "Gestion des comptes financiers de type Comptes bancaires ou postaux";
// Possible values for version are: 'development', 'experimental', 'dolibarr' or version // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
$this->version = 'dolibarr'; $this->version = 'dolibarr';
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 0; $this->special = 0;
$this->picto='account'; $this->picto='account';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/banque/temp");
$r=0;
$this->dirs[$r][0] = "output"; // Dependancies
$this->dirs[$r][1] = "/banque"; $this->depends = array();
$this->requiredby = array("modComptabilite","modComptabiliteExpert");
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/banque/temp";
// Dépendances
$this->depends = array();
$this->requiredby = array("modComptabilite","modComptabiliteExpert");
$this->conflictwith = array(); $this->conflictwith = array();
$this->langfiles = array("banks","compta","bills","companies"); $this->langfiles = array("banks","compta","bills","companies");
// Constantes // Constants
$this->const = array(); $this->const = array();
// Boites // Boites
$this->boxes = array(); $this->boxes = array();
$this->boxes[0][1] = "box_comptes.php"; $this->boxes[0][1] = "box_comptes.php";
// Permissions // Permissions
$this->rights = array(); $this->rights = array();
$this->rights_class = 'banque'; $this->rights_class = 'banque';
$r=0; $r=0;
$r++; $r++;
$this->rights[$r][0] = 111; // id de la permission $this->rights[$r][0] = 111; // id de la permission
$this->rights[$r][1] = 'Lire les comptes bancaires'; // libelle de la permission $this->rights[$r][1] = 'Lire les comptes bancaires'; // libelle de la permission
$this->rights[$r][2] = 'r'; // type de la permission (déprécié à ce jour) $this->rights[$r][2] = 'r'; // type de la permission (déprécié à ce jour)
$this->rights[$r][3] = 1; // La permission est-elle une permission par défaut $this->rights[$r][3] = 1; // La permission est-elle une permission par défaut
$this->rights[$r][4] = 'lire'; $this->rights[$r][4] = 'lire';
$r++; $r++;
$this->rights[$r][0] = 112; // id de la permission $this->rights[$r][0] = 112; // id de la permission
$this->rights[$r][1] = 'Creer/modifier montant/supprimer ecriture bancaire'; // libelle de la permission $this->rights[$r][1] = 'Creer/modifier montant/supprimer ecriture bancaire'; // libelle de la permission
$this->rights[$r][2] = 'w'; // type de la permission (déprécié à ce jour) $this->rights[$r][2] = 'w'; // type de la permission (déprécié à ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par défaut $this->rights[$r][3] = 0; // La permission est-elle une permission par défaut
$this->rights[$r][4] = 'modifier'; $this->rights[$r][4] = 'modifier';
$r++; $r++;
$this->rights[$r][0] = 113; // id de la permission $this->rights[$r][0] = 113; // id de la permission
$this->rights[$r][1] = 'Configurer les comptes bancaires (creer, gerer categories)'; // libelle de la permission $this->rights[$r][1] = 'Configurer les comptes bancaires (creer, gerer categories)'; // libelle de la permission
$this->rights[$r][2] = 'a'; // type de la permission (déprécié à ce jour) $this->rights[$r][2] = 'a'; // type de la permission (déprécié à ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par défaut $this->rights[$r][3] = 0; // La permission est-elle une permission par défaut
$this->rights[$r][4] = 'configurer'; $this->rights[$r][4] = 'configurer';
$r++; $r++;
$this->rights[$r][0] = 114; // id de la permission $this->rights[$r][0] = 114; // id de la permission
$this->rights[$r][1] = 'Rapprocher les ecritures bancaires'; // libelle de la permission $this->rights[$r][1] = 'Rapprocher les ecritures bancaires'; // libelle de la permission
$this->rights[$r][2] = 'w'; // type de la permission (déprécié à ce jour) $this->rights[$r][2] = 'w'; // type de la permission (déprécié à ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par défaut $this->rights[$r][3] = 0; // La permission est-elle une permission par défaut
$this->rights[$r][4] = 'consolidate'; $this->rights[$r][4] = 'consolidate';
$r++; $r++;
$this->rights[$r][0] = 115; // id de la permission $this->rights[$r][0] = 115; // id de la permission
$this->rights[$r][1] = 'Exporter transactions et releves'; // libelle de la permission $this->rights[$r][1] = 'Exporter transactions et releves'; // libelle de la permission
$this->rights[$r][2] = 'r'; // type de la permission (déprécié à ce jour) $this->rights[$r][2] = 'r'; // type de la permission (déprécié à ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par défaut $this->rights[$r][3] = 0; // La permission est-elle une permission par défaut
$this->rights[$r][4] = 'export'; $this->rights[$r][4] = 'export';
$r++; $r++;
$this->rights[$r][0] = 116; // id de la permission $this->rights[$r][0] = 116; // id de la permission
$this->rights[$r][1] = 'Virements entre comptes'; // libelle de la permission $this->rights[$r][1] = 'Virements entre comptes'; // libelle de la permission
$this->rights[$r][2] = 'w'; // type de la permission (déprécié à ce jour) $this->rights[$r][2] = 'w'; // type de la permission (déprécié à ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par défaut $this->rights[$r][3] = 0; // La permission est-elle une permission par défaut
$this->rights[$r][4] = 'transfer'; $this->rights[$r][4] = 'transfer';
$r++; $r++;
$this->rights[$r][0] = 117; // id de la permission $this->rights[$r][0] = 117; // id de la permission
$this->rights[$r][1] = 'Gerer les envois de cheques'; // libelle de la permission $this->rights[$r][1] = 'Gerer les envois de cheques'; // libelle de la permission
$this->rights[$r][2] = 'w'; // type de la permission (déprécié à ce jour) $this->rights[$r][2] = 'w'; // type de la permission (déprécié à ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par défaut $this->rights[$r][3] = 0; // La permission est-elle une permission par défaut
$this->rights[$r][4] = 'cheque'; $this->rights[$r][4] = 'cheque';
// Exports // Exports
//-------- //--------
$r=0; $r=0;
$r++; $r++;
$this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_code[$r]=$this->rights_class.'_'.$r;
$this->export_label[$r]='Ecritures bancaires et relevés'; $this->export_label[$r]='Ecritures bancaires et relevés';
$this->export_permission[$r]=array(array("banque","export")); $this->export_permission[$r]=array(array("banque","export"));
$this->export_fields_array[$r]=array('b.rowid'=>'IdTransaction','ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.dateo'=>'DateOperation','b.label'=>'Label','b.num_chq'=>'ChequeOrTransferNumber','-b.amount'=>'Debit','b.amount'=>'Credit','b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation","bu.url_id"=>"IdThirdParty","s.nom"=>"ThirdParty","s.code_compta"=>"CustomerAccountancyCode","s.code_compta_fournisseur"=>"SupplierAccountancyCode"); $this->export_fields_array[$r]=array('b.rowid'=>'IdTransaction','ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.dateo'=>'DateOperation','b.label'=>'Label','b.num_chq'=>'ChequeOrTransferNumber','-b.amount'=>'Debit','b.amount'=>'Credit','b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation","bu.url_id"=>"IdThirdParty","s.nom"=>"ThirdParty","s.code_compta"=>"CustomerAccountancyCode","s.code_compta_fournisseur"=>"SupplierAccountancyCode");
$this->export_entities_array[$r]=array('b.rowid'=>'account','ba.ref'=>'account','ba.label'=>'account','b.datev'=>'account','b.dateo'=>'account','b.label'=>'account','b.num_chq'=>'account','-b.amount'=>'account','b.amount'=>'account','b.num_releve'=>'account','b.datec'=>"account","bu.url_id"=>"company","s.nom"=>"company","s.code_compta"=>"company","s.code_compta_fournisseur"=>"company"); $this->export_entities_array[$r]=array('b.rowid'=>'account','ba.ref'=>'account','ba.label'=>'account','b.datev'=>'account','b.dateo'=>'account','b.label'=>'account','b.num_chq'=>'account','-b.amount'=>'account','b.amount'=>'account','b.num_releve'=>'account','b.datec'=>"account","bu.url_id"=>"company","s.nom"=>"company","s.code_compta"=>"company","s.code_compta_fournisseur"=>"company");
$this->export_alias_array[$r]=array('b.rowid'=>'tran_id','ba.ref'=>'account_ref','ba.label'=>'account_label','b.datev'=>'datev','b.dateo'=>'dateo','b.label'=>'label','b.num_chq'=>'num','-b.amount'=>'debit','b.amount'=>'credit','b.num_releve'=>'numrel','b.datec'=>"datec","bu.url_id"=>"soc_id","s.nom"=>"thirdparty","s.code_compta"=>"customeracccode","s.code_compta_fournisseur"=>"supplieracccode"); $this->export_alias_array[$r]=array('b.rowid'=>'tran_id','ba.ref'=>'account_ref','ba.label'=>'account_label','b.datev'=>'datev','b.dateo'=>'dateo','b.label'=>'label','b.num_chq'=>'num','-b.amount'=>'debit','b.amount'=>'credit','b.num_releve'=>'numrel','b.datec'=>"datec","bu.url_id"=>"soc_id","s.nom"=>"thirdparty","s.code_compta"=>"customeracccode","s.code_compta_fournisseur"=>"supplieracccode");
$this->export_special_array[$r]=array('-b.amount'=>'NULLIFNEG','b.amount'=>'NULLIFNEG'); $this->export_special_array[$r]=array('-b.amount'=>'NULLIFNEG','b.amount'=>'NULLIFNEG');
$this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_start[$r]='SELECT DISTINCT ';
$this->export_sql_end[$r] =' FROM ('.MAIN_DB_PREFIX.'bank_account as ba, '.MAIN_DB_PREFIX.'bank as b)'; $this->export_sql_end[$r] =' FROM ('.MAIN_DB_PREFIX.'bank_account as ba, '.MAIN_DB_PREFIX.'bank as b)';
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."bank_url as bu ON (bu.fk_bank = b.rowid AND bu.type = 'company')"; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."bank_url as bu ON (bu.fk_bank = b.rowid AND bu.type = 'company')";
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON bu.url_id = s.rowid'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON bu.url_id = s.rowid';
$this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account'; $this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account';
$this->export_sql_end[$r] .=' AND ba.entity = '.$conf->entity; $this->export_sql_end[$r] .=' AND ba.entity = '.$conf->entity;
$this->export_sql_end[$r] .=' ORDER BY b.datev, b.num_releve'; $this->export_sql_end[$r] .=' ORDER BY b.datev, b.num_releve';
} }
/** /**
* \brief Fonction appelée lors de l'activation du module. Insère en base les constantes, boites, permissions du module. * \brief Fonction appelée lors de l'activation du module. Insère en base les constantes, boites, permissions du module.
* Définit également les répertoires de données à créer pour ce module. * Définit également les répertoires de données à créer pour ce module.
*/ */
function init() function init()
{ {
global $conf; global $conf;
// Permissions // Permissions
$this->remove(); $this->remove();
$sql = array(); $sql = array();
return $this->_init($sql); return $this->_init($sql);
} }
/** /**
* \brief Fonction appelée lors de la désactivation d'un module. * \brief Fonction appelée lors de la désactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module. * Supprime de la base les constantes, boites et permissions du module.
*/ */
function remove() function remove()
{ {
$sql = array(); $sql = array();
return $this->_remove($sql); return $this->_remove($sql);
} }
} }
?> ?>

View File

@ -59,15 +59,7 @@ class modBarcode extends DolibarrModules
$this->picto='barcode'; $this->picto='barcode';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/barcode/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/barcode";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/barcode/temp";
// Dependances // Dependances
$this->depends = array("modProduit"); $this->depends = array("modProduit");

View File

@ -18,15 +18,15 @@
*/ */
/** /**
\defgroup bookmark Module Bookmark * \defgroup bookmark Module Bookmark
\brief Module pour g<EFBFBD>rer les Bookmarks * \brief Module to manage Bookmarks
\version $Id$ * \version $Id$
*/ */
/** /**
\file htdocs/includes/modules/modBookmark.class.php * \file htdocs/includes/modules/modBookmark.class.php
\ingroup bookmark * \ingroup bookmark
\brief Fichier de description et activation du module Bookmarks * \brief Fichier de description et activation du module Bookmarks
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@ -61,7 +61,7 @@ class modBookmark extends DolibarrModules
$this->special = 2; $this->special = 2;
$this->picto='bookmark'; $this->picto='bookmark';
// Dir // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array();
// Dependancies // Dependancies

View File

@ -58,20 +58,20 @@ class modBoutique extends DolibarrModules
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 1; $this->special = 1;
// Dir // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array();
// Config pages // Config pages
// $this->config_page_url = array("boutique.php","osc-languages.php"); // $this->config_page_url = array("boutique.php","osc-languages.php");
$this->config_page_url = array("boutique.php"); $this->config_page_url = array("boutique.php");
// Dependances // Dependancies
$this->depends = array(); $this->depends = array();
$this->requiredby = array(); $this->requiredby = array();
$this->conflictwith = array("modOSCommerceWS"); $this->conflictwith = array("modOSCommerceWS");
$this->langfiles = array("shop"); $this->langfiles = array("shop");
// Constantes // Constants
$this->const = array(); $this->const = array();
// Boites // Boites

View File

@ -31,9 +31,9 @@ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
/** /**
\class modCategorie * \class modCategorie
\brief Classe de description et activation du module Categorie * \brief Classe de description et activation du module Categorie
*/ */
class modCashDesk extends DolibarrModules class modCashDesk extends DolibarrModules
{ {
/** /**
@ -63,7 +63,7 @@ class modCashDesk extends DolibarrModules
$this->special = 0; $this->special = 0;
$this->picto = 'generic'; $this->picto = 'generic';
// Dir // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array();
// Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'. // Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'.

View File

@ -58,7 +58,7 @@ class modCategorie extends DolibarrModules
$this->special = 2; $this->special = 2;
$this->picto = 'generic'; $this->picto = 'generic';
// Dir // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array();
// Dependencies // Dependencies

View File

@ -60,7 +60,7 @@ class modClickToDial extends DolibarrModules
$this->special = 1; $this->special = 1;
$this->picto='phoning'; $this->picto='phoning';
// Dir // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array();
// Dependencies // Dependencies

View File

@ -64,15 +64,7 @@ class modCommande extends DolibarrModules
$this->picto='order'; $this->picto='order';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/commande/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/commande";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/commande/temp";
// Config pages // Config pages
$this->config_page_url = array("commande.php"); $this->config_page_url = array("commande.php");

View File

@ -62,29 +62,13 @@ class modCommercial extends DolibarrModules
$this->picto='commercial'; $this->picto='commercial';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/comm/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/comm";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/comm/temp";
$r++;
$this->dirs[$r][0] = "actions";
$this->dirs[$r][1] = "/action";
$r++;
$this->dirs[$r][0] = "actions_temp";
$this->dirs[$r][1] = "/action/temp";
// Dependancies // Dependancies
$this->depends = array("modSociete"); $this->depends = array("modSociete");
$this->requiredby = array("modPropale","modContrat","modCommande","modFicheinter"); $this->requiredby = array("modPropale","modContrat","modCommande","modFicheinter");
// Constantes // Constants
$this->const = array(); $this->const = array();
// Boxes // Boxes

View File

@ -77,43 +77,9 @@ class modComptabiliteExpert extends DolibarrModules
$this->const = array(); $this->const = array();
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/comptabiliteexpert/temp");
$r=0;
$this->dirs[$r][0] = "output"; // Boxes
$this->dirs[$r][1] = "/comptaexpert";
$this->dirs[$r][2] = 1;
$this->dirs[$r][3] = "";
$this->dirs[$r][4] = "comptaexpert";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/comptaexpert/temp";
$this->dirs[$r][2] = 1;
$this->dirs[$r][3] = "";
$this->dirs[$r][4] = "comptaexpert";
$r++;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/comptaexpert/rapport";
$this->dirs[$r][2] = 1;
$this->dirs[$r][3] = "rapport";
$this->dirs[$r][4] = "comptaexpert";
$r++;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/comptaexpert/export";
$this->dirs[$r][2] = 1;
$this->dirs[$r][3] = "export";
$this->dirs[$r][4] = "comptaexpert";
// Repertoires
//$this->dirs = array();
//$this->dirs[0] = $conf->comptaexpert->dir_output;
//$this->dirs[1] = $conf->comptaexpert->dir_output."/rapport";
//$this->dirs[2] = $conf->comptaexpert->dir_output."/export";
// Boites
$this->boxes = array(); $this->boxes = array();
// Permissions // Permissions

View File

@ -18,131 +18,123 @@
*/ */
/** /**
\defgroup contrat Module contrat \defgroup contrat Module contrat
\brief Module pour gerer la tenue de contrat de services \brief Module pour gerer la tenue de contrat de services
\version $Id$ \version $Id$
*/ */
/** /**
\file htdocs/includes/modules/modContrat.class.php \file htdocs/includes/modules/modContrat.class.php
\ingroup contrat \ingroup contrat
\brief Fichier de description et activation du module Contrat \brief Fichier de description et activation du module Contrat
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
/** /**
\class modContrat \class modContrat
\brief Classe de description et activation du module Contrat \brief Classe de description et activation du module Contrat
*/ */
class modContrat extends DolibarrModules class modContrat extends DolibarrModules
{ {
/** /**
* \brief Constructeur. Definit les noms, constantes et boites * \brief Constructeur. Definit les noms, constantes et boites
* \param DB handler d'acces base * \param DB handler d'acces base
*/ */
function modContrat($DB) function modContrat($DB)
{ {
$this->db = $DB ; $this->db = $DB ;
$this->numero = 54 ; $this->numero = 54 ;
$this->family = "crm"; $this->family = "crm";
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = eregi_replace('^mod','',get_class($this)); $this->name = eregi_replace('^mod','',get_class($this));
$this->description = "Gestion des contrats de services"; $this->description = "Gestion des contrats de services";
// Possible values for version are: 'development', 'experimental', 'dolibarr' or version // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
$this->version = 'dolibarr'; $this->version = 'dolibarr';
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 0; $this->special = 0;
$this->picto='contract'; $this->picto='contract';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/contracts/temp");
$r=0;
$this->dirs[$r][0] = "output"; // Dependances
$this->dirs[$r][1] = "/contracts"; $this->depends = array("modService");
$this->requiredby = array();
$r++; // Constantes
$this->dirs[$r][0] = "temp"; $this->const = array();
$this->dirs[$r][1] = "/contracts/temp";
// Dependances // Boites
$this->depends = array("modService"); $this->boxes = array();
$this->requiredby = array();
// Constantes // Permissions
$this->const = array(); $this->rights = array();
$this->rights_class = 'contrat';
// Boites $this->rights[1][0] = 161;
$this->boxes = array(); $this->rights[1][1] = 'Lire les contrats';
$this->rights[1][2] = 'r';
$this->rights[1][3] = 1;
$this->rights[1][4] = 'lire';
// Permissions $this->rights[2][0] = 162;
$this->rights = array(); $this->rights[2][1] = 'Creer / modifier les contrats';
$this->rights_class = 'contrat'; $this->rights[2][2] = 'w';
$this->rights[2][3] = 0;
$this->rights[2][4] = 'creer';
$this->rights[1][0] = 161; $this->rights[3][0] = 163;
$this->rights[1][1] = 'Lire les contrats'; $this->rights[3][1] = 'Activer un service d\'un contrat';
$this->rights[1][2] = 'r'; $this->rights[3][2] = 'w';
$this->rights[1][3] = 1; $this->rights[3][3] = 0;
$this->rights[1][4] = 'lire'; $this->rights[3][4] = 'activer';
$this->rights[2][0] = 162; $this->rights[4][0] = 164;
$this->rights[2][1] = 'Creer / modifier les contrats'; $this->rights[4][1] = 'Desactiver un service d\'un contrat';
$this->rights[2][2] = 'w'; $this->rights[4][2] = 'w';
$this->rights[2][3] = 0; $this->rights[4][3] = 0;
$this->rights[2][4] = 'creer'; $this->rights[4][4] = 'desactiver';
$this->rights[3][0] = 163; $this->rights[5][0] = 165;
$this->rights[3][1] = 'Activer un service d\'un contrat'; $this->rights[5][1] = 'Supprimer un contrat';
$this->rights[3][2] = 'w'; $this->rights[5][2] = 'd';
$this->rights[3][3] = 0; $this->rights[5][3] = 0;
$this->rights[3][4] = 'activer'; $this->rights[5][4] = 'supprimer';
$this->rights[4][0] = 164; }
$this->rights[4][1] = 'Desactiver un service d\'un contrat';
$this->rights[4][2] = 'w';
$this->rights[4][3] = 0;
$this->rights[4][4] = 'desactiver';
$this->rights[5][0] = 165;
$this->rights[5][1] = 'Supprimer un contrat';
$this->rights[5][2] = 'd';
$this->rights[5][3] = 0;
$this->rights[5][4] = 'supprimer';
}
/** /**
* \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module. * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
* Definit egalement les repertoires de donnees a creer pour ce module. * Definit egalement les repertoires de donnees a creer pour ce module.
*/ */
function init() function init()
{ {
global $conf; global $conf;
// Nettoyage avant activation // Nettoyage avant activation
$this->remove(); $this->remove();
return $this->_init($sql); return $this->_init($sql);
} }
/** /**
* \brief Fonction appelee lors de la desactivation d'un module. * \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module. * Supprime de la base les constantes, boites et permissions du module.
*/ */
function remove() function remove()
{ {
$sql = array(); $sql = array();
return $this->_remove($sql); return $this->_remove($sql);
} }
} }
?> ?>

View File

@ -63,18 +63,18 @@ class modDeplacement extends DolibarrModules
$this->special = 0; $this->special = 0;
$this->picto = "trip"; $this->picto = "trip";
// Dir // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array();
// Config pages // Config pages
$this->config_page_url = array(); $this->config_page_url = array();
$this->langfiles = array("companies","trips"); $this->langfiles = array("companies","trips");
// Dependances // Dependancies
$this->depends = array(); $this->depends = array();
$this->requiredby = array(); $this->requiredby = array();
// Constantes // Constants
$this->const = array(); $this->const = array();
// Boxes // Boxes

View File

@ -61,15 +61,7 @@ class modDocument extends DolibarrModules
$this->picto='dir'; $this->picto='dir';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/ged/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/ged";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/ged/temp";
// Config pages // Config pages
//$this->config_page_url = array("document.php"); //$this->config_page_url = array("document.php");

View File

@ -14,13 +14,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** /**
\defgroup domain Module domain * \defgroup domain Module domain
\brief Module pour g<EFBFBD>rer une base de noms de domaines * \brief Module to manage a list of DNS names
* \version $Id$
*/ */
/** /**
@ -66,8 +65,8 @@ class modDomain extends DolibarrModules
//------------- //-------------
$this->config_page_url = array(); $this->config_page_url = array();
// D<EFBFBD>pendances // Dependancies
//------------ //-------------
$this->depends = array(); $this->depends = array();
$this->requiredby = array(); $this->requiredby = array();
$this->langfiles = array("domains"); $this->langfiles = array("domains");

View File

@ -25,19 +25,18 @@
*/ */
/** /**
\file htdocs/includes/modules/modDon.class.php * \file htdocs/includes/modules/modDon.class.php
\ingroup don * \ingroup don
\brief Fichier de description et activation du module Don * \brief Fichier de description et activation du module Don
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
/** /**
\class modDon * \class modDon
\brief Classe de description et activation du module Don * \brief Classe de description et activation du module Don
*/ */
class modDon extends DolibarrModules class modDon extends DolibarrModules
{ {
@ -59,24 +58,16 @@ class modDon extends DolibarrModules
$this->special = 0; $this->special = 0;
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/dons/temp");
$r=0;
$this->dirs[$r][0] = "output"; // Dependancies
$this->dirs[$r][1] = "/dons";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/dons/temp";
// Dependances
$this->depends = array(); $this->depends = array();
$this->requiredby = array(); $this->requiredby = array();
// Config pages // Config pages
$this->config_page_url = array("dons.php"); $this->config_page_url = array("dons.php");
// Constantes // Constants
$this->const = array(); $this->const = array();
$this->const[0][0] = "DON_FORM"; $this->const[0][0] = "DON_FORM";
$this->const[0][1] = "chaine"; $this->const[0][1] = "chaine";

View File

@ -60,10 +60,7 @@ class modDroitPret extends DolibarrModules
// Dir // Dir
global $dolibarr_smarty_compile; global $dolibarr_smarty_compile;
global $dolibarr_smarty_cache; global $dolibarr_smarty_cache;
$this->dirs = array(); $this->dirs = array($dolibarr_smarty_compile,$dolibarr_smarty_cache);
$this->dirs[0] = $dolibarr_smarty_compile;
$this->dirs[1] = $dolibarr_smarty_cache;
// Dependances // Dependances
$this->depends = array(); $this->depends = array();

View File

@ -66,15 +66,7 @@ class modECM extends DolibarrModules
$this->picto='dir'; $this->picto='dir';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/ecm/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/ecm";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/ecm/temp";
// Config pages. Put here list of php page names stored in admmin directory used to setup module // Config pages. Put here list of php page names stored in admmin directory used to setup module
$this->config_page_url = array(); $this->config_page_url = array();

View File

@ -59,13 +59,10 @@ class modEditeur extends DolibarrModules
$this->special = 3; $this->special = 3;
$this->picto='book'; $this->picto='book';
// Dir // Data directories to create when module is enabled
global $dolibarr_smarty_compile; global $dolibarr_smarty_compile;
global $dolibarr_smarty_cache; global $dolibarr_smarty_cache;
$this->dirs = array(); $this->dirs = array($dolibarr_smarty_compile,$dolibarr_smarty_cache);
$this->dirs[0] = $dolibarr_smarty_compile;
$this->dirs[1] = $dolibarr_smarty_cache;
// Config pages // Config pages
$this->config_page_url = array("editeur.php"); $this->config_page_url = array("editeur.php");

View File

@ -15,13 +15,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** /**
\defgroup energie Module energie \defgroup energie Module energie
\brief Module pour le suivi de la consommation d'energie \brief Module pour le suivi de la consommation d'energie
\version $Id$
*/ */
/** /**
@ -63,19 +62,7 @@ class modEnergie extends DolibarrModules
$this->picto='energie'; $this->picto='energie';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/energie/temp","/energie/graph");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/energie";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/energie/temp";
$r++;
$this->dirs[$r][0] = "graph";
$this->dirs[$r][1] = "/energie/graph";
// Dependances // Dependances
$this->depends = array(); $this->depends = array();

View File

@ -60,6 +60,7 @@ class modExpedition extends DolibarrModules
$this->picto = "sending"; $this->picto = "sending";
// Data directories to create when module is enabled // Data directories to create when module is enabled
// TODO Replace with simple directories
$this->dirs = array(); $this->dirs = array();
$r=0; $r=0;

View File

@ -23,9 +23,9 @@
*/ */
/** /**
\file htdocs/includes/modules/modExport.class.php * \file htdocs/includes/modules/modExport.class.php
\ingroup export * \ingroup export
\brief Fichier de description et activation du module export * \brief Fichier de description et activation du module export
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@ -57,15 +57,7 @@ class modExport extends DolibarrModules
$this->picto=''; $this->picto='';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/export/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/export";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/export/temp";
// Config pages // Config pages
$this->config_page_url = array(); $this->config_page_url = array();

View File

@ -60,15 +60,7 @@ class modExternalRss extends DolibarrModules
$this->picto='rss'; $this->picto='rss';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/rss/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/rss";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/rss/temp";
// Config pages // Config pages
$this->config_page_url = array("external_rss.php"); $this->config_page_url = array("external_rss.php");

View File

@ -41,202 +41,194 @@ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
class modFacture extends DolibarrModules class modFacture extends DolibarrModules
{ {
/** /**
* \brief Constructeur. Definit les noms, constantes et boites * \brief Constructeur. Definit les noms, constantes et boites
* \param DB Database handler * \param DB Database handler
*/ */
function modFacture($DB) function modFacture($DB)
{ {
global $conf; global $conf;
$this->db = $DB; $this->db = $DB;
$this->numero = 30; $this->numero = 30;
$this->family = "financial"; $this->family = "financial";
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = eregi_replace('^mod','',get_class($this)); $this->name = eregi_replace('^mod','',get_class($this));
$this->description = "Gestion des factures"; $this->description = "Gestion des factures";
// Possible values for version are: 'development', 'experimental', 'dolibarr' or version // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
$this->version = 'dolibarr'; $this->version = 'dolibarr';
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 0; $this->special = 0;
$this->picto='bill'; $this->picto='bill';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/facture/temp");
$r=0;
$this->dirs[$r][0] = "output"; // Dependencies
$this->dirs[$r][1] = "/facture"; $this->depends = array("modSociete");
$this->requiredby = array("modComptabilite","modComptabiliteExpert");
$this->conflictwith = array();
$this->langfiles = array("bills","companies","compta","products");
$r++; // Config pages
$this->dirs[$r][0] = "temp"; $this->config_page_url = array("facture.php");
$this->dirs[$r][1] = "/facture/temp";
// Dependencies // Constantes
$this->depends = array("modSociete"); $this->const = array();
$this->requiredby = array("modComptabilite","modComptabiliteExpert"); $r=0;
$this->conflictwith = array();
$this->langfiles = array("bills","companies","compta","products");
// Config pages $this->const[$r][0] = "FACTURE_ADDON_PDF";
$this->config_page_url = array("facture.php"); $this->const[$r][1] = "chaine";
$this->const[$r][2] = "crabe";
$r++;
// Constantes $this->const[$r][0] = "FACTURE_ADDON";
$this->const = array(); $this->const[$r][1] = "chaine";
$r=0; $this->const[$r][2] = "terre";
$r++;
$this->const[$r][0] = "FACTURE_ADDON_PDF"; $this->const[$r][0] = "FAC_FORCE_DATE_VALIDATION";
$this->const[$r][1] = "chaine"; $this->const[$r][1] = "yesno";
$this->const[$r][2] = "crabe"; $this->const[$r][2] = "0";
$r++; $r++;
$this->const[$r][0] = "FACTURE_ADDON"; // Boites
$this->const[$r][1] = "chaine"; $this->boxes = array();
$this->const[$r][2] = "terre"; $r=0;
$r++; $this->boxes[$r][1] = "box_factures_imp.php";
$r++;
$this->boxes[$r][1] = "box_factures.php";
$r++;
$this->const[$r][0] = "FAC_FORCE_DATE_VALIDATION"; // Permissions
$this->const[$r][1] = "yesno"; $this->rights = array();
$this->const[$r][2] = "0"; $this->rights_class = 'facture';
$r++; $r=0;
// Boites $r++;
$this->boxes = array(); $this->rights[$r][0] = 11;
$r=0; $this->rights[$r][1] = 'Lire les factures';
$this->boxes[$r][1] = "box_factures_imp.php"; $this->rights[$r][2] = 'a';
$r++; $this->rights[$r][3] = 1;
$this->boxes[$r][1] = "box_factures.php"; $this->rights[$r][4] = 'lire';
$r++;
// Permissions $r++;
$this->rights = array(); $this->rights[$r][0] = 12;
$this->rights_class = 'facture'; $this->rights[$r][1] = 'Creer les factures';
$r=0; $this->rights[$r][2] = 'a';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'creer';
$r++; $r++;
$this->rights[$r][0] = 11; $this->rights[$r][0] = 13;
$this->rights[$r][1] = 'Lire les factures'; $this->rights[$r][1] = 'Modifier les factures';
$this->rights[$r][2] = 'a'; $this->rights[$r][2] = 'a';
$this->rights[$r][3] = 1; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'lire'; $this->rights[$r][4] = 'modifier';
$r++; $r++;
$this->rights[$r][0] = 12; $this->rights[$r][0] = 14;
$this->rights[$r][1] = 'Creer les factures'; $this->rights[$r][1] = 'Valider les factures';
$this->rights[$r][2] = 'a'; $this->rights[$r][2] = 'a';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'creer'; $this->rights[$r][4] = 'valider';
$r++; $r++;
$this->rights[$r][0] = 13; $this->rights[$r][0] = 15;
$this->rights[$r][1] = 'Modifier les factures'; $this->rights[$r][1] = 'Envoyer les factures par mail';
$this->rights[$r][2] = 'a'; $this->rights[$r][2] = 'a';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'modifier'; $this->rights[$r][4] = 'envoyer';
$r++; $r++;
$this->rights[$r][0] = 14; $this->rights[$r][0] = 16;
$this->rights[$r][1] = 'Valider les factures'; $this->rights[$r][1] = 'Emettre des paiements sur les factures';
$this->rights[$r][2] = 'a'; $this->rights[$r][2] = 'a';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'valider'; $this->rights[$r][4] = 'paiement';
$r++; $r++;
$this->rights[$r][0] = 15; $this->rights[$r][0] = 19;
$this->rights[$r][1] = 'Envoyer les factures par mail'; $this->rights[$r][1] = 'Supprimer les factures';
$this->rights[$r][2] = 'a'; $this->rights[$r][2] = 'a';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'envoyer'; $this->rights[$r][4] = 'supprimer';
$r++; $r++;
$this->rights[$r][0] = 16; $this->rights[$r][0] = 1321;
$this->rights[$r][1] = 'Emettre des paiements sur les factures'; $this->rights[$r][1] = 'Exporter les factures clients, attributs et reglements';
$this->rights[$r][2] = 'a'; $this->rights[$r][2] = 'r';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'paiement'; $this->rights[$r][4] = 'facture';
$this->rights[$r][5] = 'export';
$r++;
$this->rights[$r][0] = 19;
$this->rights[$r][1] = 'Supprimer les factures';
$this->rights[$r][2] = 'a';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'supprimer';
$r++;
$this->rights[$r][0] = 1321;
$this->rights[$r][1] = 'Exporter les factures clients, attributs et reglements';
$this->rights[$r][2] = 'r';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'facture';
$this->rights[$r][5] = 'export';
// Exports // Exports
//-------- //--------
$r=1; $r=1;
$this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_code[$r]=$this->rights_class.'_'.$r;
$this->export_label[$r]='CustomersInvoicesAndInvoiceLines'; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_label[$r]='CustomersInvoicesAndInvoiceLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
$this->export_permission[$r]=array(array("facture","facture","export")); $this->export_permission[$r]=array(array("facture","facture","export"));
$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','s.fk_pays'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePayed",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_taux'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalVAT",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.product_type'=>"TypeOfLineServiceOrProduct",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'); $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','s.fk_pays'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePayed",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_taux'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalVAT",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.product_type'=>"TypeOfLineServiceOrProduct",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company','s.ville'=>'company','s.fk_pays'=>'company','s.tel'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_taux'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.product_type'=>'invoice_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product'); $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company','s.ville'=>'company','s.fk_pays'=>'company','s.tel'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_taux'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.product_type'=>'invoice_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product');
$this->export_alias_array[$r]=array('s.rowid'=>"socid",'s.nom'=>'soc_name','s.address'=>'soc_adres','s.cp'=>'soc_zip','s.ville'=>'soc_ville','s.fk_pays'=>'soc_pays','s.tel'=>'soc_tel','s.siren'=>'soc_siren','s.siret'=>'soc_siret','s.ape'=>'soc_ape','s.idprof4'=>'soc_idprof4','s.code_compta'=>'soc_customer_accountancy','s.code_compta_fournisseur'=>'soc_supplier_accountancy','s.tva_intra'=>'vat','f.rowid'=>"invoiceid",'f.facnumber'=>"ref",'f.datec'=>"datecreation",'f.datef'=>"dateinvoice",'f.total'=>"totalht",'f.total_ttc'=>"totalttc",'f.tva'=>"totalvat",'f.paye'=>"paid",'f.fk_statut'=>'status','f.note'=>"note",'fd.rowid'=>'lineid','fd.description'=>"linedescription",'fd.price'=>"lineprice",'fd.total_ht'=>"linetotalht",'fd.total_tva'=>"linetotaltva",'fd.total_ttc'=>"linetotalttc",'fd.tva_taux'=>"linevatrate",'fd.qty'=>"lineqty",'fd.date_start'=>"linedatestart",'fd.date_end'=>"linedateend",'fd.product_type'=>'producttype','fd.fk_product'=>'productid','p.ref'=>'productref','p.label'=>'productlabel'); $this->export_alias_array[$r]=array('s.rowid'=>"socid",'s.nom'=>'soc_name','s.address'=>'soc_adres','s.cp'=>'soc_zip','s.ville'=>'soc_ville','s.fk_pays'=>'soc_pays','s.tel'=>'soc_tel','s.siren'=>'soc_siren','s.siret'=>'soc_siret','s.ape'=>'soc_ape','s.idprof4'=>'soc_idprof4','s.code_compta'=>'soc_customer_accountancy','s.code_compta_fournisseur'=>'soc_supplier_accountancy','s.tva_intra'=>'vat','f.rowid'=>"invoiceid",'f.facnumber'=>"ref",'f.datec'=>"datecreation",'f.datef'=>"dateinvoice",'f.total'=>"totalht",'f.total_ttc'=>"totalttc",'f.tva'=>"totalvat",'f.paye'=>"paid",'f.fk_statut'=>'status','f.note'=>"note",'fd.rowid'=>'lineid','fd.description'=>"linedescription",'fd.price'=>"lineprice",'fd.total_ht'=>"linetotalht",'fd.total_tva'=>"linetotaltva",'fd.total_ttc'=>"linetotalttc",'fd.tva_taux'=>"linevatrate",'fd.qty'=>"lineqty",'fd.date_start'=>"linedatestart",'fd.date_end'=>"linedateend",'fd.product_type'=>'producttype','fd.fk_product'=>'productid','p.ref'=>'productref','p.label'=>'productlabel');
$this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_start[$r]='SELECT DISTINCT ';
$this->export_sql_end[$r] =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)'; $this->export_sql_end[$r] =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture'; $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
$this->export_sql_end[$r] .=' AND s.entity = '.$conf->entity; $this->export_sql_end[$r] .=' AND s.entity = '.$conf->entity;
$r++; $r++;
$this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_code[$r]=$this->rights_class.'_'.$r;
$this->export_label[$r]='CustomersInvoicesAndPayments'; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_label[$r]='CustomersInvoicesAndPayments'; // Translation key (used only if key ExportDataset_xxx_z not found)
$this->export_permission[$r]=array(array("facture","facture","export")); $this->export_permission[$r]=array(array("facture","facture","export"));
$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','s.fk_pays'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePayed",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'p.rowid'=>'PaymentId','pf.amount'=>'AmountPayment','p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber'); $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','s.fk_pays'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePayed",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'p.rowid'=>'PaymentId','pf.amount'=>'AmountPayment','p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber');
$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company','s.ville'=>'company','s.fk_pays'=>'company','s.tel'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'p.rowid'=>'payment','pf.amount'=>'payment','p.datep'=>'payment','p.num_paiement'=>'payment'); $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company','s.ville'=>'company','s.fk_pays'=>'company','s.tel'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'p.rowid'=>'payment','pf.amount'=>'payment','p.datep'=>'payment','p.num_paiement'=>'payment');
$this->export_alias_array[$r]=array('s.rowid'=>"socid",'s.nom'=>'soc_name','s.address'=>'soc_adres','s.cp'=>'soc_zip','s.ville'=>'soc_ville','s.fk_pays'=>'soc_pays','s.tel'=>'soc_tel','s.siren'=>'soc_siren','s.siret'=>'soc_siret','s.ape'=>'soc_ape','s.idprof4'=>'soc_idprof4','s.code_compta'=>'soc_customer_accountancy','s.code_compta_fournisseur'=>'soc_supplier_accountancy','s.tva_intra'=>'vat','f.rowid'=>"invoiceid",'f.facnumber'=>"ref",'f.datec'=>"datecreation",'f.datef'=>"dateinvoice",'f.total'=>"totalht",'f.total_ttc'=>"totalttc",'f.tva'=>"totalvat",'f.paye'=>"paid",'f.fk_statut'=>'status','f.note'=>"note",'p.rowid'=>'paymentid','pf.amount'=>'amount_payment','p.datep'=>'date_payment','p.num_paiement'=>'num_payment'); $this->export_alias_array[$r]=array('s.rowid'=>"socid",'s.nom'=>'soc_name','s.address'=>'soc_adres','s.cp'=>'soc_zip','s.ville'=>'soc_ville','s.fk_pays'=>'soc_pays','s.tel'=>'soc_tel','s.siren'=>'soc_siren','s.siret'=>'soc_siret','s.ape'=>'soc_ape','s.idprof4'=>'soc_idprof4','s.code_compta'=>'soc_customer_accountancy','s.code_compta_fournisseur'=>'soc_supplier_accountancy','s.tva_intra'=>'vat','f.rowid'=>"invoiceid",'f.facnumber'=>"ref",'f.datec'=>"datecreation",'f.datef'=>"dateinvoice",'f.total'=>"totalht",'f.total_ttc'=>"totalttc",'f.tva'=>"totalvat",'f.paye'=>"paid",'f.fk_statut'=>'status','f.note'=>"note",'p.rowid'=>'paymentid','pf.amount'=>'amount_payment','p.datep'=>'date_payment','p.num_paiement'=>'num_payment');
$this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_start[$r]='SELECT DISTINCT ';
$this->export_sql_end[$r] =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'societe as s)'; $this->export_sql_end[$r] =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'societe as s)';
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement as p ON pf.fk_paiement = p.rowid'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement as p ON pf.fk_paiement = p.rowid';
$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid'; $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
$this->export_sql_end[$r] .=' AND s.entity = '.$conf->entity; $this->export_sql_end[$r] .=' AND s.entity = '.$conf->entity;
$r++; $r++;
} }
/** /**
* \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module. * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
* Definit egalement les repertoires de donnees a creer pour ce module. * Definit egalement les repertoires de donnees a creer pour ce module.
*/ */
function init() function init()
{ {
global $conf; global $conf;
// Permissions // Permissions
$this->remove(); $this->remove();
$sql = array( $sql = array(
"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity, "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity,
"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','invoice',".$conf->entity.")", "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','invoice',".$conf->entity.")",
); );
return $this->_init($sql); return $this->_init($sql);
} }
/** /**
* \brief Fonction appelee lors de la desactivation d'un module. * \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module. * Supprime de la base les constantes, boites et permissions du module.
*/ */
function remove() function remove()
{ {
$sql = array(); $sql = array();
return $this->_remove($sql); return $this->_remove($sql);
} }
} }
?> ?>

View File

@ -57,19 +57,7 @@ class modFckeditor extends DolibarrModules
$this->special = 2; $this->special = 2;
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/fckeditor/temp","/fckeditor/images");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/fckeditor";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/fckeditor/temp";
$r++;
$this->dirs[$r][0] = "images";
$this->dirs[$r][1] = "/fckeditor/images";
// Config pages // Config pages
$this->config_page_url = array("fckeditor.php"); $this->config_page_url = array("fckeditor.php");

View File

@ -66,15 +66,7 @@ class modFicheinter extends DolibarrModules
$this->picto = "intervention"; $this->picto = "intervention";
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/ficheinter/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/ficheinter";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/ficheinter/temp";
// Dependencies // Dependencies
$this->depends = array("modSociete","modCommercial"); $this->depends = array("modSociete","modCommercial");

View File

@ -61,6 +61,7 @@ class modFournisseur extends DolibarrModules
$this->picto='company'; $this->picto='company';
// Data directories to create when module is enabled // Data directories to create when module is enabled
// TODO Replace with simple directories
$this->dirs = array(); $this->dirs = array();
$r=0; $r=0;

View File

@ -57,15 +57,7 @@ class modImport extends DolibarrModules
$this->picto=''; $this->picto='';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/import/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/import";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/import/temp";
// Config pages // Config pages
$this->config_page_url = array(); $this->config_page_url = array();

View File

@ -59,15 +59,7 @@ class modLabel extends DolibarrModules
$this->picto='label'; $this->picto='label';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/label/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/label";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/label/temp";
// Dependancies // Dependancies
$this->depends = array(); $this->depends = array();

View File

@ -16,18 +16,17 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** \defgroup ldap Module ldap /** \defgroup ldap Module ldap
\brief Module pour interfacer les contacts avec un annuaire Ldap \brief Module pour interfacer les contacts avec un annuaire Ldap
*/ */
/** /**
\file htdocs/includes/modules/modLdap.class.php \file htdocs/includes/modules/modLdap.class.php
\ingroup ldap \ingroup ldap
\brief Fichier de description et activation du module Ldap \brief Fichier de description et activation du module Ldap
\version $Id$
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@ -57,24 +56,16 @@ class modLdap extends DolibarrModules
$this->special = 1; $this->special = 1;
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/ldap/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/ldap";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/ldap/temp";
// Config pages // Config pages
$this->config_page_url = array("ldap.php"); $this->config_page_url = array("ldap.php");
// D<EFBFBD>pendances // Dependancies
$this->depends = array(); $this->depends = array();
$this->requiredby = array(); $this->requiredby = array();
// Constantes // Constants
$this->const = array(); $this->const = array();
$r=0; $r=0;

View File

@ -59,15 +59,7 @@ class modMailing extends DolibarrModules
$this->picto='email'; $this->picto='email';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/mailing/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/mailings";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/mailings/temp";
// Dependances // Dependances
$this->depends = array(); $this->depends = array();

View File

@ -15,8 +15,6 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** \defgroup mantis Module Mantis /** \defgroup mantis Module Mantis
@ -27,6 +25,7 @@
\file htdocs/includes/modules/modMantis.class.php \file htdocs/includes/modules/modMantis.class.php
\ingroup mantis \ingroup mantis
\brief Description and activation file for module Mantis \brief Description and activation file for module Mantis
\version $Id$
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");

View File

@ -72,8 +72,6 @@ class modMultiCompany extends DolibarrModules
// Data directories to create when module is enabled. // Data directories to create when module is enabled.
$this->dirs = array(); $this->dirs = array();
//$this->dirs[0] = DOL_DATA_ROOT.'/mymodule;
//$this->dirs[1] = DOL_DATA_ROOT.'/mymodule/temp;
// Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'. // Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'.
$this->style_sheet = ''; $this->style_sheet = '';

View File

@ -58,7 +58,7 @@ class modNotification extends DolibarrModules
$this->special = 1; $this->special = 1;
$this->picto='email'; $this->picto='email';
// Dir // Data directories to create when module is enabled.
$this->dirs = array(); $this->dirs = array();
// Dependances // Dependances

View File

@ -59,7 +59,7 @@ class modOSCommerceWS extends DolibarrModules
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 1; $this->special = 1;
// Dir // Data directories to create when module is enabled.
$this->dirs = array(); $this->dirs = array();
// Config pages // Config pages

View File

@ -69,9 +69,7 @@ class modPayBox extends DolibarrModules
$this->picto=DOL_URL_ROOT.'/paybox/images/paybox.png'; $this->picto=DOL_URL_ROOT.'/paybox/images/paybox.png';
// Data directories to create when module is enabled. // Data directories to create when module is enabled.
$this->dirs = array(); $this->dirs = array('/paybox/temp');
//$this->dirs[0] = DOL_DATA_ROOT.'/mymodule;
//$this->dirs[1] = DOL_DATA_ROOT.'/mymodule/temp;
// Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'. // Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'.
$this->style_sheet = ''; $this->style_sheet = '';

View File

@ -15,8 +15,6 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** \defgroup postnuke Module postnuke /** \defgroup postnuke Module postnuke
@ -27,6 +25,7 @@
\file htdocs/includes/modules/modPostnuke.class.php \file htdocs/includes/modules/modPostnuke.class.php
\ingroup postnuke \ingroup postnuke
\brief Fichier de description et activation du module Postnuke \brief Fichier de description et activation du module Postnuke
\version $Id$
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@ -57,7 +56,7 @@ class modPostnuke extends DolibarrModules
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 1; $this->special = 1;
// Dir // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array();
// D<>pendances // D<>pendances

View File

@ -64,21 +64,7 @@ class modPrelevement extends DolibarrModules
$this->picto='payment'; $this->picto='payment';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/prelevement/temp","/prelevement/receipts");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/prelevement";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/prelevement/temp";
$r++;
$this->dirs[$r][0] = "bon";
$this->dirs[$r][1] = "/prelevement/bon";
$this->dirs[0] = $conf->prelevement->dir_output . "/bon";
// Dependancies // Dependancies
$this->depends = array("modFacture"); $this->depends = array("modFacture");

View File

@ -66,15 +66,7 @@ class modProduit extends DolibarrModules
$this->picto='product'; $this->picto='product';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/produit/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/produit";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/produit/temp";
// Dependencies // Dependencies
$this->depends = array(); $this->depends = array();

View File

@ -60,6 +60,9 @@ class modProjet extends DolibarrModules
$this->special = 0; $this->special = 0;
$this->picto='project'; $this->picto='project';
// Data directories to create when module is enabled
$this->dirs = array();
// Dependancies // Dependancies
$this->depends = array(); $this->depends = array();
$this->requiredby = array(); $this->requiredby = array();

View File

@ -64,21 +64,13 @@ class modPropale extends DolibarrModules
$this->picto='propal'; $this->picto='propal';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/propale/temp");
$r=0;
$this->dirs[$r][0] = "output"; // Dependancies
$this->dirs[$r][1] = "/propale";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/propale/temp";
// Dependances
$this->depends = array("modSociete","modCommercial"); $this->depends = array("modSociete","modCommercial");
$this->config_page_url = array("propale.php"); $this->config_page_url = array("propale.php");
// Constantes // Constants
$this->const = array(); $this->const = array();
$this->const[0][0] = "PROPALE_ADDON_PDF"; $this->const[0][0] = "PROPALE_ADDON_PDF";

View File

@ -65,24 +65,16 @@ class modService extends DolibarrModules
$this->picto='service'; $this->picto='service';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/produit/temp");
$r=0;
$this->dirs[$r][0] = "output"; // Dependancies
$this->dirs[$r][1] = "/produit";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/produit/temp";
// Dependances
$this->depends = array("modProduit"); $this->depends = array("modProduit");
$this->requiredby = array("modContrat"); $this->requiredby = array("modContrat");
// Constantes // Constants
$this->const = array(); $this->const = array();
// Boites // Boxes
$this->boxes = array(); $this->boxes = array();
$this->boxes[0][1] = "box_services_vendus.php"; $this->boxes[0][1] = "box_services_vendus.php";

View File

@ -67,6 +67,7 @@ class modSociete extends DolibarrModules
$this->picto='company'; $this->picto='company';
// Data directories to create when module is enabled // Data directories to create when module is enabled
// TODO Replace with simple directories
$this->dirs = array(); $this->dirs = array();
$r=0; $r=0;

View File

@ -63,7 +63,7 @@ class modStock extends DolibarrModules
$this->special = 0; $this->special = 0;
$this->picto='stock'; $this->picto='stock';
// Dir // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array();
$this->config_page_url = array("stock.php"); $this->config_page_url = array("stock.php");
@ -73,7 +73,7 @@ class modStock extends DolibarrModules
$this->requiredby = array(); $this->requiredby = array();
$this->langfiles = array("stocks"); $this->langfiles = array("stocks");
// Constantes // Constants
$this->const = array(); $this->const = array();
// Boxes // Boxes

View File

@ -58,11 +58,6 @@ class modSyslog extends DolibarrModules
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array();
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/logs";
$this->dirs[$r][2] = 1;
// Config pages // Config pages
$this->config_page_url = array("syslog.php"); $this->config_page_url = array("syslog.php");

View File

@ -21,8 +21,8 @@
*/ */
/** \defgroup tax Module taxes /** \defgroup tax Module taxes
\brief Module pour inclure des fonctions de saisies des taxes (tva) et charges sociales \brief Module pour inclure des fonctions de saisies des taxes (tva) et charges sociales
*/ */
/** /**
* \file htdocs/includes/modules/modTax.class.php * \file htdocs/includes/modules/modTax.class.php
@ -35,16 +35,16 @@ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
/** /**
\class modTax \class modTax
\brief Classe de description et activation du module Tax \brief Classe de description et activation du module Tax
*/ */
class modTax extends DolibarrModules class modTax extends DolibarrModules
{ {
/** /**
* \brief Constructeur. Definit les noms, constantes et boites * \brief Constructeur. Definit les noms, constantes et boites
* \param DB handler d'acces base * \param DB handler d'acces base
*/ */
function modTax($DB) function modTax($DB)
{ {
global $conf; global $conf;
@ -63,18 +63,10 @@ class modTax extends DolibarrModules
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 0; $this->special = 0;
$this->picto='bill'; $this->picto='bill';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/taxes/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/taxes";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/taxes/temp";
// Config pages // Config pages
$this->config_page_url = array("taxes.php"); $this->config_page_url = array("taxes.php");
@ -129,30 +121,30 @@ class modTax extends DolibarrModules
$this->rights[$r][5] = 'export'; $this->rights[$r][5] = 'export';
// Exports // Exports
//-------- //--------
$r=0; $r=0;
$r++; $r++;
$this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_code[$r]=$this->rights_class.'_'.$r;
$this->export_label[$r]='Taxes et charges sociales, et leurs reglements'; $this->export_label[$r]='Taxes et charges sociales, et leurs reglements';
$this->export_permission[$r]=array(array("tax","charges","export")); $this->export_permission[$r]=array(array("tax","charges","export"));
$this->export_fields_array[$r]=array('cc.libelle'=>"Type",'c.rowid'=>"IdSocialContribution",'c.libelle'=>"Label",'c.date_ech'=>'DateDue','c.periode'=>'Period','c.amount'=>"AmountExpected","c.paye"=>"Status",'p.rowid'=>'PaymentId','p.datep'=>'DatePayment','p.amount'=>'AmountPayment','p.num_paiement'=>'Numero'); $this->export_fields_array[$r]=array('cc.libelle'=>"Type",'c.rowid'=>"IdSocialContribution",'c.libelle'=>"Label",'c.date_ech'=>'DateDue','c.periode'=>'Period','c.amount'=>"AmountExpected","c.paye"=>"Status",'p.rowid'=>'PaymentId','p.datep'=>'DatePayment','p.amount'=>'AmountPayment','p.num_paiement'=>'Numero');
$this->export_entities_array[$r]=array('cc.libelle'=>"tax_type",'c.rowid'=>"tax",'c.libelle'=>'tax','c.date_ech'=>'tax','c.periode'=>'tax','c.amount'=>"tax","c.paye"=>"tax",'p.rowid'=>'payment','p.datep'=>'payment','p.amount'=>'payment','p.num_paiement'=>'payment'); $this->export_entities_array[$r]=array('cc.libelle'=>"tax_type",'c.rowid'=>"tax",'c.libelle'=>'tax','c.date_ech'=>'tax','c.periode'=>'tax','c.amount'=>"tax","c.paye"=>"tax",'p.rowid'=>'payment','p.datep'=>'payment','p.amount'=>'payment','p.num_paiement'=>'payment');
$this->export_alias_array[$r]=array('cc.libelle'=>"type",'c.rowid'=>"idsocialcontrib",'c.libelle'=>'label','c.date_ech'=>'datedue','c.periode'=>'period','c.amount'=>"amount_clamed","c.paye"=>"status",'p.rowid'=>'paymentid','p.datep'=>'date_payment','p.amount'=>'amount_payment','p.num_paiement'=>'num_payment'); $this->export_alias_array[$r]=array('cc.libelle'=>"type",'c.rowid'=>"idsocialcontrib",'c.libelle'=>'label','c.date_ech'=>'datedue','c.periode'=>'period','c.amount'=>"amount_clamed","c.paye"=>"status",'p.rowid'=>'paymentid','p.datep'=>'date_payment','p.amount'=>'amount_payment','p.num_paiement'=>'num_payment');
$this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_start[$r]='SELECT DISTINCT ';
$this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'c_chargesociales as cc, '.MAIN_DB_PREFIX.'chargesociales as c'; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'c_chargesociales as cc, '.MAIN_DB_PREFIX.'chargesociales as c';
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementcharge as p ON p.fk_charge = c.rowid'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementcharge as p ON p.fk_charge = c.rowid';
$this->export_sql_end[$r] .=' WHERE c.fk_type = cc.id'; $this->export_sql_end[$r] .=' WHERE c.fk_type = cc.id';
$this->export_sql_end[$r] .=' AND c.entity = '.$conf->entity; $this->export_sql_end[$r] .=' AND c.entity = '.$conf->entity;
} }
/** /**
* \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module. * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
* Definit egalement les repertoires de donnees a creer pour ce module. * Definit egalement les repertoires de donnees a creer pour ce module.
*/ */
function init() function init()
{ {
global $conf; global $conf;
@ -163,10 +155,10 @@ class modTax extends DolibarrModules
return $this->_init($sql); return $this->_init($sql);
} }
/** /**
* \brief Fonction appelee lors de la desactivation d'un module. * \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module. * Supprime de la base les constantes, boites et permissions du module.
*/ */
function remove() function remove()
{ {
$sql = array(); $sql = array();

View File

@ -15,8 +15,6 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** /**
@ -28,6 +26,7 @@
\file htdocs/includes/modules/modTelephonie.class.php \file htdocs/includes/modules/modTelephonie.class.php
\ingroup telephonie \ingroup telephonie
\brief Fichier de description et activation du module de Telephonie \brief Fichier de description et activation du module de Telephonie
\version $Id$
*/ */
include_once(DOL_DOCUMENT_ROOT."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT."/includes/modules/DolibarrModules.class.php");
@ -64,57 +63,23 @@ class modTelephonie extends DolibarrModules
$this->picto='phoning'; $this->picto='phoning';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/telephonie/temp",
$r=0; "/telephonie/graph",
"/telephonie/logs",
"/telephonie/client",
"/telephonie/rapports",
"/telephonie/ligne/commande/retour/traite",
"/telephonie/cdr/archives",
"/telephonie/cdr/atraiter");
$this->dirs[$r][0] = "output"; // Dependancies
$this->dirs[$r][1] = "/telephonie";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/telephonie/temp";
$r++;
$this->dirs[$r][0] = "graph";
$this->dirs[$r][1] = "/telephonie/graph";
$r++;
$this->dirs[$r][0] = "logs";
$this->dirs[$r][1] = "/telephonie/logs";
$r++;
$this->dirs[$r][0] = "client";
$this->dirs[$r][1] = "/telephonie/client";
$r++;
$this->dirs[$r][0] = "rapports";
$this->dirs[$r][1] = "/telephonie/rapports";
$r++;
$this->dirs[$r][0] = "ligne";
$this->dirs[$r][1] = "/telephonie/ligne";
$r++;
$this->dirs[$r][0] = "ligne_commande";
$this->dirs[$r][1] = "/telephonie/ligne/commande";
$r++;
$this->dirs[$r][0] = "ligne_commande_retour";
$this->dirs[$r][1] = "/telephonie/ligne/commande/retour";
$r++;
$this->dirs[$r][0] = "ligne_commande_retour_traite";
$this->dirs[$r][1] = "/telephonie/ligne/commande/retour/traite";
$r++;
$this->dirs[$r][0] = "cdr";
$this->dirs[$r][1] = "/telephonie/cdr";
$r++;
$this->dirs[$r][0] = "cdr_archive";
$this->dirs[$r][1] = "/telephonie/cdr_archive";
$r++;
$this->dirs[$r][0] = "cdr_atraiter";
$this->dirs[$r][1] = "/telephonie/cdr/atraiter";
// Dependances
$this->depends = array(); $this->depends = array();
$this->requiredby = array(); $this->requiredby = array();
// Constantes // Constants
$this->const = array(); $this->const = array();
// Boites // Boxes
$this->boxes = array(); $this->boxes = array();
// Permissions // Permissions

View File

@ -63,30 +63,20 @@ class modUser extends DolibarrModules
$this->picto='group'; $this->picto='group';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array("/users/temp");
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/users";
$this->dirs[$r][2] = 1;
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/users/temp";
$this->dirs[$r][2] = 1;
// Config pages // Config pages
// $this->config_page_url = array("/user/admin/index.php"); // $this->config_page_url = array("/user/admin/index.php");
// Dependances // Dependancies
$this->depends = array(); $this->depends = array();
$this->requiredby = array(); $this->requiredby = array();
$this->langfiles = array("main","users","companies"); $this->langfiles = array("main","users","companies");
// Constantes // Constants
$this->const = array(); $this->const = array();
// Boites // Boxes
$this->boxes = array(); $this->boxes = array();
// Permissions // Permissions

View File

@ -225,7 +225,7 @@ if ($modulepart)
$user->getrights('prelevement'); $user->getrights('prelevement');
if ($user->rights->prelevement->bons->lire) $accessallowed=1; if ($user->rights->prelevement->bons->lire) $accessallowed=1;
$original_file=$conf->prelevement->dir_bon.'/'.$original_file; $original_file=$conf->prelevement->dir_output.'/receipts/'.$original_file;
} }
// Wrapping pour les graph telephonie // Wrapping pour les graph telephonie
@ -236,14 +236,14 @@ if ($modulepart)
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file=$conf->telephonie->dir_graph.'/'.$original_file; $original_file=$conf->telephonie->dir_temp.'/'.$original_file;
} }
// Wrapping pour les graph energie // Wrapping pour les graph energie
elseif ($modulepart == 'energie') elseif ($modulepart == 'energie')
{ {
$accessallowed=1; $accessallowed=1;
$original_file=$conf->energie->dir_graph.'/'.$original_file; $original_file=$conf->energie->dir_temp.'/'.$original_file;
} }
// Wrapping pour les graph bank // Wrapping pour les graph bank