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

Remove pre.inc.php

Browse Source
This commit is contained in:
Laurent Destailleur 2010-03-27 14:40:39 +00:00
parent 8e398cc069
commit d2aff43936
67 changed files with 303 additions and 897 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/clients.php
View File

@ -25,7 +25,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once("./pre.inc.php"); require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");

6
htdocs/compta/comptacompte.class.php
View File

@ -24,9 +24,9 @@
*/ */
/*! \class ComptaCompte /** \class ComptaCompte
\brief Classe permettant la gestion des comptes generaux de compta * \brief Classe permettant la gestion des comptes generaux de compta
*/ */
class ComptaCompte class ComptaCompte
{ {

2
htdocs/compta/facture.php
View File

@ -28,7 +28,7 @@
* \version $Id$ * \version $Id$
*/ */
require('./pre.inc.php'); require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php');
require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php');

2
htdocs/compta/fiche.php
View File

@ -26,7 +26,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");

2
htdocs/compta/index.php
View File

@ -25,7 +25,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php');
require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.facture.class.php');

2
htdocs/compta/paiement.php
View File

@ -26,7 +26,7 @@
* \version $Id$ * \version $Id$
*/ */
include_once('./pre.inc.php'); require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php');
include_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); include_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php');
include_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); include_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php');

2
htdocs/compta/paiement_charge.php
View File

@ -23,7 +23,7 @@
* \version $Id$ * \version $Id$
*/ */
include_once("./pre.inc.php"); require('../main.inc.php');
include_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php");
include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php");

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

@ -27,7 +27,7 @@
* \version $Id$ * \version $Id$
*/ */
require('./pre.inc.php'); require('../../main.inc.php');
include_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php");
require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php');
require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");

50
htdocs/compta/payment_sc/pre.inc.php
View File

@ -1,50 +0,0 @@
<?php
/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/compta/paiement/pre.inc.php
* \ingroup compta
* \brief Fichier gestionnaire du menu compta paiement
* \version $Id$
*/
require("../../main.inc.php");
$langs->load("bills");
$langs->load("compta");
$langs->load("propal");
function llxHeader($head = '', $title='', $help_url='')
{
global $user, $conf, $langs;
$langs->load("compta");
$langs->load("propal");
top_menu($head, $title, $target);
$menu = new Menu();
$menu->add("index.php",$langs->trans("Contributions"));
$menu->add_submenu(DOL_URL_ROOT."/compta/sociales/index.php",$langs->trans("SocialContributions"));
left_menu($menu->liste);
}
?>

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

@ -1,135 +0,0 @@
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/compta/pre.inc.php
* \ingroup compta
* \brief Fichier gestionnaire du menu compta
* \version $Id$
*/
require("../main.inc.php");
function llxHeader($head = '', $title='', $help_url='')
{
global $user, $conf, $langs;
top_menu($head, $title);
$menu = new Menu();
// Les recettes
if ($conf->societe->enabled)
{
$langs->load("commercial");
$menu->add(DOL_URL_ROOT."/compta/clients.php", $langs->trans("Customers"));
}
if ($conf->propal->enabled)
{
$langs->load("propal");
$menu->add(DOL_URL_ROOT."/compta/propal.php",$langs->trans("Prop"));
}
if ($conf->contrat->enabled)
{
$langs->load("contracts");
$menu->add(DOL_URL_ROOT."/contrat/",$langs->trans("Contracts"));
}
if ($conf->don->enabled)
{
$langs->load("donations");
$menu->add(DOL_URL_ROOT."/compta/dons/",$langs->trans("Donations"));
}
if ($conf->facture->enabled)
{
$langs->load("bills");
$menu->add(DOL_URL_ROOT."/compta/facture.php",$langs->trans("Bills"));
$menu->add_submenu(DOL_URL_ROOT."/compta/facture/impayees.php",$langs->trans("Unpaid"));
$menu->add_submenu(DOL_URL_ROOT."/compta/paiement/liste.php",$langs->trans("Payments"));
$menu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php", $langs->trans("Repeatable"));
$menu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/", $langs->trans("Statistics"));
}
if ($conf->commande->enabled && $conf->facture->enabled)
{
$langs->load("orders");
$menu->add(DOL_URL_ROOT."/compta/commande/liste.php?leftmenu=orders&amp;afacturer=1", $langs->trans("MenuOrdersToBill"));
}
// Les depenses
if ($conf->fournisseur->enabled)
{
$langs->load("suppliers");
$menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers"));
}
if ($conf->deplacement->enabled)
{
$langs->load("trips");
$menu->add(DOL_URL_ROOT."/compta/deplacement/", $langs->trans("Trips"));
}
if ($conf->tax->enabled && $conf->compta->tva && $user->societe_id == 0)
{
$menu->add(DOL_URL_ROOT."/compta/tva/index.php",$langs->trans("VAT"));
}
if ($conf->tax->enabled)
{
$menu->add(DOL_URL_ROOT."/compta/charges/index.php",$langs->trans("Charges"));
}
// Vision des recettes-depenses
if ($conf->banque->enabled && $user->rights->banque->lire)
{
$langs->load("banks");
$menu->add(DOL_URL_ROOT."/compta/bank/",$langs->trans("Bank"));
}
$menu->add(DOL_URL_ROOT."/compta/stats/",$langs->trans("Reportings"));
if ($conf->prelevement->enabled)
{
$menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrders"));
}
if ($conf->compta->enabled)
{
if ($user->rights->compta->ventilation->creer)
{
$menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation"));
}
if ($user->rights->compta->ventilation->parametrer)
{
$menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param"));
}
}
left_menu($menu->liste, $help_url);
}
?>

