lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chemin absolu sur les include php.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-09-24 22:28:19 +00:00
parent 33a1002b30
commit c4bb527b03
10 changed files with 69 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/action/document.php
View File

@ -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");

4
htdocs/comm/action/fiche.php
View File

@ -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");

2
htdocs/comm/action/index.php
View File

@ -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");

2
htdocs/comm/action/rapport/index.php
View File

@ -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)

4
htdocs/comm/propal.php
View File

@ -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"];

2
htdocs/comm/prospect/fiche.php
View File

@ -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');

7
htdocs/compta/clients.php
View File

@ -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");

2
htdocs/compta/facture.php
View File

@ -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;

105
htdocs/compta/fiche.php
View File

@ -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 '</td>';
if ($societe->client) {
print '<tr>';
print '<td nowrap width="100">'.$langs->trans("CustomerCode"). '</td><td colspan="3">'. $societe->code_client . '</td>';
print '</tr>';
print '<tr>';
print '<td nowrap>'.$langs->trans("CustomerAccountancyCode").'</td><td colspan="3">'.$societe->code_compta.'</td>';
print '</tr>';
if ($societe->client)
{
print '<tr>';
print '<td nowrap width="100">'.$langs->trans("CustomerCode"). '</td><td colspan="3">'. $societe->code_client . '</td>';
print '</tr>';
print '<tr>';
print '<td nowrap>'.$langs->trans("CustomerAccountancyCode").'</td><td colspan="3">'.$societe->code_compta.'</td>';
print '</tr>';
}
if ($societe->fournisseur) {
print '<tr>';
print '<td nowrap>'.$langs->trans("SupplierCode"). '</td><td colspan="3">'. $societe->code_fournisseur . '</td>';
print '</tr>';
print '<tr>';
print '<td nowrap>'.$langs->trans("SupplierAccountancyCode").'</td><td colspan="3">'.$societe->code_compta_fournisseur.'</td>';
print '</tr>';
if ($societe->fournisseur)
{
print '<tr>';
print '<td nowrap>'.$langs->trans("SupplierCode"). '</td><td colspan="3">'. $societe->code_fournisseur . '</td>';
print '</tr>';
print '<tr>';
print '<td nowrap>'.$langs->trans("SupplierAccountancyCode").'</td><td colspan="3">'.$societe->code_compta_fournisseur.'</td>';
print '</tr>';
}
print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">'.nl2br($societe->adresse)."</td></tr>";
@ -246,40 +248,43 @@ if ($socid > 0)
$societe->typent= $arr[$societe->typent_id];
print '<tr><td>'.$langs->trans("Type").'</td><td>'.$societe->typent.'</td><td>'.$langs->trans("Staff").'</td><td>'.$societe->effectif.'</td></tr>';
// Remise permanente
print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
print $langs->trans("CustomerRelativeDiscount");
print '<td><td align="right">';
print '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$societe->id.'">'.img_edit($langs->trans("Modify")).'</a>';
print '</td></tr></table>';
print '</td><td colspan="3">'.$societe->remise_client."&nbsp;%</td>";
print '</tr>';
// Remise avoirs
print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding">';
print '<tr><td nowrap>';
print $langs->trans("CustomerAbsoluteDiscount");
print '<td><td align="right">';
print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$societe->id.'">'.img_edit($langs->trans("Modify")).'</a>';
print '</td></tr></table>';
print '</td>';
print '<td colspan="3">';
$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.'&nbsp;'.$langs->trans("Currency".$conf->monnaie);
else print $langs->trans("None");
// Remise permanente
print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
print $langs->trans("CustomerRelativeDiscount");
print '<td><td align="right">';
print '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$societe->id.'">'.img_edit($langs->trans("Modify")).'</a>';
print '</td></tr></table>';
print '</td><td colspan="3">'.$societe->remise_client."&nbsp;%</td>";
print '</tr>';
// Remise avoirs
print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding">';
print '<tr><td nowrap>';
print $langs->trans("CustomerAbsoluteDiscount");
print '<td><td align="right">';
print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$societe->id.'">'.img_edit($langs->trans("Modify")).'</a>';
print '</td></tr></table>';
print '</td>';
print '<td colspan="3">';
$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.'&nbsp;'.$langs->trans("Currency".$conf->monnaie);
else print $langs->trans("None");
}
print '</td>';
print '</tr>';
}
print '</td>';
print '</tr>';
print "</table>";
print "</td>\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 "</tr>\n";
$i++;
}
$db->free();
$db->free($resql);
}
else
{

2
htdocs/index.php
View File

@ -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;