lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean a lot of code

Browse Source
This commit is contained in:
Laurent Destailleur 2009-02-11 15:09:59 +00:00
parent ab0d83633f
commit 0056facfd2
27 changed files with 283 additions and 354 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.settings/org.eclipse.core.resources.prefs
View File

@ -1,4 +1,4 @@
#Fri Jan 23 00:49:24 CET 2009 #Wed Feb 11 15:08:12 CET 2009
eclipse.preferences.version=1 eclipse.preferences.version=1
encoding//dev/initdemo/initdemo.sql=UTF-8 encoding//dev/initdemo/initdemo.sql=UTF-8
encoding//dev/skeletons/modMyModule.class.php=ISO-8859-1 encoding//dev/skeletons/modMyModule.class.php=ISO-8859-1
@ -614,6 +614,14 @@ encoding//htdocs/lib/product.lib.php=ISO-8859-1
encoding//htdocs/main.inc.php=ISO-8859-1 encoding//htdocs/main.inc.php=ISO-8859-1
encoding//htdocs/master.inc.php=ISO-8859-1 encoding//htdocs/master.inc.php=ISO-8859-1
encoding//htdocs/paiement.class.php=ISO-8859-1 encoding//htdocs/paiement.class.php=ISO-8859-1
encoding//htdocs/product/canvas/livre/liste.tpl=UTF-8
encoding//htdocs/product/canvas/livre/livre-create.tpl=UTF-8
encoding//htdocs/product/canvas/livre/livre-edit.tpl=UTF-8
encoding//htdocs/product/canvas/livre/livre-view.tpl=UTF-8
encoding//htdocs/product/canvas/livrecontrat/livrecontrat-edit.tpl=UTF-8
encoding//htdocs/product/canvas/livrecontrat/livrecontrat-view.tpl=UTF-8
encoding//htdocs/product/canvas/livrecouverture/livrecouverture-edit.tpl=UTF-8
encoding//htdocs/product/canvas/livrecouverture/livrecouverture-view.tpl=UTF-8
encoding//htdocs/product/fiche.php=ISO-8859-1 encoding//htdocs/product/fiche.php=ISO-8859-1
encoding//htdocs/product/reassort.php=ISO-8859-1 encoding//htdocs/product/reassort.php=ISO-8859-1
encoding//htdocs/product/stats/fiche.php=ISO-8859-1 encoding//htdocs/product/stats/fiche.php=ISO-8859-1

3
dev/skeletons/modMyModule.class.php
View File

@ -87,7 +87,8 @@ class modMyModule extends DolibarrModules
// Constants // Constants
$this->const = array(); // List of particular constants to add when module is enabled $this->const = array(); // List of particular constants to add when module is enabled
//Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0),
// 1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
// New pages on tabs // New pages on tabs
$this->tabs = array('entity:Title:@mymodule:/mymodule/mynewtab.php?id=__ID__'); $this->tabs = array('entity:Title:@mymodule:/mymodule/mynewtab.php?id=__ID__');

30
htdocs/admin/modules.php
View File

@ -263,10 +263,10 @@ asort($orders);
// Affichage debut page // Affichage debut page
if ($mode==0) print $langs->trans("ModulesDesc")."<br>\n"; if ($mode==0) { $tagmode = 'common'; print $langs->trans("ModulesDesc")."<br>\n"; }
if ($mode==1) print $langs->trans("ModulesInterfaceDesc")."<br>\n"; if ($mode==2) { $tagmode = 'other'; print $langs->trans("ModulesSpecialDesc")."<br>\n"; }
if ($mode==2) print $langs->trans("ModulesSpecialDesc")."<br>\n"; if ($mode==1) { $tagmode = 'interfaces'; print $langs->trans("ModulesInterfaceDesc")."<br>\n"; }
if ($mode==3) print $langs->trans("ModulesJobDesc")."<br>\n"; if ($mode==3) { $tagmode = 'functional'; print $langs->trans("ModulesJobDesc")."<br>\n"; }
print "<br>\n"; print "<br>\n";
@ -281,15 +281,6 @@ if (! empty($categ[$categidx]))
$h++; $h++;
} }
$categidx=1;
if (! empty($categ[$categidx]))
{
$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$categidx;
$head[$h][1] = $langs->trans("ModulesInterfaces");
$head[$h][2] = 'interfaces';
$h++;
}
$categidx=2; $categidx=2;
if (! empty($categ[$categidx])) if (! empty($categ[$categidx]))
{ {
@ -299,16 +290,25 @@ if (! empty($categ[$categidx]))
$h++; $h++;
} }
$categidx=1;
if (! empty($categ[$categidx]))
{
$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$categidx;
$head[$h][1] = $langs->trans("ModulesInterfaces");
$head[$h][2] = 'interfaces';
$h++;
}
$categidx=3; $categidx=3;
if (! empty($categ[$categidx])) if (! empty($categ[$categidx]))
{ {
$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$categidx; $head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$categidx;
$head[$h][1] = $langs->trans("ModulesJob"); $head[$h][1] = $langs->trans("ModulesSpecial");
$head[$h][2] = 'functional'; $head[$h][2] = 'functional';
$h++; $h++;
} }
dolibarr_fiche_head($head, $mode, $langs->trans("Modules")); dolibarr_fiche_head($head, $tagmode, $langs->trans("Modules"));
if ($mesg) print '<div class="error">'.$mesg.'</div>'; if ($mesg) print '<div class="error">'.$mesg.'</div>';