2
htdocs/compta/prelevement/bon-prelevement.class.php
View File

@ -24,7 +24,7 @@
\version $Id$ \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/commonobject.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe.class.php");

4
htdocs/compta/prelevement/bon.php
View File

@ -20,11 +20,11 @@
/** /**
\file htdocs/compta/prelevement/bon.php \file htdocs/compta/prelevement/bon.php
\ingroup prelevement \ingroup prelevement
\brief Fiche aper<EFBFBD>u du bon de prelevement \brief Fiche apercu du bon de prelevement
\version $Id$ \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
$langs->load("bills"); $langs->load("bills");

2
htdocs/compta/prelevement/bons.php
View File

@ -25,7 +25,7 @@
\version $Id$ \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
$langs->load("widthdrawals"); $langs->load("widthdrawals");

2
htdocs/compta/prelevement/config.php
View File

@ -25,7 +25,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
// Security check // Security check

8
htdocs/compta/prelevement/create.php
View File

@ -18,12 +18,12 @@
*/ */
/** /**
\file htdocs/compta/prelevement/create.php * \file htdocs/compta/prelevement/create.php
\brief Prelevement * \brief Prelevement
\version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php");
require_once DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php";
require_once DOL_DOCUMENT_ROOT."/societe.class.php"; require_once DOL_DOCUMENT_ROOT."/societe.class.php";

4
htdocs/compta/prelevement/demandes.php
View File

@ -20,11 +20,11 @@
/** /**
\file htdocs/compta/prelevement/demandes.php \file htdocs/compta/prelevement/demandes.php
\brief Page de la liste des demandes de pr<EFBFBD>l<EFBFBD>vements \brief Page de la liste des demandes de prelevements
\version $Id$ \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php"; require_once DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php";
require_once DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php";
require_once DOL_DOCUMENT_ROOT."/societe.class.php"; require_once DOL_DOCUMENT_ROOT."/societe.class.php";

6
htdocs/compta/prelevement/factures.php
View File

@ -21,17 +21,17 @@
/** /**
\file htdocs/compta/prelevement/factures.php \file htdocs/compta/prelevement/factures.php
\ingroup prelevement \ingroup prelevement
\brief Page liste des factures prélevées \brief Page liste des factures prelevees
\version $Id$ \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");
$langs->load("companies"); $langs->load("companies");
// Sécurité accés client // S<EFBFBD>curit<EFBFBD> acc<63>s client
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();
llxHeader('',$langs->trans("WithdrawalReceipt")); llxHeader('',$langs->trans("WithdrawalReceipt"));

11
htdocs/compta/prelevement/facturesrejets.php
View File

@ -17,17 +17,16 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
* *
*/ */
require("./pre.inc.php");
require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php";
require_once DOL_DOCUMENT_ROOT."/paiement.class.php"; require_once DOL_DOCUMENT_ROOT."/paiement.class.php";
/* /*
* Sécurite acces client * Security check
*/ */
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();
@ -98,11 +97,11 @@ if ($result)
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $i = 0;
print_barre_liste("Prélèvements rejetés", $page, "rejets.php", $urladd, $sortfield, $sortorder, '', $num); print_barre_liste("Pr<EFBFBD>l<EFBFBD>vements rejet<65>s", $page, "rejets.php", $urladd, $sortfield, $sortorder, '', $num);
print"\n<!-- debut table -->\n"; print"\n<!-- debut table -->\n";
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">'; print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre("Bon N°","rejets.php","p.ref",'',$urladd); print_liste_field_titre("Bon N<EFBFBD>","rejets.php","p.ref",'',$urladd);
print_liste_field_titre($langs->trans("Invoice"),"rejets.php","p.facnumber",'',$urladd); print_liste_field_titre($langs->trans("Invoice"),"rejets.php","p.facnumber",'',$urladd);
print_liste_field_titre($langs->trans("ThirdParty"),"rejets.php","s.nom",'',$urladd); print_liste_field_titre($langs->trans("ThirdParty"),"rejets.php","s.nom",'',$urladd);
print_liste_field_titre($langs->trans("Amount"),"rejets.php","f.total_ttc","",$urladd,'align="center"'); print_liste_field_titre($langs->trans("Amount"),"rejets.php","f.total_ttc","",$urladd,'align="center"');
@ -133,7 +132,7 @@ if ($result)
print '<td align="center">'.price($obj->total_ttc)."</td>\n"; print '<td align="center">'.price($obj->total_ttc)."</td>\n";
print '<td><b>Rejeté</b></td><td>'; print '<td><b>Rejet<EFBFBD></b></td><td>';
print '</td>'; print '</td>';

