';
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
index 43ef9962126..a47d921987a 100644
--- a/htdocs/fourn/fiche.php
+++ b/htdocs/fourn/fiche.php
@@ -1,7 +1,7 @@
* Copyright (C) 2003 Eric Seigne
- * Copyright (C) 2004-2009 Laurent Destailleur
+ * Copyright (C) 2004-2010 Laurent Destailleur
* Copyright (C) 2005-2008 Regis Houssin
* Copyright (C) 2010 Juanjo Menent
*
@@ -297,20 +297,23 @@ if ( $societe->fetch($socid) )
print '';
print '
';
- /*
- * Liste des contacts
- */
- show_contacts($conf,$langs,$db,$societe);
+ if ($conf->global->MAIN_REPEATCONTACTTASKONEACHTAB)
+ {
+ /*
+ * Liste des contacts
+ */
+ show_contacts($conf,$langs,$db,$societe);
- /*
- * Listes des actions a faire
- */
- show_actions_todo($conf,$langs,$db,$societe);
+ /*
+ * Listes des actions a faire
+ */
+ show_actions_todo($conf,$langs,$db,$societe);
- /*
- * Listes des actions effectuees
- */
- show_actions_done($conf,$langs,$db,$societe);
+ /*
+ * Listes des actions effectuees
+ */
+ show_actions_done($conf,$langs,$db,$societe);
+ }
}
else
{
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index d97ac1385a0..a01134bf815 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004-2009 Laurent Destailleur
+ * Copyright (C) 2004-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
@@ -18,11 +18,11 @@
*/
/**
- \file htdocs/fourn/recap-fourn.php
- \ingroup fournisseur
- \brief Page de fiche recap fournisseur
- \version $Id$
-*/
+ * \file htdocs/fourn/recap-fourn.php
+ * \ingroup fournisseur
+ * \brief Page de fiche recap fournisseur
+ * \version $Id$
+ */
require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@@ -57,7 +57,7 @@ if ($socid > 0)
*/
$head = societe_prepare_head($societe);
- dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"));
+ dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), 0, 'company');
print "\n";
diff --git a/htdocs/includes/modules/societe/doc/odt_generic.modules.php b/htdocs/includes/modules/societe/doc/odt_generic.modules.php
index 69b1225c451..5eaac7a52df 100644
--- a/htdocs/includes/modules/societe/doc/odt_generic.modules.php
+++ b/htdocs/includes/modules/societe/doc/odt_generic.modules.php
@@ -28,6 +28,7 @@
require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
/**
@@ -88,21 +89,36 @@ class odt_generic extends ModeleDocProjects
$texte.= '';
// List of directories area
- $texte.= '| '.$langs->trans("ListOfDirectoriesForModelGenODT").' : ';
-
- $listofdir=explode(',',preg_replace('/\r\n/',',',$conf->global->COMPANY_ADDON_PDF_ODTPATH));
- foreach($listofdir as $tmpdir)
+ $texte.= ' | ';
+ $textbis=$langs->trans("ListOfDirectories");
+ $listofdir=explode(',',preg_replace('/\r\n/',',',trim($conf->global->COMPANY_ADDON_PDF_ODTPATH)));
+ $listoffiles=array();
+ foreach($listofdir as $key=>$tmpdir)
{
+ $tmpdir=trim($tmpdir);
$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
- if (! is_dir($tmpdir)) $texte.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+ if (! $tmpdir) { unset($listofdir[$key]); continue; }
+ if (! is_dir($tmpdir)) $textbis.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+ else
+ {
+ $tmpfiles=dol_dir_list($tmpdir,'files',0,'\.odt');
+ $listoffiles=array_merge($listoffiles,$tmpfiles);
+ }
}
+ $texte.= $form->textwithpicto($textbis,$langs->trans("ListOfDirectoriesForModelGenODT"),1,'help');
//var_dump($listofdir);
- $texte.= '
';
-
$texte.= ' | ';
+ $texte.= '';
+
+ // Scan directories
+ if (sizeof($listofdir)) $texte.='
'.$langs->trans("NumberOfModelFilesFound").': '.sizeof($listoffiles);
+
+ $texte.= ' | ';
+
+
+ $texte.= '';
$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte.= ' | ';
$texte.= ' ';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b92edf092a2..21930c57806 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -266,7 +266,9 @@ 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
+ListOfDirectories=List of OpenDocument templates directories
+ListOfDirectoriesForModelGenODT=List of directories contenaining templates files with OpenDocument format.
Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.
Files in those directories must end with .odt.
+NumberOfModelFilesFound=Number of ODT templates files found in those directories
ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir
# Modules
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 8281394a6ae..afeb58a0bd0 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -266,7 +266,9 @@ 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
+ListOfDirectories=Liste des répertoires de modèles OpenDocument
+ListOfDirectoriesForModelGenODT=Liste des répertoires contenant des documents modèles OpenDocument.
Indiquer le chemin complet du répertoire.
Ajouter un retour à la ligne entre chaque répertoire.
Pour indiquer un répertoire du module GED, indiquer DOL_DATA_ROOT/ecm/nomdurepertoire.
Les fichiers modèles dans ces répertoires doivent se terminer par .odt.
+NumberOfModelFilesFound=Nombre de fichiers modèles ODT trouvés dans ce(s) répertoire(s)
ExampleOfDirectoriesForModelGen=Exemples de syntaxe:
c:\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir
# Modules = undefined
diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php
index 43cac6c0da5..34819cfaf83 100644
--- a/htdocs/lib/company.lib.php
+++ b/htdocs/lib/company.lib.php
@@ -44,10 +44,16 @@ function societe_prepare_head($objsoc)
$head[$h][2] = 'company';
$h++;
+ $head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$objsoc->id;
+ $head[$h][1] = $langs->trans("Agenda");
+ $head[$h][2] = 'agenda';
+ $h++;
+
+
if ($objsoc->client==1 || $objsoc->client==3)
{
$head[$h][0] = DOL_URL_ROOT.'/comm/fiche.php?socid='.$objsoc->id;
- $head[$h][1] = $langs->trans("Customer");;
+ $head[$h][1] = $langs->trans("Customer");
$head[$h][2] = 'customer';
$h++;
}
diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php
index 77918285fa1..8e100af6cc5 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/lib/files.lib.php
@@ -28,7 +28,7 @@
* \param $path Starting path from which to search
* \param $types Can be "directories", "files", or "all"
* \param $recursive Determines whether subdirectories are searched
- * \param $filter Regex for filter
+ * \param $filter Regex for include filter
* \param $exludefilter Regex for exclude filter (example: '\.meta$')
* \param $sortcriteria Sort criteria ("name","date","size")
* \param $sortorder Sort order (SORT_ASC, SORT_DESC)
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
new file mode 100644
index 00000000000..49a06b240d1
--- /dev/null
+++ b/htdocs/societe/agenda.php
@@ -0,0 +1,181 @@
+
+ * Copyright (C) 2005 Brice Davoleau
+ * Copyright (C) 2005-2009 Regis Houssin
+ * Copyright (C) 2006-2009 Laurent Destailleur
+ * Copyright (C) 2007 Patrick Raguin
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * \file htdocs/societe/agenda.php
+ * \ingroup societe
+ * \brief Page of third party events
+ * \version $Id$
+ */
+
+require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
+
+$langs->load("companies");
+
+$mesg=isset($_GET["mesg"])?''.$_GET["mesg"].' ':'';
+
+$dbtablename = '';
+if ($_REQUEST["socid"])
+{
+ if ($_REQUEST["typeid"] == 1) { $type = 'fournisseur'; $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; }
+ if ($_REQUEST["typeid"] == 2) { $type = 'societe'; $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; }
+ $objecttype = 'societe&categorie';
+ $objectid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:'';
+ $fieldid = 'rowid';
+}
+else if ($_REQUEST["id"] || $_REQUEST["ref"])
+{
+ $type = 'produit';
+ $objecttype = 'produit|service&categorie';
+ $objectid = isset($_REQUEST["id"])?$_REQUEST["id"]:(isset($_REQUEST["ref"])?$_REQUEST["ref"]:'');
+ $dbtablename = 'product';
+ $fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
+}
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user,$objecttype,$objectid,$dbtablename,'','',$fieldid);
+
+
+/*
+ * Actions
+ */
+
+
+
+
+
+/*
+ * View
+ */
+
+$contactstatic = new Contact($db);
+
+$html = new Form($db);
+
+/*
+ * Fiche categorie de client et/ou fournisseur
+ */
+if ($_GET["socid"])
+{
+ require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
+
+ $langs->load("companies");
+
+
+ $soc = new Societe($db);
+ $result = $soc->fetch($_GET["socid"]);
+ llxHeader("","",$langs->trans("Category"));
+
+
+ $head = societe_prepare_head($soc);
+
+ dol_fiche_head($head, 'agenda', $langs->trans("ThirdParty"),0,'company');
+
+ print '';
+
+ print '| '.$langs->trans("Name").' | ';
+ print $html->showrefnav($soc,'socid','',1,'rowid','nom');
+ print ' | ';
+
+ print '| '.$langs->trans('Prefix').' | '.$soc->prefix_comm.' | ';
+
+ if ($soc->client)
+ {
+ print '| ';
+ print $langs->trans('CustomerCode').' | ';
+ print $soc->code_client;
+ if ($soc->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode");
+ print ' | ';
+ }
+
+ if ($soc->fournisseur)
+ {
+ print '| ';
+ print $langs->trans('SupplierCode').' | ';
+ print $soc->code_fournisseur;
+ if ($soc->check_codefournisseur() <> 0) print ' '.$langs->trans("WrongSupplierCode");
+ print ' | ';
+ }
+
+ if ($conf->global->MAIN_MODULE_BARCODE)
+ {
+ print '| '.$langs->trans('Gencod').' | '.$soc->gencod.' | ';
+ }
+
+ print "| ".$langs->trans('Address')." | ".nl2br($soc->address)." | ";
+
+ print '| '.$langs->trans('Zip').' | '.$soc->cp." | ";
+ print ''.$langs->trans('Town').' | '.$soc->ville." | ";
+ if ($soc->pays) {
+ print '| '.$langs->trans('Country').' | '.$soc->pays.' | ';
+ }
+
+ print '| '.$langs->trans('Phone').' | '.dol_print_phone($soc->tel,$soc->pays_code,0,$soc->id,'AC_TEL').' | ';
+ print ''.$langs->trans('Fax').' | '.dol_print_phone($soc->fax,$soc->pays_code,0,$soc->id,'AC_FAX').' | ';
+
+ // EMail
+ print '| '.$langs->trans('EMail').' | ';
+ print dol_print_email($soc->email,0,$soc->id,'AC_EMAIL');
+ print ' | ';
+
+ // Web
+ print ''.$langs->trans('Web').' | ';
+ print dol_print_url($soc->url);
+ print ' | ';
+
+ // Assujeti a TVA ou pas
+ print '';
+ print '| '.$langs->trans('VATIsUsed').' | ';
+ print yn($soc->tva_assuj);
+ print ' | ';
+ print ' ';
+
+ print ' ';
+
+ print '';
+
+ if ($mesg) print($mesg);
+
+ /*
+ * Listes des actions a faire
+ */
+ show_actions_todo($conf,$langs,$db,$soc);
+
+ /*
+ * Listes des actions effectuees
+ */
+ show_actions_done($conf,$langs,$db,$soc);
+}
+
+
+
+
+
+
+$db->close();
+
+llxFooter('$Date$ - $Revision$');
+?>
|