From c4bb527b03c9e3777d9b7544b47b401443ebafa6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2005 22:28:19 +0000 Subject: [PATCH] Chemin absolu sur les include php. --- htdocs/comm/action/document.php | 6 +- htdocs/comm/action/fiche.php | 4 +- htdocs/comm/action/index.php | 2 +- htdocs/comm/action/rapport/index.php | 2 +- htdocs/comm/propal.php | 4 +- htdocs/comm/prospect/fiche.php | 2 +- htdocs/compta/clients.php | 7 +- htdocs/compta/facture.php | 2 +- htdocs/compta/fiche.php | 105 ++++++++++++++------------- htdocs/index.php | 2 +- 10 files changed, 69 insertions(+), 67 deletions(-) diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 6c6989dc90f..d80cccf7177 100755 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -32,9 +32,9 @@ require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); -require_once("../../cactioncomm.class.php"); -require_once("../../actioncomm.class.php"); -if ($conf->webcal->enabled) require_once("../../lib/webcal.class.php"); +require_once(DOL_DOCUMENT_ROOT."/cactioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); +if ($conf->webcal->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/webcal.class.php"); $langs->load("companies"); $langs->load("commercial"); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 642156d9f4d..8cb1a0cc846 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -30,8 +30,8 @@ require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); -require_once("../../cactioncomm.class.php"); -require_once("../../actioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/cactioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); $langs->load("companies"); $langs->load("commercial"); diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 15c9ac93713..8970ce93ff7 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -31,7 +31,7 @@ require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); -require_once("../../actioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); $langs->load("companies"); diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 5958934d1c9..e985a8fdf8e 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -31,7 +31,7 @@ require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); -require_once("../../../actioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); // Sécurité accés client if ($user->societe_id > 0) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 284c79f4816..48589499295 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -42,8 +42,8 @@ $langs->load('bills'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/project.class.php'); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); -require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); -require_once('../actioncomm.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/propal.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/actioncomm.class.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); $sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"]; diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 91629c8c5cd..6f742d52351 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -29,7 +29,7 @@ require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); -require_once("../../actioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); $langs->load('companies'); $langs->load('projects'); diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 5c22f5e8ab5..c8cdbcc5a54 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -35,11 +35,8 @@ if (! $user->rights->societe->lire) accessforbidden(); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); -require_once("../actioncomm.class.php"); - -if ($conf->webcal->enabled) { - require("../lib/webcal.class.php"); -} +require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); +if ($conf->webcal->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/webcal.class.php"); $langs->load("companies"); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index a062aee946e..aeb14010ab0 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -498,7 +498,7 @@ if ($_POST['action'] == 'send' || $_POST['action'] == 'relance') // Insertion action require_once(DOL_DOCUMENT_ROOT.'/contact.class.php'); - include_once(DOL_DOCUMENT_ROOT.'/actioncomm.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/actioncomm.class.php'); $actioncomm = new ActionComm($db); $actioncomm->type_id = $actiontypeid; $actioncomm->label = $actionmsg2; diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index c32604cb7ef..c4a857000f6 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -29,8 +29,8 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); -require("../actioncomm.class.php"); -include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); $langs->load("companies"); if ($conf->facture->enabled) $langs->load("bills"); @@ -206,22 +206,24 @@ if ($socid > 0) print ($societe->prefix_comm?$societe->prefix_comm:' '); print ''; - if ($societe->client) { - print ''; - print ''.$langs->trans("CustomerCode"). ''. $societe->code_client . ''; - print ''; - print ''; - print ''.$langs->trans("CustomerAccountancyCode").''.$societe->code_compta.''; - print ''; + if ($societe->client) + { + print ''; + print ''.$langs->trans("CustomerCode"). ''. $societe->code_client . ''; + print ''; + print ''; + print ''.$langs->trans("CustomerAccountancyCode").''.$societe->code_compta.''; + print ''; } - if ($societe->fournisseur) { - print ''; - print ''.$langs->trans("SupplierCode"). ''. $societe->code_fournisseur . ''; - print ''; - print ''; - print ''.$langs->trans("SupplierAccountancyCode").''.$societe->code_compta_fournisseur.''; - print ''; + if ($societe->fournisseur) + { + print ''; + print ''.$langs->trans("SupplierCode"). ''. $societe->code_fournisseur . ''; + print ''; + print ''; + print ''.$langs->trans("SupplierAccountancyCode").''.$societe->code_compta_fournisseur.''; + print ''; } print ''.$langs->trans("Address").''.nl2br($societe->adresse).""; @@ -246,40 +248,43 @@ if ($socid > 0) $societe->typent= $arr[$societe->typent_id]; print ''.$langs->trans("Type").''.$societe->typent.''.$langs->trans("Staff").''.$societe->effectif.''; - // Remise permanente - print ''; - print '
'; - print $langs->trans("CustomerRelativeDiscount"); - print ''; - print ''.img_edit($langs->trans("Modify")).''; - print '
'; - print ''.$societe->remise_client." %"; - print ''; - - // Remise avoirs - print ''; - print ''; - print '
'; - print $langs->trans("CustomerAbsoluteDiscount"); - print ''; - print ''.img_edit($langs->trans("Modify")).''; - print '
'; - print ''; - print ''; - $sql = "SELECT rc.amount_ht,".$db->pdate("rc.datec")." as dc"; - $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc"; - $sql .= " WHERE rc.fk_soc =". $societe->id; - $sql .= " AND rc.fk_user = ".$user->id." AND fk_facture IS NULL"; - $resql=$db->query($sql); - if ($resql) + if ($societe->client == 1) { - $obj = $db->fetch_object($resql); - if ($obj->amount_ht) print $obj->amount_ht.' '.$langs->trans("Currency".$conf->monnaie); - else print $langs->trans("None"); + // Remise permanente + print ''; + print '
'; + print $langs->trans("CustomerRelativeDiscount"); + print ''; + print ''.img_edit($langs->trans("Modify")).''; + print '
'; + print ''.$societe->remise_client." %"; + print ''; + + // Remise avoirs + print ''; + print ''; + print '
'; + print $langs->trans("CustomerAbsoluteDiscount"); + print ''; + print ''.img_edit($langs->trans("Modify")).''; + print '
'; + print ''; + print ''; + $sql = "SELECT rc.amount_ht,".$db->pdate("rc.datec")." as dc"; + $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc"; + $sql .= " WHERE rc.fk_soc =". $societe->id; + $sql .= " AND rc.fk_user = ".$user->id." AND fk_facture IS NULL"; + $resql=$db->query($sql); + if ($resql) + { + $obj = $db->fetch_object($resql); + if ($obj->amount_ht) print $obj->amount_ht.' '.$langs->trans("Currency".$conf->monnaie); + else print $langs->trans("None"); + } + print ''; + print ''; } - print ''; - print ''; - + print ""; print "\n"; @@ -291,7 +296,7 @@ if ($socid > 0) $MAXLIST=5; $tableaushown=0; - /* + /** * Dernieres factures */ if ($conf->facture->enabled && $user->rights->facture->lire) @@ -338,7 +343,7 @@ if ($socid > 0) print "\n"; $i++; } - $db->free(); + $db->free($resql); } else { diff --git a/htdocs/index.php b/htdocs/index.php index 2bd2c9c42f8..08f3870a993 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -220,7 +220,7 @@ if (MAIN_SHOW_WORKBOARD == 1) // Nbre actions à faire (en retard) if (($conf->commercial->enabled || $conf->compta->enabled) && $user->rights->actions->lire) { - include_once("./actioncomm.class.php"); + include_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); $board=new ActionComm($db); $board->load_board($user); $board->warning_delay=$conf->actions->warning_delay/60/60/24;