4
htdocs/compta/prelevement/fiche-rejet.php
View File

@ -22,11 +22,11 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");
// Sécurité accés client // Securite acces client
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();
llxHeader('',$langs->trans("WithdrawalReceipt")); llxHeader('',$langs->trans("WithdrawalReceipt"));

4
htdocs/compta/prelevement/fiche-stat.php
View File

@ -21,9 +21,9 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
// Sécurité accés client // Security check
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();

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

@ -24,7 +24,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
if (!$user->rights->prelevement->bons->lire) if (!$user->rights->prelevement->bons->lire)
accessforbidden(); accessforbidden();

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

@ -24,7 +24,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php"; require_once DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php";
require_once DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php";
require_once DOL_DOCUMENT_ROOT."/societe.class.php"; require_once DOL_DOCUMENT_ROOT."/societe.class.php";

2
htdocs/compta/prelevement/ligne-prelevement.class.php
View File

@ -17,8 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*
*/ */
/* /*

2
htdocs/compta/prelevement/ligne.php
View File

@ -25,7 +25,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/ligne-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/ligne-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");

7
htdocs/compta/prelevement/lignes.php
View File

@ -21,11 +21,12 @@
/* /*
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php");
require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");
// Sécurité accés client // Security check
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();
@ -164,7 +165,7 @@ if ($result)
if ($obj->statut == 3) if ($obj->statut == 3)
{ {
print '<b>Rejeté</b>'; print '<b>Rejet<EFBFBD></b>';
} }
else else
{ {

2
htdocs/compta/prelevement/liste.php
View File

@ -25,7 +25,7 @@
\version $Id$ \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
$langs->load("withdrawals"); $langs->load("withdrawals");
$langs->load("companies"); $langs->load("companies");

4
htdocs/compta/prelevement/liste_factures.php
View File

@ -21,11 +21,11 @@
/** /**
\file htdocs/compta/prelevement/liste_factures.php \file htdocs/compta/prelevement/liste_factures.php
\ingroup prelevement \ingroup prelevement
\brief Page liste des factures prélevées \brief Page liste des factures prelevees
\version $Id$ \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");

76
htdocs/compta/prelevement/pre.inc.php
View File

@ -1,76 +0,0 @@
<?php
/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
\file htdocs/compta/prelevement/pre.inc.php
\ingroup prelevement
\brief Fichier gestionnaire du menu prelevement
\version $Id$
*/
require("../../main.inc.php");
require_once DOL_DOCUMENT_ROOT."/compta/prelevement/bon-prelevement.class.php";
$langs->load("banks");
$langs->load("withdrawals");
$langs->load("bills");
function llxHeader($head = "", $title="", $help_url='')
{
global $user, $conf, $langs;
top_menu($head, $title);
$menu = new Menu();
if ($conf->prelevement->enabled)
{
if ($user->rights->prelevement->bons->lire)
{
$menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrders"));
if ($user->rights->prelevement->bons->creer)
$menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/create.php",$langs->trans("NewStandingOrder"));
$menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/bons.php",$langs->trans("Receipts"));
$menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/liste.php",$langs->trans("List"));
$menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/liste_factures.php",$langs->trans("Bills"));
$menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/rejets.php",$langs->trans("Rejects"));
$menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/stats.php",$langs->trans("Statistics"));
$menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/config.php",$langs->trans("Setup"));
$menu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("Demandes"));
$menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("StandingOrderToProcess"));
$menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php?statut=1",$langs->trans("StandingOrderProcessed"));
}
}
$langs->load("bills");
$menu->add(DOL_URL_ROOT."/compta/facture.php",$langs->trans("Bills"));
$menu->add_submenu(DOL_URL_ROOT."/compta/facture/impayees.php",$langs->trans("BillsUnpaid"));
left_menu($menu->liste, $help_url);
}
?>