0
htdocs/docs/class/courrier-droit-editeur.class.php → htdocs/docs/class/pdf_courrier_droit_editeur.class.php
View File

26
htdocs/docs/document.class.php
View File

@ -38,6 +38,8 @@ class Document
$this->db = $db; $this->db = $db;
} }
/** /**
\brief Génère le document \brief Génère le document
\return int 0= ok, <> 0 = ko \return int 0= ok, <> 0 = ko
@ -48,28 +50,8 @@ class Document
dolibarr_syslog("Document::Generate id=$id", LOG_DEBUG ); dolibarr_syslog("Document::Generate id=$id", LOG_DEBUG );
$this->id = $id; $this->id = $id;
$class = $id;
// On récupère données du mail $classfile = 'docs/class/'.$class.'.class.php';
$sql = "SELECT classfile,class";
$sql .= " FROM ".MAIN_DB_PREFIX."document_generator";
$sql .= " WHERE rowid = '".$this->id."';";
$resql=$this->db->query($sql);
if ($resql)
{
while ($obj = $this->db->fetch_object($resql) )
{
$class = $obj->class;
$classfile = $obj->classfile;
}
$this->db->free($resql);
}
else
{
print $this->db->error();
print "$sql\n";
}
require DOL_DOCUMENT_ROOT.'/'.$classfile; require DOL_DOCUMENT_ROOT.'/'.$classfile;
$obj = new $class($this->db); $obj = new $class($this->db);

71
htdocs/docs/generate.php
View File

@ -14,39 +14,44 @@
* 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$
* $Source$
*/ */
/** /**
\file htdocs/docs/index.php \file htdocs/docs/index.php
\ingroup document \ingroup document
\brief Page d'accueil module document \brief Page d'accueil module document
\version $Revision$ \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
/* /*
* Affichage page configuration module societe * Actions
*
*/ */
if ($_GET["id"] > 0) if ($_GET["id"])
{ {
require_once(DOL_DOCUMENT_ROOT.'/docs/document.class.php'); require_once(DOL_DOCUMENT_ROOT.'/docs/document.class.php');
$doc = new Document($db); $doc = new Document($db);
if ($doc->Generate($_GET["id"]) == 0) if ($doc->Generate($_GET["id"]) == 0)
{ {
Header("Location: index.php"); Header("Location: index.php");
} exit;
}
} }
/*
* View
*/
llxHeader(); llxHeader();
print_titre($langs->trans("Documents")); print_titre($langs->trans("DocumentsBuilder"));
print "<table class=\"noborder\" width=\"100%\">\n"; print "<table class=\"noborder\" width=\"100%\">\n";
print "<tr class=\"liste_titre\">\n"; print "<tr class=\"liste_titre\">\n";
@ -54,30 +59,18 @@ print ' <td>'.$langs->trans("Name").'</td>';
print ' <td>'.$langs->trans("Description").'</td>'; print ' <td>'.$langs->trans("Description").'</td>';
print "</tr>\n"; print "</tr>\n";
$sql = "SELECT dg.rowid,dg.name, dg.classfile, dg.class"; // TODO: Scan class that are in docs/class directory to find generator availables
$sql.= " FROM ".MAIN_DB_PREFIX."document_generator as dg"; $listofmodules=array('pdf_courrier_droit_editeur');
$sql.= " ORDER BY dg.name ASC;";
$resql = $db->query($sql); $var=true;
if ($resql) foreach ($listofmodules as $val)
{ {
$var=True; $var=!$var;
while ($obj = $db->fetch_object($resql) )
{
$var=!$var; print "<tr $bc[$var]>";
print '<td><a href="generate.php?id='.urlencode($val).'">'.$val.'</a></td>';
print "<tr $bc[$var]>"; print '<td>&nbsp;</td>';
print '<td><a href="generate.php?id='.$obj->rowid.'">'.stripslashes($obj->name).'</a></td>'; print "</tr>\n";
print '<td>&nbsp;</td>';
print "</tr>\n";
}
$db->free($resql);
}
else
{
dolibarr_print_error($db);
} }

12
htdocs/docs/index.php
View File

@ -14,27 +14,25 @@
* 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$
* $Source$
*/ */
/** /**
\file htdocs/docs/index.php \file htdocs/docs/index.php
\ingroup document \ingroup document
\brief Page d'accueil module document \brief Page d'accueil module document
\version $Revision$ \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
/* /*
* Affichage page configuration module societe * View
*
*/ */
llxHeader(); llxHeader();
print_titre($langs->trans("Documents")); print_titre($langs->trans("DocumentsBuilder"));
print "<table class=\"noborder\" width=\"100%\">\n"; print "<table class=\"noborder\" width=\"100%\">\n";
print "<tr class=\"liste_titre\">\n"; print "<tr class=\"liste_titre\">\n";

135
htdocs/docs/pre.inc.php
View File

