Look: Uniformize view

htdocs/compta/tva.php

@@ -0,0 +1,98 @@
+<?PHP
+/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004      Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/*	\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 "<TABLE border=\"1\" width=\"100%\">";
+    print "<TR class=\"liste_titre\">";
+    print "<TD width=\"60%\">$date</TD>";
+    print "<TD align=\"right\">Montant</TD>";
+    print "<td>&nbsp;</td>\n";
+    print "</TR>\n";
+    $var=True;
+    while ($i < $num) {
+      $obj = $db->fetch_object($result);
+      $var=!$var;
+      print "<TR $bc[$var]>";
+      print "<TD>$obj->dm</TD>\n";
+      print "<TD align=\"right\">".price($obj->amount)."</TD><td>&nbsp;</td>\n";
+      print "</TR>\n";
+
+      $total = $total + $obj->amount;
+
+      $i++;
+    }
+    print "<tr><td align=\"right\">".$langs->trans("TotalHT").":</td><td align=\"right\"><b>".price($total)."</b></td><td>".$langs->trans("Currency".$conf->monnaie)."</td></tr>";
+
+    print "</table>";
+    $db->free();
+  }
+}
+
+/*
+ *
+ */
+
+llxHeader();
+
+$yearc = strftime("%Y",time());
+
+
+echo '<table width="100%"><tr><td width="50%" valign="top">';
+
+print "<b>TVA collect<63>e</b>";
+
+for ($y = $yearc ; $y >= $conf->years ; $y=$y-1 ) {
+
+  print "<table width=\"100%\">";
+  print "<tr><td valign=\"top\">";
+
+  $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<EFBFBD>e $y");
+
+  print "</td></tr></table>";
+}
+
+echo '</td><td valign="top" width="50%">';
+echo 'Tva Pay<61>e<br>';
+echo '</td></tr></table>';
+
+
+$db->close();
+
+llxFooter();
+?>

htdocs/core/photos_resize.php

@@ -16,12 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**
- *       \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');

htdocs/product/stock/product.php

@@ -296,15 +296,8 @@ if ($_GET["id"] || $_GET["ref"])
 			dol_print_error($db);
 		}
 		print '<tr><td valign="top">'.$langs->trans("LastMovement").'</td><td colspan="3">';
-		if ($lastmovementdate)
+		if ($lastmovementdate) print dol_print_date($lastmovementdate,'dayhour').' ';
-		{
+		print '(<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?idproduct='.$product->id.'">'.$langs->trans("FullList").'</a>)';
-		    print dol_print_date($lastmovementdate,'dayhour').' ';
-		    print '(<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?idproduct='.$product->id.'">'.$langs->trans("FullList").'</a>)';
-		}
-		else
-		{
-		     print '<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?idproduct='.$product->id.'">'.$langs->trans("None").'</a>';
-		}
 		print "</td></tr>";
 
 		print "</table>";

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
     // -----------------------------------------