7
htdocs/compta/prelevement/rejet-prelevement.class.php
View File

@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/* /*
@ -53,7 +52,7 @@ class RejetPrelevement
$this->motifs[0] = "Non renseigne"; $this->motifs[0] = "Non renseigne";
$this->motifs[1] = "Provision insuffisante"; $this->motifs[1] = "Provision insuffisante";
$this->motifs[2] = "Tirage conteste"; $this->motifs[2] = "Tirage conteste";
$this->motifs[3] = "Pas de bon à payer"; $this->motifs[3] = "Pas de bon <EFBFBD> payer";
$this->motifs[4] = "Opposition sur compte"; $this->motifs[4] = "Opposition sur compte";
$this->motifs[5] = "RIB inexploitable"; $this->motifs[5] = "RIB inexploitable";
$this->motifs[6] = "Compte solde"; $this->motifs[6] = "Compte solde";
@ -151,7 +150,7 @@ class RejetPrelevement
dol_syslog("RejetPrelevement::Create set_unpaid fac ".$fac->ref); dol_syslog("RejetPrelevement::Create set_unpaid fac ".$fac->ref);
$fac->set_unpaid($fac->id, $user); $fac->set_unpaid($fac->id, $user);
/* Envoi un email à l'emetteur de la demande de prev */ /* Envoi un email <EFBFBD> l'emetteur de la demande de prev */
$this->_send_email($fac); $this->_send_email($fac);
} }
@ -249,7 +248,7 @@ class RejetPrelevement
$arr = array(); $arr = array();
/* /*
* Renvoie toutes les factures associée à un prélèvement * Renvoie toutes les factures associ<EFBFBD>e <EFBFBD> un pr<EFBFBD>l<EFBFBD>vement
* *
*/ */

2
htdocs/compta/prelevement/rejets.php
View File

@ -21,7 +21,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");

2
htdocs/compta/prelevement/stats.php
View File

@ -24,7 +24,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
$langs->load("withdrawals"); $langs->load("withdrawals");
$langs->load("companies"); $langs->load("companies");

2
htdocs/compta/propal.php
View File

@ -27,7 +27,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");

2
htdocs/compta/recap-compta.php
View File

@ -24,7 +24,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");

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

@ -22,7 +22,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php");

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

@ -24,7 +24,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");

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

@ -17,7 +17,7 @@
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php");

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

@ -24,7 +24,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");

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

@ -1,59 +0,0 @@
<?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*
*/
/**
\file htdocs/compta/resultat/pre.inc.php
\ingroup compta
\brief Fichier gestionnaire du menu compta/stats
*/
require("../../main.inc.php");
function llxHeader($head = "") {
global $user, $conf, $langs;
/*
*
*
*/
top_menu($head);
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/compta/resultat/","Résultat / Exercice");
$menu->add_submenu(DOL_URL_ROOT."/compta/resultat/clientfourn.php",$langs->trans("ByCompanies"));
$menu->add(DOL_URL_ROOT."/compta/stats/index.php","Chiffre d'affaire");
$menu->add_submenu(DOL_URL_ROOT."/compta/stats/cumul.php","Cumulé");
if ($conf->propal->enabled) {
$menu->add_submenu(DOL_URL_ROOT."/compta/stats/prev.php","Prévisionnel");
$menu->add_submenu(DOL_URL_ROOT."/compta/stats/comp.php","Transformé");
}
$menu->add_submenu(DOL_URL_ROOT."/compta/stats/casoc.php",$langs->trans("ByCompanies"));
$menu->add_submenu(DOL_URL_ROOT."/compta/stats/cabyuser.php",$langs->trans("ByUsers"));
left_menu($menu->liste);
}
?>

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