@ -19,98 +19,101 @@
*/ */
/** /**
\file htdocs/pre.inc.php * \file htdocs/docs/pre.inc.php
\brief Fichier gestionnaire du menu de gauche de l'accueil * \brief Fichier gestionnaire du menu de gauche de l'accueil
\version $Source$ * \version $Source$
*/ */
require ("../main.inc.php"); require ("../main.inc.php");
function llxHeader($head = "") require_once("../main.inc.php");
function llxHeader($head = "", $title="", $help_url='')
{ {
global $user, $conf, $langs; global $user, $conf, $langs;
top_menu($head); top_menu($head);
$menu = new Menu(); $menu = new Menu();
if ($conf->societe->enabled && $user->rights->societe->lire) if ($conf->societe->enabled && $user->rights->societe->lire)
{ {
$langs->load("companies"); $langs->load("companies");
$menu->add(DOL_URL_ROOT."/societe.php", $langs->trans("Companies")); $menu->add(DOL_URL_ROOT."/societe.php", $langs->trans("Companies"));
if(is_dir("societe/groupe")) if(is_dir("societe/groupe"))
{ {
$menu->add_submenu(DOL_URL_ROOT."/societe/groupe/index.php", $langs->trans("MenuSocGroup")); $menu->add_submenu(DOL_URL_ROOT."/societe/groupe/index.php", $langs->trans("MenuSocGroup"));
} }
$menu->add_submenu(DOL_URL_ROOT."/contact/index.php",$langs->trans("Contacts")); $menu->add_submenu(DOL_URL_ROOT."/contact/index.php",$langs->trans("Contacts"));
} }
if ($conf->commercial->enabled && $user->rights->commercial->lire) if ($conf->commercial->enabled && $user->rights->commercial->lire)
{ {
$langs->load("commercial"); $langs->load("commercial");
$menu->add(DOL_URL_ROOT."/comm/index.php",$langs->trans("Commercial")); $menu->add(DOL_URL_ROOT."/comm/index.php",$langs->trans("Commercial"));
$menu->add_submenu(DOL_URL_ROOT."/comm/clients.php",$langs->trans("Customers")); $menu->add_submenu(DOL_URL_ROOT."/comm/clients.php",$langs->trans("Customers"));
$menu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php",$langs->trans("Prospects")); $menu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php",$langs->trans("Prospects"));
if ($user->rights->propale->lire) if ($user->rights->propale->lire)
{ {
$langs->load("propal"); $langs->load("propal");
$menu->add_submenu(DOL_URL_ROOT."/comm/propal.php", $langs->trans("Prop")); $menu->add_submenu(DOL_URL_ROOT."/comm/propal.php", $langs->trans("Prop"));
} }
} }
if ($conf->compta->enabled || $conf->comptaexpert->enabled) if ($conf->compta->enabled || $conf->comptaexpert->enabled)
{ {
$langs->load("compta"); $langs->load("compta");
$menu->add(DOL_URL_ROOT."/compta/index.php", $langs->trans("MenuFinancial")); $menu->add(DOL_URL_ROOT."/compta/index.php", $langs->trans("MenuFinancial"));
if ($user->rights->facture->lire) { if ($user->rights->facture->lire) {
$langs->load("bills"); $langs->load("bills");
$menu->add_submenu(DOL_URL_ROOT."/compta/facture.php", $langs->trans("Bills")); $menu->add_submenu(DOL_URL_ROOT."/compta/facture.php", $langs->trans("Bills"));
} }
} }
if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire)
{ {
$langs->trans("interventions"); $langs->trans("interventions");
$menu->add(DOL_URL_ROOT."/fichinter/index.php", $langs->trans("Interventions")); $menu->add(DOL_URL_ROOT."/fichinter/index.php", $langs->trans("Interventions"));
} }
if (($conf->produit->enabled || $conf->service->enabled) && $user->rights->produit->lire) if (($conf->produit->enabled || $conf->service->enabled) && $user->rights->produit->lire)
{ {
$langs->load("products"); $langs->load("products");
$chaine=""; $chaine="";
if ($conf->produit->enabled) { $chaine.= $langs->trans("Products"); } if ($conf->produit->enabled) { $chaine.= $langs->trans("Products"); }
if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; } if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
if ($conf->service->enabled) { $chaine.= $langs->trans("Services"); } if ($conf->service->enabled) { $chaine.= $langs->trans("Services"); }
$menu->add(DOL_URL_ROOT."/product/index.php", "$chaine"); $menu->add(DOL_URL_ROOT."/product/index.php", "$chaine");
} }
if ($conf->commande->enabled && $user->rights->commande->lire) if ($conf->commande->enabled && $user->rights->commande->lire)
{ {
$langs->load("orders"); $langs->load("orders");
$menu->add(DOL_URL_ROOT."/commande/index.php", $langs->trans("Orders")); $menu->add(DOL_URL_ROOT."/commande/index.php", $langs->trans("Orders"));
} }
if ($conf->document->enabled) if ($conf->document->enabled)
{ {
$menu->add(DOL_URL_ROOT."/docs/index.php", $langs->trans("Documents")); $menu->add(DOL_URL_ROOT."/docs/index.php", $langs->trans("DocumentsBuilder"));
$menu->add_submenu(DOL_URL_ROOT."/docs/generate.php", $langs->trans("Génération")); $menu->add_submenu(DOL_URL_ROOT."/docs/generate.php", $langs->trans("Build"));
} }
if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire)
{ {
$langs->load("suppliers"); $langs->load("suppliers");
$menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers")); $menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers"));
} }
left_menu($menu->liste); left_menu($menu->liste);
} }
?> ?>

