Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

migration php3 to php4

Browse Source
This commit is contained in:
hitweb 2003-09-11 20:18:51 +00:00
parent 8c7628343d
commit 774e6445ca
148 changed files with 459 additions and 459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/about.php
View File

@ -20,7 +20,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();

2
htdocs/actioncomm.class.php
View File

@ -109,7 +109,7 @@ class ActionComm
if ($this->fk_facture)
{
$this->objet_url = '<a href="'. DOL_URL_ROOT . '/compta/facture.php3?facid='.$this->fk_facture.'">Facture</a>';
$this->objet_url = '<a href="'. DOL_URL_ROOT . '/compta/facture.php?facid='.$this->fk_facture.'">Facture</a>';
}
$this->db->free();

2
htdocs/adherents/cartes/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
function llxHeader($head = "") {
global $user, $conf;

2
htdocs/adherents/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../main.inc.php3");
require("../main.inc.php");
function llxHeader($head = "") {
global $user, $conf;

6
htdocs/admin/external_rss.php
View File

@ -71,9 +71,9 @@ print "\n<p align=\"justify\">Attention, pour la r
<li>WikiApril / http://wiki.april.org / http://wiki.april.org/RecentChanges?format=rss (et tous les sites phpwiki)</li>
<li>LinuxFR / http://linuxfr.org / http://www.linuxfr.org/backend.rss</li>
<li>WikiInterneRycks / ../wiki / ../wiki/RecentChanges?format=rss (ne marche pas, je suis en https et en plus y a un apache_auth)</li>
<li>LoLix / http://back.fr.lolix.org/ / http://back.fr.lolix.org/jobs.rss.php3</li>
<li>LoLix / http://back.fr.lolix.org/ / http://back.fr.lolix.org/jobs.rss.php</li>
<li>Parinux / http://parinux.org/ / http://parinux.org/backend.rss</li>
<li>Docs d'AbulÉdu / http://docs.abuledu.org / http://docs.abuledu.org/backend.php3 (et tous les sites spip)</li>
<li>Docs d'AbulÉdu / http://docs.abuledu.org / http://docs.abuledu.org/backend.php (et tous les sites spip)</li>
</ul>
</p>
<form name=\"externalrssconfig\" action=\"" . $_SERVER['SCRIPT_NAME'] . "\" method=\"post\">
@ -81,7 +81,7 @@ print "\n<p align=\"justify\">Attention, pour la r
// Pour l'instant on fait un seul RSS externe, mais c'est sans soucis qu'on passe à plus !
// ptet définir une variable pour NBMAX_RSS_EXTERNE ... modifier en fonction le fichier
// ../pre.inc.php3
// ../pre.inc.php
for($i = 0; $i < $nbexternalrss; $i++) {
print "<tr>
<th colspan=\"2\">Syndication du site numéro " . ($i+1) . "</th>

2
htdocs/admin/pre.inc.php
View File

@ -18,7 +18,7 @@
* $Id$
* $Source$
*/
require("../main.inc.php3");
require("../main.inc.php");
function llxHeader($head = "", $urlp = "") {
global $user, $conf;

2
htdocs/admin/system/pre.inc.php
View File

@ -18,7 +18,7 @@
* $Id$
* $Source$
*/
require("../../main.inc.php3");
require("../../main.inc.php");
function llxHeader($head = "", $urlp = "") {
/*

4
htdocs/admin/system/update.php
View File

@ -25,8 +25,8 @@ $user->getrights('facture');
if (!$user->rights->facture->lire)
accessforbidden();
require("../../facture.class.php3");
require("../../propal.class.php3");
require("../../facture.class.php");
require("../../propal.class.php");
llxHeader();

2
htdocs/boutique/auteur/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
require("../livre/livre.class.php");
require("./auteur.class.php");

2
htdocs/boutique/client/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
require("./client.class.php");
function llxHeader($head = "", $urlp = "") {

2
htdocs/boutique/commande/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
require("./commande.class.php");
function llxHeader($head = "", $urlp = "") {

2
htdocs/boutique/editeur/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
require("../livre/livre.class.php");
require("./editeur.class.php");

2
htdocs/boutique/livre/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
require("./livre.class.php");
require("../editeur/editeur.class.php");
require("../auteur/auteur.class.php");

2
htdocs/boutique/newsletter/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
require("./newsletter.class.php");
function llxHeader($head = "", $urlp = "") {

2
htdocs/boutique/notification/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
require("../livre/livre.class.php");
require("./notification.class.php");

2
htdocs/boutique/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../main.inc.php3");
require("../main.inc.php");
require("./livre/livre.class.php");
require("./editeur/editeur.class.php");
require("./auteur/auteur.class.php");

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

@ -18,12 +18,12 @@
* $Id$
* $Source$
*/
require("./pre.inc.php3");
require("./pre.inc.php");
require("../../contact.class.php3");
require("../../lib/webcal.class.php3");
require("../../cactioncomm.class.php3");
require("../../actioncomm.class.php3");
require("../../contact.class.php");
require("../../lib/webcal.class.php");
require("../../cactioncomm.class.php");
require("../../actioncomm.class.php");
/*
* Sécurité accés client
@ -118,7 +118,7 @@ if ($HTTP_POST_VARS["action"] == 'add_action')
$webcal->add($user, $todo->date, $societe->nom, $libelle);
}
}
Header("Location: ".DOL_URL_ROOT."/comm/fiche.php3?socid=$socid");
Header("Location: ".DOL_URL_ROOT."/comm/fiche.php?socid=$socid");
}
if ($HTTP_POST_VARS["action"] == 'confirm_delete' && $HTTP_POST_VARS["confirm"] == yes)
@ -186,7 +186,7 @@ if ($action=='create')
print '<tr><td colspan="2"><div class="titre">Rendez-vous</div></td></tr>';
print '<tr><td width="10%">Société</td><td width="40%">';
print '<a href="../fiche.php3?socid='.$socid.'">'.$societe->nom.'</a></td></tr>';
print '<a href="../fiche.php?socid='.$socid.'">'.$societe->nom.'</a></td></tr>';
print '<tr><td width="10%">Contact</td><td width="40%">'.$contact->fullname.'</td></tr>';
print '<tr><td width="10%">Date</td><td width="40%">';
print_date_select();
@ -224,7 +224,7 @@ if ($action=='create')
print '<tr><td width="10%">Action</td><td>'.$caction->libelle.'</td></tr>';
print '<tr><td width="10%">Société</td><td width="40%">';
print '<a href="../fiche.php3?socid='.$socid.'">'.$societe->nom.'</a></td></tr>';
print '<a href="../fiche.php?socid='.$socid.'">'.$societe->nom.'</a></td></tr>';
print '<tr><td width="10%">Contact</td><td width="40%">'.$contact->fullname.'</td></tr>';
print '<td>Date</td><td>';
print $html->select_date('','ac',1,1);
@ -246,7 +246,7 @@ if ($action=='create')
print '<input type="hidden" name="todo" value="on">';
print '<input type="hidden" name="afaire" value="1">';
print '<tr><td width="10%">Société</td><td width="40%">';
print '<a href="../fiche.php3?socid='.$socid.'">'.$societe->nom.'</a></td></tr>';
print '<a href="../fiche.php?socid='.$socid.'">'.$societe->nom.'</a></td></tr>';
}
print '<tr><td width="10%">Date</td><td width="40%">';
@ -306,12 +306,12 @@ if ($id)
if ($action == 'edit')
{
print_titre ("Edition de la fiche action");
print '<form action="fiche.php3?id='.$id.'" method="post">';
print '<form action="fiche.php?id='.$id.'" method="post">';
print '<input type="hidden" name="action" value="update">';
print '<table width="100%" border="1" cellspacing="0" cellpadding="3">';
print '<tr><td width="20%">Type</td><td colspan="3">'.$act->type.'</td></tr>';
print '<tr><td width="20%">Société</td>';
print '<td width="30%"><a href="../fiche.php3?socid='.$act->societe->id.'">'.$act->societe->nom.'</a></td>';
print '<td width="30%"><a href="../fiche.php?socid='.$act->societe->id.'">'.$act->societe->nom.'</a></td>';
print '<td width="20%">Contact</td><td width="30%">';
$html->select_array("scontactid", $act->societe->contact_array(), $act->contact->id, 1);
@ -340,7 +340,7 @@ if ($id)
print '<table width="100%" border="1" cellspacing="0" cellpadding="3">';
print '<tr><td width="20%">Type</td><td colspan="3">'.$act->type.'</td></tr>';
print '<tr><td width="20%">Société</td>';
print '<td width="30%"><a href="../fiche.php3?socid='.$act->societe->id.'">'.$act->societe->nom.'</a></td>';
print '<td width="30%"><a href="../fiche.php?socid='.$act->societe->id.'">'.$act->societe->nom.'</a></td>';
print '<td width="10%">Contact</td><td width="40%">'.$act->contact->fullname.'</td></tr>';
print '<tr><td>Date</td><td>'.strftime('%d %B %Y %H:%M',$act->date).'</td>';
@ -366,17 +366,17 @@ if ($id)
print '<td align="center" width="20%">';
if ($action=='edit')
{
print '<a href="fiche.php3?id='.$act->id.'">Annuler</a></td>';
print '<a href="fiche.php?id='.$act->id.'">Annuler</a></td>';
}
else
{
print '<a href="fiche.php3?action=edit&id='.$act->id.'">Editer</a></td>';
print '<a href="fiche.php?action=edit&id='.$act->id.'">Editer</a></td>';
}
print '<td align="center" width="20%">-</td>';
print '<td align="center" width="20%">-</td>';
print '<td align="center" width="20%">-</td>';
print '<td align="center" width="20%">';
print '<a href="fiche.php3?action=delete&id='.$act->id.'">Supprimer</a></td>';
print '<a href="fiche.php?action=delete&id='.$act->id.'">Supprimer</a></td>';
print '</table>';
}

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

@ -20,12 +20,12 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
require("../../contact.class.php3");
require("../../lib/webcal.class.php3");
require("../../cactioncomm.class.php3");
require("../../actioncomm.class.php3");
require("../../contact.class.php");
require("../../lib/webcal.class.php");
require("../../cactioncomm.class.php");
require("../../actioncomm.class.php");
/*
* Sécurité accés client
@ -204,9 +204,9 @@ if ( $db->query($sql) )
print '<TD width="20%">';
print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/fiche.php3?socid='.$obj->socidp.'">'.$obj->societe.'</A></TD>';
print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socidp.'">'.$obj->societe.'</A></TD>';
print '<TD width="30%"><a href="fiche.php3?id='.$obj->id.'">'.$obj->libelle.'</a></td>';
print '<TD width="30%"><a href="fiche.php?id='.$obj->id.'">'.$obj->libelle.'</a></td>';
/*
* Contact
*/
@ -215,7 +215,7 @@ if ( $db->query($sql) )
{
$cont = new Contact($db);
$cont->fetch($obj->fk_contact);
print '<a href="'.DOL_URL_ROOT.'/comm/people.php3?socid='.$obj->socidp.'&contactid='.$cont->id.'">'.$cont->fullname.'</a>';
print '<a href="'.DOL_URL_ROOT.'/comm/people.php?socid='.$obj->socidp.'&contactid='.$cont->id.'">'.$cont->fullname.'</a>';
}
else
{

8
htdocs/comm/action/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
function llxHeader($head = "", $urlp = "") {
/*
@ -34,11 +34,11 @@ function llxHeader($head = "", $urlp = "") {
$menu->add_submenu(DOL_URL_ROOT."/comm/action/?time=today", "Aujourd'hui");
$menu->add(DOL_URL_ROOT."/comm/clients.php3", "Clients");
$menu->add(DOL_URL_ROOT."/comm/clients.php", "Clients");
$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php3", "Contacts");
$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php", "Contacts");
$menu->add(DOL_URL_ROOT."/comm/propal.php3", "Propales");
$menu->add(DOL_URL_ROOT."/comm/propal.php", "Propales");
$menu->add(DOL_URL_ROOT."/comm/projet/", "Projets");

14
htdocs/comm/index.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
$user->getrights('propale');
@ -72,7 +72,7 @@ print '<tr><td valign="top" width="30%">';
print '<TABLE border="0" cellspacing="0" cellpadding="3" width="100%">';
print '<tr class="liste_titre"><td colspan="2">Rechercher une proposition</td></tr>';
print '<form method="post" action="propal.php3">';
print '<form method="post" action="propal.php">';
print "<tr $bc[1]><td>";
print 'Num. : <input type="text" name="sf_ref"><input type="submit" value="Rechercher" class="flat"></td></tr>';
print "</form></table><br>\n";
@ -95,7 +95,7 @@ if ( $db->query($sql) )
{
$obj = $db->fetch_object( $i);
$var=!$var;
print "<tr $bc[$var]><td><a href=\"propal.php3?propalid=".$obj->rowid."\">".$obj->ref."</a></td></tr>";
print "<tr $bc[$var]><td><a href=\"propal.php?propalid=".$obj->rowid."\">".$obj->ref."</a></td></tr>";
$i++;
}
print "</table><br>";
@ -120,7 +120,7 @@ if ( $db->query($sql) )
{
$obj = $db->fetch_object( $i);
$var=!$var;
print "<tr $bc[$var]><td><a href=\"propal.php3?propalid=".$obj->rowid."\">".$obj->ref."</a></td></tr>";
print "<tr $bc[$var]><td><a href=\"propal.php?propalid=".$obj->rowid."\">".$obj->ref."</a></td></tr>";
$i++;
}
print "</table><br>";
@ -153,7 +153,7 @@ if ( $db->query($sql) )
$obj = $db->fetch_object( $i);
$var = !$var;
print "<tr $bc[$var]>";
print '<td><a href="fiche.php3?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
print '<td align="right"><a href="index.php?action=del_bookmark&bid='.$obj->bid.'">';
print '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/editdelete.png" border="0"></a></td>';
print '</tr>';
@ -187,8 +187,8 @@ if ( $db->query($sql) )
$var=!$var;
print "<tr $bc[$var]><td>".strftime("%d %b %Y",$obj->da)."</td>";
print "<td><a href=\"action/fiche.php3?id=$obj->id\">$obj->libelle $obj->label</a></td>";
print '<td><a href="fiche.php3?socid='.$obj->idp.'">'.$obj->sname.'</a></td>';
print "<td><a href=\"action/fiche.php?id=$obj->id\">$obj->libelle $obj->label</a></td>";
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->sname.'</a></td>';
$i++;
}
$db->free();

20
htdocs/comm/people.php
View File

@ -19,8 +19,8 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("../contact.class.php3");
require("./pre.inc.php");
require("../contact.class.php");
if ($sortorder == "")
{
@ -39,7 +39,7 @@ if ($action == 'add')
$result = $db->query($sql);
if ($result)
{
Header("Location: fiche.php3?socid=$socid");
Header("Location: fiche.php?socid=$socid");
}
}
}
@ -59,7 +59,7 @@ if ($action == 'update')
$result = $contact->update($contactid);
if ($result)
{
Header("Location: fiche.php3?socid=$socid");
Header("Location: fiche.php?socid=$socid");
}
}
}
@ -99,7 +99,7 @@ if ($socid > 0)
*
*
*/
print_fiche_titre ("Contact société : <a href=\"fiche.php3?socid=$objsoc->idp\">$objsoc->nom</a>");
print_fiche_titre ("Contact société : <a href=\"fiche.php?socid=$objsoc->idp\">$objsoc->nom</a>");
/*
*
*/
@ -152,12 +152,12 @@ if ($socid > 0)
{
if ($obj->fk_user)
{
print '<tr><td>Login</td><td colspan="4"><a href="'.DOL_URL_ROOT.'/user/fiche.php3?id='.$obj->fk_user.'">Fiche</a></td></tr>';
print '<tr><td>Login</td><td colspan="4"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->fk_user.'">Fiche</a></td></tr>';
}
else
{
print '<tr><td>Login</td><td colspan="3">Pas de compte</td>';
print '<td align="center"><a href="people.php3?contactid='.$contactid.'&socid='.$socid.'&action=create_user">Créer un compte</td></tr>';
print '<td align="center"><a href="people.php?contactid='.$contactid.'&socid='.$socid.'&action=create_user">Créer un compte</td></tr>';
}
}
@ -166,7 +166,7 @@ if ($socid > 0)
if ($action == 'addcontact')
{
print "<form method=\"post\" action=\"people.php3?socid=$socid\">";
print "<form method=\"post\" action=\"people.php?socid=$socid\">";
print "<input type=\"hidden\" name=\"action\" value=\"add\">";
print "<table border=0>";
print "<tr><td>Nom</td><td><input name=\"name\" type=\"text\" size=\"20\" maxlength=\"80\"></td>";
@ -196,7 +196,7 @@ if ($socid > 0)
$obj = $db->fetch_object( 0);
}
print "<form method=\"post\" action=\"people.php3?socid=$socid\">";
print "<form method=\"post\" action=\"people.php?socid=$socid\">";
print '<input type="hidden" name="action" value="update">';
print "<input type=\"hidden\" name=\"contactid\" value=\"$contactid\">";
print '<br><table border="1" cellpadding="4" cellspacing="0">';
@ -256,7 +256,7 @@ if ($socid > 0)
print "<td>". strftime("%d %b %Y %H:%M", $obj->da) ."</td>";
if ($obj->propalrowid)
{
print "<td><a href=\"propal.php3?propalid=$obj->propalrowid\">$obj->libelle</a></td>";
print "<td><a href=\"propal.php?propalid=$obj->propalrowid\">$obj->libelle</a></td>";
}
else
{

12
htdocs/comm/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../main.inc.php3");
require("../main.inc.php");
function llxHeader($head = "", $urlp = "") {
global $user, $conf;
@ -32,17 +32,17 @@ function llxHeader($head = "", $urlp = "") {
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/comm/clients.php3", "Clients");
$menu->add(DOL_URL_ROOT."/comm/clients.php", "Clients");
$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php3", "Contacts");
$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php", "Contacts");
$menu->add(DOL_URL_ROOT."/comm/action/", "Actions");
if ($user->rights->propale->lire)
{
$menu->add(DOL_URL_ROOT."/comm/propal.php3", "Propales");
$menu->add_submenu("propal.php3?viewstatut=0", "Brouillons");
$menu->add_submenu("propal.php3?viewstatut=1", "Ouvertes");
$menu->add(DOL_URL_ROOT."/comm/propal.php", "Propales");
$menu->add_submenu("propal.php?viewstatut=0", "Brouillons");
$menu->add_submenu("propal.php?viewstatut=1", "Ouvertes");
}
if ($conf->fichinter->enabled )

34
htdocs/comm/propal.php
View File

@ -25,7 +25,7 @@
* @package propale
*/
require("./pre.inc.php3");
require("./pre.inc.php");
$user->getrights('propale');
if (!$user->rights->propale->lire)
@ -34,11 +34,11 @@ if (!$user->rights->propale->lire)
/*
* Modules optionnels
*/
require("../project.class.php3");
require("./propal_model_pdf.class.php3");
require("../propal.class.php3");
require("../actioncomm.class.php3");
require("../lib/CMailFile.class.php3");
require("../project.class.php");
require("./propal_model_pdf.class.php");
require("../propal.class.php");
require("../actioncomm.class.php");
require("../lib/CMailFile.class.php");
/*
*
@ -263,7 +263,7 @@ if ($propalid)
print "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">";
print '<tr><td>Société</td><td colspan="3"><a href="fiche.php3?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
print '<tr><td>Société</td><td colspan="3"><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
print '<td>Statut</td><td align="center"><b>'.$obj->lst.'</b></td></tr>';
print '<tr><td>Date</td><td colspan="3">'.strftime("%A %d %B %Y",$obj->dp).'</td>';
@ -328,7 +328,7 @@ if ($propalid)
*/
if ($propal->brouillon == 1)
{
print '<form action="propal.php3?propalid='.$propalid.'" method="post">';
print '<form action="propal.php?propalid='.$propalid.'" method="post">';
print '<input type="hidden" name="action" value="setremise">';
print '<table cellpadding="3" cellspacing="0" border="1"><tr><td>Remise</td><td align="right">';
print '<input type="text" name="remise" size="3" value="'.$propal->remise_percent.'">%';
@ -368,13 +368,13 @@ if ($propalid)
$var=!$var;
print "<TR $bc[$var]>";
print "<TD>[$objp->ref]</TD>\n";
print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php3?id='.$objp->prodid.'">'.$objp->product.'</td>';
print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->prodid.'">'.$objp->product.'</td>';
print "<TD align=\"right\">".price($objp->price)."</TD>";
print '<td align="center">'.$objp->tva_tx.' %</td>';
print "<td align=\"center\">".$objp->qty."</td>\n";
if ($obj->statut == 0 && $user->rights->propale->creer)
{
print '<td align="center"><a href="propal.php3?propalid='.$propalid.'&ligne='.$objp->rowid.'&action=del_ligne">Supprimer</a></td>';
print '<td align="center"><a href="propal.php?propalid='.$propalid.'&ligne='.$objp->rowid.'&action=del_ligne">Supprimer</a></td>';
}
else
{
@ -405,7 +405,7 @@ if ($propalid)
print "<td align=\"center\">".$objp->qty."</td>\n";
if ($obj->statut == 0 && $user->rights->propale->creer)
{
print '<td align="center"><a href="propal.php3?propalid='.$propalid.'&ligne='.$objp->rowid.'&action=del_ligne">Supprimer</a></td>';
print '<td align="center"><a href="propal.php?propalid='.$propalid.'&ligne='.$objp->rowid.'&action=del_ligne">Supprimer</a></td>';
}
else
{
@ -446,7 +446,7 @@ if ($propalid)
*/
$html = new Form($db);
$var=!$var;
print '<form action="propal.php3?propalid='.$propalid.'" method="post">';
print '<form action="propal.php?propalid='.$propalid.'" method="post">';
print '<input type="hidden" name="action" value="addproduct">';
print '<tr '.$bc[$var].'>';
print '<td>&nbsp;</td>';
@ -458,7 +458,7 @@ if ($propalid)
print '</tr></form>';
$var=!$var;
print '<form action="propal.php3?propalid='.$propalid.'" method="post">';
print '<form action="propal.php?propalid='.$propalid.'" method="post">';
print '<input type="hidden" name="action" value="addligne">';
print "<tr $bc[$var]><td>&nbsp;</td><td colspan=\"3\"><select name=\"idprod\">$opt</select></td>";
print '<td align="center"><input type="text" size="3" name="qty" value="1"></td>';
@ -632,7 +632,7 @@ if ($propalid)
if ($propal->brouillon == 1)
{
print '<form action="propal.php3?propalid='.$propalid.'" method="post">';
print '<form action="propal.php?propalid='.$propalid.'" method="post">';
print '<input type="hidden" name="action" value="setpdfmodel">';
print '<tr><td>Modèle</td><td align="right">';
@ -848,7 +848,7 @@ if ($propalid)
$var=!$var;
print "<TR $bc[$var]>";
print "<TD><a href=\"$PHP_SELF?propalid=$objp->propalid\">$objp->ref</a></TD>\n";
print "<TD><a href=\"fiche.php3?socid=$objp->idp\">$objp->nom</a></TD>\n";
print "<TD><a href=\"fiche.php?socid=$objp->idp\">$objp->nom</a></TD>\n";
$now = time();
$lim = 3600 * 24 * 15 ;
@ -867,9 +867,9 @@ if ($propalid)
$m = strftime("%m",$objp->dp);
print strftime("%d",$objp->dp)."\n";
print " <a href=\"propal.php3?year=$y&month=$m\">";
print " <a href=\"propal.php?year=$y&month=$m\">";
print strftime("%B",$objp->dp)."</a>\n";
print " <a href=\"propal.php3?year=$y\">";
print " <a href=\"propal.php?year=$y\">";
print strftime("%Y",$objp->dp)."</a></TD>\n";
print "<TD align=\"right\">".price($objp->price)."</TD>\n";

2
htdocs/comm/propal/document.php
View File

@ -25,7 +25,7 @@ if (!$user->rights->propale->lire)
accessforbidden();
require_once("../../propal.class.php3");
require_once("../../propal.class.php");
llxHeader();
function do_upload ($upload_dir)

12
htdocs/comm/propal/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
function llxHeader($head = "", $urlp = "") {
global $user, $conf;
@ -32,17 +32,17 @@ function llxHeader($head = "", $urlp = "") {
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/comm/clients.php3", "Clients");
$menu->add(DOL_URL_ROOT."/comm/clients.php", "Clients");
$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php3", "Contacts");
$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php", "Contacts");
$menu->add(DOL_URL_ROOT."/comm/action/", "Actions");
if ($user->rights->propale->lire)
{
$menu->add(DOL_URL_ROOT."/comm/propal.php3", "Propales");
$menu->add_submenu("propal.php3?viewstatut=0", "Brouillons");
$menu->add_submenu("propal.php3?viewstatut=1", "Ouvertes");
$menu->add(DOL_URL_ROOT."/comm/propal.php", "Propales");
$menu->add_submenu("propal.php?viewstatut=0", "Brouillons");
$menu->add_submenu("propal.php?viewstatut=1", "Ouvertes");
}
if ($conf->fichinter->enabled )

4
htdocs/comm/socnote.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
/*
@ -59,7 +59,7 @@ if ($socid > 0) {
print '<table border="1" width="100%" cellspacing="0" cellpadding="3">';
print "<tr><td>";
print "<form method=\"post\" action=\"fiche.php3?socid=$soc->id\">";
print "<form method=\"post\" action=\"fiche.php?socid=$soc->id\">";
print "<input type=\"hidden\" name=\"action\" value=\"note\">";
print "<textarea name=\"note\" cols=\"60\" rows=\"10\">$soc->note</textarea><br>";
print "<input type=\"submit\">";

2
htdocs/commande/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../main.inc.php3");
require("../main.inc.php");
require("./commande.class.php");
function llxHeader($head = "", $urlp = "")

4
htdocs/compta/bank/account.php
View File

@ -21,7 +21,7 @@
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
if ($HTTP_POST_VARS["action"] == 'add' && $account)
{
@ -283,7 +283,7 @@ if ($account)
if ($objp->rappro)
{
print "<td align=\"center\"><a href=\"releve.php3?num=$objp->num_releve&account=$account\">$objp->num_releve</a></td>";
print "<td align=\"center\"><a href=\"releve.php?num=$objp->num_releve&account=$account\">$objp->num_releve</a></td>";
}
else
{

2
htdocs/compta/bank/bilan.php
View File

@ -20,7 +20,7 @@
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();

4
htdocs/compta/bank/bplc.php
View File

@ -19,8 +19,8 @@
* $Source$
*/
require("./pre.inc.php3");
require("./bank.lib.php3");
require("./pre.inc.php");
require("./bank.lib.php");
llxHeader();

6
htdocs/compta/bank/budget.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();
@ -122,7 +122,7 @@ else
print "<tr $bc[$var]>";
print "<td align=\"right\">".strftime("%d %B %Y",$objp->do)."</TD>\n";
print "<td><a href=\"ligne.php3?rowid=$objp->rowid\">$objp->label</a></td>";
print "<td><a href=\"ligne.php?rowid=$objp->rowid\">$objp->label</a></td>";
print "<td align=\"right\">".price(abs($objp->amount))."</td><td>&nbsp;</td>";
print "</tr>";
$i++;
@ -139,7 +139,7 @@ else
}
print '<a href="categ.php3">Editer</a>';
print '<a href="categ.php">Editer</a>';

2
htdocs/compta/bank/categ.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();

4
htdocs/compta/bank/config.php
View File

@ -18,8 +18,8 @@
* $Id$
* $Source$
*/
require("./pre.inc.php3");
require("./bank.lib.php3");
require("./pre.inc.php");
require("./bank.lib.php");
llxHeader();

2
htdocs/compta/bank/fiche.php
View File

@ -19,7 +19,7 @@
* $Id$
* $Source$
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();

12
htdocs/compta/bank/index.php
View File

@ -19,10 +19,10 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./bank.lib.php3");
require("../../tva.class.php3");
require("../../chargesociales.class.php3");
require("./pre.inc.php");
require("./bank.lib.php");
require("../../tva.class.php");
require("../../chargesociales.class.php");
llxHeader();
@ -61,7 +61,7 @@ for ($i = 0 ; $i < sizeof($accounts) ; $i++)
$solde = $acc->solde();
print "<tr><td>";
print '<a href="account.php3?account='.$acc->id.'">'.$acc->label.'</a>';
print '<a href="account.php?account='.$acc->id.'">'.$acc->label.'</a>';
print "</td><td>$acc->bank</td><td>$acc->number</td>";
@ -119,7 +119,7 @@ for ($i = 0 ; $i < sizeof($accounts) ; $i++) {
$solde = $acc->solde();
print "<tr><td>";
print '<a href="account.php3?account='.$acc->id.'">'.$acc->label.'</a>';
print '<a href="account.php?account='.$acc->id.'">'.$acc->label.'</a>';
print "</td><td>$acc->bank</td><td>$acc->number</td>";

6
htdocs/compta/bank/ligne.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();
@ -105,7 +105,7 @@ if ($result)
print "<td>&nbsp;</td><td align=\"right\">".price($objp->amount)."</TD>\n";
}
print "<td align=\"center\"><a href=\"releve.php3?num=$objp->num_releve&ve=1\">$objp->num_releve</a></td>";
print "<td align=\"center\"><a href=\"releve.php?num=$objp->num_releve&ve=1\">$objp->num_releve</a></td>";
print "<td align=\"center\">$objp->author</td>";
print "</tr>";
@ -181,7 +181,7 @@ if ($result)
print "<tr $bc[$var]>";
print "<td>$objp->label</td>";
print "<td align=\"center\"><a href=\"budget.php3?bid=$objp->rowid\">voir</a></td>";
print "<td align=\"center\"><a href=\"budget.php?bid=$objp->rowid\">voir</a></td>";
print "</tr>";
$i++;

18
htdocs/compta/bank/pre.inc.php
View File

@ -20,7 +20,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
require("./account.class.php");
function llxHeader($head = "")
@ -36,7 +36,7 @@ function llxHeader($head = "")
$menu = new Menu();
$menu->add("index.php","Comptes");
$menu->add_submenu("search.php3","Recherche");
$menu->add_submenu("search.php","Recherche");
$sql = "SELECT rowid, label FROM llx_bank_account where clos = 0 AND courant = 1";
@ -50,9 +50,9 @@ function llxHeader($head = "")
while ($i < $numr)
{
$objp = $db->fetch_object($i);
$menu->add("account.php3?account=" . $objp->rowid, $objp->label);
$menu->add_submenu("releve.php3?account=" . $objp->rowid ,"Relevés");
$menu->add_submenu("rappro.php3?account=".$objp->rowid,"Rappro");
$menu->add("account.php?account=" . $objp->rowid, $objp->label);
$menu->add_submenu("releve.php?account=" . $objp->rowid ,"Relevés");
$menu->add_submenu("rappro.php?account=".$objp->rowid,"Rappro");
$i++;
}
}
@ -60,11 +60,11 @@ function llxHeader($head = "")
$menu->add("index.php","Banque");
$menu->add_submenu("budget.php3","Budgets");
$menu->add_submenu("bilan.php3","Bilan");
$menu->add_submenu("virement.php3","Virement");
$menu->add_submenu("budget.php","Budgets");
$menu->add_submenu("bilan.php","Bilan");
$menu->add_submenu("virement.php","Virement");
$menu->add_submenu("config.php3","Config");
$menu->add_submenu("config.php","Config");
if (defined("COMPTA_ONLINE_PAYMENT_BPLC") && COMPTA_ONLINE_PAYMENT_BPLC)
{

6
htdocs/compta/bank/rappro.php
View File

@ -18,7 +18,7 @@
* $Id$
* $Source$
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();
@ -121,7 +121,7 @@ if ($result)
if ($objp->rappro)
{
print "<td align=\"center\"><a href=\"releve.php3?num=$objp->num_releve\">$objp->num_releve</a></td>";
print "<td align=\"center\"><a href=\"releve.php?num=$objp->num_releve\">$objp->num_releve</a></td>";
}
else
{
@ -140,7 +140,7 @@ if ($result)
}
print "</table>";
print '<br>Dernier relevé : <a href="releve.php3?account='.$account.'&num='.$last_releve.'">'.$last_releve.'</a>';
print '<br>Dernier relevé : <a href="releve.php?account='.$account.'&num='.$last_releve.'">'.$last_releve.'</a>';
$db->close();

4
htdocs/compta/bank/releve.php
View File

@ -23,7 +23,7 @@
* $rel
* $ve
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();
@ -200,7 +200,7 @@ else
print "<td align=\"right\">".price($total)."</TD>\n";
print "<td align=\"center\">[<a href=\"ligne.php3?rowid=$objp->rowid&account=$account\">edit</a>]</td>";
print "<td align=\"center\">[<a href=\"ligne.php?rowid=$objp->rowid&account=$account\">edit</a>]</td>";
print "</tr>";
$i++;

6
htdocs/compta/bank/search.php
View File

@ -21,8 +21,8 @@
*
*******************************************************************************/
require("./pre.inc.php3");
require("./bank.lib.php3");
require("./pre.inc.php");
require("./bank.lib.php");
llxHeader();
if ($vline) {
@ -44,7 +44,7 @@ print "<td align=\"right\">Compte</td>";
print "</TR>\n";
?>
<form method="post" action="search.php3">
<form method="post" action="search.php">
<tr>
<td></td>
<td>

4
htdocs/compta/bank/virement.php
View File

@ -19,8 +19,8 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./bank.lib.php3");
require("./pre.inc.php");
require("./bank.lib.php");
llxHeader();

2
htdocs/compta/caisse/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
function llxHeader($head = "") {
global $user, $conf;

2
htdocs/compta/charges.php
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();

10
htdocs/compta/charges/fiche.php
View File

@ -20,8 +20,8 @@
*
*/
require("./pre.inc.php3");
require("../service.class.php3");
require("./pre.inc.php");
require("../service.class.php");
llxHeader();
@ -133,10 +133,10 @@ if ($action == 'create') {
print '<td width="20%" align="center">-</td>';
print '<td width="20%" align="center">[<a href="fiche.php3?action=edit&id='.$id.'">Editer</a>]</td>';
print '<td width="20%" align="center">[<a href="fiche.php?action=edit&id='.$id.'">Editer</a>]</td>';
print '<td width="20%" align="center">[<a href="fiche.php3?action=datedeb&id='.$id.'">Date de debut</a>]</td>';
print '<td width="20%" align="center">[<a href="fiche.php3?action=datefin&id='.$id.'">Date de fin</a>]</td>';
print '<td width="20%" align="center">[<a href="fiche.php?action=datedeb&id='.$id.'">Date de debut</a>]</td>';
print '<td width="20%" align="center">[<a href="fiche.php?action=datefin&id='.$id.'">Date de fin</a>]</td>';
print '<td width="20%" align="center">-</td>';
print '</table><br>';

2
htdocs/compta/charges/index.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();

2
htdocs/compta/charges/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
function llxHeader($head = "")
{

16
htdocs/compta/clients.php
View File

@ -19,11 +19,11 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("../contact.class.php3");
require("../lib/webcal.class.php3");
require("../cactioncomm.class.php3");
require("../actioncomm.class.php3");
require("./pre.inc.php");
require("../contact.class.php");
require("../lib/webcal.class.php");
require("../cactioncomm.class.php");
require("../actioncomm.class.php");
llxHeader();
@ -45,7 +45,7 @@ if ($sortfield == "") {
if ($action=='add_action') {
/*
* Vient de actioncomm.php3
* Vient de actioncomm.php
*
*/
$actioncomm = new ActionComm($db);
@ -223,13 +223,13 @@ if ($result)
$var=!$var;
print "<TR $bc[$var]>";
print "<TD><a href=\"fiche.php3?socid=$obj->idp\">$obj->nom</A></td>\n";
print "<TD><a href=\"fiche.php?socid=$obj->idp\">$obj->nom</A></td>\n";
print "<TD>".$obj->ville."&nbsp;</TD>\n";
print "<TD align=\"center\">$obj->prefix_comm&nbsp;</TD>\n";
if ($user->societe_id == 0)
{
print "<TD align=\"center\"><a href=\"facture.php3?socidp=$obj->idp&action=create\">[Facture]</A></td>\n";
print "<TD align=\"center\"><a href=\"facture.php?socidp=$obj->idp&action=create\">[Facture]</A></td>\n";
}
else
{

2
htdocs/compta/config.php
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();

4
htdocs/compta/deplacement/index.php
View File

@ -20,7 +20,7 @@
*
*/
require("./pre.inc.php");
require("../../tva.class.php3");
require("../../tva.class.php");
/*
*
@ -84,7 +84,7 @@ if ( $db->query($sql) )
$var=!$var;
print "<TR $bc[$var]>";
print '<td><a href="fiche.php?id='.$objp->rowid.'">'.strftime("%d %B %Y",$objp->dd).'</a></td>';
print "<TD><a href=\"../comm/fiche.php3?socid=$objp->idp\">$objp->nom</a></TD>\n";
print "<TD><a href=\"../comm/fiche.php?socid=$objp->idp\">$objp->nom</a></TD>\n";
print '<TD align="center">'.$objp->firstname.' '.$objp->name.'</td>';

2
htdocs/compta/deplacement/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
require("./deplacement.class.php");
$deplacement_type[0] = "voiture";

2
htdocs/compta/dons/fiche.php
View File

@ -259,7 +259,7 @@ if ($rowid > 0 && $action == 'edit')
if ($don->statut == 1 && $resteapayer > 0)
{
print "<td align=\"center\" width=\"25%\">[<a href=\"paiement.php3?facid=$facid&action=create\">Emettre un paiement</a>]</td>";
print "<td align=\"center\" width=\"25%\">[<a href=\"paiement.php?facid=$facid&action=create\">Emettre un paiement</a>]</td>";
}
elseif ($don->statut == 0)
{

2
htdocs/compta/dons/formulaire/fsfe.fr.php
View File

@ -28,7 +28,7 @@
* $Source$
*
*/
require("../../../main.inc.php3");
require("../../../main.inc.php");
require("../../../projetdon.class.php");
require("../../../don.class.php");

2
htdocs/compta/dons/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
require("../../projetdon.class.php");
$libelle[0] = "Promesses non validées";

36
htdocs/compta/facture.php
View File

@ -19,17 +19,17 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
$user->getrights('facture');
if (!$user->rights->facture->lire)
accessforbidden();
require("../facture.class.php3");
require("../lib/CMailFile.class.php3");
require("../facture.class.php");
require("../lib/CMailFile.class.php");
require("../paiement.class.php");
require("../project.class.php3");
require("../propal.class.php3");
require("../project.class.php");
require("../propal.class.php");
require("./bank/account.class.php");
require("../contrat/contrat.class.php");
@ -99,7 +99,7 @@ if ($HTTP_POST_VARS["action"] == 'add')
else
{
print "<p><b>Erreur : la facture n'a pas été créée, vérifier le numéro !</b>";
print "<p>Retour à la <a href=\"propal.php3?propalid=$propalid\">propal</a>";
print "<p>Retour à la <a href=\"propal.php?propalid=$propalid\">propal</a>";
print $db->error();
}
}
@ -508,7 +508,7 @@ else
print "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">";
print "<tr><td>Client</td>";
print "<td colspan=\"3\">";
print '<b><a href="fiche.php3?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>';
print '<b><a href="fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>';
print "<td>Conditions de réglement : " . $fac->cond_reglement ."</td></tr>";
@ -562,7 +562,7 @@ else
print '<td align="right">'.price($objp->amount)."</TD><td>$_MONNAIE</td>\n";
if (! $fac->paye && $user->rights->facture->paiement)
{
print '<td><a href="facture.php3?facid='.$facid.'&action=del_paiement&paiementid='.$objp->rowid.'">Del</a>';
print '<td><a href="facture.php?facid='.$facid.'&action=del_paiement&paiementid='.$objp->rowid.'">Del</a>';
}
print "</tr>";
$total = $total + $objp->amount;
@ -611,7 +611,7 @@ else
if ($fac->brouillon == 1)
{
print '<form action="facture.php3?facid='.$facid.'" method="post">';
print '<form action="facture.php?facid='.$facid.'" method="post">';
print '<input type="hidden" name="action" value="setremise">';
print '<table cellpadding="3" cellspacing="0" border="1"><tr><td>Remise</td><td align="right">';
print '<input type="text" name="remise" size="3" value="'.$fac->remise_percent.'">%';
@ -652,7 +652,7 @@ else
print "<TR $bc[$var]>";
if ($objp->fk_product)
{
print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php3?id='.$objp->fk_product.'">'.stripslashes(nl2br($objp->description)).'</a></td>';
print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">'.stripslashes(nl2br($objp->description)).'</a></td>';
}
else
{
@ -750,7 +750,7 @@ else
if ($fac->statut == 1 && $resteapayer > 0 && $user->rights->facture->paiement)
{
print "<td align=\"center\" width=\"25%\">[<a href=\"paiement.php3?facid=$facid&action=create\">Emettre un paiement</a>]</td>";
print "<td align=\"center\" width=\"25%\">[<a href=\"paiement.php?facid=$facid&action=create\">Emettre un paiement</a>]</td>";
}
else
{
@ -792,7 +792,7 @@ else
{
if ($user->rights->facture->creer)
{
print "<td align=\"center\" width=\"25%\"><a href=\"facture.php3?facid=$facid&action=pdf\">Générer la facture</a></td>";
print "<td align=\"center\" width=\"25%\"><a href=\"facture.php?facid=$facid&action=pdf\">Générer la facture</a></td>";
}
else
{
@ -984,7 +984,7 @@ else
$objp = $db->fetch_object( $i);
$var=!$var;
print "<TR $bc[$var]>";
print "<TD><a href=\"propal.php3?propalid=$objp->propalid\">$objp->ref</a></TD>\n";
print "<TD><a href=\"propal.php?propalid=$objp->propalid\">$objp->ref</a></TD>\n";
print "<TD>".strftime("%d %B %Y",$objp->dp)."</TD>\n";
print '<TD align="right">'.price($objp->price).'</TD>';
print "</tr>";
@ -1101,9 +1101,9 @@ else
}
}
print '<td><a class="'.$class.'" href="facture.php3?facid='.$objp->facid.'">' . $objp->facnumber;
print '<td><a class="'.$class.'" href="facture.php?facid='.$objp->facid.'">' . $objp->facnumber;
print "</a></TD>\n";
print '<TD><a class="'.$class.'" href="fiche.php3?socid='.$objp->idp.'">'.$objp->nom.'</a></td>';
print '<TD><a class="'.$class.'" href="fiche.php?socid='.$objp->idp.'">'.$objp->nom.'</a></td>';
if ($objp->df > 0 )
{
@ -1112,9 +1112,9 @@ else
$m = strftime("%m",$objp->df);
print strftime("%d",$objp->df)."\n";
print ' <a class="'.$class.'" href="facture.php3?year='.$y.'&month='.$m.'">';
print ' <a class="'.$class.'" href="facture.php?year='.$y.'&month='.$m.'">';
print strftime("%B",$objp->df)."</a>\n";
print ' <a class="'.$class.' "href="facture.php3?year='.$y.'">';
print ' <a class="'.$class.' "href="facture.php?year='.$y.'">';
print strftime("%Y",$objp->df)."</a></TD>\n";
}
else
@ -1132,7 +1132,7 @@ else
}
else
{
print '<td align="center"><a href="facture.php3?filtre=paye:0,fk_statut:1">impayée</a></td>';
print '<td align="center"><a href="facture.php?filtre=paye:0,fk_statut:1">impayée</a></td>';
}
}
else

42
htdocs/compta/fiche.php
View File

@ -19,11 +19,11 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("../contact.class.php3");
require("../lib/webcal.class.php3");
require("../cactioncomm.class.php3");
require("../actioncomm.class.php3");
require("./pre.inc.php");
require("../contact.class.php");
require("../lib/webcal.class.php");
require("../cactioncomm.class.php");
require("../actioncomm.class.php");
/*
* Sécurité accés client
@ -43,7 +43,7 @@ llxHeader();
if ($action=='add_action') {
/*
* Vient de actioncomm.php3
* Vient de actioncomm.php
*
*/
$actioncomm = new ActionComm($db);
@ -187,12 +187,12 @@ if ($socid > 0)
if ($user->societe_id == 0)
{
print '<td align="center"><a href="../comm/fiche.php3?socid='.$objsoc->idp.'">Commercial</a></td>';
print '<td align="center"><a href="../comm/fiche.php?socid='.$objsoc->idp.'">Commercial</a></td>';
print "<td align=\"center\"><a href=\"../comm/docsoc.php?socid=$objsoc->idp\">Documents</a></td>";
print "<td align=\"center\"><a href=\"index.php?socidp=$objsoc->idp&action=add\">[Bookmark]</a></td>";
if ($user->rights->facture->creer)
print "<td>[<a href=\"facture.php3?action=create&socidp=$objsoc->idp\">".translate("Facture")."</a>]</td>";
print "<td><a href=\"socnote.php3?socid=$objsoc->idp\">Notes</a></td>";
print "<td>[<a href=\"facture.php?action=create&socidp=$objsoc->idp\">".translate("Facture")."</a>]</td>";
print "<td><a href=\"socnote.php?socid=$objsoc->idp\">Notes</a></td>";
print "<td align=\"center\">[<a href=\"deplacement/fiche.php?socid=$objsoc->idp&action=create\">Déplacement</a>]</td>";
}
print "</tr></table>";
@ -245,7 +245,7 @@ if ($socid > 0)
if ($num > 0)
{
print "<tr $bc[$var]>";
print "<td colspan=\"4\"><a href=\"facture.php3?socidp=$objsoc->idp\">liste des factures ($num)</td></tr>";
print "<td colspan=\"4\"><a href=\"facture.php?socidp=$objsoc->idp\">liste des factures ($num)</td></tr>";
}
while ($i < $num && $i < 5)
@ -253,7 +253,7 @@ if ($socid > 0)
$objp = $db->fetch_object( $i);
$var=!$var;
print "<TR $bc[$var]>";
print "<TD><a href=\"../compta/facture.php3?facid=$objp->facid\">$objp->facnumber</a></TD>\n";
print "<TD><a href=\"../compta/facture.php?facid=$objp->facid\">$objp->facnumber</a></TD>\n";
if ($objp->df > 0 )
{
print "<TD align=\"right\">".strftime("%d %B %Y",$objp->df)."</TD>\n";
@ -344,7 +344,7 @@ if ($socid > 0)
print '<tr class="liste_titre"><td><b>Pr&eacute;nom Nom</b></td>';
print '<td><b>Poste</b></td><td><b>T&eacute;l</b></td>';
print "<td><b>Fax</b></td><td><b>Email</b></td>";
print "<td><a href=\"../comm/people.php3?socid=$objsoc->idp&action=addcontact\">Ajouter</a></td></tr>";
print "<td><a href=\"../comm/people.php?socid=$objsoc->idp&action=addcontact\">Ajouter</a></td></tr>";
$sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note FROM llx_socpeople as p WHERE p.fk_soc = $objsoc->idp ORDER by p.datec";
$result = $db->query($sql);
@ -358,9 +358,9 @@ if ($socid > 0)
print "<tr $bc[$var]>";
print '<td>';
//print '<a href="action/fiche.php3?action=create&actionid=5&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">';
//print '<a href="action/fiche.php?action=create&actionid=5&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">';
//print '<img border="0" src="/theme/'.$conf->theme.'/img/filenew.png"></a>&nbsp;';
print '<a href="../comm/action/fiche.php3?action=create&actionid=5&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->firstname.' '. $obj->name.'</a>&nbsp;</td>';
print '<a href="../comm/action/fiche.php?action=create&actionid=5&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->firstname.' '. $obj->name.'</a>&nbsp;</td>';
if ($obj->note)
{
@ -368,10 +368,10 @@ if ($socid > 0)
}
print "</td>";
print "<td>$obj->poste&nbsp;</td>";
print '<td><a href="../comm/action/fiche.php3?action=create&actionid=1&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->phone.'</a>&nbsp;</td>';
print '<td><a href="../comm/action/fiche.php3?action=create&actionid=2&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->fax.'</a>&nbsp;</td>';
print '<td><a href="../comm/action/fiche.php3?action=create&actionid=4&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->email.'</a>&nbsp;</td>';
print "<td><a href=\"../comm/people.php3?socid=$objsoc->idp&action=editcontact&contactid=$obj->idp\">Modifier</a></td>";
print '<td><a href="../comm/action/fiche.php?action=create&actionid=1&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->phone.'</a>&nbsp;</td>';
print '<td><a href="../comm/action/fiche.php?action=create&actionid=2&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->fax.'</a>&nbsp;</td>';
print '<td><a href="../comm/action/fiche.php?action=create&actionid=4&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->email.'</a>&nbsp;</td>';
print "<td><a href=\"../comm/people.php?socid=$objsoc->idp&action=editcontact&contactid=$obj->idp\">Modifier</a></td>";
print "</tr>\n";
$i++;
$tag = !$tag;
@ -427,7 +427,7 @@ if ($socid > 0)
print '<td width="10%">&nbsp;</td>';
if ($obj->propalrowid) {
print '<td width="40%"><a href="propal.php3?propalid='.$obj->propalrowid.'">'.$obj->libelle.'</a></td>';
print '<td width="40%"><a href="propal.php?propalid='.$obj->propalrowid.'">'.$obj->libelle.'</a></td>';
} else {
print '<td width="40%">'.$obj->libelle.'</td>';
}
@ -438,13 +438,13 @@ if ($socid > 0)
if ($obj->fk_contact) {
$contact = new Contact($db);
$contact->fetch($obj->fk_contact);
print '<td width="40%"><a href="people.php3?socid='.$objsoc->idp.'&contactid='.$contact->id.'">'.$contact->fullname.'</a></td>';
print '<td width="40%"><a href="people.php?socid='.$objsoc->idp.'&contactid='.$contact->id.'">'.$contact->fullname.'</a></td>';
} else {
print '<td width="40%">&nbsp;</td>';
}
/*
*/
print '<td width="20%"><a href="../user.php3">'.$obj->code.'</a></td>';
print '<td width="20%"><a href="../user.php">'.$obj->code.'</a></td>';
print "</tr>\n";
$i++;
}

22
htdocs/compta/index.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
/*
* Sécurité accés client
@ -71,7 +71,7 @@ print '<tr><td valign="top" width="33%">';
print '<TABLE border="0" cellspacing="0" cellpadding="3" width="100%">';
print "<TR class=\"liste_titre\">";
print '<td colspan="2">Rechercher une facture</td></tr>';
print '<form method="post" action="facture.php3">';
print '<form method="post" action="facture.php">';
print "<tr $bc[1]><td>";
print 'Num. : <input type="text" name="sf_ref"><input type="submit" value="Rechercher" class="flat"></td></tr>';
print "</form></table><br>";
@ -103,8 +103,8 @@ if ($user->comm > 0 && $conf->commercial )
{
$var=!$var;
$obj = $db->fetch_object($i);
print "<tr $bc[$var]><td><a href=\"propal.php3?propalid=$obj->rowid\">$obj->ref</a></td>";
print '<td align="right"><a href="fiche.php3?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
print "<tr $bc[$var]><td><a href=\"propal.php?propalid=$obj->rowid\">$obj->ref</a></td>";
print '<td align="right"><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
$i++;
}
print "</table><br>";
@ -132,8 +132,8 @@ if ( $db->query($sql) )
{
$obj = $db->fetch_object( $i);
$var=!$var;
print '<tr '.$bc[$var].'><td><a href="facture.php3?facid='.$obj->rowid.'">'.$obj->facnumber.'</td>';
print '<td><a href="fiche.php3?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
print '<tr '.$bc[$var].'><td><a href="facture.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</td>';
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
$i++;
}
@ -210,7 +210,7 @@ if ( $db->query($sql) )
$obj = $db->fetch_object( $i);
$var = !$var;
print "<tr $bc[$var]>";
print '<td><a href="fiche.php3?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
print '<td align="right"><a href="index.php?action=del_bookmark&bid='.$obj->bid.'">';
print '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/editdelete.png" border="0"></a></td>';
print '</tr>';
@ -262,8 +262,8 @@ if ( $db->query($sql) )
{
$obj = $db->fetch_object( $i);
$var=!$var;
print '<tr '.$bc[$var].'><td><a href="facture.php3?facid='.$obj->rowid.'">'.$obj->facnumber.'</td>';
print '<td><a href="fiche.php3?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
print '<tr '.$bc[$var].'><td><a href="facture.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</td>';
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
$i++;
}
print "</table><br>";
@ -289,7 +289,7 @@ if ( $result ) {
$obj = $db->fetch_object($i);
$var=!$var;
print "<tr $bc[$var]><td>".strftime("%d %b %Y",$obj->da)."</td><td><a href=\"action/fiche.php3\">$obj->libelle $obj->label</a></td></tr>";
print "<tr $bc[$var]><td>".strftime("%d %b %Y",$obj->da)."</td><td><a href=\"action/fiche.php\">$obj->libelle $obj->label</a></td></tr>";
$i++;
}
$db->free();
@ -329,7 +329,7 @@ if ($user->societe_id == 0)
$obj = $db->fetch_object( $i);
$var = !$var;
print "<tr $bc[$var]>";
print '<td><a href="../fourn/facture/fiche.php3?facid='.$obj->rowid.'">'.$obj->libelle.'</a></td>';
print '<td><a href="../fourn/facture/fiche.php?facid='.$obj->rowid.'">'.$obj->libelle.'</a></td>';
print '<td align="right">'.price($obj->amount).'</td>';
print '</tr>';
$i++;

2
htdocs/compta/ligne.php
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();

6
htdocs/compta/paiement.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
require("../paiement.class.php");
require("./bank/account.class.php");
@ -58,7 +58,7 @@ if ($action == 'create')
$total = $obj->total;
print_titre("Emettre un paiement");
print '<form action="facture.php3?id='.$facid.'" method="post">';
print '<form action="facture.php?id='.$facid.'" method="post">';
print '<input type="hidden" name="action" value="add_paiement">';
print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
@ -191,7 +191,7 @@ if ($action == '') {
$objp = $db->fetch_object( $i);
$var=!$var;
print "<TR $bc[$var]>";
print "<TD><a href=\"facture.php3?facid=$objp->facid\">$objp->facnumber</a></TD>\n";
print "<TD><a href=\"facture.php?facid=$objp->facid\">$objp->facnumber</a></TD>\n";
print "<TD>".strftime("%d %B %Y",$objp->dp)."</TD>\n";
print "<TD>$objp->paiement_type $objp->num_paiement</TD>\n";
print '<TD align="right">'.price($objp->amount).'</TD><td>&nbsp;</td>';

6
htdocs/compta/paiement/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
function llxHeader($head = "") {
global $user, $conf;
@ -33,9 +33,9 @@ function llxHeader($head = "") {
$menu = new Menu();
$menu->add("../facture.php3","Factures");
$menu->add("../facture.php","Factures");
$menu->add_submenu("../paiement.php3","Paiements");
$menu->add_submenu("../paiement.php","Paiements");
$menu->add(DOL_URL_ROOT."/compta/stats/","Chiffre d'affaire");

2
htdocs/compta/pmt.php
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
/*

4
htdocs/compta/pointmort.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
function pt ($db, $sql) {
$result = $db->query($sql);
@ -169,7 +169,7 @@ ppt($db, 0);
print "<br><br><br><table cellspacing=0 border=1 cellpadding=3>";
print "<tr><td bgcolor=\"#e0e0e0\"><a href=\"pmt.php3\">Paramétrer le point mort</a></td></tr>";
print "<tr><td bgcolor=\"#e0e0e0\"><a href=\"pmt.php\">Paramétrer le point mort</a></td></tr>";
print "</table>";

16
htdocs/compta/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../main.inc.php3");
require("../main.inc.php");
function llxHeader($head = "", $title="") {
global $user, $conf;
@ -32,19 +32,19 @@ function llxHeader($head = "", $title="") {
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/compta/clients.php3", "Clients");
$menu->add(DOL_URL_ROOT."/compta/clients.php", "Clients");
if ($conf->don->enabled)
{
$menu->add(DOL_URL_ROOT."/compta/dons/","Dons");
}
$menu->add(DOL_URL_ROOT."/compta/facture.php3","Factures");
$menu->add_submenu("paiement.php3","Paiements");
$menu->add(DOL_URL_ROOT."/compta/facture.php","Factures");
$menu->add_submenu("paiement.php","Paiements");
if ($user->comm > 0 && $conf->commercial && MAIN_MODULE_PROPALE)
{
$menu->add(DOL_URL_ROOT."/compta/propal.php3","Propales");
$menu->add(DOL_URL_ROOT."/compta/propal.php","Propales");
}
$menu->add(DOL_URL_ROOT."/contrat/","Contrats");
@ -62,9 +62,9 @@ function llxHeader($head = "", $title="") {
$menu->add(DOL_URL_ROOT."/fourn/index.php", "Fournisseurs");
/*
* $menu->add("ligne.php3","Compta");
* $menu->add_submenu("ligne.php3","Lignes");
* $menu->add_submenu("config.php3","Configuration");
* $menu->add("ligne.php","Compta");
* $menu->add_submenu("ligne.php","Lignes");
* $menu->add_submenu("config.php","Configuration");
*/
if ($user->compta > 0)

26
htdocs/compta/propal.php
View File

@ -19,15 +19,15 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
require("../lib/CMailFile.class.php3");
require("../lib/CMailFile.class.php");
/*
* Modules optionnels
*/
require("../project.class.php3");
require("../propal.class.php3");
require("../actioncomm.class.php3");
require("../project.class.php");
require("../propal.class.php");
require("../actioncomm.class.php");
/*
*
*/
@ -110,7 +110,7 @@ if ($propalid)
print '<table border="1" cellspacing="0" cellpadding="2" width="100%">';
print '<tr><td>Société</td><td colspan="2"><a href="fiche.php3?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
print '<tr><td>Société</td><td colspan="2"><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
print "<td valign=\"top\" width=\"50%\" rowspan=\"9\">Note :<br>". nl2br($obj->note)."</td></tr>";
//
@ -121,7 +121,7 @@ if ($propalid)
$projet = new Project($db);
$projet->fetch($obj->fk_projet);
print '<tr><td>Projet</td><td colspan="1">';
print '<a href="projet/fiche.php3?id='.$projet->id.'">';
print '<a href="projet/fiche.php?id='.$projet->id.'">';
print $projet->title.'</a></td></tr>';
}
print "<tr><td>Destinataire</td><td colspan=\"2\">$obj->firstname $obj->name &lt;$obj->email&gt;</td></tr>";
@ -223,7 +223,7 @@ if ($propalid)
$objp = $db->fetch_object( $i);
$var=!$var;
print "<TR bgcolor=\"#e0e0e0\">";
print "<TD><a href=\"../compta/facture.php3?facid=$objp->facid\">$objp->facnumber</a>";
print "<TD><a href=\"../compta/facture.php?facid=$objp->facid\">$objp->facnumber</a>";
if ($objp->paye)
{
print " (<b>pay&eacute;e</b>)";
@ -260,7 +260,7 @@ if ($propalid)
if ($obj->statut == 2)
{
print '<td bgcolor="#e0e0e0" align="center" width="25%">';
print "<a href=\"facture.php3?propalid=$propalid&action=create\">Emettre une facture</td>";
print "<a href=\"facture.php?propalid=$propalid&action=create\">Emettre une facture</td>";
}
else
{
@ -312,7 +312,7 @@ if ($propalid)
$objp = $db->fetch_object($i);
$var=!$var;
print "<tr $bc[$var]><td>[$objp->ref]</TD>\n";
print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php3?id='.$objp->prodid.'">'.$objp->product.'</td>';
print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->prodid.'">'.$objp->product.'</td>';
print "<td align=\"right\">".price($objp->price)."</TD>";
print '<td>&nbsp;</td>';
print "<td align=\"center\">".$objp->qty."</td></tr>\n";
@ -440,7 +440,7 @@ if ($propalid)
$var=!$var;
print "<TR $bc[$var]>";
print "<TD><a href=\"$PHP_SELF?propalid=$objp->propalid\">$objp->ref</a></TD>\n";
print "<TD><a href=\"fiche.php3?socid=$objp->idp\">$objp->nom</a></TD>\n";
print "<TD><a href=\"fiche.php?socid=$objp->idp\">$objp->nom</a></TD>\n";
$now = time();
$lim = 3600 * 24 * 15 ;
@ -459,9 +459,9 @@ if ($propalid)
$m = strftime("%m",$objp->dp);
print strftime("%d",$objp->dp)."\n";
print " <a href=\"propal.php3?year=$y&month=$m\">";
print " <a href=\"propal.php?year=$y&month=$m\">";
print strftime("%B",$objp->dp)."</a>\n";
print " <a href=\"propal.php3?year=$y\">";
print " <a href=\"propal.php?year=$y\">";
print strftime("%Y",$objp->dp)."</a></TD>\n";
print "<TD align=\"right\">".price($objp->price)."</TD>\n";

2
htdocs/compta/resultat/caisse.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
/*
*

8
htdocs/compta/resultat/index.php
View File

@ -19,9 +19,9 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("../../tva.class.php3");
require("../../chargesociales.class.php3");
require("./pre.inc.php");
require("../../tva.class.php");
require("../../chargesociales.class.php");
/*
*
*/
@ -64,7 +64,7 @@ if ($result) {
$var=!$var;
print "<TR $bc[$var]><td>&nbsp</td>";
print "<td>Factures <a href=\"/compta/facture.php3?facid=$objp->facid\">$objp->facnumber</a> $objp->nom</TD>\n";
print "<td>Factures <a href=\"/compta/facture.php?facid=$objp->facid\">$objp->facnumber</a> $objp->nom</TD>\n";
print "<TD align=\"right\">".price($objp->amount)."</TD>\n";

6
htdocs/compta/resultat/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
function llxHeader($head = "") {
global $conf;
@ -33,8 +33,8 @@ function llxHeader($head = "") {
$menu = new Menu();
$menu->add("/compta/facture.php3","Factures");
$menu->add("../charges.php3","Charges");
$menu->add("/compta/facture.php","Factures");
$menu->add("../charges.php","Charges");
$menu->add(DOL_URL_ROOT."/compta/stats/","Chiffre d'affaire");

2
htdocs/compta/sociales/index.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();

2
htdocs/compta/sociales/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
function llxHeader($head = "")
{

4
htdocs/compta/stats/casoc.php
View File

@ -88,10 +88,10 @@ if ($result)
$var=!$var;
print "<TR $bc[$var]>";
print "<TD><a href=\"../fiche.php3?socid=$objp->idp\">$objp->nom</a></TD>\n";
print "<TD><a href=\"../fiche.php?socid=$objp->idp\">$objp->nom</a></TD>\n";
print '<TD align="right">'.price($objp->ca).'</td>';
print '<td align="right">'.price(100 / $catotal * $objp->ca).'%</td>';
print "<td align=\"center\"><a href=\"../facture.php3?socidp=$objp->idp\">Voir les factures</a></TD>\n";
print "<td align=\"center\"><a href=\"../facture.php?socidp=$objp->idp\">Voir les factures</a></TD>\n";
print "</TR>\n";
$i++;

4
htdocs/compta/stats/comp.php
View File

@ -69,7 +69,7 @@ function propals ($db, $year, $month) {
print "<TD><a href=\"comp.php?socidp=$objp->idp\">$objp->nom</a></TD>\n";
print "<TD><a href=\"../../comm/propal.php3?propalid=$objp->propalid\">$objp->ref</a></TD>\n";
print "<TD><a href=\"../../comm/propal.php?propalid=$objp->propalid\">$objp->ref</a></TD>\n";
print "<TD align=\"right\">".strftime("%d %B %Y",$objp->dp)."</TD>\n";
@ -125,7 +125,7 @@ function factures ($db, $year, $month, $paye) {
$var=!$var;
print "<TR $bc[$var]>";
print "<TD><a href=\"comp.php?socidp=$objp->idp\">$objp->nom</a></TD>\n";
print "<TD><a href=\"../facture.php3?facid=$objp->facid\">$objp->facnumber</a></TD>\n";
print "<TD><a href=\"../facture.php?facid=$objp->facid\">$objp->facnumber</a></TD>\n";
if ($objp->df > 0 )
{
print "<TD align=\"right\">".strftime("%d %B %Y",$objp->df)."</TD>\n";

4
htdocs/compta/stats/exercices.php
View File

@ -69,7 +69,7 @@ function propals ($db, $year, $month) {
print "<TD><a href=\"comp.php?socidp=$objp->idp\">$objp->nom</a></TD>\n";
print "<TD><a href=\"../comm/propal.php3?propalid=$objp->propalid\">$objp->ref</a></TD>\n";
print "<TD><a href=\"../comm/propal.php?propalid=$objp->propalid\">$objp->ref</a></TD>\n";
print "<TD align=\"right\">".strftime("%d %B %Y",$objp->dp)."</TD>\n";
@ -122,7 +122,7 @@ function factures ($db, $year, $month, $paye) {
$var=!$var;
print "<TR $bc[$var]>";
print "<TD><a href=\"comp.php?socidp=$objp->idp\">$objp->nom</a></TD>\n";
print "<TD><a href=\"facture.php3?facid=$objp->facid\">$objp->facnumber</a></TD>\n";
print "<TD><a href=\"facture.php?facid=$objp->facid\">$objp->facnumber</a></TD>\n";
if ($objp->df > 0 ) {
print "<TD align=\"right\">".strftime("%d %B %Y",$objp->df)."</TD>\n";
} else {

2
htdocs/compta/stats/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
function llxHeader($head = "") {
global $user, $conf;

2
htdocs/compta/tva.php
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
/*

6
htdocs/compta/tva/fiche.php
View File

@ -19,8 +19,8 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("../../tva.class.php3");
require("./pre.inc.php");
require("../../tva.class.php");
$mesg = '';
@ -180,7 +180,7 @@ if ($action == 'create')
}
else
{
print '<td width="20%" align="center">[<a href="fiche.php3?action=edit&id='.$id.'">Editer</a>]</td>';
print '<td width="20%" align="center">[<a href="fiche.php?action=edit&id='.$id.'">Editer</a>]</td>';
}
print '<td width="20%" align="center">-</td>';
print '</table><br>';

4
htdocs/compta/tva/index.php
View File

@ -19,8 +19,8 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("../../tva.class.php3");
require("./pre.inc.php");
require("../../tva.class.php");
/*
*

2
htdocs/compta/tva/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
function llxHeader($head = "") {
global $user, $conf;

4
htdocs/compta/tva/reglement.php
View File

@ -19,8 +19,8 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("../../tva.class.php3");
require("./pre.inc.php");
require("../../tva.class.php");
/*
*

4
htdocs/compta/voyage/bilan.php
View File

@ -20,8 +20,8 @@
*
*/
require("./pre.inc.php3");
require("./reduc.class.php3");
require("./pre.inc.php");
require("./reduc.class.php");
llxHeader();

2
htdocs/compta/voyage/index.php
View File

@ -20,7 +20,7 @@
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();

10
htdocs/compta/voyage/pre.inc.php
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
function llxHeader($head = "") {
global $user, $conf;
@ -36,11 +36,11 @@ function llxHeader($head = "") {
$menu->add("index.php","Voyages");
$menu->add_submenu("index.php","Voyages");
$menu->add_submenu("bilan.php3","Bilan");
$menu->add_submenu("reduc.php3","Reduc");
$menu->add_submenu("voyage.php3","Voyage");
$menu->add_submenu("bilan.php","Bilan");
$menu->add_submenu("reduc.php","Reduc");
$menu->add_submenu("voyage.php","Voyage");
$menu->add("/compta/facture.php3","Factures");
$menu->add("/compta/facture.php","Factures");
$menu->add("/compta/bank/index.php","Bank");

2
htdocs/compta/voyage/reduc.php
View File

@ -20,7 +20,7 @@
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();

2
htdocs/compta/voyage/voyage.php
View File

@ -20,7 +20,7 @@
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();
?>

10
htdocs/contact.php
View File

@ -20,7 +20,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
/*
* Sécurité accés client
@ -120,15 +120,15 @@ if ($result)
print "<TR $bc[$var]>";
print '<TD><a href="'.DOL_URL_ROOT.'/comm/people.php3?contactid='.$obj->cidp.'&socid='.$obj->idp.'">'.$obj->name.'</a></TD>';
print '<TD><a href="'.DOL_URL_ROOT.'/comm/people.php?contactid='.$obj->cidp.'&socid='.$obj->idp.'">'.$obj->name.'</a></TD>';
print "<TD>$obj->firstname</TD>";
print '<TD><a href="contact.php?socid='.$obj->idp.'"><img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/filter.png" border="0"></a>&nbsp;';
print "<a href=\"".DOL_URL_ROOT."/comm/fiche.php3?socid=$obj->idp\">$obj->nom</A></td>\n";
print "<a href=\"".DOL_URL_ROOT."/comm/fiche.php?socid=$obj->idp\">$obj->nom</A></td>\n";
print '<td><a href="action/fiche.php3?action=create&actionid=4&contactid='.$obj->cidp.'&socid='.$obj->idp.'">'.$obj->email.'</a>&nbsp;</td>';
print '<td><a href="action/fiche.php?action=create&actionid=4&contactid='.$obj->cidp.'&socid='.$obj->idp.'">'.$obj->email.'</a>&nbsp;</td>';
print '<td><a href="action/fiche.php3?action=create&actionid=1&contactid='.$obj->cidp.'&socid='.$obj->idp.'">'.$obj->phone.'</a>&nbsp;</td>';
print '<td><a href="action/fiche.php?action=create&actionid=1&contactid='.$obj->cidp.'&socid='.$obj->idp.'">'.$obj->phone.'</a>&nbsp;</td>';
print "</TR>\n";
$i++;

2
htdocs/contrat/contrat.class.php
View File

@ -32,7 +32,7 @@ class Contrat
Function Contrat($DB)
{
include_once("../societe.class.php3");
include_once("../societe.class.php");
$this->db = $DB ;
$this->product = new Product($DB);
$this->societe = new Societe($DB);

4
htdocs/contrat/fiche.php
View File

@ -22,7 +22,7 @@
require("./pre.inc.php");
require("./contrat.class.php");
require("../facture.class.php3");
require("../facture.class.php");
llxHeader();
@ -149,7 +149,7 @@ else
if ($contrat->factureid)
{
print '<td>Société</td><td>'.$contrat->societe->nom_url.'</td>';
print '<td>Facture</td><td><a href="../compta/facture.php3?facid='.$contrat->factureid.'">Facture</td>';
print '<td>Facture</td><td><a href="../compta/facture.php?facid='.$contrat->factureid.'">Facture</td>';
}
else
{

2
htdocs/contrat/index.php
View File

@ -71,7 +71,7 @@ if ( $db->query($sql) )
$var=!$var;
print "<TR $bc[$var]>";
print "<TD><a href=\"fiche.php?id=$obj->cid\">$obj->label</a></td>\n";
print "<TD><a href=\"../comm/fiche.php3?socid=$obj->sidp\">$obj->nom</a></TD>\n";
print "<TD><a href=\"../comm/fiche.php?socid=$obj->sidp\">$obj->nom</a></TD>\n";
print '<td align="center">';
if ($obj->enservice == 1)
{

2
htdocs/contrat/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../main.inc.php3");
require("../main.inc.php");
$types[0] = "produit";
$types[1] = "service";

2
htdocs/domain/index.php
View File

@ -20,7 +20,7 @@
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();

4
htdocs/domain/pre.inc.php
View File

@ -20,7 +20,7 @@
*
*/
require ("../main.inc.php3");
require ("../main.inc.php");
function llxHeader($head = "") {
@ -36,7 +36,7 @@ function llxHeader($head = "") {
$menu->add("/comm/index.php", "Commercial");
$menu->add_submenu("/comm/clients.php3", "Clients");
$menu->add_submenu("/comm/clients.php", "Clients");
$menu->add_submenu("/compta/", "Factures");

4
htdocs/fichinter/index.php
View File

@ -20,7 +20,7 @@
*
*/
require("./pre.inc.php");
require("../contact.class.php3");
require("../contact.class.php");
if ($user->societe_id > 0)
{
@ -85,7 +85,7 @@ if ( $db->query($sql) )
print "<TD><a href=\"fiche.php?id=$objp->fichid\">$objp->ref</a></TD>\n";
print '<td><a href="index.php?socid='.$objp->idp.'"><img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/filter.png" border="0"></a>&nbsp;';
print "<a href=\"../comm/fiche.php3?socid=$objp->idp\">$objp->nom</a></TD>\n";
print "<a href=\"../comm/fiche.php?socid=$objp->idp\">$objp->nom</a></TD>\n";
print "<TD>".strftime("%d %B %Y",$objp->dp)."</TD>\n";
print '<TD align="center">'.sprintf("%.1f",$objp->duree).'</TD>';
print '<TD align="center">'.$objp->fk_statut.'</TD>';

6
htdocs/fourn/contact.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
llxHeader();
@ -125,8 +125,8 @@ if ($result) {
print "<TD>$obj->name</TD>";
print "<TD>$obj->firstname</TD>";
print '<TD><a href="contact.php3?socid='.$obj->idp.'"><img src="/theme/'.$conf->theme.'/img/filter.png" border="0"></a>&nbsp;';
print "<a href=\"fiche.php3?socid=$obj->idp\">$obj->nom</A></td>\n";
print '<TD><a href="contact.php?socid='.$obj->idp.'"><img src="/theme/'.$conf->theme.'/img/filter.png" border="0"></a>&nbsp;';
print "<a href=\"fiche.php?socid=$obj->idp\">$obj->nom</A></td>\n";
print "<TD>$obj->email&nbsp;</TD>\n";
print '<td>'.$obj->phone.'</td>';

8
htdocs/fourn/facture/fiche.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
/*
* Sécurité accés client
@ -312,7 +312,7 @@ else
print '<td align="center">'.price($fac->lignes[$i][5])."</td>";
print '<td align="right">'.price($fac->lignes[$i][6])."</td>";
print '<td align="center">[';
print '<a href="fiche.php3?facid='.$facid.'&action=del_ligne&ligne_id='.$fac->lignes[$i][7].'">Supprimer</a>]</td>';
print '<a href="fiche.php?facid='.$facid.'&action=del_ligne&ligne_id='.$fac->lignes[$i][7].'">Supprimer</a>]</td>';
print '</tr>';
}
@ -351,7 +351,7 @@ else
* Facture
*/
print '<table border="1" cellspacing="0" cellpadding="2" width="100%">';
print "<tr><td>Société</td><td colspan=\"3\"><b><a href=\"../fiche.php3?socid=$obj->socidp\">$obj->socnom</a></b></td>";
print "<tr><td>Société</td><td colspan=\"3\"><b><a href=\"../fiche.php?socid=$obj->socidp\">$obj->socnom</a></b></td>";
print "<td align=\"right\"><a href=\"index.php?socidp=$obj->socidp\">Autres factures</a></td>\n";
print "</tr>";
print "<tr><td>Date</td><td colspan=\"4\">".strftime("%A %d %B %Y",$obj->df)."</td></tr>\n";
@ -472,7 +472,7 @@ else
if ($obj->statut == 0 && $user->societe_id == 0)
{
print '<td align="center" width="25%">[<a href="fiche.php3?facid='.$obj->rowid.'&action=edit">Editer</a>]</td>';
print '<td align="center" width="25%">[<a href="fiche.php?facid='.$obj->rowid.'&action=edit">Editer</a>]</td>';
}
else
{

12
htdocs/fourn/facture/index.php
View File

@ -19,8 +19,8 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("../../contact.class.php3");
require("./pre.inc.php");
require("../../contact.class.php");
llxHeader();
@ -139,10 +139,10 @@ if ($result)
$var=!$var;
print "<TR $bc[$var]>";
print "<TD><a href=\"fiche.php3?facid=$obj->facid\">$obj->facnumber</A></td>\n";
print "<TD><a href=\"fiche.php3?facid=$obj->facid\">".strftime("%d %b %Y",$obj->datef)."</A></td>\n";
print '<TD><a href="fiche.php3?facid='.$obj->facid.'">'.stripslashes("$obj->libelle").'</A></td>';
print "<TD><a href=\"../fiche.php3?socid=$obj->socid\">$obj->nom</A></td>\n";
print "<TD><a href=\"fiche.php?facid=$obj->facid\">$obj->facnumber</A></td>\n";
print "<TD><a href=\"fiche.php?facid=$obj->facid\">".strftime("%d %b %Y",$obj->datef)."</A></td>\n";
print '<TD><a href="fiche.php?facid='.$obj->facid.'">'.stripslashes("$obj->libelle").'</A></td>';
print "<TD><a href=\"../fiche.php?socid=$obj->socid\">$obj->nom</A></td>\n";
print '<TD align="right">'.price($obj->total_ht).'</TD>';
print '<TD align="center">'.$yn[$obj->paye].'</TD>';

8
htdocs/fourn/facture/paiement.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
require("./paiementfourn.class.php");
/*
@ -49,7 +49,7 @@ if ($action == 'add') {
if ( $paiementfourn->create($user) )
{
Header("Location: fiche.php3?facid=$facid");
Header("Location: fiche.php?facid=$facid");
}
$action = '';
@ -88,7 +88,7 @@ if ($action == 'create')
print "<tr class=\"liste_titre\"><td colspan=\"3\">Facture</td>";
print '<tr><td>Numéro :</td><td colspan="2">';
print '<a href="fiche.php3?facid='.$facid.'">'.$obj->facnumber.'</a></td></tr>';
print '<a href="fiche.php?facid='.$facid.'">'.$obj->facnumber.'</a></td></tr>';
print "<tr><td>Société :</td><td colspan=\"2\">$obj->nom</td></tr>";
print "<tr><td>Montant :</td><td colspan=\"2\">".price($obj->total_ttc)." euros TTC</td></tr>";
@ -195,7 +195,7 @@ if ($action == '') {
$objp = $db->fetch_object( $i);
$var=!$var;
print "<TR $bc[$var]>";
print "<TD><a href=\"fiche.php3?facid=$objp->facid\">$objp->facnumber</a></TD>\n";
print "<TD><a href=\"fiche.php?facid=$objp->facid\">$objp->facnumber</a></TD>\n";
print "<TD>".strftime("%d %B %Y",$objp->dp)."</TD>\n";
print "<TD>$objp->paiement_type $objp->num_paiement</TD>\n";
print '<TD align="right">'.price($objp->amount).'</TD><td>&nbsp;</td>';

6
htdocs/fourn/facture/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../../main.inc.php3");
require("../../main.inc.php");
require("../../facturefourn.class.php");
function llxHeader($head = "", $urlp = "") {
@ -38,7 +38,7 @@ function llxHeader($head = "", $urlp = "") {
if ($user->societe_id == 0)
{
$menu->add_submenu(DOL_URL_ROOT."/soc.php3?&action=create","Nouvelle société");
$menu->add_submenu(DOL_URL_ROOT."/soc.php?&action=create","Nouvelle société");
}
@ -46,7 +46,7 @@ function llxHeader($head = "", $urlp = "") {
if ($user->societe_id == 0)
{
$menu->add_submenu("fiche.php3?action=create","Nouvelle");
$menu->add_submenu("fiche.php?action=create","Nouvelle");
}
$menu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", "Paiements");

26
htdocs/fourn/fiche.php
View File

@ -20,8 +20,8 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("../contact.class.php3");
require("./pre.inc.php");
require("../contact.class.php");
llxHeader();
@ -150,9 +150,9 @@ if ($socid > 0) {
print "<tr><td><div class=\"titre\">Fiche fournisseur : $objsoc->nom</div></td>";
print '<td><a href="facture/fiche.php3?action=create&socid='.$objsoc->idp.'">Nouvelle Facture <img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/filenew.png" border="0" alt="Nouvelle facture"></a></td>';
print '<td><a href="facture/fiche.php?action=create&socid='.$objsoc->idp.'">Nouvelle Facture <img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/filenew.png" border="0" alt="Nouvelle facture"></a></td>';
print "<td align=\"center\">[<a href=\"../soc.php3?socid=$objsoc->idp&action=edit\">Editer</a>]</td>";
print "<td align=\"center\">[<a href=\"../soc.php?socid=$objsoc->idp&action=edit\">Editer</a>]</td>";
@ -223,7 +223,7 @@ if ($socid > 0) {
$obj = $db->fetch_object( $i);
$tag = !$tag;
print "<tr $bc[$tag]>";
print '<td><a href="projet/fiche.php3?id='.$obj->rowid.'">'.$obj->title.'</a></td>';
print '<td><a href="projet/fiche.php?id='.$obj->rowid.'">'.$obj->title.'</a></td>';
print "<td align=\"right\">".strftime("%d %b %Y", $obj->do) ."</td></tr>";
$i++;
@ -269,7 +269,7 @@ if ($socid > 0) {
print "<tr><td><b>Pr&eacute;nom Nom</b></td>";
print '<td><b>Poste</b></td><td><b>T&eacute;l</b></td>';
print "<td><b>Fax</b></td><td><b>Email</b></td>";
print "<td><a href=\"people.php3?socid=$objsoc->idp&action=addcontact\">Ajouter</a></td></tr>";
print "<td><a href=\"people.php?socid=$objsoc->idp&action=addcontact\">Ajouter</a></td></tr>";
$sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note";
$sql .= " FROM llx_socpeople as p WHERE p.fk_soc = $objsoc->idp ORDER by p.datec";
@ -288,10 +288,10 @@ if ($socid > 0) {
}
print "</td>";
print "<td>$obj->poste&nbsp;</td>";
print '<td><a href="actioncomm.php3?action=create&actionid=1&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->phone.'</a>&nbsp;</td>';
print '<td><a href="actioncomm.php3?action=create&actionid=2&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->fax.'</a>&nbsp;</td>';
print '<td><a href="actioncomm.php3?action=create&actionid=4&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->email.'</a>&nbsp;</td>';
print "<td><a href=\"people.php3?socid=$objsoc->idp&action=editcontact&contactid=$obj->idp\">Modifier</a></td>";
print '<td><a href="actioncomm.php?action=create&actionid=1&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->phone.'</a>&nbsp;</td>';
print '<td><a href="actioncomm.php?action=create&actionid=2&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->fax.'</a>&nbsp;</td>';
print '<td><a href="actioncomm.php?action=create&actionid=4&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->email.'</a>&nbsp;</td>';
print "<td><a href=\"people.php?socid=$objsoc->idp&action=editcontact&contactid=$obj->idp\">Modifier</a></td>";
print "</tr>\n";
$i++;
$tag = !$tag;
@ -356,7 +356,7 @@ if ($socid > 0) {
print "<TD>" .strftime("%H:%M",$obj->da)."</TD>\n";
if ($obj->propalrowid) {
print '<td width="40%"><a href="propal.php3?propalid='.$obj->propalrowid.'">'.$obj->libelle.'</a></td>';
print '<td width="40%"><a href="propal.php?propalid='.$obj->propalrowid.'">'.$obj->libelle.'</a></td>';
} else {
print '<td width="40%">'.$obj->libelle.'</td>';
}
@ -367,13 +367,13 @@ if ($socid > 0) {
if ($obj->fk_contact) {
$contact = new Contact($db);
$contact->fetch($obj->fk_contact);
print '<td width="40%"><a href="people.php3?socid='.$objsoc->idp.'&contactid='.$contact->id.'">'.$contact->fullname.'</a></td>';
print '<td width="40%"><a href="people.php?socid='.$objsoc->idp.'&contactid='.$contact->id.'">'.$contact->fullname.'</a></td>';
} else {
print '<td width="40%">&nbsp;</td>';
}
/*
*/
print '<td width="20%"><a href="'.DOL_URL_ROOT.'/user/fiche.php3?id='.$obj->fk_user_author.'">'.$obj->code.'</a></td>';
print '<td width="20%"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->fk_user_author.'">'.$obj->code.'</a></td>';
print "</tr>\n";
$i++;
$tag = !$tag;

8
htdocs/fourn/index.php
View File

@ -19,8 +19,8 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("../contact.class.php3");
require("./pre.inc.php");
require("../contact.class.php");
/*
* Sécurité accés client
@ -156,12 +156,12 @@ if ($result)
$var=!$var;
print "<TR $bc[$var]>";
print "<TD><a href=\"fiche.php3?socid=$obj->idp\">$obj->nom</A></td>\n";
print "<TD><a href=\"fiche.php?socid=$obj->idp\">$obj->nom</A></td>\n";
print "<TD>".$obj->ville."</TD>\n";
print "<TD align=\"center\">$obj->prefix_comm&nbsp;</TD>\n";
print '<td><a href="facture/fiche.php3?action=create&socid='.$obj->idp.'"><img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/filenew.png" border="0" alt="Nouvelle facture"></a></td>';
print '<td><a href="facture/fiche.php?action=create&socid='.$obj->idp.'"><img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/filenew.png" border="0" alt="Nouvelle facture"></a></td>';
print "</tr>\n";
$i++;

16
htdocs/fourn/people.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("./pre.inc.php3");
require("./pre.inc.php");
if ($sortorder == "")
{
@ -47,7 +47,7 @@ if ($action == 'add') {
$sql .= " VALUES (now(),$socid,'$name','$firstname','$poste','$phone','$fax','$email')";
$result = $db->query($sql);
if ($result) {
Header("Location: fiche.php3?socid=$socid");
Header("Location: fiche.php?socid=$socid");
}
}
}
@ -60,7 +60,7 @@ if ($action == 'update') {
$sql .= " WHERE idp=$contactid";
$result = $db->query($sql);
if ($result) {
Header("Location: fiche.php3?socid=$socid");
Header("Location: fiche.php?socid=$socid");
}
}
}
@ -94,8 +94,8 @@ if ($socid > 0) {
*
*/
print "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"3\">\n";
print "<tr><td><div class=\"titre\">Contacts pour la société : <a href=\"fiche.php3?socid=$objsoc->idp\">$objsoc->nom</a></div></td>";
print "<td align=\"center\">[<a href=\"people.php3?socid=$socid&action=addcontact\">Ajouter un contact</a>]</td>";
print "<tr><td><div class=\"titre\">Contacts pour la société : <a href=\"fiche.php?socid=$objsoc->idp\">$objsoc->nom</a></div></td>";
print "<td align=\"center\">[<a href=\"people.php?socid=$socid&action=addcontact\">Ajouter un contact</a>]</td>";
print '</td></tr></table>';
print "<hr>";
@ -162,7 +162,7 @@ if ($socid > 0) {
if ($action == 'addcontact') {
print "<br><form method=\"post\" action=\"people.php3?socid=$socid\">";
print "<br><form method=\"post\" action=\"people.php?socid=$socid\">";
print "<input type=\"hidden\" name=\"action\" value=\"add\">";
print "<table border=0>";
print "<tr><td colspan=\"2\"><div class=\"titre\">Ajouter le contact</div></td>";
@ -190,7 +190,7 @@ if ($socid > 0) {
$obj = $db->fetch_object( 0);
}
print "<form method=\"post\" action=\"people.php3?socid=$socid\">";
print "<form method=\"post\" action=\"people.php?socid=$socid\">";
print "<input type=\"hidden\" name=\"action\" value=\"update\">";
print "<input type=\"hidden\" name=\"contactid\" value=\"$contactid\">";
print "<table border=0>";
@ -239,7 +239,7 @@ if ($socid > 0) {
}
print "<td>". strftime("%d %b %Y %H:%M", $obj->da) ."</td>";
if ($obj->propalrowid) {
print "<td><a href=\"propal.php3?propalid=$obj->propalrowid\">$obj->libelle</a></td>";
print "<td><a href=\"propal.php?propalid=$obj->propalrowid\">$obj->libelle</a></td>";
} else {
print "<td>$obj->libelle</td>";
}

8
htdocs/fourn/pre.inc.php
View File

@ -19,7 +19,7 @@
* $Source$
*
*/
require("../main.inc.php3");
require("../main.inc.php");
function llxHeader($head = "", $urlp = "")
{
@ -40,16 +40,16 @@ function llxHeader($head = "", $urlp = "")
*/
if ($user->societe_id == 0)
{
$menu->add_submenu(DOL_URL_ROOT."/soc.php3?&action=create","Nouvelle société");
$menu->add_submenu(DOL_URL_ROOT."/soc.php?&action=create","Nouvelle société");
}
$menu->add_submenu("contact.php3","Contacts");
$menu->add_submenu("contact.php","Contacts");
$menu->add(DOL_URL_ROOT."/fourn/facture/index.php", "Factures");
if ($user->societe_id == 0)
{
$menu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php3?action=create","Nouvelle");
$menu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create","Nouvelle");
}
left_menu($menu->liste);

2
htdocs/includes/boxes/box_clients.php
View File

@ -44,7 +44,7 @@ if ($result)
$info_box_contents[$i][0] = array('align' => 'left',
'text' => $objp->nom,
'url' => DOL_URL_ROOT."/comm/fiche.php3?socid=".$objp->idp);
'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->idp);
$i++;
}

Some files were not shown because too many files have changed in this diff Show More