@ -24,7 +24,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php"); require(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php");
$langs->load("compta"); $langs->load("compta");

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

@ -25,7 +25,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php"); require(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php");
// Security check // Security check

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

@ -1,48 +0,0 @@
<?php
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2006 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*/
/**
\file htdocs/compta/sociales/pre.inc.php
\ingroup tax
\brief Fichier gestionnaire du menu charges sociales
*/
require("../../main.inc.php");
function llxHeader($head = "")
{
global $user, $conf, $langs;
$langs->load("compta");
$langs->load("propal");
top_menu($head);
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/compta/charges/index.php",$langs->trans("Contributions"));
$menu->add_submenu(DOL_URL_ROOT."/compta/sociales/charges.php?action=create",$langs->trans("MenuNewSocialContribution"));
$menu->add_submenu(DOL_URL_ROOT."/compta/sociales/index.php",$langs->trans("List"));
left_menu($menu->liste);
}
?>

2
htdocs/compta/stats/cabyuser.php
View File

@ -24,7 +24,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");

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

@ -25,7 +25,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");

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

@ -23,7 +23,8 @@
* \ingroup commercial * \ingroup commercial
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php");
require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/accountancy.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/accountancy.lib.php");
// Security check // Security check
@ -140,7 +141,7 @@ function factures ($db, $year, $month, $paye)
print "<td>Num</td>"; print "<td>Num</td>";
print "<td align=\"right\">Date</td>"; print "<td align=\"right\">Date</td>";
print "<td align=\"right\">Montant</td>"; print "<td align=\"right\">Montant</td>";
print "<td align=\"right\">Payé</td>"; print "<td align=\"right\">Pay<EFBFBD></td>";
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
while ($i < $num) while ($i < $num)
@ -261,9 +262,9 @@ function ppt ($db, $year, $socid)
print "<table width=\"100%\">"; print "<table width=\"100%\">";
print '<tr class="liste_titre"><td align="center" valign="top" width="30%">'; print '<tr class="liste_titre"><td align="center" valign="top" width="30%">';
print "CA Prévisionnel basé sur les propal $year"; print "CA Pr<EFBFBD>visionnel bas<61> sur les propal $year";
print "</td><td align=\"center\" valign=\"top\">CA Réalisé $year</td>"; print "</td><td align=\"center\" valign=\"top\">CA R<EFBFBD>alis<EFBFBD> $year</td>";
print "<td align=\"center\" valign=\"top\">Delta $year</td></tr>"; print "<td align=\"center\" valign=\"top\">Delta $year</td></tr>";
print '<tr><td valign="top" align="center" width="30%">'; print '<tr><td valign="top" align="center" width="30%">';
@ -336,7 +337,7 @@ llxHeader();
$cyear = isset($_GET["year"])?$_GET["year"]:0; $cyear = isset($_GET["year"])?$_GET["year"]:0;
if (! $cyear) { $cyear = strftime ("%Y", time()); } if (! $cyear) { $cyear = strftime ("%Y", time()); }
print_fiche_titre("Chiffre d'Affaire transformé (prévu-réalisé)",($cyear?"<a href='comp.php?year=".($cyear-1)."'>".img_previous()."</a> Année $cyear <a href='comp.php?year=".($cyear+1)."'>".img_next()."</a>":"")); print_fiche_titre("Chiffre d'Affaire transform<EFBFBD> (pr<70>vu-r<>alis<69>)",($cyear?"<a href='comp.php?year=".($cyear-1)."'>".img_previous()."</a> Ann<EFBFBD>e $cyear <a href='comp.php?year=".($cyear+1)."'>".img_next()."</a>":""));
ppt($db, $cyear, $socid); ppt($db, $cyear, $socid);

10
htdocs/compta/stats/cumul.php
View File

