From d5d92914497197dd38d841bf15e85aab0301a744 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Feb 2010 23:29:46 +0000 Subject: [PATCH] Qual: Uniformize code --- htdocs/admin/confexped.php | 34 ++++--------- htdocs/admin/dons.php | 14 +++--- htdocs/admin/expedition.php | 34 ++++++------- htdocs/admin/facture.php | 20 ++++---- htdocs/admin/fichinter.php | 20 ++++---- htdocs/admin/fournisseur.php | 44 ++++++++-------- htdocs/admin/livraison.php | 30 +++++------ htdocs/admin/project.php | 14 +++--- htdocs/admin/societe.php | 24 +++++---- htdocs/ecm/docdir.php | 14 +++--- .../societe/doc/odt_generic.modules.php | 34 +++++++++---- .../societe/mod_codecompta_panicum.php | 50 +++++++++++-------- htdocs/langs/en_US/admin.lang | 3 ++ htdocs/langs/en_US/errors.lang | 1 + htdocs/langs/fr_FR/admin.lang | 5 +- htdocs/langs/fr_FR/errors.lang | 1 + htdocs/lib/functions.lib.php | 2 +- 17 files changed, 182 insertions(+), 162 deletions(-) diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php index e412f64061f..993ada95a4e 100644 --- a/htdocs/admin/confexped.php +++ b/htdocs/admin/confexped.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * @@ -19,11 +19,11 @@ */ /** - \file htdocs/admin/confexped.php - \ingroup produit - \brief Page d'administration/configuration du module Expedition - \version $Id$ -*/ + * \file htdocs/admin/confexped.php + * \ingroup produit + * \brief Page to setup sending module + * \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); @@ -112,28 +112,22 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print "\n"; print ""; print ""; print ''; print ''; print '"; @@ -150,22 +144,16 @@ print ""; print ""; print ''; print ''; print '"; diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php index ea8d19efc9a..beeb541ee1f 100644 --- a/htdocs/admin/dons.php +++ b/htdocs/admin/dons.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2010 Laurent Destailleur * * 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 @@ -122,7 +122,7 @@ if ($_GET["action"] == 'del') /* - * Affiche page + * View */ $dir = "../includes/modules/dons/"; @@ -207,20 +207,20 @@ while (($file = readdir($handle))!==false) print "'; } else { print ""; } @@ -228,11 +228,11 @@ while (($file = readdir($handle))!==false) print "'; diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 85d76777e2c..bb9e0175756 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2004 Eric Seigne @@ -22,10 +22,10 @@ */ /** - \file htdocs/admin/expedition.php - \ingroup expedition - \brief Page d'administration/configuration du module Expedition - \version $Id$ + * \file htdocs/admin/expedition.php + * \ingroup expedition + * \brief Page d'administration/configuration du module Expedition + * \version $Id$ */ require("./pre.inc.php"); @@ -97,7 +97,7 @@ if ($_GET["action"] == 'del') $sql.= " WHERE nom = '".$_GET["value"]."'"; $sql.= " AND type = '".$type."'"; $sql.= " AND entity = ".$conf->entity; - + if ($db->query($sql)) { @@ -146,7 +146,7 @@ if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod') $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."expedition_methode"; $sql.= " WHERE rowid = ".$moduleid; - + $resql = $db->query($sql); if ($resql && ($statut == 1 || $_GET["action"] == 'setmod')) { @@ -155,7 +155,7 @@ if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod') $sqlu = "UPDATE ".MAIN_DB_PREFIX."expedition_methode"; $sqlu.= " SET statut=1"; $sqlu.= " WHERE rowid=".$moduleid; - + $result=$db->query($sqlu); if ($result) { @@ -288,7 +288,7 @@ print '
'.$langs->trans("Feature").' '.$langs->trans("Action").''.$langs->trans("Status").'
'.$langs->trans("SendingsAbility").''; - -if($conf->global->MAIN_SUBMODULE_EXPEDITION == 1) -{ - print img_tick(); -} - print ''; if($conf->global->MAIN_SUBMODULE_EXPEDITION == 0) { - print ''.$langs->trans("Activate").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; } else if($conf->global->MAIN_SUBMODULE_EXPEDITION == 1) { - print ''.$langs->trans("Disable").''; + print ''.img_picto($langs->trans("Enabled"),'on').''; } print "
'.$langs->trans("DeliveriesOrderAbility").''; - -if($conf->global->MAIN_SUBMODULE_LIVRAISON == 1) -{ - print img_tick(); -} - print ''; if($conf->global->MAIN_SUBMODULE_LIVRAISON == 0) { - print ''.$langs->trans("Activate").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; } else if($conf->global->MAIN_SUBMODULE_LIVRAISON == 1) { - print ''.$langs->trans("Disable").''; + print ''.img_picto($langs->trans("Enabled"),'on').''; } print "\n"; if ($conf->global->DON_ADDON_MODEL == $name) { - print img_tick($langs->trans("Enabled")); + print img_picto($langs->trans("Enabled"),'on'); } else { print ' '; print ''; - print ''.$langs->trans("Activate").''; + print ''.img_picto($langs->trans("Enabled"),'on').''; } print '\n"; - print ''.$langs->trans("Activate").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; print ""; if ($conf->global->DON_ADDON_MODEL == "$name") { - print img_tick($langs->trans("Default")); + print img_picto($langs->trans("Default"),'on'); } else { - print ''.$langs->trans("Default").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; } print '
'; print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; print "\n"; @@ -319,26 +319,26 @@ if(is_dir($dir)) print $module->description; print ''; - // Activ + // Active if (in_array($name, $def)) { print ""; } else { print ""; } @@ -346,11 +346,11 @@ if(is_dir($dir)) print "'; @@ -378,10 +378,6 @@ else } print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Activated").''.$langs->trans("Status").''.$langs->trans("Default").''.$langs->trans("Infos").'
\n"; if ($conf->global->EXPEDITION_ADDON_PDF != $name) { print ''; - print img_tick($langs->trans("Disable")); + print img_picto($langs->trans("Activated"),'on'); print ''; } else { - print img_tick($langs->trans("Activated")); + print img_picto($langs->trans("Activated"),'on'); } print "\n"; - print ''.$langs->trans("Activate").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; print ""; if ($conf->global->EXPEDITION_ADDON_PDF == $name) { - print img_tick($langs->trans("Default")); + print img_picto($langs->trans("Default"),'on'); } else { - print ''.$langs->trans("Default").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; } print '
'; -/* - * - * - */ $db->close(); diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 5c35cadb9ff..ff7fee2ba5c 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -23,7 +23,7 @@ /** * \file htdocs/admin/facture.php * \ingroup facture - * \brief Page d'administration/configuration du module Facture + * \brief Page to setup invoice module * \version $Id$ */ @@ -223,7 +223,7 @@ print ''; print ''.$langs->trans("Name").''; print ''.$langs->trans("Description").''; print ''.$langs->trans("Example").''; -print ''.$langs->trans("Default").''; +print ''.$langs->trans("Status").''; print ''.$langs->trans("Infos").''; print ''."\n"; @@ -273,11 +273,11 @@ foreach ($conf->file->dol_document_root as $dirroot) print ''; if ($conf->global->FACTURE_ADDON == "$file") { - print img_tick($langs->trans("Activated")); + print img_picto($langs->trans("Activated"),'on'); } else { - print ''.$langs->trans("Default").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; } print ''; @@ -367,7 +367,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; print "\n"; @@ -409,19 +409,19 @@ foreach ($conf->file->dol_document_root as $dirroot) if ($conf->global->FACTURE_ADDON_PDF != "$name") { print ''; - print img_tick($langs->trans("Disable")); + print img_picto($langs->trans("Enabled"),'on'); print ''; } else { - print img_tick($langs->trans("Enabled")); + print img_picto($langs->trans("Enabled"),'on'); } print ""; } else { print ""; } @@ -429,11 +429,11 @@ foreach ($conf->file->dol_document_root as $dirroot) print "'; diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 16ca35f45b4..75b4893202a 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2005-2009 Regis Houssin @@ -190,7 +190,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; print "\n"; @@ -229,11 +229,11 @@ if ($handle) print ''; @@ -294,7 +294,7 @@ print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Activated").''.$langs->trans("Status").''.$langs->trans("Default").''.$langs->trans("Infos").'
\n"; - print ''.$langs->trans("Activate").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; print ""; if ($conf->global->FACTURE_ADDON_PDF == "$name") { - print img_tick($langs->trans("Default")); + print img_picto($langs->trans("Default"),'on'); } else { - print ''.$langs->trans("Default").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; } print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Activated").''.$langs->trans("Status").''.$langs->trans("Infos").'
'; if ($conf->global->FICHEINTER_ADDON == $className) { - print img_tick($langs->trans("Activated")); + print img_picto($langs->trans("Activated"),'on'); } else { - print ''.$langs->trans("Default").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; } print '
'; print ''; print ''; print ''; -print '\n"; +print '\n"; print '\n"; print ''; print "\n"; @@ -328,19 +328,19 @@ while (($file = readdir($handle))!==false) if ($conf->global->FICHEINTER_ADDON_PDF != "$name") { print ''; - print img_tick($langs->trans("Disable")); + print img_picto($langs->trans("Enabled"),'on'); print ''; } else { - print img_tick($langs->trans("Enabled")); + print img_picto($langs->trans("Enabled"),'on'); } print ""; } else { print ""; } @@ -348,11 +348,11 @@ while (($file = readdir($handle))!==false) print "'; diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php index 90d20ab55ab..57177875ce7 100644 --- a/htdocs/admin/fournisseur.php +++ b/htdocs/admin/fournisseur.php @@ -71,8 +71,8 @@ if ($_GET["action"] == 'specimen') if ($obj->write_file($commande,$langs) > 0) { - header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande_fournisseur&file=SPECIMEN.pdf"); - return; + header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande_fournisseur&file=SPECIMEN.pdf"); + return; } else { @@ -177,7 +177,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; print "\n"; @@ -215,11 +215,11 @@ if ($handle) print ''; @@ -296,7 +296,7 @@ print "
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Activated")."'.$langs->trans("Status")."'.$langs->trans("Default")."'.$langs->trans("Infos").'
\n"; - print ''.$langs->trans("Activate").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; print ""; if ($conf->global->FICHEINTER_ADDON_PDF == "$name") { - print img_tick($langs->trans("Default")); + print img_picto($langs->trans("Default"),'on'); } else { - print ''.$langs->trans("Default").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; } print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Activated").''.$langs->trans("Status").''.$langs->trans("Info").'
'; if ($conf->global->COMMANDE_SUPPLIER_ADDON == "$file") { - print img_tick($langs->trans("Activated")); + print img_picto($langs->trans("Activated"),'on'); } else { - print ''.$langs->trans("Activate").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; } print '
\n"; print "\n"; print ' \n"; print " \n"; -print '\n"; +print '\n"; print '\n"; print ''; print "\n"; @@ -324,35 +324,35 @@ while (($file = readdir($handle))!==false) // Active if (in_array($name, $def)) { - print ""; } else { - print ""; + print ""; } // Defaut print "'; diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 7b948124ab5..cf6ccb6eaec 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2004 Eric Seigne @@ -22,11 +22,11 @@ */ /** - \file htdocs/admin/livraison.php - \ingroup livraison - \brief Page d'administration/configuration du module Livraison - \version $Id$ -*/ + * \file htdocs/admin/livraison.php + * \ingroup livraison + * \brief Page d'administration/configuration du module Livraison + * \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/livraison/livraison.class.php"); @@ -197,7 +197,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; print ''."\n"; @@ -236,11 +236,11 @@ if ($handle) print ''; @@ -314,7 +314,7 @@ print '
'.$langs->trans("Name")."".$langs->trans("Description")."'.$langs->trans("Activated")."'.$langs->trans("Status")."'.$langs->trans("Default")."'.$langs->trans("Info").'
\n"; - if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF != "$name") - { - print ''; - print img_tick($langs->trans("Disable")); - print ''; - } - else - { - print img_tick($langs->trans("Enabled")); - } + print "\n"; + if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF != "$name") + { + print ''; + print img_picto($langs->trans("Enabled"),'on'); + print ''; + } + else + { + print img_picto($langs->trans("Enabled"),'on'); + } print "\n"; - print ''.$langs->trans("Activate").''; - print "\n"; + print ''.$langs->trans("Activate").''; + print ""; if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF == "$name") { - print img_tick($langs->trans("Default")); + print img_picto($langs->trans("Default"),'on'); } else { - print ''.$langs->trans("Default").''; + print ''.img_picto($langs->trans("Disabled"),'on').''; } print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Activated").''.$langs->trans("Status").''.$langs->trans("Infos").'
'; if ($conf->global->LIVRAISON_ADDON == "$file") { - print img_tick($langs->trans("Activated")); + print img_picto($langs->trans("Activated"),'on'); } else { - print ''.$langs->trans("Default").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; } print '
'; print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; print "\n"; @@ -352,19 +352,19 @@ if(is_dir($dir)) if ($conf->global->LIVRAISON_ADDON_PDF != "$name") { print ''; - print img_tick($langs->trans("Disable")); + print img_picto($langs->trans("Enabled"),'on'); print ''; } else { - print img_tick($langs->trans("Enabled")); + print img_picto($langs->trans("Enabled"),'on'); } print ""; } else { print ""; } @@ -372,11 +372,11 @@ if(is_dir($dir)) print "'; diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php index 71f6a50e420..f5d01956de9 100644 --- a/htdocs/admin/project.php +++ b/htdocs/admin/project.php @@ -204,11 +204,11 @@ if ($handle) print ''; @@ -316,19 +316,19 @@ while (($file = readdir($handle))!==false) if ($conf->global->PROJECT_ADDON_PDF != "$name") { print ''; - print img_tick($langs->trans("Disable")); + print img_picto($langs->trans("Enabled"),'on'); print ''; } else { - print img_tick($langs->trans("Enabled")); + print img_picto($langs->trans("Enabled"),'on'); } print ""; } else { print ""; } @@ -336,11 +336,11 @@ while (($file = readdir($handle))!==false) print "'; diff --git a/htdocs/admin/societe.php b/htdocs/admin/societe.php index 0338168d41b..d957c22d218 100644 --- a/htdocs/admin/societe.php +++ b/htdocs/admin/societe.php @@ -78,10 +78,11 @@ if ($_POST["action"] == 'usesearchtoselectcompany') } // define constants for tigre model -if ($_POST["action"] == 'updateMask') +if ($_POST["action"] == 'setModuleOptions') { - dolibarr_set_const($db, "COMPANY_ELEPHANT_MASK_CUSTOMER",$_POST["maskcustomer"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "COMPANY_ELEPHANT_MASK_SUPPLIER",$_POST["masksupplier"],'chaine',0,'',$conf->entity); + $param=$_POST["param1"]; + $value=$_POST["value1"]; + dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity); } if ($_GET["action"] == 'set') @@ -345,19 +346,19 @@ foreach ($conf->file->dol_document_root as $dirroot) if ($conf->global->COMPANY_ADDON_PDF != "$name") { print ''; - print img_tick($langs->trans("Disable")); + print img_picto($langs->trans("Enabled"),'on'); print ''; } else { - print img_tick($langs->trans("Enabled")); + print img_picto($langs->trans("Enabled"),'on'); } print ""; } else { print ""; } @@ -365,11 +366,11 @@ foreach ($conf->file->dol_document_root as $dirroot) print "'; @@ -392,7 +393,10 @@ foreach ($conf->file->dol_document_root as $dirroot) { print ''.img_object($langs->trans("Preview"),'bill').''; } - else print ' '; + else + { + print ''.img_object($langs->trans("PreviewNotAvailable"),'generic').''; + } print ''; print "\n"; @@ -406,6 +410,8 @@ print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Action").''.$langs->trans("Status").''.$langs->trans("Default").''.$langs->trans("Infos").'
\n"; - print ''.$langs->trans("Activate").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; print ""; if ($conf->global->LIVRAISON_ADDON_PDF == "$name") { - print img_tick($langs->trans("Default")); + print img_picto($langs->trans("Default"),'on'); } else { - print ''.$langs->trans("Default").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; } print ''; if ($conf->global->PROJECT_ADDON == "$file") { - print img_tick($langs->trans("Activated")); + print img_picto($langs->trans("Activated"),'on'); } else { - print ''.$langs->trans("Activate").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; } print '\n"; - print ''.$langs->trans("Activate").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; print ""; if ($conf->global->PROJECT_ADDON_PDF == "$name") { - print img_tick($langs->trans("Default")); + print img_picto($langs->trans("Default"),'on'); } else { - print ''.$langs->trans("Default").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; } print '\n"; - print ''.$langs->trans("Activate").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; print ""; if ($conf->global->COMPANY_ADDON_PDF == "$name") { - print img_tick($langs->trans("Default")); + print img_picto($langs->trans("Default"),'on'); } else { - print ''.$langs->trans("Default").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; } print '
'; print '
'; +print_titre($langs->trans("Other")); + // Autres options $html=new Form($db); $var=true; diff --git a/htdocs/ecm/docdir.php b/htdocs/ecm/docdir.php index 3b220db45ea..d29063c4b82 100644 --- a/htdocs/ecm/docdir.php +++ b/htdocs/ecm/docdir.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2008-2010 Laurent Destailleur * Copyright (C) 2008 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -157,7 +157,7 @@ if ($_GET["action"] == 'create') print ''; // Label - print ''."\n"; + print ''."\n"; print ''."\n"; - print ''."\n"; + + print '
'.$langs->trans("Label").'
'.$langs->trans("Label").'
'.$langs->trans ("AddIn").''; print $formecm->select_all_sections(! empty($_GET["catParent"])?$_GET["catParent"]:$ecmdir->fk_parent,'catParent'); @@ -170,13 +170,15 @@ if ($_GET["action"] == 'create') print ''; print '
'; + print '

