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

Renamed a development module in english

Browse Source
This commit is contained in:
Laurent Destailleur 2009-06-16 20:21:51 +00:00
parent aaac14c8c0
commit ae67640f6c
17 changed files with 103 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/accountancy/accountancyaccount.class.php
View File

@ -18,7 +18,7 @@
/** /**
* \file htdocs/accountancy/accountancyaccount.class.php * \file htdocs/accountancy/accountancyaccount.class.php
* \ingroup comptaexpert * \ingroup accounting
* \brief Fichier de la classe des comptes comptables * \brief Fichier de la classe des comptes comptables
* \version $Id$ * \version $Id$
*/ */

2
htdocs/accountancy/accountancysystem.class.php
View File

@ -18,7 +18,7 @@
/** /**
* \file htdocs/accountancy/accountancysystem.class.php * \file htdocs/accountancy/accountancysystem.class.php
* \ingroup comptaexpert * \ingroup accounting
* \brief Fichier de la classe des plans de comptes comptables * \brief Fichier de la classe des plans de comptes comptables
* \version $Id$ * \version $Id$
*/ */

23
htdocs/admin/comptaexpert.php → htdocs/admin/accounting.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 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
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -15,17 +15,14 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* 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$
* $Source$
*/ */
/** /**
\file htdocs/admin/comptaexpert.php * \file htdocs/admin/accounting.php
\ingroup comptaexpert * \ingroup accounting
\brief Page de configuration du module comptabilit<EFBFBD> expert * \brief Page de configuration du module comptabilite expert
\version $Revision$ * \version $Id$
*/ */
require('./pre.inc.php'); require('./pre.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
@ -37,8 +34,6 @@ if (!$user->admin)
accessforbidden(); accessforbidden();
llxHeader();
$compta_mode = defined('COMPTA_MODE')?COMPTA_MODE:'RECETTES-DEPENSES'; $compta_mode = defined('COMPTA_MODE')?COMPTA_MODE:'RECETTES-DEPENSES';
@ -72,9 +67,11 @@ if ($_GET['action'] == 'delete')
/* /*
* Affichage page * View
*/ */
llxHeader();
$html=new Form($db); $html=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
@ -85,7 +82,7 @@ print '<br>';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
// Cas du param<EFBFBD>tre COMPTA_MODE // Cas du parametre COMPTA_MODE
print '<form action="compta.php" method="post">'; print '<form action="compta.php" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setcomptamode">'; print '<input type="hidden" name="action" value="setcomptamode">';

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

@ -188,7 +188,7 @@ if ($_GET["action"] == 'create')
print '</td></tr>'; print '</td></tr>';
// Code compta // Code compta
if ($conf->comptaexpert->enabled) if ($conf->accounting->enabled)
{ {
print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>'; print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>';
print '<td colspan="3"><input type="text" name="account_number" value="'.$account->account_number.'"></td></tr>'; print '<td colspan="3"><input type="text" name="account_number" value="'.$account->account_number.'"></td></tr>';
@ -321,7 +321,7 @@ else
print '</td></tr>'; print '</td></tr>';
// Code compta // Code compta
if ($conf->comptaexpert->enabled) if ($conf->accounting->enabled)
{ {
print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>'; print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>';
print '<td colspan="3">'.$account->account_number.'</td></tr>'; print '<td colspan="3">'.$account->account_number.'</td></tr>';
@ -425,7 +425,7 @@ else
print '</td></tr>'; print '</td></tr>';
// Code compta // Code compta
if ($conf->comptaexpert->enabled) if ($conf->accounting->enabled)
{ {
print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>'; print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>';
print '<td colspan="3"><input type="text" name="account_number" value="'.$account->account_number.'"></td></tr>'; print '<td colspan="3"><input type="text" name="account_number" value="'.$account->account_number.'"></td></tr>';

1
htdocs/core/conf.class.php
View File

@ -174,7 +174,6 @@ class Conf
// For backward compatibility // For backward compatibility
// TODO Replace this->xxx->enabled by this->modulename->enabled to remove this code // TODO Replace this->xxx->enabled by this->modulename->enabled to remove this code
$this->comptaexpert->enabled=defined("MAIN_MODULE_COMPTABILITE_EXPERT")?MAIN_MODULE_COMPTABILITE_EXPERT:0;
$this->compta->enabled=defined("MAIN_MODULE_COMPTABILITE")?MAIN_MODULE_COMPTABILITE:0; $this->compta->enabled=defined("MAIN_MODULE_COMPTABILITE")?MAIN_MODULE_COMPTABILITE:0;
$this->webcal->enabled=defined('MAIN_MODULE_WEBCALENDAR')?MAIN_MODULE_WEBCALENDAR:0; $this->webcal->enabled=defined('MAIN_MODULE_WEBCALENDAR')?MAIN_MODULE_WEBCALENDAR:0;
$this->propal->enabled=defined("MAIN_MODULE_PROPALE")?MAIN_MODULE_PROPALE:0; $this->propal->enabled=defined("MAIN_MODULE_PROPALE")?MAIN_MODULE_PROPALE:0;

16
htdocs/includes/menus/barre_left/eldy_backoffice.php
View File

@ -513,7 +513,7 @@ class MenuLeft {
} }
// Compta expert // Compta expert
if ($conf->comptaexpert->enabled) if ($conf->accounting->enabled)
{ {
} }
@ -557,18 +557,18 @@ class MenuLeft {
} }
// Rapports // Rapports
if ($conf->compta->enabled || $conf->comptaexpert->enabled) if ($conf->compta->enabled || $conf->accounting->enabled)
{ {
// Bilan, résultats // Bilan, résultats
$newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy",$langs->trans("Reportings"),0,$user->rights->compta->resultat->lire||$user->rights->comptaexpert->comptarapport->lire); $newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy",$langs->trans("Reportings"),0,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
if ($leftmenu=="ca") $newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca",$langs->trans("ReportInOut"),1,$user->rights->compta->resultat->lire||$user->rights->comptaexpert->comptarapport->lire); if ($leftmenu=="ca") $newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca",$langs->trans("ReportInOut"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/resultat/clientfourn.php?leftmenu=ca",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire||$user->rights->comptaexpert->comptarapport->lire); if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/resultat/clientfourn.php?leftmenu=ca",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
/* On verra ca avec module compabilité expert /* On verra ca avec module compabilité expert
if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/resultat/compteres.php?leftmenu=ca","Compte de résultat",2,$user->rights->compta->resultat->lire); if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/resultat/compteres.php?leftmenu=ca","Compte de résultat",2,$user->rights->compta->resultat->lire);
if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/resultat/bilan.php?leftmenu=ca","Bilan",2,$user->rights->compta->resultat->lire); if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/resultat/bilan.php?leftmenu=ca","Bilan",2,$user->rights->compta->resultat->lire);
*/ */
if ($leftmenu=="ca") $newmenu->add(DOL_URL_ROOT."/compta/stats/index.php?leftmenu=ca",$langs->trans("ReportTurnover"),1,$user->rights->compta->resultat->lire||$user->rights->comptaexpert->comptarapport->lire); if ($leftmenu=="ca") $newmenu->add(DOL_URL_ROOT."/compta/stats/index.php?leftmenu=ca",$langs->trans("ReportTurnover"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
/* /*
if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/cumul.php?leftmenu=ca","Cumulé",2,$user->rights->compta->resultat->lire); if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/cumul.php?leftmenu=ca","Cumulé",2,$user->rights->compta->resultat->lire);
@ -578,8 +578,8 @@ class MenuLeft {
} }
if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/exercices.php?leftmenu=ca",$langs->trans("Evolution"),2,$user->rights->compta->resultat->lire); if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/exercices.php?leftmenu=ca",$langs->trans("Evolution"),2,$user->rights->compta->resultat->lire);
*/ */
if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/casoc.php?leftmenu=ca",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire||$user->rights->comptaexpert->comptarapport->lire); if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/casoc.php?leftmenu=ca",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/cabyuser.php?leftmenu=ca",$langs->trans("ByUsers"),2,$user->rights->compta->resultat->lire||$user->rights->comptaexpert->comptarapport->lire); if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/cabyuser.php?leftmenu=ca",$langs->trans("ByUsers"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
} }
} }

16
htdocs/includes/menus/barre_left/eldy_frontoffice.php
View File

@ -498,7 +498,7 @@ class MenuLeft {
} }
// Compta expert // Compta expert
if ($conf->comptaexpert->enabled) if ($conf->accounting->enabled)
{ {
} }
@ -547,20 +547,20 @@ class MenuLeft {
*/ */
// Rapports // Rapports
/* /*
if ($conf->compta->enabled || $conf->comptaexpert->enabled) if ($conf->compta->enabled || $conf->accounting->enabled)
{ {
// Bilan, résultats // Bilan, résultats
$newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy",$langs->trans("Reportings"),0,$user->rights->compta->resultat->lire||$user->rights->comptaexpert->comptarapport->lire); $newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy",$langs->trans("Reportings"),0,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
if ($leftmenu=="ca") $newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca",$langs->trans("ReportInOut"),1,$user->rights->compta->resultat->lire||$user->rights->comptaexpert->comptarapport->lire); if ($leftmenu=="ca") $newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca",$langs->trans("ReportInOut"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/resultat/clientfourn.php?leftmenu=ca",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire||$user->rights->comptaexpert->comptarapport->lire); if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/resultat/clientfourn.php?leftmenu=ca",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
if ($leftmenu=="ca") $newmenu->add(DOL_URL_ROOT."/compta/stats/index.php?leftmenu=ca","Chiffre d'affaire",1,$user->rights->compta->resultat->lire||$user->rights->comptaexpert->comptarapport->lire); if ($leftmenu=="ca") $newmenu->add(DOL_URL_ROOT."/compta/stats/index.php?leftmenu=ca","Chiffre d'affaire",1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/casoc.php?leftmenu=ca",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire||$user->rights->comptaexpert->comptarapport->lire); if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/casoc.php?leftmenu=ca",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/cabyuser.php?leftmenu=ca",$langs->trans("ByUsers"),2,$user->rights->compta->resultat->lire||$user->rights->comptaexpert->comptarapport->lire); if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/cabyuser.php?leftmenu=ca",$langs->trans("ByUsers"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
} }
*/ */

4
htdocs/includes/menus/barre_top/eldy_backoffice.php
View File

@ -188,7 +188,7 @@ class MenuTop {
} }
// Financial // Financial
if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled if ($conf->compta->enabled || $conf->accounting->enabled || $conf->banque->enabled
|| $conf->facture->enabled) || $conf->facture->enabled)
{ {
$langs->load("compta"); $langs->load("compta");
@ -204,7 +204,7 @@ class MenuTop {
} }
$idsel='id="mainmenu_accountancy" '; $idsel='id="mainmenu_accountancy" ';
if ($user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire if ($user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire
|| $user->rights->facture->lire || $user->rights->banque->lire) || $user->rights->facture->lire || $user->rights->banque->lire)
{ {
print '<td class="tmenu">'; print '<td class="tmenu">';

4
htdocs/includes/menus/barre_top/eldy_frontoffice.php
View File

@ -188,7 +188,7 @@ class MenuTop {
} }
// Financial // Financial
if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled if ($conf->compta->enabled || $conf->accounting->enabled || $conf->banque->enabled
|| $conf->facture->enabled) || $conf->facture->enabled)
{ {
$langs->load("compta"); $langs->load("compta");
@ -204,7 +204,7 @@ class MenuTop {
} }
$idsel='id="mainmenu_accountancy" '; $idsel='id="mainmenu_accountancy" ';
if ($user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire if ($user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire
|| $user->rights->facture->lire || $user->rights->banque->lire) || $user->rights->facture->lire || $user->rights->banque->lire)
{ {
print '<td class="tmenu">'; print '<td class="tmenu">';

4
htdocs/includes/menus/barre_top/rodolphe.php
View File

@ -166,7 +166,7 @@ class MenuTop {
} }
// Financial // Financial
if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled if ($conf->compta->enabled || $conf->accounting->enabled || $conf->banque->enabled
|| $conf->facture->enabled) || $conf->facture->enabled)
{ {
$langs->load("compta"); $langs->load("compta");
@ -182,7 +182,7 @@ class MenuTop {
} }
$idsel='id="accountancy" '; $idsel='id="accountancy" ';
if ($user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire if ($user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire
|| $user->rights->facture->lire || $user->rights->banque->lire) || $user->rights->facture->lire || $user->rights->banque->lire)
{ {
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuFinancial").'</a></td>'; print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuFinancial").'</a></td>';

14
htdocs/includes/menus/init_menu_auguria.sql
View File

@ -18,7 +18,7 @@ insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`,
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->produit->enabled || $conf->service->enabled', 3__+MAX_llx_menu__, 'auguria', 'top', 'products', '', 0, '/product/index.php?mainmenu=products&amp;leftmenu=', 'Products/Services', -1, 'products', '$user->rights->produit->lire||$user->rights->service->lire', '', 0, 3, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->produit->enabled || $conf->service->enabled', 3__+MAX_llx_menu__, 'auguria', 'top', 'products', '', 0, '/product/index.php?mainmenu=products&amp;leftmenu=', 'Products/Services', -1, 'products', '$user->rights->produit->lire||$user->rights->service->lire', '', 0, 3, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->fournisseur->enabled', 4__+MAX_llx_menu__, 'auguria', 'top', 'suppliers', '', 0, '/fourn/index.php?mainmenu=suppliers&amp;leftmenu=', 'Suppliers', -1, 'suppliers', '$user->rights->fournisseur->lire', '', 0, 4, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->fournisseur->enabled', 4__+MAX_llx_menu__, 'auguria', 'top', 'suppliers', '', 0, '/fourn/index.php?mainmenu=suppliers&amp;leftmenu=', 'Suppliers', -1, 'suppliers', '$user->rights->fournisseur->lire', '', 0, 4, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled', 5__+MAX_llx_menu__, 'auguria', 'top', 'commercial', '', 0, '/comm/index.php?mainmenu=commercial&amp;leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 5, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled', 5__+MAX_llx_menu__, 'auguria', 'top', 'commercial', '', 0, '/comm/index.php?mainmenu=commercial&amp;leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 5, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled || $conf->facture->enabled', 6__+MAX_llx_menu__, 'auguria', 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&amp;leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire || $user->rights->commande->lire || $user->rights->facture->lire || $user->rights->banque->lire', '', 2, 6, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->accounting->enabled || $conf->banque->enabled || $conf->facture->enabled', 6__+MAX_llx_menu__, 'auguria', 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&amp;leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->commande->lire || $user->rights->facture->lire || $user->rights->banque->lire', '', 2, 6, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->projet->enabled', 7__+MAX_llx_menu__, 'auguria', 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&amp;leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 0, 7, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->projet->enabled', 7__+MAX_llx_menu__, 'auguria', 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&amp;leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 0, 7, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->mailing->enabled || $conf->export->enabled || $conf->global->MAIN_MODULE_IMPORT || $conf->global->MAIN_MODULE_DOMAIN', 8__+MAX_llx_menu__, 'auguria', 'top', 'tools', '', 0, '/index.php?mainmenu=tools&amp;leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire', '', 2, 8, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->mailing->enabled || $conf->export->enabled || $conf->global->MAIN_MODULE_IMPORT || $conf->global->MAIN_MODULE_DOMAIN', 8__+MAX_llx_menu__, 'auguria', 'top', 'tools', '', 0, '/index.php?mainmenu=tools&amp;leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire', '', 2, 8, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('! empty($conf->telephonie->enabled) && $user->rights->telephonie->lire', 9__+MAX_llx_menu__, 'auguria', 'top', 'telephony', '', 0, '/telephonie/index.php?mainmenu=telephony&amp;leftmenu=', 'Telephony', -1, 'telephony', '$user->rights->telephonie->lire', '', 2, 9, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('! empty($conf->telephonie->enabled) && $user->rights->telephonie->lire', 9__+MAX_llx_menu__, 'auguria', 'top', 'telephony', '', 0, '/telephonie/index.php?mainmenu=telephony&amp;leftmenu=', 'Telephony', -1, 'telephony', '$user->rights->telephonie->lire', '', 2, 9, __ENTITY__);
@ -232,12 +232,12 @@ insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`,
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->banque->enabled', 'auguria', 'left', 2603__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/search.php', 'ListTransactions', 1, 'banks', '$user->rights->banque->lire', '', 0, 2, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->banque->enabled', 'auguria', 'left', 2603__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/search.php', 'ListTransactions', 1, 'banks', '$user->rights->banque->lire', '', 0, 2, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->banque->enabled', 'auguria', 'left', 2604__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/budget.php', 'ListTransactionsByCategory', 1, 'banks', '$user->rights->banque->lire', '', 0, 3, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->banque->enabled', 'auguria', 'left', 2604__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/budget.php', 'ListTransactionsByCategory', 1, 'banks', '$user->rights->banque->lire', '', 0, 3, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->banque->enabled', 'auguria', 'left', 2606__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/virement.php', 'BankTransfers', 1, 'banks', '$user->rights->banque->modifier', '', 0, 5, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->banque->enabled', 'auguria', 'left', 2606__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/virement.php', 'BankTransfers', 1, 'banks', '$user->rights->banque->modifier', '', 0, 5, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->comptaexpert->enabled', 'auguria', 'left', 2700__+MAX_llx_menu__, 'accountancy', '', 6__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 11, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->accounting->enabled', 'auguria', 'left', 2700__+MAX_llx_menu__, 'accountancy', '', 6__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 11, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->comptaexpert->enabled', 'auguria', 'left', 2701__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->accounting->enabled', 'auguria', 'left', 2701__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->comptaexpert->enabled', 'auguria', 'left', 2702__+MAX_llx_menu__, 'accountancy', '', 2701__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->accounting->enabled', 'auguria', 'left', 2702__+MAX_llx_menu__, 'accountancy', '', 2701__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->comptaexpert->enabled', 'auguria', 'left', 2703__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/stats/index.php?leftmenu=ca', 'ReportTurnover', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 1, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->accounting->enabled', 'auguria', 'left', 2703__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/stats/index.php?leftmenu=ca', 'ReportTurnover', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->comptaexpert->enabled', 'auguria', 'left', 2704__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/casoc?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->accounting->enabled', 'auguria', 'left', 2704__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/casoc?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->comptaexpert->enabled', 'auguria', 'left', 2705__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 1, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->accounting->enabled', 'auguria', 'left', 2705__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->projet->enabled', 'auguria', 'left', 3600__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects', 'Projects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->projet->enabled', 'auguria', 'left', 3600__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects', 'Projects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->projet->enabled', 'auguria', 'left', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/fiche.php?leftmenu=projects&action=create', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->projet->enabled', 'auguria', 'left', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/fiche.php?leftmenu=projects&action=create', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);

29
htdocs/includes/modules/modComptabiliteExpert.class.php → htdocs/includes/modules/modAccounting.class.php
View File

@ -19,33 +19,32 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** \defgroup comptabilite_expert Module comptabilite expert /** \defgroup accounting Module accounting
\brief Module pour inclure des fonctions de comptabilit<EFBFBD> (gestion de comptes comptables et rapports) * \brief Module pour inclure des fonctions de comptabilite (gestion de comptes comptables et rapports)
\version $Id$ * \version $Id$
*/ */
/** /**
\file htdocs/includes/modules/modComptabiliteExpert.class.php * \file htdocs/includes/modules/modAccounting.class.php
\ingroup comptabilite_expert * \ingroup accounting
\brief Fichier de description et activation du module Comptabilite Expert * \brief Fichier de description et activation du module Comptabilite Expert
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
/** /**
\class modComptabiliteExpert * \class modAccounting
\brief Classe de description et activation du module Comptabilite Expert * \brief Classe de description et activation du module Comptabilite Expert
*/ */
class modAccounting extends DolibarrModules
class modComptabiliteExpert extends DolibarrModules
{ {
/** /**
* \brief Constructeur. Definit les noms, constantes et boites * \brief Constructeur. Definit les noms, constantes et boites
* \param DB handler d'acces base * \param DB handler d'acces base
*/ */
function modComptabiliteExpert($DB) function modAccounting($DB)
{ {
global $conf; global $conf;
@ -55,7 +54,7 @@ class modComptabiliteExpert extends DolibarrModules
$this->family = "financial"; $this->family = "financial";
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = eregi_replace('^mod','',get_class($this)); $this->name = eregi_replace('^mod','',get_class($this));
$this->description = "Gestion expert de comptabilite (doubles parties)"; $this->description = "Gestion complète de comptabilite (doubles parties)";
// Possible values for version are: 'development', 'experimental', 'dolibarr' or version // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
//$this->version = 'dolibarr'; //$this->version = 'dolibarr';
@ -65,7 +64,7 @@ class modComptabiliteExpert extends DolibarrModules
$this->special = 0; $this->special = 0;
// Config pages // Config pages
$this->config_page_url = array("comptaexpert.php"); $this->config_page_url = array("accounting.php");
// Dependances // Dependances
$this->depends = array("modFacture","modBanque"); $this->depends = array("modFacture","modBanque");
@ -77,14 +76,14 @@ class modComptabiliteExpert extends DolibarrModules
$this->const = array(); $this->const = array();
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array("/comptabiliteexpert/temp"); $this->dirs = array("/accounting/temp");
// Boxes // Boxes
$this->boxes = array(); $this->boxes = array();
// Permissions // Permissions
$this->rights = array(); $this->rights = array();
$this->rights_class = 'comptaexpert'; $this->rights_class = 'accounting';
$this->rights[1][0] = 131; $this->rights[1][0] = 131;
$this->rights[1][1] = 'Lire le plan de compte'; $this->rights[1][1] = 'Lire le plan de compte';

2
htdocs/includes/modules/modBanque.class.php
View File

@ -69,7 +69,7 @@ class modBanque extends DolibarrModules
// Dependancies // Dependancies
$this->depends = array(); $this->depends = array();
$this->requiredby = array("modComptabilite","modComptabiliteExpert"); $this->requiredby = array("modComptabilite","modAccounting");
$this->conflictwith = array(); $this->conflictwith = array();
$this->langfiles = array("banks","compta","bills","companies"); $this->langfiles = array("banks","compta","bills","companies");

2
htdocs/includes/modules/modComptabilite.class.php
View File

@ -69,7 +69,7 @@ class modComptabilite extends DolibarrModules
// Dependances // Dependances
$this->depends = array("modFacture","modBanque"); $this->depends = array("modFacture","modBanque");
$this->requiredby = array(); $this->requiredby = array();
$this->conflictwith = array("modComptabiliteExpert"); $this->conflictwith = array("modAccounting");
$this->langfiles = array("compta"); $this->langfiles = array("compta");
// Constantes // Constantes

2
htdocs/includes/modules/modFacture.class.php
View File

@ -69,7 +69,7 @@ class modFacture extends DolibarrModules
// Dependencies // Dependencies
$this->depends = array("modSociete"); $this->depends = array("modSociete");
$this->requiredby = array("modComptabilite","modComptabiliteExpert"); $this->requiredby = array("modComptabilite","modAccounting");
$this->conflictwith = array(); $this->conflictwith = array();
$this->langfiles = array("bills","companies","compta","products"); $this->langfiles = array("bills","companies","compta","products");

2
htdocs/lib/company.lib.php
View File

@ -64,7 +64,7 @@ function societe_prepare_head($objsoc)
$head[$h][2] = 'supplier'; $head[$h][2] = 'supplier';
$h++; $h++;
} }
if ($conf->facture->enabled || $conf->compta->enabled || $conf->comptaexpert->enabled) if ($conf->facture->enabled || $conf->compta->enabled || $conf->accounting->enabled)
{ {
$langs->load("compta"); $langs->load("compta");
$head[$h][0] = DOL_URL_ROOT.'/compta/fiche.php?socid='.$objsoc->id; $head[$h][0] = DOL_URL_ROOT.'/compta/fiche.php?socid='.$objsoc->id;

44
htdocs/lib/tax.lib.php
View File

@ -38,7 +38,7 @@ function vat_by_thirdparty($db, $y, $modetax, $direction)
global $conf; global $conf;
$list=array(); $list=array();
//print "xx".$conf->global->MAIN_MODULE_COMPTABILITEEXPERT; //print "xx".$conf->global->MAIN_MODULE_ACCOUNTING;
//print "xx".$conf->global->MAIN_MODULE_COMPTABILITE; //print "xx".$conf->global->MAIN_MODULE_COMPTABILITE;
if ($direction == 'sell') if ($direction == 'sell')
@ -61,11 +61,11 @@ function vat_by_thirdparty($db, $y, $modetax, $direction)
if ($modetax == 1) if ($modetax == 1)
{ {
// If vat payed on due invoices (non draft) // If vat payed on due invoices (non draft)
if ($conf->global->MAIN_MODULE_COMPTABILITEEXPERT) if ($conf->global->MAIN_MODULE_ACCOUNTING)
{ {
// \todo a ce jour on se sait pas la compter car le montant tva d'un payment // \todo a ce jour on se sait pas la compter car le montant tva d'un payment
// n'est pas stocké dans la table des payments. // n'est pas stock<EFBFBD> dans la table des payments.
// Seul le module compta expert peut résoudre ce problème. // Seul le module compta expert peut r<EFBFBD>soudre ce probl<62>me.
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht). // detail part tva et part ht).
$sql = 'TODO'; $sql = 'TODO';
@ -85,19 +85,19 @@ function vat_by_thirdparty($db, $y, $modetax, $direction)
} }
else else
{ {
if ($conf->global->MAIN_MODULE_COMPTABILITEEXPERT) if ($conf->global->MAIN_MODULE_ACCOUNTING)
{ {
// If vat payed on payments // If vat payed on payments
// \todo a ce jour on se sait pas la compter car le montant tva d'un payment // \todo a ce jour on se sait pas la compter car le montant tva d'un payment
// n'est pas stocké dans la table des payments. // n'est pas stock<EFBFBD> dans la table des payments.
// Seul le module compta expert peut résoudre ce problème. // Seul le module compta expert peut r<EFBFBD>soudre ce probl<62>me.
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht). // detail part tva et part ht).
$sql = 'TODO'; $sql = 'TODO';
} }
if ($conf->global->MAIN_MODULE_COMPTABILITE) if ($conf->global->MAIN_MODULE_COMPTABILITE)
{ {
// Tva sur factures payés (should be on payment) // Tva sur factures pay<EFBFBD>s (should be on payment)
/* $sql = "SELECT s.nom as nom, s.tva_intra as tva_intra,"; /* $sql = "SELECT s.nom as nom, s.tva_intra as tva_intra,";
$sql.= " sum(fd.total_ht) as amount, sum(".$total_tva.") as tva,"; $sql.= " sum(fd.total_ht) as amount, sum(".$total_tva.") as tva,";
$sql.= " s.tva_assuj as assuj, s.rowid as socid"; $sql.= " s.tva_assuj as assuj, s.rowid as socid";
@ -184,11 +184,11 @@ function vat_by_quarter($db, $y, $q, $modetax, $direction)
if ($modetax == 1) // Option vat on debit if ($modetax == 1) // Option vat on debit
{ {
// If vat payed on due invoices (non draft) // If vat payed on due invoices (non draft)
if ($conf->global->MAIN_MODULE_COMPTABILITEEXPERT) if ($conf->global->MAIN_MODULE_ACCOUNTING)
{ {
// \todo a ce jour on se sait pas la compter car le montant tva d'un payment // \todo a ce jour on se sait pas la compter car le montant tva d'un payment
// n'est pas stocké dans la table des payments. // n'est pas stock<EFBFBD> dans la table des payments.
// Seul le module compta expert peut résoudre ce problème. // Seul le module compta expert peut r<EFBFBD>soudre ce probl<62>me.
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht). // detail part tva et part ht).
$sql='TODO'; $sql='TODO';
@ -216,18 +216,18 @@ function vat_by_quarter($db, $y, $q, $modetax, $direction)
else // Option vat on payments else // Option vat on payments
{ {
// If vat payed on payments // If vat payed on payments
if ($conf->global->MAIN_MODULE_COMPTABILITEEXPERT) if ($conf->global->MAIN_MODULE_ACCOUNTING)
{ {
// \todo a ce jour on se sait pas la compter car le montant tva d'un payment // \todo a ce jour on se sait pas la compter car le montant tva d'un payment
// n'est pas stocké dans la table des payments. // n'est pas stock<EFBFBD> dans la table des payments.
// Seul le module compta expert peut résoudre ce problème. // Seul le module compta expert peut r<EFBFBD>soudre ce probl<62>me.
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht). // detail part tva et part ht).
$sql='TODO'; $sql='TODO';
} }
if ($conf->global->MAIN_MODULE_COMPTABILITE) if ($conf->global->MAIN_MODULE_COMPTABILITE)
{ {
// Tva sur factures payés (should be on shipment, done on payment instead !) // Tva sur factures pay<EFBFBD>s (should be on shipment, done on payment instead !)
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_taux as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_taux as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
$sql.= " d.date_start as date_start, d.date_end as date_end,"; $sql.= " d.date_start as date_start, d.date_end as date_end,";
$sql.= " f.facnumber as facnum, f.type, f.total_ttc as ftotal_ttc,"; $sql.= " f.facnumber as facnum, f.type, f.total_ttc as ftotal_ttc,";
@ -315,11 +315,11 @@ function vat_by_quarter($db, $y, $q, $modetax, $direction)
if ($modetax == 1) // Option vat on debit if ($modetax == 1) // Option vat on debit
{ {
// If vat payed on due invoices (non draft) // If vat payed on due invoices (non draft)
if ($conf->global->MAIN_MODULE_COMPTABILITEEXPERT) if ($conf->global->MAIN_MODULE_ACCOUNTING)
{ {
// \todo a ce jour on se sait pas la compter car le montant tva d'un payment // \todo a ce jour on se sait pas la compter car le montant tva d'un payment
// n'est pas stocké dans la table des payments. // n'est pas stock<EFBFBD> dans la table des payments.
// Seul le module compta expert peut résoudre ce problème. // Seul le module compta expert peut r<EFBFBD>soudre ce probl<62>me.
// (Il faut quand un payment a lieu, stocker en plus du montant du paiement le // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht). // detail part tva et part ht).
$sql='TODO'; $sql='TODO';
@ -347,18 +347,18 @@ function vat_by_quarter($db, $y, $q, $modetax, $direction)
else // Option vat on payments else // Option vat on payments
{ {
// If vat payed on payments // If vat payed on payments
if ($conf->global->MAIN_MODULE_COMPTABILITEEXPERT) if ($conf->global->MAIN_MODULE_ACCOUNTING)
{ {
// \todo a ce jour on se sait pas la compter car le montant tva d'un payment // \todo a ce jour on se sait pas la compter car le montant tva d'un payment
// n'est pas stocké dans la table des payments. // n'est pas stock<EFBFBD> dans la table des payments.
// Seul le module compta expert peut résoudre ce problème. // Seul le module compta expert peut r<EFBFBD>soudre ce probl<62>me.
// (Il faut quand un paiement a lieu, stocker en plus du montant du paiement le // (Il faut quand un paiement a lieu, stocker en plus du montant du paiement le
// detail part tva et part ht). // detail part tva et part ht).
$sql='TODO'; $sql='TODO';
} }
if ($conf->global->MAIN_MODULE_COMPTABILITE) if ($conf->global->MAIN_MODULE_COMPTABILITE)
{ {
// Tva sur factures payés (should be on payment) // Tva sur factures pay<EFBFBD>s (should be on payment)
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_taux as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_taux as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
$sql.= " d.date_start as date_start, d.date_end as date_end,"; $sql.= " d.date_start as date_start, d.date_end as date_end,";
$sql.= " f.facnumber as facnum, f.type, f.total_ttc as ftotal_ttc,"; $sql.= " f.facnumber as facnum, f.type, f.total_ttc as ftotal_ttc,";