From 7e22db2abef8ead8acdb81e7542a4faf7ac82ce4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 12 Sep 2011 19:34:59 +0000 Subject: [PATCH] Look: Uniformize view --- htdocs/compta/tva.php | 98 ++++++++++++++++++++++++++++++++ htdocs/core/photos_resize.php | 6 -- htdocs/product/stock/product.php | 11 +--- htdocs/societe/soc.php | 16 ++++++ 4 files changed, 116 insertions(+), 15 deletions(-) create mode 100644 htdocs/compta/tva.php diff --git a/htdocs/compta/tva.php b/htdocs/compta/tva.php new file mode 100644 index 00000000000..44054fc1f89 --- /dev/null +++ b/htdocs/compta/tva.php @@ -0,0 +1,98 @@ + + * Copyright (C) 2004 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +/* \deprecated Ce fichier semble ne plus servir. A virer */ + +require('../main.inc.php'); + + +/* + * + * + */ + +function pt ($db, $sql, $date) { + global $bc; + + $result = $db->query($sql); + if ($result) { + $num = $db->num_rows($result); + $i = 0; $total = 0 ; + print ""; + print ""; + print ""; + print ""; + print "\n"; + print "\n"; + $var=True; + while ($i < $num) { + $obj = $db->fetch_object($result); + $var=!$var; + print ""; + print "\n"; + print "\n"; + print "\n"; + + $total = $total + $obj->amount; + + $i++; + } + print ""; + + print "
$dateMontant 
$obj->dm".price($obj->amount)." 
".$langs->trans("TotalHT").":".price($total)."".$langs->trans("Currency".$conf->monnaie)."
"; + $db->free(); + } +} + +/* + * + */ + +llxHeader(); + +$yearc = strftime("%Y",time()); + + +echo '
'; + +print "TVA collect�e"; + +for ($y = $yearc ; $y >= $conf->years ; $y=$y-1 ) { + + print ""; + print "
"; + + $sql = "SELECT sum(f.tva) as amount , date_format(f.datef,'%Y-%m') as dm"; + $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1 AND f.datef >= '$y-01-01' AND f.datef <= '$y-12-31' "; + $sql .= " GROUP BY dm DESC"; + + pt($db, $sql,"Ann�e $y"); + + print "
"; +} + +echo '		'; +echo 'Tva Pay�e
'; +echo '
'; + + +$db->close(); + +llxFooter(); +?> diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php index 01b7887f2ec..eff90336095 100644 --- a/htdocs/core/photos_resize.php +++ b/htdocs/core/photos_resize.php @@ -16,12 +16,6 @@ * along with this program. If not, see . */ -/** - * \file htdocs/core/photos_resize.php - * \ingroup core - * \brief File of page to resize photos - */ - //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); //if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); //if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 475d5430c0a..060fb14090d 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -296,15 +296,8 @@ if ($_GET["id"] || $_GET["ref"]) dol_print_error($db); } print ''.$langs->trans("LastMovement").''; - if ($lastmovementdate) - { - print dol_print_date($lastmovementdate,'dayhour').' '; - print '('.$langs->trans("FullList").')'; - } - else - { - print ''.$langs->trans("None").''; - } + if ($lastmovementdate) print dol_print_date($lastmovementdate,'dayhour').' '; + print '('.$langs->trans("FullList").')'; print ""; print ""; diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index f2637207840..12277db42a3 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -88,6 +88,21 @@ $parameters=array('socid'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks $error=$hookmanager->error; $errors=$hookmanager->errors; +// ---------- start deprecated. Must use hook to hook actions. +/*if (method_exists($objcanvas->control,'doActions')) +{ + $objcanvas->doActions($socid); + + if (! empty($objcanvas->error) || (! empty($objcanvas->errors) && sizeof($objcanvas->errors) > 0)) + { + $error=$objcanvas->error; $errors=$objcanvas->errors; + if ($action=='add') { $objcanvas->action='create'; $action='create'; } + if ($action=='update') { $objcanvas->action='edit'; $action='edit'; } + } +}*/ +// ---------- end deprecated. + + if (empty($reshook)) { if ($_POST["getcustomercode"]) @@ -524,6 +539,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) } else { + // ----------------------------------------- // When used in standard mode // -----------------------------------------