mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Fix: Reduce content of third parties tab
This commit is contained in:
Laurent Destailleur
parent
3d8dc0b7e7
commit
ffd1e04f55
|
|
@ -395,7 +395,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
|
|||
}
|
||||
else
|
||||
{
|
||||
print '<a href="#">'.img_object($langs->trans("PreviewNotAvailable"),'generic').'</a>';
|
||||
print img_object($langs->trans("PreviewNotAvailable"),'generic');
|
||||
}
|
||||
print '</td>';
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2005 Davoleau Brice <brice.davoleau@gmail.com>
|
||||
* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2006-2008 Regis Houssin <regis@dolibarr.fr>
|
||||
* Copyright (C) 2006-2008 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2006-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -164,14 +164,14 @@ class Categorie
|
|||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Appel des triggers
|
||||
include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
|
||||
$interface=new Interfaces($this->db);
|
||||
$result=$interface->run_triggers('CATEGORY_CREATE',$this,$user,$langs,$conf);
|
||||
if ($result < 0) { $error++; $this->errors=$interface->errors; }
|
||||
// Fin appel triggers
|
||||
|
||||
|
||||
return $id;
|
||||
}
|
||||
else
|
||||
|
|
@ -244,14 +244,14 @@ class Categorie
|
|||
if ($this->db->query($sql))
|
||||
{
|
||||
$this->db->commit();
|
||||
|
||||
|
||||
// Appel des triggers
|
||||
include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
|
||||
$interface=new Interfaces($this->db);
|
||||
$result=$interface->run_triggers('CATEGORY_MODIFY',$this,$user,$langs,$conf);
|
||||
if ($result < 0) { $error++; $this->errors=$interface->errors; }
|
||||
// Fin appel triggers
|
||||
|
||||
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
|
|
@ -305,7 +305,7 @@ class Categorie
|
|||
$result=$interface->run_triggers('CATEGORY_DELETE',$this,$user,$langs,$conf);
|
||||
if ($result < 0) { $error++; $this->errors=$interface->errors; }
|
||||
// Fin appel triggers
|
||||
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ if ($_GET["socid"])
|
|||
|
||||
print '<table class="border" width="100%">';
|
||||
|
||||
print '<tr><td width="30%">'.$langs->trans("Name").'</td><td width="70%" colspan="3">';
|
||||
print '<tr><td width="25%">'.$langs->trans("Name").'</td><td colspan="3">';
|
||||
print $html->showrefnav($soc,'socid','',1,'rowid','nom');
|
||||
print '</td></tr>';
|
||||
|
||||
|
|
@ -169,10 +169,15 @@ if ($_GET["socid"])
|
|||
print '</td></tr>';
|
||||
}
|
||||
|
||||
if ($conf->global->MAIN_MODULE_BARCODE)
|
||||
{
|
||||
print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3">'.$soc->gencod.'</td></tr>';
|
||||
}
|
||||
|
||||
print "<tr><td valign=\"top\">".$langs->trans('Address')."</td><td colspan=\"3\">".nl2br($soc->address)."</td></tr>";
|
||||
|
||||
print '<tr><td>'.$langs->trans('Zip').'</td><td>'.$soc->cp."</td>";
|
||||
print '<td>'.$langs->trans('Town').'</td><td>'.$soc->ville."</td></tr>";
|
||||
print '<tr><td width="25%">'.$langs->trans('Zip').'</td><td width="25%">'.$soc->cp."</td>";
|
||||
print '<td width="25%">'.$langs->trans('Town').'</td><td width="25%">'.$soc->ville."</td></tr>";
|
||||
if ($soc->pays) {
|
||||
print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">'.$soc->pays.'</td></tr>';
|
||||
}
|
||||
|
|
@ -180,7 +185,15 @@ if ($_GET["socid"])
|
|||
print '<tr><td>'.$langs->trans('Phone').'</td><td>'.dol_print_phone($soc->tel,$soc->pays_code,0,$soc->id,'AC_TEL').'</td>';
|
||||
print '<td>'.$langs->trans('Fax').'</td><td>'.dol_print_phone($soc->fax,$soc->pays_code,0,$soc->id,'AC_FAX').'</td></tr>';
|
||||
|
||||
print '<tr><td>'.$langs->trans("Web")."</td><td colspan=\"3\"><a href=\"http://$soc->url\" target=\"_blank\">".$soc->url."</a> </td></tr>";
|
||||
// EMail
|
||||
print '<tr><td>'.$langs->trans('EMail').'</td><td>';
|
||||
print dol_print_email($soc->email,0,$soc->id,'AC_EMAIL');
|
||||
print '</td>';
|
||||
|
||||
// Web
|
||||
print '<td>'.$langs->trans('Web').'</td><td>';
|
||||
print dol_print_url($soc->url);
|
||||
print '</td></tr>';
|
||||
|
||||
// Assujeti a TVA ou pas
|
||||
print '<tr>';
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
|
||||
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
|
||||
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
|
||||
|
|
@ -727,20 +727,23 @@ if ($socid > 0)
|
|||
print '</div>';
|
||||
print '<br>';
|
||||
|
||||
/*
|
||||
* Liste des contacts
|
||||
*/
|
||||
show_contacts($conf,$langs,$db,$objsoc);
|
||||
if ($conf->global->MAIN_REPEATCONTACTTASKONEACHTAB)
|
||||
{
|
||||
/*
|
||||
* Liste des contacts
|
||||
*/
|
||||
show_contacts($conf,$langs,$db,$objsoc);
|
||||
|
||||
/*
|
||||
* Listes des actions a faire
|
||||
*/
|
||||
show_actions_todo($conf,$langs,$db,$objsoc);
|
||||
/*
|
||||
* Listes des actions a faire
|
||||
*/
|
||||
show_actions_todo($conf,$langs,$db,$objsoc);
|
||||
|
||||
/*
|
||||
* Listes des actions effectuees
|
||||
*/
|
||||
show_actions_done($conf,$langs,$db,$objsoc);
|
||||
/*
|
||||
* Listes des actions effectuees
|
||||
*/
|
||||
show_actions_done($conf,$langs,$db,$objsoc);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -279,20 +279,23 @@ if ($socid > 0)
|
|||
print '<br>';
|
||||
|
||||
|
||||
/*
|
||||
* 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);
|
||||
}
|
||||
}
|
||||
|
||||
$db->close();
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* 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, 'prospect', $langs->trans("ThirdParty"));
|
||||
dol_fiche_head($head, 'prospect', $langs->trans("ThirdParty"), 0, 'company');
|
||||
|
||||
|
||||
print "<table width=\"100%\">\n";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -57,7 +57,7 @@ if ($socid > 0)
|
|||
*/
|
||||
$head = societe_prepare_head($societe);
|
||||
|
||||
dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"));
|
||||
dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
|
||||
|
||||
|
||||
print "<table width=\"100%\">\n";
|
||||
|
|
|
|||
|
|
@ -506,20 +506,23 @@ if ($socid > 0)
|
|||
print "<br>\n";
|
||||
|
||||
|
||||
/*
|
||||
* 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
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* 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/compta/recap-compta.php
|
||||
\ingroup compta
|
||||
\brief Page de fiche recap compta
|
||||
\version $Id$
|
||||
*/
|
||||
* \file htdocs/compta/recap-compta.php
|
||||
* \ingroup compta
|
||||
* \brief Page de fiche recap compta
|
||||
* \version $Id$
|
||||
*/
|
||||
|
||||
require("./pre.inc.php");
|
||||
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
|
||||
|
|
@ -40,6 +40,7 @@ if ($user->societe_id > 0)
|
|||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* View
|
||||
*/
|
||||
|
|
@ -56,7 +57,7 @@ if ($socid > 0)
|
|||
*/
|
||||
$head = societe_prepare_head($societe);
|
||||
|
||||
dol_fiche_head($head, 'compta', $langs->trans("ThirdParty"));
|
||||
dol_fiche_head($head, 'compta', $langs->trans("ThirdParty"), 0, 'company');
|
||||
|
||||
print "<table width=\"100%\">\n";
|
||||
print '<tr><td valign="top" width="50%">';
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2003 Eric Seigne <erics@rycks.com>
|
||||
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2008 Regis Houssin <regis@dolibarr.fr>
|
||||
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
|
||||
*
|
||||
|
|
@ -297,20 +297,23 @@ if ( $societe->fetch($socid) )
|
|||
print '</div>';
|
||||
print '<br>';
|
||||
|
||||
/*
|
||||
* 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
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* 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 "<table width=\"100%\">\n";
|
||||
|
|
|
|||
|
|
@ -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.= '<table class="nobordernopadding" width="100%">';
|
||||
|
||||
// List of directories area
|
||||
$texte.= '<tr><td>'.$langs->trans("ListOfDirectoriesForModelGenODT").' : ';
|
||||
|
||||
$listofdir=explode(',',preg_replace('/\r\n/',',',$conf->global->COMPANY_ADDON_PDF_ODTPATH));
|
||||
foreach($listofdir as $tmpdir)
|
||||
$texte.= '<tr><td>';
|
||||
$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.= '<br>';
|
||||
|
||||
$texte.= '<textarea class="flat" cols="80" name="value1">';
|
||||
$texte.=$conf->global->COMPANY_ADDON_PDF_ODTPATH;
|
||||
$texte.= '</textarea></td><td valign="top" rowspan="2">';
|
||||
$texte.= '</textarea>';
|
||||
|
||||
// Scan directories
|
||||
if (sizeof($listofdir)) $texte.='<br>'.$langs->trans("NumberOfModelFilesFound").': '.sizeof($listoffiles);
|
||||
|
||||
$texte.= '</td>';
|
||||
|
||||
|
||||
$texte.= '<td valign="top" rowspan="2">';
|
||||
$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
|
||||
$texte.= '</td>';
|
||||
$texte.= '</tr>';
|
||||
|
|
|
|||
|
|
@ -266,7 +266,9 @@ ConfirmPurge=Are you sure you want to execute this purge ?<br>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.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b>.
|
||||
NumberOfModelFilesFound=Number of ODT templates files found in those directories
|
||||
ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
|
||||
|
||||
# Modules
|
||||
|
|
|
|||
|
|
@ -266,7 +266,9 @@ ConfirmPurge=Etes vous sur de vouloir réaliser cette purge ?<br>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.<br><br>Indiquer le chemin complet du répertoire.<br>Ajouter un retour à la ligne entre chaque répertoire.<br>Pour indiquer un répertoire du module GED, indiquer <b>DOL_DATA_ROOT/ecm/nomdurepertoire</b>.<br><br>Les fichiers modèles dans ces répertoires doivent se terminer par <b>.odt</b>.
|
||||
NumberOfModelFilesFound=Nombre de fichiers modèles ODT trouvés dans ce(s) répertoire(s)
|
||||
ExampleOfDirectoriesForModelGen=Exemples de syntaxe:<br>c:\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
|
||||
|
||||
# Modules = undefined
|
||||
|
|
|
|||
|
|
@ -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++;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
181
htdocs/societe/agenda.php
Normal file
181
htdocs/societe/agenda.php
Normal file
|
|
@ -0,0 +1,181 @@
|
|||
<?php
|
||||
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2005 Brice Davoleau <brice.davoleau@gmail.com>
|
||||
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
||||
* Copyright (C) 2006-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
|
||||
*
|
||||
* 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"])?'<div class="ok">'.$_GET["mesg"].'</div>':'';
|
||||
|
||||
$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 '<table class="border" width="100%">';
|
||||
|
||||
print '<tr><td width="25%">'.$langs->trans("Name").'</td><td colspan="3">';
|
||||
print $html->showrefnav($soc,'socid','',1,'rowid','nom');
|
||||
print '</td></tr>';
|
||||
|
||||
print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$soc->prefix_comm.'</td></tr>';
|
||||
|
||||
if ($soc->client)
|
||||
{
|
||||
print '<tr><td>';
|
||||
print $langs->trans('CustomerCode').'</td><td colspan="3">';
|
||||
print $soc->code_client;
|
||||
if ($soc->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode");
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
if ($soc->fournisseur)
|
||||
{
|
||||
print '<tr><td>';
|
||||
print $langs->trans('SupplierCode').'</td><td colspan="3">';
|
||||
print $soc->code_fournisseur;
|
||||
if ($soc->check_codefournisseur() <> 0) print ' '.$langs->trans("WrongSupplierCode");
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
if ($conf->global->MAIN_MODULE_BARCODE)
|
||||
{
|
||||
print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3">'.$soc->gencod.'</td></tr>';
|
||||
}
|
||||
|
||||
print "<tr><td valign=\"top\">".$langs->trans('Address')."</td><td colspan=\"3\">".nl2br($soc->address)."</td></tr>";
|
||||
|
||||
print '<tr><td width="25%">'.$langs->trans('Zip').'</td><td width="25%">'.$soc->cp."</td>";
|
||||
print '<td width="25%">'.$langs->trans('Town').'</td><td width="25%">'.$soc->ville."</td></tr>";
|
||||
if ($soc->pays) {
|
||||
print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">'.$soc->pays.'</td></tr>';
|
||||
}
|
||||
|
||||
print '<tr><td>'.$langs->trans('Phone').'</td><td>'.dol_print_phone($soc->tel,$soc->pays_code,0,$soc->id,'AC_TEL').'</td>';
|
||||
print '<td>'.$langs->trans('Fax').'</td><td>'.dol_print_phone($soc->fax,$soc->pays_code,0,$soc->id,'AC_FAX').'</td></tr>';
|
||||
|
||||
// EMail
|
||||
print '<tr><td>'.$langs->trans('EMail').'</td><td>';
|
||||
print dol_print_email($soc->email,0,$soc->id,'AC_EMAIL');
|
||||
print '</td>';
|
||||
|
||||
// Web
|
||||
print '<td>'.$langs->trans('Web').'</td><td>';
|
||||
print dol_print_url($soc->url);
|
||||
print '</td></tr>';
|
||||
|
||||
// Assujeti a TVA ou pas
|
||||
print '<tr>';
|
||||
print '<td nowrap="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">';
|
||||
print yn($soc->tva_assuj);
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
print '</table>';
|
||||
|
||||
print '</div>';
|
||||
|
||||
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$');
|
||||
?>
|
||||
Loading…
Reference in New Issue
Block a user