From ae67640f6c06a99711484569a508022da4a54983 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 16 Jun 2009 20:21:51 +0000 Subject: [PATCH] Renamed a development module in english --- .../accountancy/accountancyaccount.class.php | 2 +- .../accountancy/accountancysystem.class.php | 2 +- .../{comptaexpert.php => accounting.php} | 27 +++++------- htdocs/compta/bank/fiche.php | 6 +-- htdocs/core/conf.class.php | 1 - .../menus/barre_left/eldy_backoffice.php | 16 +++---- .../menus/barre_left/eldy_frontoffice.php | 16 +++---- .../menus/barre_top/eldy_backoffice.php | 4 +- .../menus/barre_top/eldy_frontoffice.php | 4 +- htdocs/includes/menus/barre_top/rodolphe.php | 4 +- htdocs/includes/menus/init_menu_auguria.sql | 14 +++--- ...pert.class.php => modAccounting.class.php} | 29 ++++++------ htdocs/includes/modules/modBanque.class.php | 2 +- .../modules/modComptabilite.class.php | 36 +++++++-------- htdocs/includes/modules/modFacture.class.php | 2 +- htdocs/lib/company.lib.php | 2 +- htdocs/lib/tax.lib.php | 44 +++++++++---------- 17 files changed, 103 insertions(+), 108 deletions(-) rename htdocs/admin/{comptaexpert.php => accounting.php} (93%) rename htdocs/includes/modules/{modComptabiliteExpert.class.php => modAccounting.class.php} (83%) diff --git a/htdocs/accountancy/accountancyaccount.class.php b/htdocs/accountancy/accountancyaccount.class.php index 690de107d0a..8e3121d70d3 100644 --- a/htdocs/accountancy/accountancyaccount.class.php +++ b/htdocs/accountancy/accountancyaccount.class.php @@ -18,7 +18,7 @@ /** * \file htdocs/accountancy/accountancyaccount.class.php - * \ingroup comptaexpert + * \ingroup accounting * \brief Fichier de la classe des comptes comptables * \version $Id$ */ diff --git a/htdocs/accountancy/accountancysystem.class.php b/htdocs/accountancy/accountancysystem.class.php index 46565ae5c77..798e71f7f18 100644 --- a/htdocs/accountancy/accountancysystem.class.php +++ b/htdocs/accountancy/accountancysystem.class.php @@ -18,7 +18,7 @@ /** * \file htdocs/accountancy/accountancysystem.class.php - * \ingroup comptaexpert + * \ingroup accounting * \brief Fichier de la classe des plans de comptes comptables * \version $Id$ */ diff --git a/htdocs/admin/comptaexpert.php b/htdocs/admin/accounting.php similarity index 93% rename from htdocs/admin/comptaexpert.php rename to htdocs/admin/accounting.php index 08d37978563..0d4f6f7e966 100644 --- a/htdocs/admin/comptaexpert.php +++ b/htdocs/admin/accounting.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2006 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * * 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 @@ -15,17 +15,14 @@ * 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/admin/comptaexpert.php - \ingroup comptaexpert - \brief Page de configuration du module comptabilit� expert - \version $Revision$ -*/ + * \file htdocs/admin/accounting.php + * \ingroup accounting + * \brief Page de configuration du module comptabilite expert + * \version $Id$ + */ require('./pre.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); @@ -37,8 +34,6 @@ if (!$user->admin) accessforbidden(); -llxHeader(); - $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); $linkback=''.$langs->trans("BackToModuleList").''; @@ -85,7 +82,7 @@ print '
'; print ''; -// Cas du param�tre COMPTA_MODE +// Cas du parametre COMPTA_MODE print ''; print ''; print ''; @@ -109,7 +106,7 @@ $sql ="SELECT rowid, name, value, type, note"; $sql.=" FROM llx_const"; $sql.=" WHERE name like 'COMPTA_%' and name not in ('COMPTA_MODE')"; $result = $db->query($sql); -if ($result) +if ($result) { $num = $db->num_rows($result); $i = 0; @@ -160,7 +157,7 @@ if ($result) $i++; } - + if ($num) { print "
\n"; diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 0ce9faafbb0..b8a78feae3a 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -188,7 +188,7 @@ if ($_GET["action"] == 'create') print ''; // Code compta - if ($conf->comptaexpert->enabled) + if ($conf->accounting->enabled) { print ''.$langs->trans("AccountancyCode").''; print ''; @@ -321,7 +321,7 @@ else print ''; // Code compta - if ($conf->comptaexpert->enabled) + if ($conf->accounting->enabled) { print ''.$langs->trans("AccountancyCode").''; print ''.$account->account_number.''; @@ -425,7 +425,7 @@ else print ''; // Code compta - if ($conf->comptaexpert->enabled) + if ($conf->accounting->enabled) { print ''.$langs->trans("AccountancyCode").''; print ''; diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php index 938143d7c82..f2514a18a0a 100644 --- a/htdocs/core/conf.class.php +++ b/htdocs/core/conf.class.php @@ -174,7 +174,6 @@ class Conf // For backward compatibility // 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->webcal->enabled=defined('MAIN_MODULE_WEBCALENDAR')?MAIN_MODULE_WEBCALENDAR:0; $this->propal->enabled=defined("MAIN_MODULE_PROPALE")?MAIN_MODULE_PROPALE:0; diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 8cd6529c43b..d3238078e4d 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -513,7 +513,7 @@ class MenuLeft { } // Compta expert - if ($conf->comptaexpert->enabled) + if ($conf->accounting->enabled) { } @@ -557,18 +557,18 @@ class MenuLeft { } // Rapports - if ($conf->compta->enabled || $conf->comptaexpert->enabled) + if ($conf->compta->enabled || $conf->accounting->enabled) { // Bilan, résultats - $newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca&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&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_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(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->accounting->comptarapport->lire); /* 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/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); @@ -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/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/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/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->accounting->comptarapport->lire); } } diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index 5776a4e1caf..b6ce08882e9 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -498,7 +498,7 @@ class MenuLeft { } // Compta expert - if ($conf->comptaexpert->enabled) + if ($conf->accounting->enabled) { } @@ -547,20 +547,20 @@ class MenuLeft { */ // Rapports /* - if ($conf->compta->enabled || $conf->comptaexpert->enabled) + if ($conf->compta->enabled || $conf->accounting->enabled) { // Bilan, résultats - $newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca&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&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_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(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->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/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/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->accounting->comptarapport->lire); } */ diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php index 22020508df4..7a1a7ece1c3 100644 --- a/htdocs/includes/menus/barre_top/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php @@ -188,7 +188,7 @@ class MenuTop { } // Financial - if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled + if ($conf->compta->enabled || $conf->accounting->enabled || $conf->banque->enabled || $conf->facture->enabled) { $langs->load("compta"); @@ -204,7 +204,7 @@ class MenuTop { } $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) { print ''; diff --git a/htdocs/includes/menus/barre_top/eldy_frontoffice.php b/htdocs/includes/menus/barre_top/eldy_frontoffice.php index 5ff062535ae..83970b08bb2 100644 --- a/htdocs/includes/menus/barre_top/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_frontoffice.php @@ -188,7 +188,7 @@ class MenuTop { } // Financial - if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled + if ($conf->compta->enabled || $conf->accounting->enabled || $conf->banque->enabled || $conf->facture->enabled) { $langs->load("compta"); @@ -204,7 +204,7 @@ class MenuTop { } $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) { print ''; diff --git a/htdocs/includes/menus/barre_top/rodolphe.php b/htdocs/includes/menus/barre_top/rodolphe.php index 074aa1e6fe0..db656cdf5e2 100644 --- a/htdocs/includes/menus/barre_top/rodolphe.php +++ b/htdocs/includes/menus/barre_top/rodolphe.php @@ -166,7 +166,7 @@ class MenuTop { } // Financial - if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled + if ($conf->compta->enabled || $conf->accounting->enabled || $conf->banque->enabled || $conf->facture->enabled) { $langs->load("compta"); @@ -182,7 +182,7 @@ class MenuTop { } $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) { print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuFinancial").''; diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index b75752c0338..30724eeeb7f 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -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&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&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&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&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&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&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&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&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', 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->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->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->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->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->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->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', 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->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->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->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->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->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', 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__); diff --git a/htdocs/includes/modules/modComptabiliteExpert.class.php b/htdocs/includes/modules/modAccounting.class.php similarity index 83% rename from htdocs/includes/modules/modComptabiliteExpert.class.php rename to htdocs/includes/modules/modAccounting.class.php index d55e4b1f05e..0b18ad6e4a7 100644 --- a/htdocs/includes/modules/modComptabiliteExpert.class.php +++ b/htdocs/includes/modules/modAccounting.class.php @@ -19,33 +19,32 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/** \defgroup comptabilite_expert Module comptabilite expert - \brief Module pour inclure des fonctions de comptabilit� (gestion de comptes comptables et rapports) - \version $Id$ +/** \defgroup accounting Module accounting + * \brief Module pour inclure des fonctions de comptabilite (gestion de comptes comptables et rapports) + * \version $Id$ */ /** - \file htdocs/includes/modules/modComptabiliteExpert.class.php - \ingroup comptabilite_expert - \brief Fichier de description et activation du module Comptabilite Expert + * \file htdocs/includes/modules/modAccounting.class.php + * \ingroup accounting + * \brief Fichier de description et activation du module Comptabilite Expert */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); /** - \class modComptabiliteExpert - \brief Classe de description et activation du module Comptabilite Expert + * \class modAccounting + * \brief Classe de description et activation du module Comptabilite Expert */ - -class modComptabiliteExpert extends DolibarrModules +class modAccounting extends DolibarrModules { /** * \brief Constructeur. Definit les noms, constantes et boites * \param DB handler d'acces base */ - function modComptabiliteExpert($DB) + function modAccounting($DB) { global $conf; @@ -55,7 +54,7 @@ class modComptabiliteExpert extends DolibarrModules $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) $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 //$this->version = 'dolibarr'; @@ -65,7 +64,7 @@ class modComptabiliteExpert extends DolibarrModules $this->special = 0; // Config pages - $this->config_page_url = array("comptaexpert.php"); + $this->config_page_url = array("accounting.php"); // Dependances $this->depends = array("modFacture","modBanque"); @@ -77,14 +76,14 @@ class modComptabiliteExpert extends DolibarrModules $this->const = array(); // Data directories to create when module is enabled - $this->dirs = array("/comptabiliteexpert/temp"); + $this->dirs = array("/accounting/temp"); // Boxes $this->boxes = array(); // Permissions $this->rights = array(); - $this->rights_class = 'comptaexpert'; + $this->rights_class = 'accounting'; $this->rights[1][0] = 131; $this->rights[1][1] = 'Lire le plan de compte'; diff --git a/htdocs/includes/modules/modBanque.class.php b/htdocs/includes/modules/modBanque.class.php index e877057dcff..03e1049b9dc 100644 --- a/htdocs/includes/modules/modBanque.class.php +++ b/htdocs/includes/modules/modBanque.class.php @@ -69,7 +69,7 @@ class modBanque extends DolibarrModules // Dependancies $this->depends = array(); - $this->requiredby = array("modComptabilite","modComptabiliteExpert"); + $this->requiredby = array("modComptabilite","modAccounting"); $this->conflictwith = array(); $this->langfiles = array("banks","compta","bills","companies"); diff --git a/htdocs/includes/modules/modComptabilite.class.php b/htdocs/includes/modules/modComptabilite.class.php index 38e62cfbf24..059357a3cc3 100644 --- a/htdocs/includes/modules/modComptabilite.class.php +++ b/htdocs/includes/modules/modComptabilite.class.php @@ -47,49 +47,49 @@ class modComptabilite extends DolibarrModules function modComptabilite($DB) { global $conf; - + $this->db = $DB ; $this->numero = 10 ; - + $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) $this->name = eregi_replace('^mod','',get_class($this)); $this->description = "Gestion sommaire de comptabilite"; - + // Possible values for version are: 'development', 'experimental', 'dolibarr' or version $this->version = 'dolibarr'; - + $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->special = 0; $this->picto=''; - + // Config pages $this->config_page_url = array("compta.php"); - + // Dependances $this->depends = array("modFacture","modBanque"); $this->requiredby = array(); - $this->conflictwith = array("modComptabiliteExpert"); + $this->conflictwith = array("modAccounting"); $this->langfiles = array("compta"); - + // Constantes $this->const = array(); - + // Data directories to create when module is enabled $this->dirs = array("/comptabilite/temp", "/comptabilite/rapport", "/comptabilite/export", "/comptabilite/bordereau" ); - + // Boites $this->boxes = array(); - + // Permissions $this->rights = array(); $this->rights_class = 'compta'; $r=0; - + $r++; $this->rights[$r][0] = 95; $this->rights[$r][1] = 'Lire CA, bilans, resultats'; @@ -97,7 +97,7 @@ class modComptabilite extends DolibarrModules $this->rights[$r][3] = 1; $this->rights[$r][4] = 'resultat'; $this->rights[$r][5] = 'lire'; - + $r++; $this->rights[$r][0] = 96; $this->rights[$r][1] = 'Parametrer la ventilation'; @@ -105,7 +105,7 @@ class modComptabilite extends DolibarrModules $this->rights[$r][3] = 0; $this->rights[$r][4] = 'ventilation'; $this->rights[$r][5] = 'parametrer'; - + $r++; $this->rights[$r][0] = 97; $this->rights[$r][1] = 'Lire les ventilations de factures'; @@ -113,7 +113,7 @@ class modComptabilite extends DolibarrModules $this->rights[$r][3] = 1; $this->rights[$r][4] = 'ventilation'; $this->rights[$r][5] = 'lire'; - + $r++; $this->rights[$r][0] = 98; $this->rights[$r][1] = 'Ventiler les lignes de factures'; @@ -131,10 +131,10 @@ class modComptabilite extends DolibarrModules function init() { global $conf; - + // Nettoyage avant activation $this->remove(); - + return $this->_init($sql); } @@ -145,7 +145,7 @@ class modComptabilite extends DolibarrModules function remove() { $sql = array(); - + return $this->_remove($sql); } diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php index ed30ef841fc..3c273ce8c93 100644 --- a/htdocs/includes/modules/modFacture.class.php +++ b/htdocs/includes/modules/modFacture.class.php @@ -69,7 +69,7 @@ class modFacture extends DolibarrModules // Dependencies $this->depends = array("modSociete"); - $this->requiredby = array("modComptabilite","modComptabiliteExpert"); + $this->requiredby = array("modComptabilite","modAccounting"); $this->conflictwith = array(); $this->langfiles = array("bills","companies","compta","products"); diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php index d222bea55c2..3aafafae2ec 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.php @@ -64,7 +64,7 @@ function societe_prepare_head($objsoc) $head[$h][2] = 'supplier'; $h++; } - if ($conf->facture->enabled || $conf->compta->enabled || $conf->comptaexpert->enabled) + if ($conf->facture->enabled || $conf->compta->enabled || $conf->accounting->enabled) { $langs->load("compta"); $head[$h][0] = DOL_URL_ROOT.'/compta/fiche.php?socid='.$objsoc->id; diff --git a/htdocs/lib/tax.lib.php b/htdocs/lib/tax.lib.php index 63328958998..00e8ab9af11 100644 --- a/htdocs/lib/tax.lib.php +++ b/htdocs/lib/tax.lib.php @@ -38,7 +38,7 @@ function vat_by_thirdparty($db, $y, $modetax, $direction) global $conf; $list=array(); - //print "xx".$conf->global->MAIN_MODULE_COMPTABILITEEXPERT; + //print "xx".$conf->global->MAIN_MODULE_ACCOUNTING; //print "xx".$conf->global->MAIN_MODULE_COMPTABILITE; if ($direction == 'sell') @@ -61,11 +61,11 @@ function vat_by_thirdparty($db, $y, $modetax, $direction) if ($modetax == 1) { // 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 - // n'est pas stocké dans la table des payments. - // Seul le module compta expert peut résoudre ce problème. + // n'est pas stock� dans la table des payments. + // Seul le module compta expert peut r�soudre ce probl�me. // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le // detail part tva et part ht). $sql = 'TODO'; @@ -85,19 +85,19 @@ function vat_by_thirdparty($db, $y, $modetax, $direction) } else { - if ($conf->global->MAIN_MODULE_COMPTABILITEEXPERT) + if ($conf->global->MAIN_MODULE_ACCOUNTING) { // If vat payed on payments // \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. - // Seul le module compta expert peut résoudre ce problème. + // n'est pas stock� dans la table des payments. + // Seul le module compta expert peut r�soudre ce probl�me. // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le // detail part tva et part ht). $sql = 'TODO'; } if ($conf->global->MAIN_MODULE_COMPTABILITE) { - // Tva sur factures payés (should be on payment) + // Tva sur factures pay�s (should be on payment) /* $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.= " 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 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 - // n'est pas stocké dans la table des payments. - // Seul le module compta expert peut résoudre ce problème. + // n'est pas stock� dans la table des payments. + // Seul le module compta expert peut r�soudre ce probl�me. // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le // detail part tva et part ht). $sql='TODO'; @@ -216,18 +216,18 @@ function vat_by_quarter($db, $y, $q, $modetax, $direction) else // Option vat 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 - // n'est pas stocké dans la table des payments. - // Seul le module compta expert peut résoudre ce problème. + // n'est pas stock� dans la table des payments. + // Seul le module compta expert peut r�soudre ce probl�me. // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le // detail part tva et part ht). $sql='TODO'; } if ($conf->global->MAIN_MODULE_COMPTABILITE) { - // Tva sur factures payés (should be on shipment, done on payment instead !) + // Tva sur factures pay�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.= " 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,"; @@ -315,11 +315,11 @@ function vat_by_quarter($db, $y, $q, $modetax, $direction) if ($modetax == 1) // Option vat on debit { // 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 - // n'est pas stocké dans la table des payments. - // Seul le module compta expert peut résoudre ce problème. + // n'est pas stock� dans la table des payments. + // Seul le module compta expert peut r�soudre ce probl�me. // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le // detail part tva et part ht). $sql='TODO'; @@ -347,18 +347,18 @@ function vat_by_quarter($db, $y, $q, $modetax, $direction) else // Option vat 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 - // n'est pas stocké dans la table des payments. - // Seul le module compta expert peut résoudre ce problème. + // n'est pas stock� dans la table des payments. + // Seul le module compta expert peut r�soudre ce probl�me. // (Il faut quand un paiement a lieu, stocker en plus du montant du paiement le // detail part tva et part ht). $sql='TODO'; } if ($conf->global->MAIN_MODULE_COMPTABILITE) { - // Tva sur factures payés (should be on payment) + // Tva sur factures pay�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.= " 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,";