diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php index 7c00bb8f1d6..5067bd90af9 100644 --- a/htdocs/compta/bank/pre.inc.php +++ b/htdocs/compta/bank/pre.inc.php @@ -33,9 +33,9 @@ $langs->load("banks"); function llxHeader($head = "") { global $db, $user, $conf, $langs; - + top_menu($head); - + $menu = new Menu(); if ($user->rights->banque->lire) { @@ -47,7 +47,7 @@ function llxHeader($head = "") { $numr = $db->num_rows($resql); $i = 0; - + while ($i < $numr) { $objp = $db->fetch_object($resql); @@ -62,8 +62,10 @@ function llxHeader($head = "") } $db->free($resql); } + + $menu->add(DOL_URL_ROOT."/compta/bank/index.php",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire); - + $menu->add_submenu(DOL_URL_ROOT."/compta/bank/fiche.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer); $menu->add_submenu(DOL_URL_ROOT."/compta/bank/categ.php",$langs->trans("Rubriques"),1,$user->rights->banque->configurer); @@ -74,22 +76,22 @@ function llxHeader($head = "") { $menu->add_submenu(DOL_URL_ROOT."/compta/bank/virement.php",$langs->trans("BankTransfers"),1,$user->rights->banque->transfer); } - + if ($conf->global->COMPTA_ONLINE_PAYMENT_BPLC) { $menu->add(DOL_URL_ROOT."/compta/bank/bplc.php","Transactions BPLC"); } - + // Gestion cheques if ($conf->facture->enabled && $conf->banque->enabled) { $langs->load("bills"); - + $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=bank&mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque); $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=bank&mainmenu=bank&action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque); $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=bank&mainmenu=bank",$langs->trans("MenuChequesReceipts"),1,$user->rights->banque->cheque); } - + left_menu($menu->liste); } ?> diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php index 1b16b2cc21d..5ceda4da23d 100644 --- a/htdocs/compta/paiement/cheque/pre.inc.php +++ b/htdocs/compta/paiement/cheque/pre.inc.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2006 Rodolphe Quiedeville * * 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 @@ -30,12 +30,12 @@ $langs->load("bills"); $langs->load("compta"); $langs->load("banks"); -function llxHeader($head = "", $title="") +function llxHeader($head = "", $title="") { global $db, $user, $conf, $langs; - + top_menu($head); - + $menu = new Menu(); if ($user->rights->banque->lire) { @@ -47,7 +47,7 @@ function llxHeader($head = "", $title="") { $numr = $db->num_rows($resql); $i = 0; - + while ($i < $numr) { $objp = $db->fetch_object($resql); @@ -62,34 +62,37 @@ function llxHeader($head = "", $title="") } $db->free($resql); } - $menu->add(DOL_URL_ROOT."/compta/bank/index.php",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire); - - $menu->add_submenu(DOL_URL_ROOT."/compta/bank/fiche.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer); - $menu->add_submenu(DOL_URL_ROOT."/compta/bank/categ.php",$langs->trans("Categories"),1,$user->rights->banque->configurer); - $menu->add_submenu(DOL_URL_ROOT."/compta/bank/search.php",$langs->trans("SearchTransaction"),1,$user->rights->banque->lire); - $menu->add_submenu(DOL_URL_ROOT."/compta/bank/budget.php",$langs->trans("ByRubriques"),1,$user->rights->banque->lire); + + + $menu->add(DOL_URL_ROOT."/compta/bank/index.php",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire); + + $menu->add_submenu(DOL_URL_ROOT."/compta/bank/fiche.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer); + $menu->add_submenu(DOL_URL_ROOT."/compta/bank/categ.php",$langs->trans("Rubriques"),1,$user->rights->banque->configurer); + + $menu->add_submenu(DOL_URL_ROOT."/compta/bank/search.php",$langs->trans("ListTransactions"),1,$user->rights->banque->lire); + $menu->add_submenu(DOL_URL_ROOT."/compta/bank/budget.php",$langs->trans("ListTransactionsByCategory"),1,$user->rights->banque->lire); if ($user->rights->banque->transfer) { $menu->add_submenu(DOL_URL_ROOT."/compta/bank/virement.php",$langs->trans("BankTransfers"),1,$user->rights->banque->transfer); } - + if ($conf->global->COMPTA_ONLINE_PAYMENT_BPLC) { $menu->add(DOL_URL_ROOT."/compta/bank/bplc.php","Transactions BPLC"); } - + // Gestion cheques if ($conf->facture->enabled && $conf->banque->enabled) { $langs->load("bills"); - + $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=bank&mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque); $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=bank&mainmenu=bank&action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque); $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=bank&mainmenu=bank",$langs->trans("MenuChequesReceipts"),1,$user->rights->banque->cheque); } - + left_menu($menu->liste); } diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 147299cb044..26cbd1ac31a 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -1,7 +1,7 @@ * Copyright (C) 2004 Éric Seigne - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2006 Yannick Warnier * * This program is free software; you can redistribute it and/or modify @@ -94,7 +94,7 @@ if ($modetax==1) // Calculate on invoice for goods and services $description.=$fsearch; $builddate=time(); $exportlink=$langs->trans("NotYetAvailable"); - + $elementcust=$langs->trans("CustomersInvoices"); $productcust=$langs->trans("Description"); $amountcust=$langs->trans("AmountHT"); @@ -117,7 +117,7 @@ if ($modetax==0) // Invoice for goods, payment for services $description.=$fsearch; $builddate=time(); $exportlink=$langs->trans("NotYetAvailable"); - + $elementcust=$langs->trans("CustomersInvoices"); $productcust=$langs->trans("Description"); $amountcust=$langs->trans("AmountHT"); @@ -135,7 +135,7 @@ report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportl // VAT Received print "
"; -print_fiche_titre($vatcust); +print_titre($vatcust); print ""; print ""; @@ -205,7 +205,7 @@ print '
'; // VAT Payed print "
"; -print_fiche_titre($vatsup); +print_titre($vatsup); print ""; print ""; @@ -272,7 +272,7 @@ else } print '
'; - + $db->close(); diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index bb3ab1710d6..8dd6f2a7416 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -1,7 +1,7 @@ * Copyright (C) 2004 Éric Seigne - * Copyright (C) 2004-2008 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 @@ -55,7 +55,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges'); function tva_coll($db,$y,$m) { global $conf; - + if ($conf->compta->mode == "CREANCES-DETTES") { // Si on paye la tva sur les factures dues (non brouillon) @@ -69,13 +69,13 @@ function tva_coll($db,$y,$m) else { // Si on paye la tva sur les 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. // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le // detail part tva et part ht). - + /* // Tva sur factures payés $sql = "SELECT sum(f.tva) as amount"; @@ -124,20 +124,20 @@ function tva_paye($db, $y,$m) else { // Si on paye la tva sur les 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. // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le // detail part tva et part ht). - + /* // \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. // Il faut quand un payment a lieu, stocker en plus du montant du paiement le // detail part tva et part ht. - + // Tva sur factures payés $sql = "SELECT sum(f.total_tva) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; @@ -221,9 +221,9 @@ print_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." echo ''; echo ''; echo '\n"; if ($conf->compta->mode == "CREANCES-DETTES") { $y = $year_current ; - - + + $var=True; $total = 0; $subtotal = 0; $i=0; @@ -250,21 +250,21 @@ if ($conf->compta->mode == "CREANCES-DETTES") $var=!$var; print ""; print ''; - + $x_coll = tva_coll($db, $y, $m); print ""; - + $x_paye = tva_paye($db, $y, $m); print ""; - + $diff = $x_coll - $x_paye; $total = $total + $diff; $subtotal = $subtotal + $diff; - + print "\n"; print "\n"; print "\n"; - + $i++; if ($i > 2) { print ''; @@ -284,11 +284,11 @@ else } print '
'; -print_fiche_titre($langs->trans("VATSummary")); +print_titre($langs->trans("VATSummary")); echo ' '; -print_fiche_titre($langs->trans("VATPayed")); +print_titre($langs->trans("VATPayed")); echo '
'; @@ -240,8 +240,8 @@ print "
'.dolibarr_print_date(dolibarr_mktime(0,0,0,$m,1,$y),"%b %Y").'".price($x_coll)."".price($x_paye)."".price($diff)." 
'.$langs->trans("SubTotal").':'.price($subtotal).' 
'; - - + + echo ' '; - - + + /* * Réglée */ diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 85f06913425..bc3e55d9c68 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2008 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 @@ -45,7 +45,7 @@ llxHeader(); $tva_static = new Tva($db); -print_titre($langs->trans("VATPayments")); +print_fiche_titre($langs->trans("VATPayments")); $sql = "SELECT rowid, amount, label, ".$db->pdate("f.datev")." as dm"; $sql .= " FROM ".MAIN_DB_PREFIX."tva as f "; @@ -55,7 +55,7 @@ $result = $db->query($sql); if ($result) { $num = $db->num_rows($result); - $i = 0; + $i = 0; $total = 0 ; print '
'; print ''; @@ -71,22 +71,22 @@ if ($result) $obj = $db->fetch_object($result); $var=!$var; print ""; - + $tva_static->id=$obj->rowid; $tva_static->ref=$obj->rowid; print "\n"; print '\n"; print "\n"; $total = $total + $obj->amount; - + print ""; print "\n"; - + $i++; } print ''; print ""; - + print "
".$tva_static->getNomUrl(1)."'.dolibarr_print_date($obj->dm,'day')."".$obj->label."".price($obj->amount)."
'.$langs->trans("Total").'".price($total)."
"; $db->free($result); } @@ -94,7 +94,7 @@ else { dolibarr_print_error($db); } - + $db->close(); diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index bac4b297cbd..30c7d62a817 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -645,7 +645,7 @@ class MenuLeft { if ($conf->stock->enabled) { $langs->load("stocks"); - $newmenu->add(DOL_URL_ROOT."/product/stock/index.php?leftmenu=stock", $langs->trans("Stock"), 0, $user->rights->stock->lire); + $newmenu->add(DOL_URL_ROOT."/product/stock/index.php?leftmenu=stock", $langs->trans("Stocks"), 0, $user->rights->stock->lire); if ($leftmenu=="stock") $newmenu->add_submenu(DOL_URL_ROOT."/product/stock/fiche.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer); if ($leftmenu=="stock") $newmenu->add_submenu(DOL_URL_ROOT."/product/stock/liste.php", $langs->trans("List"), 1, $user->rights->stock->lire); if ($leftmenu=="stock") $newmenu->add_submenu(DOL_URL_ROOT."/product/stock/valo.php", $langs->trans("EnhancedValue"), 1, $user->rights->stock->lire); @@ -763,23 +763,25 @@ class MenuLeft { if ($conf->projet->enabled) { $langs->load("projects"); - $newmenu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer); - $newmenu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire); $newmenu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire); $newmenu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer); $newmenu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); + $newmenu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer); + $newmenu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire); + + $newmenu->add(DOL_URL_ROOT."/projet/activity/index.php?mode=mine", $langs->trans("MyActivities"), 0, $user->rights->projet->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create&mode=mine", $langs->trans("NewTask"), 1, $user->rights->projet->creer); + $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php?mode=mine", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); + $newmenu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire); $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer); $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("List"), 1, $user->rights->projet->lire); $newmenu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); - $newmenu->add(DOL_URL_ROOT."/projet/activity/index.php?mode=mine", $langs->trans("MyActivities"), 0, $user->rights->projet->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create&mode=mine", $langs->trans("NewTask"), 1, $user->rights->projet->creer); - $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php?mode=mine", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); } } diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index 6b2f3541745..47da757ac86 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -625,7 +625,7 @@ class MenuLeft { if ($conf->stock->enabled) { $langs->load("stocks"); - $newmenu->add(DOL_URL_ROOT."/product/stock/index.php?leftmenu=stock", $langs->trans("Stock"), 0, $user->rights->stock->lire); + $newmenu->add(DOL_URL_ROOT."/product/stock/index.php?leftmenu=stock", $langs->trans("Stocks"), 0, $user->rights->stock->lire); if ($leftmenu=="stock") $newmenu->add_submenu(DOL_URL_ROOT."/product/stock/fiche.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer); if ($leftmenu=="stock") $newmenu->add_submenu(DOL_URL_ROOT."/product/stock/liste.php", $langs->trans("List"), 1, $user->rights->stock->lire); if ($leftmenu=="stock") $newmenu->add_submenu(DOL_URL_ROOT."/product/stock/valo.php", $langs->trans("EnhancedValue"), 1, $user->rights->stock->lire); @@ -732,23 +732,24 @@ class MenuLeft { if ($conf->projet->enabled) { $langs->load("projects"); - $newmenu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer); - $newmenu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire); $newmenu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire); $newmenu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer); $newmenu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); - $newmenu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer); - $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("List"), 1, $user->rights->projet->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); + $newmenu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer); + $newmenu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire); $newmenu->add(DOL_URL_ROOT."/projet/activity/index.php?mode=mine", $langs->trans("MyActivities"), 0, $user->rights->projet->lire); $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create&mode=mine", $langs->trans("NewTask"), 1, $user->rights->projet->creer); $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); $newmenu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php?mode=mine", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); + + $newmenu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer); + $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("List"), 1, $user->rights->projet->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); } }