diff --git a/htdocs/admin/pre.inc.php b/htdocs/admin/pre.inc.php index 51b77b81854..e2eb0648d68 100644 --- a/htdocs/admin/pre.inc.php +++ b/htdocs/admin/pre.inc.php @@ -31,11 +31,11 @@ if (! $res) include("../../../dolibarr/htdocs/main.inc.php"); // Used on dev env $langs->load("admin"); -function llxHeader($head = "", $title="", $help_url='') +function llxHeader($head = '', $title='', $help_url='') { global $conf, $user, $langs; - top_menu($head); + top_menu($head, $title, $target); $menuarray=array(); diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 90fcc486e1c..53bc8c68102 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -107,7 +107,7 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"]=='yes' && $user->r /* -* Affichage page +* View */ llxHeader(); @@ -261,7 +261,7 @@ if ($account || $_GET["ref"]) /** - * Bandeau recherche + * Search form */ // Define transaction list navigation string @@ -473,8 +473,10 @@ if ($account || $_GET["ref"]) $isbanktransfert=false; foreach($links as $key=>$val) { if ($val['type']=='banktransfert') $isbanktransfert=true; } + $issocialcontrib=false; + //foreach($links as $key=>$val) { if ($val['type']=='sc') $issocialcontrib=true; } - if (sizeof($links) == 0 || $isbanktransfert) + if (sizeof($links) == 0 || $isbanktransfert || $issocialcontrib) { if (eregi('^\((.*)\)$',$objp->label,$reg)) { @@ -524,9 +526,14 @@ if ($account || $_GET["ref"]) } else if ($links[$key]['type']=='company') { } - else if ($links[$key]['type']=='sc') { + else if ($links[$key]['type']=='sc') { // This is waitin for card to link to payment_sc + print ''; + //print img_object($langs->trans('ShowPayment'),'payment').' '; + print $langs->trans("SocialContribution"); + print ''; } - else if ($links[$key]['type']=='payment_sc') { + else if ($links[$key]['type']=='payment_sc') + { //print ' - '; print ''; //print img_object($langs->trans('ShowPayment'),'payment').' '; diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 9b65e33bf8d..0d3a105fc5a 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -15,21 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** - \file htdocs/compta/charges/index.php - \ingroup compta - \brief Page liste des charges - \version $Revision$ -*/ + * \file htdocs/compta/charges/index.php + * \ingroup compta + * \brief Page liste des charges + * \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); +// Security check if (!$user->admin && !$user->rights->tax->charges->lire) accessforbidden(); @@ -38,16 +36,20 @@ $filtre=$_GET["filtre"]; if (! $year) { $year=date("Y", time()); } -llxHeader(); + +/* + * View + */ + +llxHeader('',$langs->trans("TaxAndDividendsArea")); print_fiche_titre($langs->trans("TaxAndDividendsArea"),($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":"")); print "
"; -/* -* Charges sociales -*/ +// Social contributions + print_titre($langs->trans("SocialContributions")); print ''; print ""; @@ -106,58 +108,64 @@ else } print '
'; -print "
"; -$tva = new Tva($db); +// VAT -print_titre($langs->trans("VATPayments")); - -$sql = "SELECT rowid, amount, label, ".$db->pdate("f.datev")." as dm"; -$sql .= " FROM ".MAIN_DB_PREFIX."tva as f "; -if ($year > 0) +if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') { - // Si period renseigné on l'utilise comme critere de date, sinon on prend date échéance, - // ceci afin d'etre compatible avec les cas ou la période n'etait pas obligatoire - $sql .= " WHERE date_format(f.datev, '%Y') = ".$year; -} -$sql .= " ORDER BY dm DESC"; - -$result = $db->query($sql); -if ($result) -{ - $num = $db->num_rows($result); - $i = 0; - $total = 0 ; - print ''; - print ''; - print ''; - print ""; - print '"; - print "\n"; - $var=1; - while ($i < $num) - { - $obj = $db->fetch_object($result); - $var=!$var; - print ""; - print '\n"; - print "\n"; - $total = $total + $obj->amount; - - print ""; - print "\n"; - - $i++; - } - print ''; - print '"; - - print "
'.$langs->trans("Date").'".$langs->trans("Label")."'.$langs->trans("Amount")."
'.dolibarr_print_date($obj->dm,'day')."".$obj->label."".price($obj->amount)."
'.$langs->trans("Total").''.price($total)."
"; - $db->free($result); -} -else -{ - dolibarr_print_error($db); + print "
"; + + $tva = new Tva($db); + + print_titre($langs->trans("VATPayments")); + + $sql = "SELECT rowid, amount, label, ".$db->pdate("f.datev")." as dm"; + $sql .= " FROM ".MAIN_DB_PREFIX."tva as f "; + if ($year > 0) + { + // Si period renseigné on l'utilise comme critere de date, sinon on prend date échéance, + // ceci afin d'etre compatible avec les cas ou la période n'etait pas obligatoire + $sql .= " WHERE date_format(f.datev, '%Y') = ".$year; + } + $sql .= " ORDER BY dm DESC"; + + $result = $db->query($sql); + if ($result) + { + $num = $db->num_rows($result); + $i = 0; + $total = 0 ; + print ''; + print ''; + print ''; + print ""; + print '"; + print "\n"; + $var=1; + while ($i < $num) + { + $obj = $db->fetch_object($result); + $var=!$var; + print ""; + print '\n"; + print "\n"; + $total = $total + $obj->amount; + + print ""; + print "\n"; + + $i++; + } + print ''; + print '"; + + print "
'.$langs->trans("Date").'".$langs->trans("Label")."'.$langs->trans("Amount")."
'.dolibarr_print_date($obj->dm,'day')."".$obj->label."".price($obj->amount)."
'.$langs->trans("Total").''.price($total)."
"; + $db->free($result); + } + else + { + dolibarr_print_error($db); + } } diff --git a/htdocs/compta/charges/pre.inc.php b/htdocs/compta/charges/pre.inc.php index 43a91b56b38..fb9125ddbe9 100644 --- a/htdocs/compta/charges/pre.inc.php +++ b/htdocs/compta/charges/pre.inc.php @@ -29,13 +29,13 @@ require("../../main.inc.php"); -function llxHeader($head = "") +function llxHeader($head = '', $title='', $help_url='') { global $user, $conf, $langs; $langs->load("compta"); $langs->load("propal"); - top_menu($head); + top_menu($head, $title, $target); $menu = new Menu(); diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 5d963cf576c..984a8675afe 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -219,10 +219,10 @@ $textnextyear=" ".img_next( print_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear"); -echo ''; +echo '
'; echo ''; @@ -284,7 +284,7 @@ else print '
'; print_fiche_titre($langs->trans("VATSummary")); -echo ''; +echo ' '; print_fiche_titre($langs->trans("VATPayed")); echo '
'; -echo ''; +echo ' '; /* diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 3da890bbc06..0520290d3a4 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -397,7 +397,7 @@ class MenuLeft { } } - // Clients + // Customers if ($conf->societe->enabled) { $newmenu->add(DOL_URL_ROOT."/compta/index.php?leftmenu=customers", $langs->trans("Customers"),0,$user->rights->societe->lire); @@ -409,7 +409,7 @@ class MenuLeft { $newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=customers&type=c", $langs->trans("Contacts"),1,$user->rights->societe->contact->lire); } - // Factures + // Invoices if ($conf->facture->enabled) { $langs->load("bills"); @@ -434,14 +434,14 @@ class MenuLeft { if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/index.php?leftmenu=customers_bills", $langs->trans("Statistics"),2,$user->rights->facture->lire); } - // Propal + // Proposals if ($conf->propal->enabled) { $langs->load("propal"); $newmenu->add(DOL_URL_ROOT."/compta/propal.php",$langs->trans("Prop"),0,$user->rights->propale->lire); } - // Commandes + // Orders if ($conf->commande->enabled ) { $langs->load("orders"); @@ -449,7 +449,7 @@ class MenuLeft { // if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/", $langs->trans("StatusOrderToBill"), 1 ,$user->rights->commande->lire); } - // Dons + // Donations if ($conf->don->enabled) { $langs->load("donations"); @@ -468,11 +468,11 @@ class MenuLeft { if ($leftmenu=="tripsandexpenses") $newmenu->add(DOL_URL_ROOT."/compta/deplacement/index.php?leftmenu=tripsandexpenses&mainmenu=accountancy", $langs->trans("List"), 1, $user->rights->deplacement->lire); } - // Taxes et charges sociales + // Taxes and social contributions if ($conf->tax->enabled) { $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy",$langs->trans("MenuTaxAndDividends"), 0, $user->rights->tax->charges->lire); - if (eregi('^tax',$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=tax_social&mainmenu=accountancy",$langs->trans("MenuSocialContributions"),1,$user->rights->tax->charges->lire); + if (eregi('^tax',$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=tax_social&mainmenu=accountancy&mode=sconly",$langs->trans("MenuSocialContributions"),1,$user->rights->tax->charges->lire); if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/sociales/charges.php?leftmenu=tax_social&action=create",$langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer); if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/sociales/index.php?leftmenu=tax_social",$langs->trans("List"), 2, $user->rights->tax->charges->lire); // VAT diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index 9145cc0a3b0..f526f34551f 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -379,7 +379,7 @@ class MenuLeft { } } - // Clients + // Customers if ($conf->societe->enabled) { $newmenu->add(DOL_URL_ROOT."/compta/index.php?leftmenu=customers", $langs->trans("Customers"),0,$user->rights->societe->lire); @@ -391,7 +391,7 @@ class MenuLeft { $newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=customers&type=c", $langs->trans("Contacts"),1,$user->rights->societe->contact->lire); } - // Factures + // Invoices if ($conf->facture->enabled) { $langs->load("bills"); @@ -414,24 +414,22 @@ class MenuLeft { if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/index.php?leftmenu=customers_bills", $langs->trans("Statistics"),2,$user->rights->facture->lire); } - // Propal + // Proposals if ($conf->propal->enabled) { $langs->load("propal"); $newmenu->add(DOL_URL_ROOT."/compta/propal.php",$langs->trans("Prop"),0,$user->rights->propale->lire); } - // Commandes - /* - if ($conf->commande->enabled ) + // Orders + if ($conf->commande->enabled) { $langs->load("orders"); if ($conf->facture->enabled) $newmenu->add(DOL_URL_ROOT."/compta/commande/liste.php?leftmenu=orders&status=3&afacturer=1", $langs->trans("MenuOrdersToBill"), 0, $user->rights->commande->lire); // if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/", $langs->trans("StatusOrderToBill"), 1 ,$user->rights->commande->lire); } - */ - // Dons + // Donations if ($conf->don->enabled) { $langs->load("donations"); @@ -450,11 +448,11 @@ class MenuLeft { if ($leftmenu=="tripsandexpenses") $newmenu->add(DOL_URL_ROOT."/compta/deplacement/index.php?leftmenu=tripsandexpenses&mainmenu=accountancy", $langs->trans("List"), 1, $user->rights->deplacement->lire); } - // Taxes et charges sociales + // Taxes and social contributions if ($conf->tax->enabled) { $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy",$langs->trans("MenuTaxAndDividends"), 0, $user->rights->tax->charges->lire); - if (eregi('^tax',$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=tax_social&mainmenu=accountancy",$langs->trans("MenuSocialContributions"),1,$user->rights->tax->charges->lire); + if (eregi('^tax',$leftmenu)) $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=tax_social&mainmenu=accountancy&mode=sconly",$langs->trans("MenuSocialContributions"),1,$user->rights->tax->charges->lire); if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/sociales/charges.php?leftmenu=tax_social&action=create",$langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer); if (eregi('^tax',$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/sociales/index.php?leftmenu=tax_social",$langs->trans("List"), 2, $user->rights->tax->charges->lire); // VAT diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1ab647ed45f..7e65c06e4e5 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -886,7 +886,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs * \param title titre page web * \param target target du menu Accueil */ -function top_menu($head, $title="", $target="") +function top_menu($head, $title='', $target='') { global $user, $conf, $langs, $db, $dolibarr_main_authentication;