'; + + print '
'; print ''; print '     '; print ''; - print ''."\n"; - - print ''; + print '
'; print ''; } diff --git a/htdocs/includes/modules/societe/doc/odt_generic.modules.php b/htdocs/includes/modules/societe/doc/odt_generic.modules.php index 6cf68db92cf..69b1225c451 100644 --- a/htdocs/includes/modules/societe/doc/odt_generic.modules.php +++ b/htdocs/includes/modules/societe/doc/odt_generic.modules.php @@ -50,7 +50,7 @@ class odt_generic extends ModeleDocProjects $langs->load("companies"); $this->db = $db; - $this->name = "Generic"; + $this->name = "Generic ODT"; $this->description = $langs->trans("DocumentModelOdt"); // Dimension page pour format A4 @@ -66,8 +66,6 @@ class odt_generic extends ModeleDocProjects // Recupere emmetteur $this->emetteur=$mysoc; if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2); // Par defaut, si n'�tait pas d�fini - - $this->params=array('COMPANY_ADDON_PDF_ODT'=>array('type'=>'TEXTAREA','default'=>'')); } /** \brief Renvoi la description du module @@ -78,25 +76,41 @@ class odt_generic extends ModeleDocProjects global $conf,$langs; $langs->load("companies"); + $langs->load("errors"); $form = new Form($db); - $texte = $this->description."
\n"; + $texte = $this->description.".
\n"; $texte.= '
'; $texte.= ''; - $texte.= ''; + $texte.= ''; + $texte.= ''; $texte.= ''; // List of directories area - $texte.= ''; $texte.= ''; // Example - $texte.= ''; $texte.= ''; $texte.= '
'.$langs->trans("ListOfDirectories").':
'; - $texte.= ''; + $texte.= '		'; + $texte.= $langs->trans("ExampleOfDirectoriesForModelGen"); + $texte.= '
'.$langs->trans("ExampleOfDirectories").':'; - $texte.= '
'; + $texte.= '
'; + $texte.= ''; + $texte.= '
'; diff --git a/htdocs/includes/modules/societe/mod_codecompta_panicum.php b/htdocs/includes/modules/societe/mod_codecompta_panicum.php index 3f4e6b25274..200ee13754a 100644 --- a/htdocs/includes/modules/societe/mod_codecompta_panicum.php +++ b/htdocs/includes/modules/societe/mod_codecompta_panicum.php @@ -1,6 +1,6 @@ - * Copyright (C) 2006 Laurent Destailleur + * Copyright (C) 2010 Laurent Destailleur * * 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 @@ -19,20 +19,18 @@ */ /** - \file htdocs/includes/modules/societe/mod_codecompta_panicum.class.php - \ingroup societe - \brief Fichier de la classe des gestion panicum des codes compta des societes clientes - \version $Id$ -*/ - + * \file htdocs/includes/modules/societe/mod_codecompta_panicum.class.php + * \ingroup societe + * \brief Fichier de la classe des gestion panicum des codes compta des societes clientes + * \version $Id$ + */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); /** - \class mod_codecompta_panicum - \brief Classe permettant la gestion panicum des codes compta des societes clients -*/ - + * \class mod_codecompta_panicum + * \brief Classe permettant la gestion panicum des codes compta des societes clients + */ class mod_codecompta_panicum extends ModeleAccountancyCode { var $nom; @@ -49,17 +47,25 @@ class mod_codecompta_panicum extends ModeleAccountancyCode return $langs->trans("ModuleCompanyCode".$this->nom); } - /** - * \brief Renvoi code - * \param DB Handler d'acc�s base - * \param societe Objet societe - */ - function get_code($DB, $societe) - { - // Renvoie toujours ok - $this->code = $societe->code_compta; - return 0; - } + /** + * \brief Return example + */ + function getExample() + { + return ''; + } + + /** + * \brief Renvoi code + * \param DB Handler d'acc�s base + * \param societe Objet societe + */ + function get_code($DB, $societe) + { + // Renvoie toujours ok + $this->code = $societe->code_compta; + return 0; + } } ?> diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 6ef05a42e3e..b92edf092a2 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -52,6 +52,7 @@ JavascriptDisabled=JavaScript disabled UsePopupCalendar=Use popup for dates input UsePreviewTabs=Use preview tabs ShowPreview=Show preview +PreviewNotAvailable=Preview not available ThemeCurrentlyActive=Theme currently active CurrentTimeZone=PHP server TimeZone Space=Space @@ -265,6 +266,8 @@ ConfirmPurge=Are you sure you want to execute this purge ?
This will delete d MinLength=Minimum length LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory ExamplesWithCurrentSetup=Examples with current running setup +ListOfDirectoriesForModelGenODT=List of directories contenaining models files with OpenDocument format +ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir # Modules Module0Name=Users & groups diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 93ad9868914..2dd867ad3cc 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -37,6 +37,7 @@ ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'. ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id. ErrorFileNotFound=File %s not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter) +ErrorDirNotFound=Directory %s not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter) ErrorFunctionNotAvailableInPHP=Function %s is required for this feature but is not available in this version/setup of PHP. ErrorDirAlreadyExists=A directory with this name already exists. ErrorFieldCanNotContainSpecialCharacters=Field %s must not contains special characters. diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 6441318e117..8281394a6ae 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -52,6 +52,7 @@ JavascriptDisabled = Javascript désactivé UsePopupCalendar = Utiliser les popups pour la saisie des dates UsePreviewTabs = Afficher les onglets "Aperçu" ShowPreview = Afficher aperçu +PreviewNotAvailable=Aperçu non disponible ThemeCurrentlyActive = Theme actuellement actif CurrentTimeZone = Time Zone serveur PHP Space = Espace @@ -265,6 +266,8 @@ ConfirmPurge=Etes vous sur de vouloir réaliser cette purge ?
Ceci effacera d MinLength=Longueur minimale LanguageFilesCachedIntoShmopSharedMemory=Fichiers .lang en mémoire partagée ExamplesWithCurrentSetup=Exemples avec le paramétrage actif courant +ListOfDirectoriesForModelGenODT=Liste des répertoires contenant des documents modèles OpenDocument +ExampleOfDirectoriesForModelGen=Exemples de syntaxe:
c:\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir # Modules = undefined Module0Name = Utilisateurs & groupes @@ -780,7 +783,7 @@ ModuleCompanyCodeDigitaria = Renvoie un code compta composé suivant le code tie UseNotifications = Utiliser les notifications NotificationsDesc = La fonction des notifications par emails permet d'envoyer automatiquement un email, pour certains évênement Dolibarr, aux tiers (sociétés clients, prospects ou fournisseurs) configurés pour. Le choix des notifications et contacts destinataires se fait tiers par tiers. ModelModules=Modèle de documents -DocumentModelOdt=Genérateur depuis des modèles au format .ODT (OpenOffice...) +DocumentModelOdt=Genération depuis des modèles au format .ODT (OpenOffice...) WatermarkOnDraft=Filigrame sur les documents brouillons ##### Webcal setup ##### = undefined WebCalSetup = Configuration du lien vers le calendrier Webcalendar diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index 75f5e9c3808..16b93c9d1c2 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -38,6 +38,7 @@ ErrorFeatureNeedJavascript=Cette fonctionnalité a besoin de javascript activé ErrorTopMenuMustHaveAParentWithId0=Un menu de type 'Top' ne peut avoir de menu père. Mettre 0 dans l'id père ou choisir un menu de type 'Left'. ErrorLeftMenuMustHaveAParentId=Un menu de type 'Left' doit avoir un id de père. ErrorFileNotFound=Fichier %s introuvable (Mauvais chemin, permissions incorrectes ou accès interdit par le paramètre PHP openbasedir ou safe_mode) +ErrorDirNotFound=Répertoire %s introuvable (Mauvais chemin, permissions incorrectes ou accès interdit par le paramètre PHP openbasedir ou safe_mode) ErrorFunctionNotAvailableInPHP=La fonction %s est requise pour cette fonctionnalité mais n'est pas disponible dans cette version/installation de PHP. ErrorDirAlreadyExists=Un répertoire portant ce nom existe déjà. ErrorFieldCanNotContainSpecialCharacters=Le champ %s ne peut contenir de caractères spéciaux. diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index aa56dc4b16c..d55894d76f9 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -193,7 +193,7 @@ function dol_escape_js($stringtoescape) function dol_escape_htmltag($stringtoescape) { // escape quotes and backslashes, newlines, etc. - return strtr($stringtoescape, array('"'=>'',"\r"=>'\\r',"\n"=>'\\n')); + return strtr($stringtoescape, array('"'=>'',"\r"=>'\\r',"\n"=>'\\n',""=>'',''=>'')); }