From 10c798c1051f713c79727ed32fb5bea933ee5d7f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 20 May 2006 10:50:47 +0000 Subject: [PATCH] =?UTF-8?q?Trad:=20Traduction=20du=20module=20compta=20par?= =?UTF-8?q?=20d=E9faut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/compta/export/index.php | 83 +++++++++++-------- htdocs/compta/export/pre.inc.php | 2 +- htdocs/compta/param/comptes/pre.inc.php | 9 +- htdocs/compta/param/pre.inc.php | 5 +- .../menus/barre_left/eldy_backoffice.php | 9 +- .../menus/barre_left/eldy_frontoffice.php | 3 +- .../menus/barre_top/eldy_backoffice.php | 7 +- .../menus/barre_top/eldy_frontoffice.php | 7 +- htdocs/langs/en_US/compta.lang | 4 + htdocs/langs/fr_FR/compta.lang | 4 + 10 files changed, 80 insertions(+), 53 deletions(-) diff --git a/htdocs/compta/export/index.php b/htdocs/compta/export/index.php index 84ee5e2554d..a169472d445 100644 --- a/htdocs/compta/export/index.php +++ b/htdocs/compta/export/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2006 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 @@ -18,54 +18,67 @@ * * $Id$ * $Source$ - * */ -/*! - \file htdocs/compta/export/index.php - \ingroup compta - \brief Page accueil zone export compta - \version $Revision$ +/** + \file htdocs/compta/export/index.php + \ingroup compta + \brief Page export ventilations + \version $Revision$ */ require("./pre.inc.php"); +require_once("./ComptaJournalPaiement.class.php"); +require_once("./ComptaJournalVente.class.php"); -require("./ComptaJournalPaiement.class.php"); -require("./ComptaJournalVente.class.php"); - +/* + * Actions + */ + if ($_GET["action"] == 'export') { - include_once DOL_DOCUMENT_ROOT.'/compta/export/modules/compta.export.class.php'; - - $exc = new ComptaExport($db, $user, 'Poivre'); - - if($_GET["id"] > 0) - { - $exc->Export($_GET["id"]); - } - else - { - $exc->Export(); - } - - print $exc->error_message; - - /* Génération du journal des Paiements */ - - $jp= new ComptaJournalPaiement($db); - $jp->GeneratePdf($user, $exc->id, $exc->ref); - - /* Génération du journal des Ventes */ - - $jp= new ComptaJournalVente($db); - $jp->GeneratePdf($user, $exc->id, $exc->ref); + $modulename='Poivre'; + + include_once DOL_DOCUMENT_ROOT.'/compta/export/modules/compta.export.class.php'; + + $exc = new ComptaExport($db, $user, $modulename); + + if($_GET["id"] > 0) + { + $exc->Export($_GET["id"]); + } + else + { + $exc->Export(); + } + + /* Génération du journal des Paiements */ + + $jp= new ComptaJournalPaiement($db); + $jp->GeneratePdf($user, $exc->id, $exc->ref); + + /* Génération du journal des Ventes */ + + $jp= new ComptaJournalVente($db); + $jp->GeneratePdf($user, $exc->id, $exc->ref); } + +/* + * Affichage page + */ + llxHeader('','Compta - Export'); print_titre("Export Comptable"); -print ''; +if ($exc->error_message); +{ + print $exc->error_message; +} + + +print '
'; print ''; + print ''; } // Projets diff --git a/htdocs/includes/menus/barre_top/eldy_frontoffice.php b/htdocs/includes/menus/barre_top/eldy_frontoffice.php index 3d3fc4b8f36..bdcd4633546 100644 --- a/htdocs/includes/menus/barre_top/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_frontoffice.php @@ -176,8 +176,9 @@ class MenuTop { } - // Compta - if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled || $conf->caisse->enabled) + // Financial + if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled || $conf->caisse->enabled + || $conf->commande->enabled || $conf->facture->enabled) { $langs->load("compta"); @@ -191,7 +192,7 @@ class MenuTop { $class = 'class="tmenu"'; } - print ''; + print ''; } // Projets diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 6eba2234939..30fe6ca0e30 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -2,6 +2,7 @@ Accountancy=Accountancy AccountancyCard=Accountancy card Treasury=Treasury +MenuFinancial=Financial OptionMode=Option for accountancy OptionModeTrue=Option Recettes-Dépenses OptionModeVirtual=Option Créances-Dettes @@ -9,6 +10,9 @@ OptionModeTrueDesc=Dans ce mode, le CA est calcul OptionModeVirtualDesc=Dans ce mode, le CA est calculé sur la base des factures validées. Qu'elles soient ou non payés, dès lors qu'elles sont dues, elles apparaissent dans le résultat. FeatureIsSupportedInInOutModeOnly=Feature only available in IN-OUT accountancy mode (See Accountancy module configuration) Param=Setup +AccountsGeneral=Accounts +Account=Account +Accounts=Accounts BillsForSuppliers=Bills for suppliers Income=Income Outcome=Outcome diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 6dd4972684b..d6ebd51159c 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -2,6 +2,7 @@ Accountancy=Compta AccountancyCard=Fiche Compta Treasury=Tréso +MenuFinancial=Compta/Tréso OptionMode=Option de tenue de comptabilité OptionModeTrue=Option Recettes-Dépenses OptionModeVirtual=Option Créances-Dettes @@ -9,6 +10,9 @@ OptionModeTrueDesc=Dans ce mode, le CA est calcul OptionModeVirtualDesc=Dans ce mode, le CA est calculé sur la base des factures validées. Payées ou non, elles apparaissent dans le résultat dès qu'elles sont dues. FeatureIsSupportedInInOutModeOnly=Fonction disponible uniquement en mode compta RECETTE-DEPENSE (Voir configuration du module compta) Param=Paramétrage +AccountsGeneral=Comptes généraux +Account=Compte +Accounts=Comptes BillsForSuppliers=Factures des fournisseurs Income=Recettes Outcome=Dépenses
'; $sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."facturedet"; diff --git a/htdocs/compta/export/pre.inc.php b/htdocs/compta/export/pre.inc.php index 2383f0a3574..fff455fc943 100644 --- a/htdocs/compta/export/pre.inc.php +++ b/htdocs/compta/export/pre.inc.php @@ -55,7 +55,7 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add(DOL_URL_ROOT."/compta/export/",$langs->trans("Export")); - $menu->add_submenu(DOL_URL_ROOT."/compta/export/index.php?action=export","Nouvel Export"); + $menu->add_submenu(DOL_URL_ROOT."/compta/export/index.php?action=export",$langs->trans("New")); $menu->add_submenu(DOL_URL_ROOT."/compta/export/liste.php",$langs->trans("List")); diff --git a/htdocs/compta/param/comptes/pre.inc.php b/htdocs/compta/param/comptes/pre.inc.php index 2b206837a2e..2d9663c24b8 100644 --- a/htdocs/compta/param/comptes/pre.inc.php +++ b/htdocs/compta/param/comptes/pre.inc.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004-2006 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 @@ -18,7 +18,6 @@ * * $Id$ * $Source$ - * */ /** \file htdocs/compta/param/pre.inc.php @@ -41,9 +40,9 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param")); - $menu->add(DOL_URL_ROOT."/compta/param/comptes/","Comptes généraux"); - $menu->add_submenu(DOL_URL_ROOT."/compta/param/comptes/liste.php","Liste"); - $menu->add_submenu(DOL_URL_ROOT."/compta/param/comptes/fiche.php?action=create","Nouveau"); + $menu->add(DOL_URL_ROOT."/compta/param/comptes/",$langs->trans("AccountsGeneral")); + $menu->add_submenu(DOL_URL_ROOT."/compta/param/comptes/liste.php",$langs->trans("List")); + $menu->add_submenu(DOL_URL_ROOT."/compta/param/comptes/fiche.php?action=create",$langs->trans("New")); left_menu($menu->liste, $help_url); } diff --git a/htdocs/compta/param/pre.inc.php b/htdocs/compta/param/pre.inc.php index 5c03b4f449b..2bc63eea5b6 100644 --- a/htdocs/compta/param/pre.inc.php +++ b/htdocs/compta/param/pre.inc.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004-2006 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 @@ -18,7 +18,6 @@ * * $Id$ * $Source$ - * */ /** @@ -39,7 +38,7 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param")); - $menu->add_submenu(DOL_URL_ROOT."/compta/param/comptes/liste.php","Comptes généraux"); + $menu->add_submenu(DOL_URL_ROOT."/compta/param/comptes/liste.php",$langs->trans("AccountsGeneral")); left_menu($menu->liste, $help_url); } diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 3f20c82aca8..4d269e0e4c9 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -299,6 +299,7 @@ class MenuLeft { $newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=customers&type=c", $langs->trans("Contacts"),1,$user->rights->societe->lire); } + // Factures if ($conf->facture->enabled) { $langs->load("bills"); @@ -372,8 +373,12 @@ class MenuLeft { { $newmenu->add(DOL_URL_ROOT."/compta/ventilation/index.php?leftmenu=ventil",$langs->trans("Ventilation"),0,$user->rights->compta->ventilation->lire); if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/ventilation/liste.php",$langs->trans("A ventiler"),1,$user->rights->compta->ventilation->lire); - if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/ventilation/lignes.php",$langs->trans("Ventilées"),1,$user->rights->compta->ventilation->lire); - if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Setup"),1,$user->rights->compta->ventilation->parametrer); + if ($leftmenu=="ventil") $newmenu->add_submenu(DOL_URL_ROOT."/compta/ventilation/lignes.php",$langs->trans("Ventilées"),1,$user->rights->compta->ventilation->lire); + if ($leftmenu=="ventil") $newmenu->add_submenu(DOL_URL_ROOT."/compta/param/",$langs->trans("Setup"),1,$user->rights->compta->ventilation->parametrer); + if ($leftmenu=="ventil") $newmenu->add_submenu(DOL_URL_ROOT."/compta/param/comptes/liste.php",$langs->trans("List"),2,$user->rights->compta->ventilation->parametrer); + if ($leftmenu=="ventil") $newmenu->add_submenu(DOL_URL_ROOT."/compta/param/comptes/fiche.php?action=create",$langs->trans("New"),2,$user->rights->compta->ventilation->parametrer); + if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/export/",$langs->trans("Export"),1,$user->rights->compta->ventilation->lire); + } // Compta expert diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index f5a88094a66..3511b789223 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -253,7 +253,7 @@ class MenuLeft { /* - * Menu COMPTA + * Menu Financial */ if ($mainmenu == 'accountancy') { @@ -309,6 +309,7 @@ class MenuLeft { $newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=customers&type=c", $langs->trans("Contacts"),1,$user->rights->societe->lire); } + // Factures if ($conf->facture->enabled) { $langs->load("bills"); diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php index a1fc8542992..8aa39979325 100644 --- a/htdocs/includes/menus/barre_top/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php @@ -178,8 +178,9 @@ class MenuTop { } - // Compta - if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled || $conf->caisse->enabled) + // Financial + if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled || $conf->caisse->enabled + || $conf->commande->enabled || $conf->facture->enabled) { $langs->load("compta"); @@ -193,7 +194,7 @@ class MenuTop { $class = 'class="tmenu"'; } - print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Accountancy")."/".$langs->trans("Treasury").'atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuFinancial").'atarget?" target=$this->atarget":"").'>'.$langs->trans("Accountancy")."/".$langs->trans("Treasury").'atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuFinancial").'