@ -20,13 +20,13 @@
/** /**
\file htdocs/compta/stats/cumul.php \file htdocs/compta/stats/cumul.php
\brief Page reporting compta chiffre affaire cumulé \brief Page reporting compta chiffre affaire cumule
\version $Id$ \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
// Sécurité accés client // Security check
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$socid = $user->societe_id; $socid = $user->societe_id;
@ -41,7 +41,7 @@ if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
llxHeader(); llxHeader();
print_titre("Chiffre d'affaire cumulé (".$langs->trans("Currency".$conf->monnaie)." HT)"); print_titre("Chiffre d'affaire cumul<EFBFBD> (".$langs->trans("Currency".$conf->monnaie)." HT)");
print '<table width="100%"><tr><td valign="top">'; print '<table width="100%"><tr><td valign="top">';
@ -66,7 +66,7 @@ if ($socid) $sql.= " AND f.fk_soc = ".$socid;
$sql.= " GROUP BY dm"; $sql.= " GROUP BY dm";
pt($db, $sql,"Suivi cumul par année"); pt($db, $sql,"Suivi cumul par ann<EFBFBD>e");
print "</td></tr></table>"; print "</td></tr></table>";

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

@ -24,14 +24,13 @@
\version $Id$ \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require("./lib.inc.php");
// Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES') // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
$modecompta = $conf->compta->mode; $modecompta = $conf->compta->mode;
if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"]; if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
// Sécurité accés client // S<EFBFBD>curit<EFBFBD> acc<63>s client
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$socid = $user->societe_id; $socid = $user->societe_id;
@ -41,7 +40,7 @@ if ($user->societe_id > 0)
llxHeader(); llxHeader();
print_titre("Comparatif CA année en cours avec année précédente (".$langs->trans("Currency".$conf->monnaie)." HT, ".$modecompta.")"); print_titre("Comparatif CA ann<EFBFBD>e en cours avec ann<6E>e pr<70>c<EFBFBD>dente (".$langs->trans("Currency".$conf->monnaie)." HT, ".$modecompta.")");
print "<br>\n"; print "<br>\n";
@ -71,7 +70,7 @@ function factures ($db, $year, $month, $paye)
print "<TD>Num</TD>"; print "<TD>Num</TD>";
print "<TD align=\"right\">Date</TD>"; print "<TD align=\"right\">Date</TD>";
print "<TD align=\"right\">Montant</TD>"; print "<TD align=\"right\">Montant</TD>";
print "<TD align=\"right\">Payé</TD>"; print "<TD align=\"right\">Pay<EFBFBD></TD>";
print "</TR>\n"; print "</TR>\n";
$var=True; $var=True;
while ($i < $num) { while ($i < $num) {

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

@ -24,7 +24,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");

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

@ -1,59 +0,0 @@
<?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*
*/
/**
\file htdocs/compta/stats/pre.inc.php
\ingroup compta
\brief Fichier gestionnaire du menu compta/stats
*/
require("../../main.inc.php");
function llxHeader($head = "") {
global $user, $conf, $langs;
/*
*
*
*/
top_menu($head);
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/compta/resultat/","Résultat / Exercice");
$menu->add_submenu(DOL_URL_ROOT."/compta/resultat/clientfourn.php",$langs->trans("ByCompanies"));
$menu->add(DOL_URL_ROOT."/compta/stats/index.php","Chiffre d'affaire");
$menu->add_submenu(DOL_URL_ROOT."/compta/stats/cumul.php","Cumulé");
if ($conf->propal->enabled) {
$menu->add_submenu(DOL_URL_ROOT."/compta/stats/prev.php","Prévisionnel");
$menu->add_submenu(DOL_URL_ROOT."/compta/stats/comp.php","Transformé");
}
$menu->add_submenu(DOL_URL_ROOT."/compta/stats/casoc.php",$langs->trans("ByCompanies"));
$menu->add_submenu(DOL_URL_ROOT."/compta/stats/cabyuser.php",$langs->trans("ByUsers"));
left_menu($menu->liste);
}
?>

15
htdocs/compta/stats/prev.php
View File