55
htdocs/includes/modules/DolibarrModules.class.php
View File

@ -118,27 +118,6 @@ class DolibarrModules
} }
} }
// Cree les documents generables
if (is_array($this->docs))
{
foreach ($this->docs as $key => $doc)
{
if (! $err)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_generator (rowid,name,classfile,class) VALUES ";
$sql .= "(".$doc[0].",'".addslashes($doc[1])."','".$doc[2]."','".$doc[3]."');";
$result=$this->db->query($sql);
if (! $result)
{
$this->error=$this->db->error();
dolibarr_syslog("DolibarrModules::_init Error sql=".$sql." - ".$this->error, LOG_ERR);
$err++;
}
}
}
}
// Cree les repertoires // Cree les repertoires
if (is_array($this->dirs)) if (is_array($this->dirs))
{ {
@ -198,9 +177,6 @@ class DolibarrModules
// Supprime les menus apportes par le module // Supprime les menus apportes par le module
$err+=$this->delete_menus(); $err+=$this->delete_menus();
// Supprime les documents generables
$err+=$this->delete_docs();
// Execute les requetes sql complementaires // Execute les requetes sql complementaires
for ($i = 0 ; $i < sizeof($array_sql) ; $i++) for ($i = 0 ; $i < sizeof($array_sql) ; $i++)
{ {
@ -535,37 +511,6 @@ class DolibarrModules
} }
/**
* \brief Supprime les documents
* \return int Nombre d'erreurs (0 si ok)
*/
function delete_docs()
{
$err=0;
// Supprime les documents generables
if (is_array($this->docs))
{
foreach ($this->docs as $key => $doc)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_generator ";
$sql .= "WHERE name= '".addslashes($doc[0])."' AND classfile='".$doc[1]."'AND class='".$doc[2]."';";
dolibarr_syslog("DolibarrModules::delete_docs sql=".$sql);
$result=$this->db->query($sql);
if (! $result)
{
dolibarr_syslog("DolibarrModules::delete_docs Error sql=".$sql." - ".$this->db->error());
$err++;
}
}
}
return $err;
}
/** /**
* \brief Supprime les boites * \brief Supprime les boites
* \return int Nombre d'erreurs (0 si ok) * \return int Nombre d'erreurs (0 si ok)

2
htdocs/includes/modules/modCategorie.class.php
View File

@ -55,7 +55,7 @@ class modCategorie extends DolibarrModules
$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 = 2;
$this->picto = 'generic'; $this->picto = 'generic';
// Dir // Dir

6
htdocs/includes/modules/modDocument.class.php
View File

@ -51,12 +51,12 @@ class modDocument extends DolibarrModules
$this->family = "other"; $this->family = "other";
// 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 documents"; $this->description = "Genération de courriers/publipostages";
// Possible values for version are: 'development', 'experimental', 'dolibarr' or version // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
$this->version = 'development'; $this->version = 'development';
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 2; $this->special = 3;
$this->picto='dir'; $this->picto='dir';
// Dir // Dir
@ -68,7 +68,7 @@ class modDocument extends DolibarrModules
// D<>pendances // D<>pendances
$this->depends = array(); $this->depends = array();
$this->requiredby = array(); $this->requiredby = array("modEditeur");
$this->conflictwith = array(); $this->conflictwith = array();
$this->langfiles = array("orders","bills","companies"); $this->langfiles = array("orders","bills","companies");

19
htdocs/includes/modules/modDroitPret.class.php
View File

@ -52,22 +52,31 @@ class modDroitPret extends DolibarrModules
// 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 du droit de prets"; $this->description = "Gestion du droit de prets";
$this->version = 'experimental'; // 'development' or 'experimental' or 'dolibarr' or version $this->version = 'development'; // 'development' or 'experimental' or 'dolibarr' or version
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 2; $this->special = 3;
// Dir // Dir
$this->dirs = array(); global $dolibarr_smarty_compile;
global $dolibarr_smarty_cache;
$this->dirs = array($dolibarr_smarty_compile,
$dolibarr_smarty_cache);
// D<>pendances // Dependances
$this->depends = array(); $this->depends = array();
$this->requiredby = array(); $this->requiredby = array();
$this->conflictwith = array();
$this->needleftmenu = array();
$this->needtotopmenu = array();
$this->langfiles = array("orders","bills","companies");
// Config pages // Config pages
$this->config_page_url = array("droitpret.php"); $this->config_page_url = array("droitpret.php");
// Constantes // Constantes
$this->const = array(); $this->const=array(0=>array('PRODUCT_CANVAS_ABILITY','chaine',1,'This is a constant',1),
1=>array('MAIN_NEED_SMARTY','chaine',1,'Need smarty',0)
);
// Boxes // Boxes
$this->boxes = array(); $this->boxes = array();

28
htdocs/includes/modules/modEditeur.class.php
View File

@ -53,43 +53,37 @@ class modEditeur extends DolibarrModules
$this->name = eregi_replace('^mod','',get_class($this)); $this->name = eregi_replace('^mod','',get_class($this));
$this->description = "Gestion des editeurs"; $this->description = "Gestion des editeurs";
// 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 = 'development';
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 3; $this->special = 3;
$this->picto='book'; $this->picto='book';
// Dir // Dir
$this->dirs = array(); global $dolibarr_smarty_compile;
global $dolibarr_smarty_cache;
$this->dirs = array($dolibarr_smarty_compile,
$dolibarr_smarty_cache);
// Config pages // Config pages
$this->config_page_url = array("editeur.php"); $this->config_page_url = array("editeur.php");
// D<EFBFBD>pendances // Dependances
$this->depends = array(); $this->depends = array("modDocument");
$this->requiredby = array(); $this->requiredby = array();
$this->conflictwith = array(); $this->conflictwith = array();
$this->needleftmenu = array('default.php'); $this->needleftmenu = array('rodolphe.php');
$this->needtotopmenu = array(); $this->needtotopmenu = array();
$this->langfiles = array("orders","bills","companies"); $this->langfiles = array("orders","bills","companies");
// Constantes // Constantes
$this->const=array();
$this->const = array();
// Boites // Boites
$this->boxes = array(); $this->boxes = array();
// Documents
$this->docs = array();
$this->docs[0][0] = 1;
$this->docs[0][1] = 'Courrier des droits';
$this->docs[0][2] = 'docs/class/courrier-droit-editeur.class.php';
$this->docs[0][3] = 'pdf_courrier_droit_editeur';
// Permissions // Permissions
$this->rights = array(); $this->rights = array();
} }
@ -101,8 +95,6 @@ class modEditeur extends DolibarrModules
{ {
global $conf; global $conf;
$sql = array();
return $this->_init($sql); return $this->_init($sql);
} }
@ -113,7 +105,7 @@ class modEditeur extends DolibarrModules
*/ */
function remove() function remove()
{ {
$sql = array(); global $conf;
return $this->_remove($sql); return $this->_remove($sql);
} }

2
htdocs/includes/modules/modEnergie.class.php
View File

@ -59,7 +59,7 @@ class modEnergie extends DolibarrModules
$this->version = 'dolibarr'; $this->version = 'dolibarr';
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 2; $this->special = 3;
$this->picto='energie'; $this->picto='energie';
// Dir // Dir

2
htdocs/includes/modules/modMailing.class.php
View File

@ -54,7 +54,7 @@ class modMailing extends DolibarrModules
$this->description = "Gestion des EMailings"; $this->description = "Gestion des EMailings";
$this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version $this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 1; $this->special = 0;
$this->picto='email'; $this->picto='email';
// Dir // Dir

2
htdocs/includes/modules/modTelephonie.class.php
View File

@ -60,7 +60,7 @@ class modTelephonie extends DolibarrModules
$this->version = 'dolibarr'; $this->version = 'dolibarr';
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 2; $this->special = 3;
$this->picto='phoning'; $this->picto='phoning';
// Dir // Dir

7
htdocs/langs/en_US/admin.lang
View File

@ -69,11 +69,10 @@ OtherSetup=Other setup
CurrentValueSeparatorDecimal=Decimal separator CurrentValueSeparatorDecimal=Decimal separator
CurrentValueSeparatorThousand=Thousand separator CurrentValueSeparatorThousand=Thousand separator
Modules=Modules Modules=Modules
ModulesCommon=Common modules ModulesCommon=Main modules
ModulesInterfaces=Interfaces modules
ModulesOther=Other modules ModulesOther=Other modules
ModulesJob=Setup modules ModulesInterfaces=Interfaces modules
ModulesSpecial=Special modules ModulesSpecial=Modules very specific
ParameterInDolibarr=Parameter %s ParameterInDolibarr=Parameter %s
LanguageParameter=Language parameter %s LanguageParameter=Language parameter %s
LanguageBrowserParameter=Parameter %s LanguageBrowserParameter=Parameter %s

7
htdocs/langs/fr_FR/admin.lang
View File

@ -69,11 +69,10 @@ OtherSetup=Divers
CurrentValueSeparatorDecimal=Séparateur décimal CurrentValueSeparatorDecimal=Séparateur décimal
CurrentValueSeparatorThousand=Séparateur de milliers CurrentValueSeparatorThousand=Séparateur de milliers
Modules=Modules Modules=Modules
ModulesCommon=Modules standards ModulesCommon=Modules principaux
ModulesOther=Modules complémentaires
ModulesInterfaces=Modules interfaces ModulesInterfaces=Modules interfaces
ModulesOther=Modules autres ModulesSpecial=Modules très spécifiques
ModulesJob=Modules métiers
ModulesSpecial=Modules spéciaux
ParameterInDolibarr=Variable %s ParameterInDolibarr=Variable %s
LanguageParameter=Variable langue %s LanguageParameter=Variable langue %s
LanguageBrowserParameter=Variable %s LanguageBrowserParameter=Variable %s

2
htdocs/pre.inc.php
View File

@ -110,7 +110,7 @@ function llxHeader($head = "")
if (! empty($conf->document->enabled)) if (! empty($conf->document->enabled))
{ {
$menu->add(DOL_URL_ROOT."/docs/index.php", $langs->trans("Documents")); $menu->add(DOL_URL_ROOT."/docs/index.php", $langs->trans("DocumentsBuilder"));
} }
if (! empty($conf->expedition->enabled) && $user->rights->expedition->lire) if (! empty($conf->expedition->enabled) && $user->rights->expedition->lire)

4
htdocs/product/canvas/livre/liste.tpl
View File

@ -14,7 +14,7 @@
<td class="liste_titre">Case <td class="liste_titre">Case
</td> </td>
<td class="liste_titre" >Référence <td class="liste_titre" >Référence
<a href="liste.php?sortfield=p.ref&amp;sortorder=asc&amp;begin=&amp;envente=&amp;canvas=livre&amp;fourn_id=&amp;snom=&amp;sref="> <a href="liste.php?sortfield=p.ref&amp;sortorder=asc&amp;begin=&amp;envente=&amp;canvas=livre&amp;fourn_id=&amp;snom=&amp;sref=">
<img src="{$url_root}/theme/{$theme}/img/1downarrow.png" border="0" alt="A-Z" title="A-Z"> <img src="{$url_root}/theme/{$theme}/img/1downarrow.png" border="0" alt="A-Z" title="A-Z">
</a> </a>
@ -33,7 +33,7 @@
</td> </td>
<td class="liste_titre" align="center">Casier</td> <td class="liste_titre" align="center">Casier</td>
<td class="liste_titre" align="center">Entrepôt</td> <td class="liste_titre" align="center">Entrepot</td>
<td class="liste_titre" align="center">Ventes</td> <td class="liste_titre" align="center">Ventes</td>
<td class="liste_titre">Stock</td> <td class="liste_titre">Stock</td>
<td class="liste_titre" align="center">Pages</td> <td class="liste_titre" align="center">Pages</td>

14
htdocs/product/canvas/livre/livre-create.tpl
View File

@ -35,7 +35,7 @@
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
<td width="15%">Référence</td> <td width="15%">Référence</td>
<td colspan="2"> <td colspan="2">
<input name="ref" size="20" value="{$prod_ref}" <input name="ref" size="20" value="{$prod_ref}"
class="{$class_normal_ref}" onfocus="this.className='{$class_focus_ref}';" onblur="this.className='{$class_normal_ref}';"> class="{$class_normal_ref}" onfocus="this.className='{$class_focus_ref}';" onblur="this.className='{$class_normal_ref}';">
@ -62,13 +62,13 @@
{$prod_isbn} {$prod_isbn}
</td> </td>
<td width="15%">ISBN-13</td> <td width="15%">ISBN-13</td>
<td width="35%"><i>sera calculé</i> <td width="35%"><i>sera calculé</i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="15%">EAN</td> <td width="15%">EAN</td>
<td colspan="3" width="85%"><i>sera calculé</i></td> <td colspan="3" width="85%"><i>sera calculé</i></td>
</tr> </tr>
<tr> <tr>
@ -100,7 +100,7 @@
</tr> </tr>
<tr> <tr>
<td>Prix de revient</td> <td>Prix de revient</td>
<td><i>sera calculé</i></td> <td><i>sera calculé</i></td>
<td>Prix reliure</td> <td>Prix reliure</td>
<td> <td>
<input name="px_reliure" type="text" size="7" maxlength="6" value="{$prod_pxreliure}" <input name="px_reliure" type="text" size="7" maxlength="6" value="{$prod_pxreliure}"
@ -171,7 +171,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="15%">Durée du contrat :</td> <td width="15%">Durée du contrat :</td>
<td width="35%"> <td width="35%">
<input name="contrat_duree" type="text" size="7" maxlength="6" value="{$livre_contrat_duree}" <input name="contrat_duree" type="text" size="7" maxlength="6" value="{$livre_contrat_duree}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';"> class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
@ -186,7 +186,7 @@
<input name="contrat_taux" type="text" size="7" maxlength="6" value="{$livre_contrat_taux}" <input name="contrat_taux" type="text" size="7" maxlength="6" value="{$livre_contrat_taux}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">% class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">%
</td> </td>
<td>Quantité achetée</td> <td>Quantité achetée</td>
<td> <td>
<input name="contrat_quant" type="text" size="7" maxlength="6" value="{$livre_contrat_quant}" <input name="contrat_quant" type="text" size="7" maxlength="6" value="{$livre_contrat_quant}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';"> class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
@ -213,7 +213,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="4" align="center"> <td colspan="4" align="center">
<input type="submit" class="button" value="Créer"> <input type="submit" class="button" value="Créer">
</td> </td>
</tr> </tr>

12
htdocs/product/canvas/livre/livre-edit.tpl
View File

@ -29,14 +29,14 @@
<table width="100%" border="0" class="notopnoleftnoright"> <table width="100%" border="0" class="notopnoleftnoright">
<tr> <tr>
<td class="notopnoleftnoright" valign="middle"> <td class="notopnoleftnoright" valign="middle">
<div class="titre">Éditer Livre</div> <div class="titre">Éditer Livre</div>
</td> </td>
</tr> </tr>
</table> </table>
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
<td width="15%">Réf.</td> <td width="15%">Réf.</td>
<td colspan="2"> <td colspan="2">
<input name="ref" size="20" value="{$prod_ref}" <input name="ref" size="20" value="{$prod_ref}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';"> class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
@ -182,7 +182,7 @@
<td>Saisi par</td><td>{$livre_contrat_user_fullname}</td> <td>Saisi par</td><td>{$livre_contrat_user_fullname}</td>
</tr> </tr>
<tr> <tr>
<td width="15%">Durée du contrat :</td> <td width="15%">Durée du contrat :</td>
<td width="35%"> <td width="35%">
<input name="contrat_duree" type="text" size="7" maxlength="6" value="{$livre_contrat_duree}" <input name="contrat_duree" type="text" size="7" maxlength="6" value="{$livre_contrat_duree}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';"> class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
@ -198,7 +198,7 @@
<input name="contrat_taux" type="text" size="7" maxlength="6" value="{$livre_contrat_taux}" <input name="contrat_taux" type="text" size="7" maxlength="6" value="{$livre_contrat_taux}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">% class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">%
</td> </td>
<td>Quantité achetée</td> <td>Quantité achetée</td>
<td> <td>
<input name="contrat_quant" type="text" size="7" maxlength="6" value="{$livre_contrat_quant}" <input name="contrat_quant" type="text" size="7" maxlength="6" value="{$livre_contrat_quant}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';"> class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
@ -220,7 +220,7 @@
<td>Saisi par</td><td>{$livre_contrat_user_fullname}</td> <td>Saisi par</td><td>{$livre_contrat_user_fullname}</td>
</tr> </tr>
<tr> <tr>
<td width="15%">Durée du contrat : </td> <td width="15%">Durée du contrat : </td>
<td width="35%">{$livre_contrat_duree}</td> <td width="35%">{$livre_contrat_duree}</td>
<td width="15%">Date d'application</td> <td width="15%">Date d'application</td>
<td width="35%">{$livre_contrat_date_app|date_format:"%d %B %Y"}</td> <td width="35%">{$livre_contrat_date_app|date_format:"%d %B %Y"}</td>
@ -228,7 +228,7 @@
<tr> <tr>
<td>Taux conclu</td> <td>Taux conclu</td>
<td>{$livre_contrat_taux} %</td> <td>{$livre_contrat_taux} %</td>
<td>Quantité achetée</td> <td>Quantité achetée</td>
<td>{$livre_contrat_quant}</td> <td>{$livre_contrat_quant}</td>
</tr> </tr>
{/if} {/if}

8
htdocs/product/canvas/livre/livre-view.tpl
View File

@ -24,7 +24,7 @@
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
<td width="15%">Référence</td> <td width="15%">Référence</td>
<td width="35%" style="font-weight: bold;">{$prod_ref}</td> <td width="35%" style="font-weight: bold;">{$prod_ref}</td>
<td width="50%" colspan="2" align="right"> <td width="50%" colspan="2" align="right">
{$fiche_cursor_prev}{$fiche_cursor_next} {$fiche_cursor_prev}{$fiche_cursor_next}
@ -96,7 +96,7 @@
</tr> </tr>
<tr> <tr>
<td width="15%">Stock réel</td> <td width="15%">Stock réel</td>
<td width="35%">{$prod_stock_reel}</td> <td width="35%">{$prod_stock_reel}</td>
<td width="15%">Exemplaires en commande</td> <td width="15%">Exemplaires en commande</td>
<td width="35%">{$prod_stock_in_command}</td> <td width="35%">{$prod_stock_in_command}</td>
@ -125,7 +125,7 @@
</tr> </tr>
<tr> <tr>
<td width="15%">Durée du contrat : </td> <td width="15%">Durée du contrat : </td>
<td width="35%">{$livre_contrat_duree}</td> <td width="35%">{$livre_contrat_duree}</td>
<td width="15%">Date d'application</td> <td width="15%">Date d'application</td>
<td width="35%">{$livre_contrat_date_app|date_format:"%d %B %Y"}</td> <td width="35%">{$livre_contrat_date_app|date_format:"%d %B %Y"}</td>
@ -134,7 +134,7 @@
<tr> <tr>
<td>Taux conclu</td> <td>Taux conclu</td>
<td>{$livre_contrat_taux} %</td> <td>{$livre_contrat_taux} %</td>
<td>Quantité achetée</td> <td>Quantité achetée</td>
<td>{$livre_contrat_quant}</td> <td>{$livre_contrat_quant}</td>
</tr> </tr>

6
htdocs/product/canvas/livrecontrat/livrecontrat-edit.tpl
View File

@ -10,7 +10,7 @@
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
<td width="15%">Réf.</td> <td width="15%">Réf.</td>
<td >{$prod_ref}</td> <td >{$prod_ref}</td>
</tr> </tr>
@ -39,7 +39,7 @@
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
<td width="15%">Durée du contrat :</td> <td width="15%">Durée du contrat :</td>
<td width="35%"> <td width="35%">
<input name="contrat_duree" type="text" size="7" maxlength="6" value="{$prod_contrat_duree}" <input name="contrat_duree" type="text" size="7" maxlength="6" value="{$prod_contrat_duree}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';"> class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
@ -54,7 +54,7 @@
<input name="contrat_taux" type="text" size="7" maxlength="6" value="{$prod_contrat_taux}" <input name="contrat_taux" type="text" size="7" maxlength="6" value="{$prod_contrat_taux}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">% class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">%
</td> </td>
<td>Quantité achetée</td> <td>Quantité achetée</td>
<td> <td>
<input name="contrat_quant" type="text" size="7" maxlength="6" value="{$prod_contrat_quant}" <input name="contrat_quant" type="text" size="7" maxlength="6" value="{$prod_contrat_quant}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';"> class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">

8
htdocs/product/canvas/livrecontrat/livrecontrat-view.tpl
View File

@ -1,7 +1,7 @@
<!-- BEGIN SMARTY TEMPLATE --> <!-- BEGIN SMARTY TEMPLATE -->
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
<td width="15%">Référence</td> <td width="15%">Référence</td>
<td width="35%" style="font-weight: bold;">{$prod_ref}</td> <td width="35%" style="font-weight: bold;">{$prod_ref}</td>
<td width="50%" colspan="2" align="right"> <td width="50%" colspan="2" align="right">
{$fiche_cursor_prev}{$fiche_cursor_next} {$fiche_cursor_prev}{$fiche_cursor_next}
@ -28,7 +28,7 @@
</tr> </tr>
<tr> <tr>
<td width="15%">Stock réel</td> <td width="15%">Stock réel</td>
<td width="35%">{$prod_stock_reel}</td> <td width="35%">{$prod_stock_reel}</td>
<td width="15%">Exemplaires en commande</td> <td width="15%">Exemplaires en commande</td>
<td width="35%">{$prod_stock_in_command}</td> <td width="35%">{$prod_stock_in_command}</td>
@ -41,7 +41,7 @@
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
<td width="15%">Durée du contrat : </td> <td width="15%">Durée du contrat : </td>
<td width="35%">{$prod_contrat_duree}</td> <td width="35%">{$prod_contrat_duree}</td>
<td width="15%">Date d'application</td> <td width="15%">Date d'application</td>
<td width="35%">{$prod_contrat_date_app|date_format:"%e %B %Y"}</td> <td width="35%">{$prod_contrat_date_app|date_format:"%e %B %Y"}</td>
@ -50,7 +50,7 @@
<tr> <tr>
<td>Taux conclu</td> <td>Taux conclu</td>
<td>{$prod_contrat_taux}</td> <td>{$prod_contrat_taux}</td>
<td>Quantité achetée</td> <td>Quantité achetée</td>
<td>{$prod_contrat_quant}</td> <td>{$prod_contrat_quant}</td>
</tr> </tr>

6
htdocs/product/canvas/livrecouverture/livrecouverture-edit.tpl
View File

@ -7,7 +7,7 @@
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
<td width="15%">Réf.</td> <td width="15%">Réf.</td>
<td colspan="2"> <td colspan="2">
<input name="ref" size="20" value="{$prod_ref}" <input name="ref" size="20" value="{$prod_ref}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';"> class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
@ -131,7 +131,7 @@
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
<td width="15%">Durée du contrat :</td> <td width="15%">Durée du contrat :</td>
<td width="35%"> <td width="35%">
<input name="contrat_duree" type="text" size="7" maxlength="6" value="{$prod_contrat_duree}" <input name="contrat_duree" type="text" size="7" maxlength="6" value="{$prod_contrat_duree}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';"> class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
@ -149,7 +149,7 @@
<input name="contrat_taux" type="text" size="7" maxlength="6" value="{$prod_contrat_taux}" <input name="contrat_taux" type="text" size="7" maxlength="6" value="{$prod_contrat_taux}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">% class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">%
</td> </td>
<td>Quantité achetée</td> <td>Quantité achetée</td>
<td> <td>
<input name="contrat_quant" type="text" size="7" maxlength="6" value="{$prod_contrat_quant}" <input name="contrat_quant" type="text" size="7" maxlength="6" value="{$prod_contrat_quant}"
class="normal" onfocus="this.className='focus';" onblur="this.className='normal';"> class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">

4
htdocs/product/canvas/livrecouverture/livrecouverture-view.tpl
View File

@ -1,7 +1,7 @@
<!-- BEGIN SMARTY TEMPLATE --> <!-- BEGIN SMARTY TEMPLATE -->
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
<td width="15%">Référence</td> <td width="15%">Réf</td>
<td width="35%" style="font-weight: bold;">{$livre_ref}</td> <td width="35%" style="font-weight: bold;">{$livre_ref}</td>
<td width="50%" align="right"> <td width="50%" align="right">
&nbsp; &nbsp;
@ -26,7 +26,7 @@
</tr> </tr>
<tr> <tr>
<td width="15%">Stock réel</td> <td width="15%">Stock réel</td>
<td width="35%">{$prod_stock_reel}</td> <td width="35%">{$prod_stock_reel}</td>
<td width="15%">Exemplaires en commande</td> <td width="15%">Exemplaires en commande</td>
<td width="35%">{$prod_stock_in_command}</td> <td width="35%">{$prod_stock_in_command}</td>