diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index e8002f4f00d..87d4694a13c 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -29,7 +29,7 @@ require("./pre.inc.php"); $langs->load("mails"); if (! $user->rights->mailing->lire || $user->societe_id > 0) - accessforbidden(); +accessforbidden(); $dirmod=DOL_DOCUMENT_ROOT."/includes/modules/mailings"; @@ -58,67 +58,81 @@ $search_email=isset($_GET["search_email"])?$_GET["search_email"]:$_POST["search_ */ if ($_GET["action"] == 'add') { - $modulename=$_GET["module"]; + $modulename=$_GET["module"]; + $result=0; - // Chargement de la classe - $file = $dirmod."/".$modulename.".modules.php"; - $classname = "mailing_".$modulename; - require_once($file); + $var=true; + foreach ($conf->dol_document_root as $dirmod) + { + $dir=$dirmod."/includes/modules/mailings/"; - $filtersarray=array(); - if (isset($_POST["filter"])) $filtersarray[0]=$_POST["filter"]; + if (is_dir($dir)) + { + // Chargement de la classe + $file = $dir."/".$modulename.".modules.php"; + $classname = "mailing_".$modulename; - $obj = new $classname($db); - $result=$obj->add_to_target($_GET["rowid"],$filtersarray); + if (file_exists($file)) + { + require_once($file); - if ($result > 0) - { - Header("Location: cibles.php?id=".$_GET["rowid"]); - exit; - } - if ($result == 0) - { - $mesg='
'.$langs->trans("WarningNoEMailsAdded").'
'; - } - if ($result < 0) - { - $mesg='
'.$obj->error.'
'; - } - $_REQUEST["id"]=$_GET["rowid"]; + $filtersarray=array(); + if (isset($_POST["filter"])) $filtersarray[0]=$_POST["filter"]; + + $obj = new $classname($db); + $result=$obj->add_to_target($_GET["rowid"],$filtersarray); + } + } + } + + if ($result > 0) + { + Header("Location: cibles.php?id=".$_GET["rowid"]); + exit; + } + if ($result == 0) + { + $mesg='
'.$langs->trans("WarningNoEMailsAdded").'
'; + } + if ($result < 0) + { + $mesg='
'.$obj->error.'
'; + } + $_REQUEST["id"]=$_GET["rowid"]; } if ($_GET["action"] == 'clear') { - // Chargement de la classe - $file = $dirmod."/modules_mailings.php"; - $classname = "MailingTargets"; - require_once($file); + // Chargement de la classe + $file = $dirmod."/modules_mailings.php"; + $classname = "MailingTargets"; + require_once($file); - $obj = new $classname($db); - $obj->clear_target($_GET["rowid"]); + $obj = new $classname($db); + $obj->clear_target($_GET["rowid"]); - Header("Location: cibles.php?id=".$_GET["rowid"]); - exit; + Header("Location: cibles.php?id=".$_GET["rowid"]); + exit; } if ($_GET["action"] == 'delete') { - // Ici, rowid indique le destinataire et id le mailing - $sql="DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles where rowid=".$_GET["rowid"]; - $resql=$db->query($sql); - if ($resql) - { - $file = $dirmod."/modules_mailings.php"; - $classname = "MailingTargets"; - require_once($file); + // Ici, rowid indique le destinataire et id le mailing + $sql="DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles where rowid=".$_GET["rowid"]; + $resql=$db->query($sql); + if ($resql) + { + $file = $dirmod."/modules_mailings.php"; + $classname = "MailingTargets"; + require_once($file); - $obj = new $classname($db); - $obj->update_nb($_REQUEST["id"]); - } - else - { - dolibarr_print_error($db); - } + $obj = new $classname($db); + $obj->update_nb($_REQUEST["id"]); + } + else + { + dolibarr_print_error($db); + } } if ($_POST["button_removefilter"]) @@ -142,298 +156,298 @@ $html = new Form($db); if ($mil->fetch($_REQUEST["id"]) >= 0) { - $h=0; - $head[$h][0] = DOL_URL_ROOT."/comm/mailing/fiche.php?id=".$mil->id; - $head[$h][1] = $langs->trans("MailCard"); - $h++; + $h=0; + $head[$h][0] = DOL_URL_ROOT."/comm/mailing/fiche.php?id=".$mil->id; + $head[$h][1] = $langs->trans("MailCard"); + $h++; - $head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$mil->id; - $head[$h][1] = $langs->trans("MailRecipients"); - $hselected = $h; - $h++; + $head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$mil->id; + $head[$h][1] = $langs->trans("MailRecipients"); + $hselected = $h; + $h++; - /* - $head[$h][0] = DOL_URL_ROOT."/comm/mailing/info.php?id=".$mil->id; - $head[$h][1] = $langs->trans("MailHistory"); - $h++; - */ - dolibarr_fiche_head($head, $hselected, $langs->trans("Mailing")); + /* + $head[$h][0] = DOL_URL_ROOT."/comm/mailing/info.php?id=".$mil->id; + $head[$h][1] = $langs->trans("MailHistory"); + $h++; + */ + dolibarr_fiche_head($head, $hselected, $langs->trans("Mailing")); - print ''; + print '
'; - print ''; - print ''; + print ''; - print ''; - print ''; - print ''; - print ''; - print '
'.$langs->trans("Ref").''; + print '
'.$langs->trans("Ref").''; print $html->showrefnav($mil,'id'); - print '
'.$langs->trans("MailTitle").''.$mil->titre.'
'.$langs->trans("MailFrom").''.htmlentities($mil->email_from).'
'.$langs->trans("Status").''.$mil->getLibStatut(4).'
'.$langs->trans("TotalNbOfDistinctRecipients").''.($mil->nbemail?$mil->nbemail:'0').'
'; + print ''; + print ''.$langs->trans("MailTitle").''.$mil->titre.''; + print ''.$langs->trans("MailFrom").''.htmlentities($mil->email_from).''; + print ''.$langs->trans("Status").''.$mil->getLibStatut(4).''; + print ''.$langs->trans("TotalNbOfDistinctRecipients").''.($mil->nbemail?$mil->nbemail:'0').''; + print ''; - print ""; + print ""; - if ($mesg) print "$mesg
\n"; + if ($mesg) print "$mesg
\n"; - $var=!$var; + $var=!$var; - // Affiche les listes de selection - if ($mil->statut == 0) - { - print_titre($langs->trans("ToAddRecipientsChooseHere")); - print ''; - print ''; - print '
'.$langs->trans("RecipientSelectionModules"); + // Affiche les listes de selection + if ($mil->statut == 0) + { + print_titre($langs->trans("ToAddRecipientsChooseHere")); + print ''; + print ''; + print ''; - print ''; - print ''; - print ''; - print "\n"; + print ''; + print ''; + print ''; + print "\n"; - clearstatcache(); + clearstatcache(); - $var=true; - foreach ($conf->dol_document_root as $dirroot) - { - $dir=$dirroot."/includes/modules/mailings/"; + $var=true; + foreach ($conf->dol_document_root as $dirroot) + { + $dir=$dirroot."/includes/modules/mailings/"; - if (is_dir($dir)) - { - $handle=opendir($dir); + if (is_dir($dir)) + { + $handle=opendir($dir); if ($handle) { - while (($file = readdir($handle))!==false) - { - if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS') - { - if (eregi("(.*)\.modules\.php$",$file,$reg)) - { - $modulename=$reg[1]; - if ($modulename == 'example') continue; + while (($file = readdir($handle))!==false) + { + if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS') + { + if (eregi("(.*)\.modules\.php$",$file,$reg)) + { + $modulename=$reg[1]; + if ($modulename == 'example') continue; - // Chargement de la classe - $file = $dir.$modulename.".modules.php"; - $classname = "mailing_".$modulename; - require_once($file); + // Chargement de la classe + $file = $dir.$modulename.".modules.php"; + $classname = "mailing_".$modulename; + require_once($file); - $obj = new $classname($db); + $obj = new $classname($db); - $qualified=1; - foreach ($obj->require_module as $key) - { - if (! $conf->$key->enabled || (! $user->admin && $obj->require_admin)) - { - $qualified=0; - //print "Les pr�requis d'activation du module mailing ne sont pas respect�s. Il ne sera pas actif"; - break; - } - } + $qualified=1; + foreach ($obj->require_module as $key) + { + if (! $conf->$key->enabled || (! $user->admin && $obj->require_admin)) + { + $qualified=0; + //print "Les pr�requis d'activation du module mailing ne sont pas respect�s. Il ne sera pas actif"; + break; + } + } - // Si le module mailing est qualifie - if ($qualified) - { - $var = !$var; - print ''; + // Si le module mailing est qualifie + if ($qualified) + { + $var = !$var; + print ''; - if ($mil->statut == 0) print ''; + if ($mil->statut == 0) print ''; - print ''; + print ''; - /* - print '"; - */ - $nbofrecipient=$obj->getNbOfRecipients(); - print ''; + /* + print '"; + */ + $nbofrecipient=$obj->getNbOfRecipients(); + print ''; - print ''; + print ''; - print ''; + print ''; - if ($mil->statut == 0) print ''; + if ($mil->statut == 0) print ''; - print "\n"; - } - } - } - } - closedir($handle); + print "\n"; + } + } + } + } + closedir($handle); } - } - } // End foreach dir + } + } // End foreach dir - print '
'.$langs->trans("RecipientSelectionModules"); if ($user->admin) print ' '.info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"),1); print ''.$langs->trans("NbOfUniqueEMails").''.$langs->trans("Filter").' 
'.$langs->trans("NbOfUniqueEMails").''.$langs->trans("Filter").' 
'; - if (! $obj->picto) $obj->picto='generic'; - print img_object($langs->trans("Module").': '.get_class($obj),$obj->picto).' '.$obj->getDesc(); - print ''; + if (! $obj->picto) $obj->picto='generic'; + print img_object($langs->trans("Module").': '.get_class($obj),$obj->picto).' '.$obj->getDesc(); + print ''; - print $modulename; - print "'; - if ($nbofrecipient >= 0) - { - print $nbofrecipient; - } - else - { - print $langs->trans("Error").' '.img_error($obj->error); - } - print ''; + print $modulename; + print "'; + if ($nbofrecipient >= 0) + { + print $nbofrecipient; + } + else + { + print $langs->trans("Error").' '.img_error($obj->error); + } + print ''; - $filter=$obj->formFilter(); - if ($filter) print $filter; - else print $langs->trans("None"); - print ''; + $filter=$obj->formFilter(); + if ($filter) print $filter; + else print $langs->trans("None"); + print ''; - if ($mil->statut == 0) - { - print ''; - } - else - { - //print $langs->trans("MailNoChangePossible"); - print " "; - } - print ''; + if ($mil->statut == 0) + { + print ''; + } + else + { + //print $langs->trans("MailNoChangePossible"); + print " "; + } + print '
'; + print '
'; print '
'; - print '
'; + print ''; print_titre($langs->trans("ToClearAllRecipientsClickHere")); - print ''; - print ''; + print '
'; + print ''; print ''; print ''; print '
'; print '
'; - print '
'; - } + print '
'; + } - // List of selected targets + // List of selected targets print "\n\n"; - print '
'; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; - $sql = "SELECT mc.rowid, mc.nom, mc.prenom, mc.email, mc.other, mc.statut, mc.date_envoi, mc.url"; - $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc"; - $sql .= " WHERE mc.fk_mailing=".$mil->id; - if ($search_nom) $sql.= " AND mc.nom like '%".addslashes($search_nom)."%'"; - if ($search_prenom) $sql.= " AND mc.prenom like '%".addslashes($search_prenom)."%'"; - if ($search_email) $sql.= " AND mc.email like '%".addslashes($search_email)."%'"; - if ($sortfield) { $sql .= " ORDER BY $sortfield $sortorder"; } - $sql .= $db->plimit($conf->liste_limit+1, $offset); + $sql = "SELECT mc.rowid, mc.nom, mc.prenom, mc.email, mc.other, mc.statut, mc.date_envoi, mc.url"; + $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc"; + $sql .= " WHERE mc.fk_mailing=".$mil->id; + if ($search_nom) $sql.= " AND mc.nom like '%".addslashes($search_nom)."%'"; + if ($search_prenom) $sql.= " AND mc.prenom like '%".addslashes($search_prenom)."%'"; + if ($search_email) $sql.= " AND mc.email like '%".addslashes($search_email)."%'"; + if ($sortfield) { $sql .= " ORDER BY $sortfield $sortorder"; } + $sql .= $db->plimit($conf->liste_limit+1, $offset); - $resql=$db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); + $resql=$db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); - $addu = "&id=".$mil->id; - if ($search_nom) $addu.= "&search_nom=".urlencode($search_nom); - if ($search_prenom) $addu.= "&search_prenom=".urlencode($search_prenom); - if ($search_email) $addu.= "&search_email=".urlencode($search_email); + $addu = "&id=".$mil->id; + if ($search_nom) $addu.= "&search_nom=".urlencode($search_nom); + if ($search_prenom) $addu.= "&search_prenom=".urlencode($search_prenom); + if ($search_email) $addu.= "&search_email=".urlencode($search_email); - print_barre_liste($langs->trans("MailSelectedRecipients"),$page,$_SERVER["PHP_SELF"],$addu,$sortfield,$sortorder,"",$num,$mil->nbemail,''); + print_barre_liste($langs->trans("MailSelectedRecipients"),$page,$_SERVER["PHP_SELF"],$addu,$sortfield,$sortorder,"",$num,$mil->nbemail,''); - if ($page) $addu.= "&page=".$page; - print ''; - print ''; - print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"mc.email",$addu,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"mc.nom",$addu,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"mc.prenom",$addu,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("OtherInformations"),$_SERVER["PHP_SELF"],"",$addu,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Source"),$_SERVER["PHP_SELF"],"",$addu,"",'align="center"',$sortfield,$sortorder); + if ($page) $addu.= "&page=".$page; + print '
'; + print ''; + print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"mc.email",$addu,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"mc.nom",$addu,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"mc.prenom",$addu,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("OtherInformations"),$_SERVER["PHP_SELF"],"",$addu,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Source"),$_SERVER["PHP_SELF"],"",$addu,"",'align="center"',$sortfield,$sortorder); // Date - if ($mil->statut < 2) - { - print ''; - } - else - { - print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"mc.date_envoi",$addu,'','align="center"',$sortfield,$sortorder); - } + if ($mil->statut < 2) + { + print ''; + } + else + { + print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"mc.date_envoi",$addu,'','align="center"',$sortfield,$sortorder); + } // Statut - print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"mc.statut",$addu,'','align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"mc.statut",$addu,'','align="right"',$sortfield,$sortorder); - print ''; - - // Ligne des champs de filtres - print ''; - // EMail - print ''; - // Name - print ''; - // Firstname - print ''; - // Other - print ''; - // Url - print ''; print ''; - $var = true; - $i = 0; + // Ligne des champs de filtres + print ''; + // EMail + print ''; + // Name + print ''; + // Firstname + print ''; + // Other + print ''; + // Url + print ''; + print ''; - if ($num) - { - while ($i < min($num,$conf->liste_limit)) - { - $obj = $db->fetch_object($resql); - $var=!$var; + $var = true; + $i = 0; - print ""; - print ''; - print ''; - print ''; - print ''; - print ''; + if ($num) + { + while ($i < min($num,$conf->liste_limit)) + { + $obj = $db->fetch_object($resql); + $var=!$var; - // Statut pour l'email destinataire (Attentioon != statut du mailing) - if ($obj->statut == 0) - { - print ''; - print ''; - } - else - { - print ''; - print ''; - } - print ''; + print ""; + print ''; + print ''; + print ''; + print ''; + print ''; - $i++; - } - } - else - { - print ''; - } - print "
  
'; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ' '; - print ''; - print ''; - print '  '; - print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ' '; + print ''; + print ''; + print '  '; + print '
'.$obj->email.''.$obj->nom.''.$obj->prenom.''.$obj->other.''.$obj->url.' '.$langs->trans("MailingStatusNotSent").' '.img_delete($langs->trans("RemoveRecipient")).''.$obj->date_envoi.''; - if ($obj->statut==-1) print $langs->trans("MailingStatusError").' '.img_error(); - if ($obj->statut==1) print $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6'); - print '
'.$obj->email.''.$obj->nom.''.$obj->prenom.''.$obj->other.''.$obj->url.'
'.$langs->trans("NoTargetYet").'

"; + // Statut pour l'email destinataire (Attentioon != statut du mailing) + if ($obj->statut == 0) + { + print ' '; + print ''.$langs->trans("MailingStatusNotSent").' '.img_delete($langs->trans("RemoveRecipient")).''; + } + else + { + print ''.$obj->date_envoi.''; + print ''; + if ($obj->statut==-1) print $langs->trans("MailingStatusError").' '.img_error(); + if ($obj->statut==1) print $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6'); + print ''; + } + print ''; - $db->free($resql); - } - else - { - dolibarr_print_error($db); - } + $i++; + } + } + else + { + print ''.$langs->trans("NoTargetYet").''; + } + print "
"; - print ''; + $db->free($resql); + } + else + { + dolibarr_print_error($db); + } + + print ''; print "\n\n"; } diff --git a/htdocs/contrat/contrat.class.php b/htdocs/contrat/contrat.class.php index 012486cc85b..bf432336037 100644 --- a/htdocs/contrat/contrat.class.php +++ b/htdocs/contrat/contrat.class.php @@ -769,6 +769,8 @@ class Contrat extends CommonObject if (! $qty) $qty=1; if (! $ventil) $ventil=0; if (! $info_bits) $info_bits=0; + if (! $pu_ht) $pu_ht=0; + if (! $pu_ttc) $pu_ttc=0; $pu_ht=price2num($pu_ht); $pu_ttc=price2num($pu_ttc); $txtva=price2num($txtva); diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index 67861f3e34d..cdf89069459 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -26,10 +26,10 @@ /** - \brief Renvoi une version en chaine depuis une version en tableau - \param versionarray Tableau de version (vermajeur,vermineur,autre) - \return string Chaine version -*/ + * \brief Renvoi une version en chaine depuis une version en tableau + * \param versionarray Tableau de version (vermajeur,vermineur,autre) + * \return string Chaine version + */ function versiontostring($versionarray) { $string='?'; diff --git a/htdocs/paypal/paypal.lib.php b/htdocs/paypal/paypal.lib.php deleted file mode 100644 index 3f4c3772532..00000000000 --- a/htdocs/paypal/paypal.lib.php +++ /dev/null @@ -1,135 +0,0 @@ - - * Copyright (C) 2005-2007 Regis Houssin - * - * 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. - * or see http://www.gnu.org/ - */ - -/** - * \file htdocs/lib/admin.lib.php - * \brief Library of admin functions - * \version $Id$ - */ - - -/** - * \brief Create a redirect form to paybox form - * \return int 1 if OK, -1 if ERROR - */ -function print_paybox_redirect($PRICE,$EMAIL,$urlok,$urlko="",$ID=0) -{ - global $conf, $langs, $db; - - dol_syslog("Paypal.lib::print_paybox_redirect", LOG_DEBUG); - - - $IBS_DEVISE="978"; # Euro - - $ModulePaybox="module_linux.cgi"; - if ($_SERVER["WINDIR"] && eregi("windows",$_SERVER["WINDIR"])) { $ModulePaybox="module_NT_2000.cgi"; } - $URLPAYBOX=URL_ROOT.'/cgi-bin/'.$ModulePaybox; - if ($conf->global->PAYBOX_CGI_URL) $URLPAYBOX=$conf->global->PAYBOX_CGI_URL; - $IBS_SITE=$conf->global->PAYBOX_IBS_SITE; - $IBS_RANG=$conf->global->PAYBOX_IBS_RANG; - - if (empty($URLPAYBOX)) - { - dol_print_error('',"Paybox setup param PAYBOX_CGI_URL not defined"); - return -1; - } - if (empty($IBS_SITE)) - { - dol_print_error('',"Paybox setup param PAYBOX_IBS_SITE not defined"); - return -1; - } - if (empty($IBS_RANG)) - { - dol_print_error('',"Paybox setup param PAYBOX_IBS_RANG not defined"); - return -1; - } - - // Value to use for test - $IBS_SITE="1999888"; # Site test - $IBS_RANG="99"; # Rang test - - - dol_syslog("Paypal.lib::print_paybox_redirect PRICE: ".$PRICE, LOG_DEBUG); - - // Definition des parametres vente produit pour paybox - $IBS_CMD="DOL:SITE=dolibarr-ID=".$ID; - $IBS_TOTAL=$PRICE*100; # En centimes - - $IBS_MODE=1; # Mode formulaire - - $IBS_PORTEUR=$EMAIL; - $IBS_RETOUR="montant:M;ref:R;auto:A;trans:T"; # Format des paramètres du get de validation en reponse (url a definir sous paybox) - $IBS_TXT="
Vous allez être envoyé vers la page de paiement sécurisé Paybox
Merci de patienter quelques secondes...
"; - $IBS_EFFECTUE=$urlok; - $IBS_ANNULE=$urlko; - $IBS_REFUSE=$urlko; - $IBS_BOUTPI="Continuer"; - $IBS_BKGD="#FFFFFF"; - $IBS_WAIT="4000"; - $IBS_LANG="FRA"; - - dol_syslog("Soumission Paybox"); - dol_syslog("IBS_MODE: $IBS_MODE"); - dol_syslog("IBS_SITE: $IBS_SITE"); - dol_syslog("IBS_RANG: $IBS_RANG"); - dol_syslog("IBS_TOTAL: $IBS_TOTAL"); - dol_syslog("IBS_DEVISE: $IBS_DEVISE"); - dol_syslog("IBS_CMD: $IBS_CMD"); - dol_syslog("IBS_PORTEUR: $IBS_PORTEUR"); - dol_syslog("IBS_RETOUR: $IBS_RETOUR"); - dol_syslog("IBS_EFFECTUE: $IBS_EFFECTUE"); - dol_syslog("IBS_ANNULE: $IBS_ANNULE"); - dol_syslog("IBS_REFUSE: $IBS_REFUSE"); - dol_syslog("IBS_BKGD: $IBS_BKGD"); - dol_syslog("IBS_WAIT: $IBS_WAIT"); - dol_syslog("IBS_LANG: $IBS_LANG"); - - print ''; - print "\n"; - print '
'; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print '
'; - print "\n"; - print ''; - print "\n"; - print ''; - print "\n"; - - return; -} - - -?> \ No newline at end of file diff --git a/htdocs/societe.php b/htdocs/societe.php index 76a3ba761c6..9e93a827882 100644 --- a/htdocs/societe.php +++ b/htdocs/societe.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2005-2006 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -114,6 +114,7 @@ if ($mode == 'search') llxHeader(); $form=new Form($db); +$companystatic=new Societe($db); // Do we click on purge search criteria ? if (isset($_POST["button_removefilter_x"])) @@ -215,10 +216,10 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset); -$result = $db->query($sql); -if ($result) +$resql = $db->query($sql); +if ($resql) { - $num = $db->num_rows($result); + $num = $db->num_rows($resql); $i = 0; $params = "&socname=".$socname."&search_nom=".$search_nom."&search_ville=".$search_ville; @@ -226,7 +227,7 @@ if ($result) $params.= '&search_idprof2='.$search_idprof2; $params.= '&search_idprof3='.$search_idprof3; $params.= '&search_idprof4='.$search_idprof4; - + print_barre_liste($title, $page, "societe.php",$params,$sortfield,$sortorder,'',$num,$nbtotalofrecords); $langs->load("other"); @@ -243,7 +244,7 @@ if ($result) } print '
'; - + // Lignes des titres print ''; print ''; @@ -292,12 +293,13 @@ if ($result) while ($i < min($num,$conf->liste_limit)) { - $obj = $db->fetch_object(); + $obj = $db->fetch_object($resql); $var=!$var; print "\n"; + $companystatic->id=$obj->rowid; + $companystatic->nom=$obj->nom; + print $companystatic->getNomUrl(1,'',24); + print "\n"; print "\n"; print "\n"; print "\n"; @@ -306,36 +308,36 @@ if ($result) print ''."\n"; $i++; } - - $db->free(); - + + $db->free($resql); + print "
"; - print "rowid."\">"; - print img_object($langs->trans("ShowCompany"),"company"); - print " rowid."\">".$obj->nom."".$obj->ville."".$obj->idprof1."".$obj->idprof2."'; if ($obj->client==1) { - print "rowid."\">".$langs->trans("Customer")."\n"; + print "rowid."\">".$langs->trans("Customer")."\n"; } elseif ($obj->client==2) { - print "rowid."\">".$langs->trans("Prospect")."\n"; + print "rowid."\">".$langs->trans("Prospect")."\n"; } else { - print " "; + print " "; } print ""; if ($obj->fournisseur) { - print ''.$langs->trans("Supplier").''; + print ''.$langs->trans("Supplier").''; } else { - print " "; + print " "; } print '
"; - + print '
'; - + } else {