@ -18,14 +18,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*
*/ */
require("./pre.inc.php");
/* require('../../main.inc.php');
* Sécurité accés client
*/ // Security check
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$socid = $user->societe_id; $socid = $user->societe_id;
@ -91,7 +88,7 @@ if ($sortorder == "")
$in = "(1,2,4)"; $in = "(1,2,4)";
print_titre ("CA Prévisionnel basé sur les propositions <b>ouvertes</b> et <b>signées</b>"); print_titre ("CA Pr<EFBFBD>visionnel bas<61> sur les propositions <b>ouvertes</b> et <b>sign<67>es</b>");
print '<table width="100%">'; print '<table width="100%">';
@ -115,7 +112,7 @@ $sql.= " AND p.entity = ".$conf->entity;
if ($socid) $sql.= " AND p.fk_soc = ".$socid; if ($socid) $sql.= " AND p.fk_soc = ".$socid;
$sql.= " GROUP BY dm DESC"; $sql.= " GROUP BY dm DESC";
pt($db, $sql, "Année"); pt($db, $sql, "Ann<EFBFBD>e");
print "<br>"; print "<br>";
@ -126,7 +123,7 @@ $sql.= " AND p.entity = ".$conf->entity;
if ($socid) $sql.= " AND p.fk_soc = ".$socid; if ($socid) $sql.= " AND p.fk_soc = ".$socid;
$sql.= " GROUP BY dm"; $sql.= " GROUP BY dm";
pt($db, $sql, "Mois cumulés"); pt($db, $sql, "Mois cumul<EFBFBD>s");
print "</td></tr></table>"; print "</td></tr></table>";

9
htdocs/compta/tva.php
View File

@ -17,12 +17,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/* \deprecated Ce fichier semble ne plus servir. A virer */ /* \deprecated Ce fichier semble ne plus servir. A virer */
require("./pre.inc.php"); require('../main.inc.php');
/* /*
@ -74,7 +73,7 @@ $yearc = strftime("%Y",time());
echo '<table width="100%"><tr><td width="50%" valign="top">'; echo '<table width="100%"><tr><td width="50%" valign="top">';
print "<b>TVA collectée</b>"; print "<b>TVA collect<EFBFBD>e</b>";
for ($y = $yearc ; $y >= $conf->years ; $y=$y-1 ) { for ($y = $yearc ; $y >= $conf->years ; $y=$y-1 ) {
@ -85,13 +84,13 @@ for ($y = $yearc ; $y >= $conf->years ; $y=$y-1 ) {
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1 AND f.datef >= '$y-01-01' AND f.datef <= '$y-12-31' "; $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1 AND f.datef >= '$y-01-01' AND f.datef <= '$y-12-31' ";
$sql .= " GROUP BY dm DESC"; $sql .= " GROUP BY dm DESC";
pt($db, $sql,"Année $y"); pt($db, $sql,"Ann<EFBFBD>e $y");
print "</td></tr></table>"; print "</td></tr></table>";
} }
echo '</td><td valign="top" width="50%">'; echo '</td><td valign="top" width="50%">';
echo 'Tva Payée<br>'; echo 'Tva Pay<EFBFBD>e<br>';
echo '</td></tr></table>'; echo '</td></tr></table>';

2
htdocs/compta/tva/clients.php
View File

@ -26,7 +26,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");

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

@ -25,7 +25,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php");

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

@ -25,7 +25,7 @@
* \brief Index page of VAT reports * \brief Index page of VAT reports
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");

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

@ -1,44 +0,0 @@
<?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
require("../../main.inc.php");
function llxHeader($head = "") {
global $user, $conf, $langs;
/*
*
*
*/
top_menu($head);
$menu = new Menu();
$menu->add("index.php",$langs->trans("VAT"));
$menu->add_submenu("reglement.php",$langs->trans("Payments"));
$menu->add_submenu("fiche.php?action=create",$langs->trans("NewPayment"));
$menu->add_submenu("clients.php",$langs->trans("Clients"));
$menu->add_submenu("quadri.php",$langs->trans("Quadri"));
left_menu($menu->liste);
}
?>

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

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 <EFBFBD>ric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006 Yannick Warnier <ywarnier@beeznest.org> * Copyright (C) 2006 Yannick Warnier <ywarnier@beeznest.org>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
@ -28,7 +28,7 @@
\todo Deal with recurrent invoices as well \todo Deal with recurrent invoices as well
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php");
$year=$_GET["year"]; $year=$_GET["year"];

2
htdocs/compta/tva/quadri_detail.php
View File

@ -27,7 +27,7 @@
* \todo Deal with recurrent invoices as well * \todo Deal with recurrent invoices as well
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");

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

@ -25,7 +25,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php");
$langs->load("compta"); $langs->load("compta");

3
htdocs/compta/ventilation/fiche.php
View File

@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -27,7 +26,7 @@
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");
$langs->load("bills"); $langs->load("bills");

4
htdocs/compta/ventilation/fournisseur/fiche.php
View File

@ -17,8 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*
*/ */
/** /**
@ -28,7 +26,7 @@
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require('../../../main.inc.php');
$mesg = ''; $mesg = '';

4
htdocs/compta/ventilation/fournisseur/index.php
View File

@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*
*/ */
/** /**
@ -29,7 +27,7 @@
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require('../../../main.inc.php');
$langs->load("suppliers"); $langs->load("suppliers");

2
htdocs/compta/ventilation/fournisseur/lignes.php
View File

@ -25,7 +25,7 @@
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require('../../../main.inc.php');
$langs->load("bills"); $langs->load("bills");

8
htdocs/compta/ventilation/fournisseur/liste.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Éric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2004 <EFBFBD>ric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -28,14 +28,14 @@
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require('../../../main.inc.php');
$langs->load("bills"); $langs->load("bills");
if (!$user->rights->facture->lire) accessforbidden(); if (!$user->rights->facture->lire) accessforbidden();
if (!$user->rights->compta->ventilation->creer) accessforbidden(); if (!$user->rights->compta->ventilation->creer) accessforbidden();
/* /*
* Sécurité accés client * S<EFBFBD>curit<EFBFBD> acc<EFBFBD>s client
*/ */
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();
@ -63,7 +63,7 @@ if ($result)
$num_lignes = $db->num_rows($result); $num_lignes = $db->num_rows($result);
$i = 0; $i = 0;
print_barre_liste("Lignes de facture à ventiler",$page,"liste.php","",$sortfield,$sortorder,'',$num_lignes); print_barre_liste("Lignes de facture <EFBFBD> ventiler",$page,"liste.php","",$sortfield,$sortorder,'',$num_lignes);
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>Facture</td>'; print '<tr class="liste_titre"><td>Facture</td>';

55
htdocs/compta/ventilation/fournisseur/pre.inc.php
View File

@ -1,55 +0,0 @@
<?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Simon Tosser <simon@kornog-computing.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*/
/**
\file htdocs/compta/ventilation/fournisseur/pre.inc.php
\ingroup compta
\brief Fichier gestionnaire du menu compta ventilation
*/
require("../../../main.inc.php");
function llxHeader($head = "", $title="", $help_url='')
{
global $user, $conf, $langs;
top_menu($head, $title);
$menu = new Menu();
$langs->load("commercial");
$menu->add(DOL_URL_ROOT."/compta/clients.php", $langs->trans("Customers"));
$menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation")." ".$langs->trans("Customers"));
$menu->add(DOL_URL_ROOT."/compta/ventilation/fournisseur/",$langs->trans("Ventilation")." ".$langs->trans("Suppliers"));
$menu->add_submenu(DOL_URL_ROOT."/compta/ventilation/fournisseur/liste.php",$langs->trans("ToDispatch"));
$menu->add_submenu(DOL_URL_ROOT."/compta/ventilation/fournisseur/lignes.php",$langs->trans("Dispatched"));
$menu->add(DOL_URL_ROOT."/compta/export/",$langs->trans("Export"));
left_menu($menu->liste, $help_url);
}
?>

3
htdocs/compta/ventilation/index.php
View File

@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -27,7 +26,7 @@
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
$langs->load("compta"); $langs->load("compta");
$langs->load("bills"); $langs->load("bills");

3
htdocs/compta/ventilation/lignes.php
View File

@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -27,7 +26,7 @@
* \version $Revision$ * \version $Revision$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");

3
htdocs/compta/ventilation/liste.php
View File

@ -18,7 +18,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
@ -29,7 +28,7 @@
* \version $Revision$ * \version $Revision$
*/ */
require("./pre.inc.php"); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");

53
htdocs/compta/ventilation/pre.inc.php
View File

@ -1,53 +0,0 @@
<?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*/
/**
\file htdocs/compta/ventilation/pre.inc.php
\ingroup compta
\brief Fichier gestionnaire du menu compta ventilation
*/
require("../../main.inc.php");
function llxHeader($head = "", $title="", $help_url='')
{
global $user, $conf, $langs;
top_menu($head, $title);
$menu = new Menu();
$langs->load("commercial");
$menu->add(DOL_URL_ROOT."/compta/clients.php", $langs->trans("Customers"));
$menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation"));
$menu->add_submenu(DOL_URL_ROOT."/compta/ventilation/liste.php",$langs->trans("ToDispatch"));
$menu->add_submenu(DOL_URL_ROOT."/compta/ventilation/lignes.php",$langs->trans("Dispatched"));
$menu->add(DOL_URL_ROOT."/compta/export/",$langs->trans("Export"));
left_menu($menu->liste, $help_url);
}
?>