From 62a5a01ba1de12e207fd6ab7c8d8ca48eadd3f4a Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Mon, 30 Dec 2013 15:15:57 +0000
Subject: [PATCH] Merged revisions 5633-5634 via svnmerge from
 svn+ssh://danydb@ns352270.ovh.net/svn/phpcompta/tags/rel671
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r5633 | danydb | 2013-12-30 16:13:16 +0100 (lun., 30 déc. 2013) | 1 line

  Final bug
........
  r5634 | danydb | 2013-12-30 16:15:04 +0100 (lun., 30 déc. 2013) | 1 line

  add todo
........
---
 include/class_filetosend.php   |   6 +-
 include/config_file.php        |   2 +-
 include/template/dashboard.php | 127 +++++++++++++++++----------------
 3 files changed, 69 insertions(+), 66 deletions(-)

diff --git a/include/class_filetosend.php b/include/class_filetosend.php
index e59364386..76429da29 100644
--- a/include/class_filetosend.php
+++ b/include/class_filetosend.php
@@ -63,7 +63,7 @@ class FileToSend
                 $this->type="application/zip";
                 break;
             default:
-                $this->type="application/octect";
+                $this->type="application/octet";
         }
         
     }
@@ -72,7 +72,9 @@ class FileToSend
      */
     function compute_name($p_filename)
     {
-        
+        /**
+         * @todo compute a filename
+         */
     }
   
 }
diff --git a/include/config_file.php b/include/config_file.php
index 6df02440b..2cab01a03 100644
--- a/include/config_file.php
+++ b/include/config_file.php
@@ -62,7 +62,7 @@ function config_file_form($p_array=null)
         /* default value */
         $ctmp=($os==1)?'/tmp':'c:/tmp';
         $cpath=($os==1)?'/usr/bin':'c:/phpcompta/postgresql/bin';
-        $cuser='phpcompta';
+        $cuser='phpcompta_sql';
         $cpasswd='dany';
         $cport=5432;
         $cdomain='';
diff --git a/include/template/dashboard.php b/include/template/dashboard.php
index 3b4e78046..19c4548aa 100644
--- a/include/template/dashboard.php
+++ b/include/template/dashboard.php
@@ -1,5 +1,68 @@
 <!-- left div -->
-<div style="float:right;max-width: 49%">
+<div style="float:left;max-width: 49%">
+    
+<div style="float:left;width: 100%">
+<fieldset >
+<legend><?php echo _('Calendrier')?>
+</legend>
+<?php echo HtmlInput::calendar_zoom($obj); ?>
+<?php echo $cal->display('short'); ?>
+</fieldset>
+</div>
+<!-- Mini rapport -->
+<div style="float:left;width: 100%">
+<?php
+/*
+ * Mini Report
+ */
+$report=$g_user->get_mini_report();
+
+$rapport=new Acc_Report($cn);
+$rapport->id=$report;
+if ( $rapport->exist() == false ) {
+  $g_user->set_mini_report(0);
+  $report=0;
+}
+
+if ( $report != 0 ) : ?>
+<fieldset style="min-height:50%;"><legend><?php echo $rapport->get_name()?></legend>
+<?php    
+  $exercice=$g_user->get_exercice();
+  if ( $exercice == 0 ) {
+    alert(_('Aucune periode par defaut'));
+  } else {
+    $periode=new Periode($cn);
+    $limit=$periode->limit_year($exercice);
+
+    $result=$rapport->get_row($limit['start'],$limit['end'],'periode');
+    $ix=0;
+    echo '<table border="0" width="100%">';
+    foreach ($result as $row) {
+      $ix++;
+	  $class=($ix%2==0)?' class="even" ':' class="odd" ';
+      echo '<tr '.$class.'>';
+
+      echo '<td> '.$row['desc'].'</td>'.
+	'<td style="text-align:right">'.nbm($row['montant'])." &euro;</td>";
+      echo '</tr>';
+    }
+    echo '</table>';
+  }
+  ?>
+  </fieldset>
+<?php
+  else :
+?>
+  <fieldset style="height:50%;width:80%;background-color:white"><legend><?php _('Aucun rapport défini')?></legend>
+  <a href="javascript:void(0)" class="cell" onclick="set_preference('<?php echo dossier::id()?>')"><?php echo _('Cliquez ici pour mettre à jour vos préférences')?></a>
+
+</fieldset>
+<?php
+endif;
+?>
+</div>
+</div>
+<div style="float:left;max-width: 49%">
 
 <?php
 
@@ -252,69 +315,7 @@ for($i=0;$i<count($last_ledger);$i++):
 </div>
 
 </div>
-<div style="float:right;max-width: 49%">
-    
-<div style="float:left;width: 100%">
-<fieldset >
-<legend><?php echo _('Calendrier')?>
-</legend>
-<?php echo HtmlInput::calendar_zoom($obj); ?>
-<?php echo $cal->display('short'); ?>
-</fieldset>
-</div>
-<!-- Mini rapport -->
-<div style="float:left;width: 100%">
-<?php
-/*
- * Mini Report
- */
-$report=$g_user->get_mini_report();
 
-$rapport=new Acc_Report($cn);
-$rapport->id=$report;
-if ( $rapport->exist() == false ) {
-  $g_user->set_mini_report(0);
-  $report=0;
-}
-
-if ( $report != 0 ) : ?>
-<fieldset style="min-height:50%;"><legend><?php echo $rapport->get_name()?></legend>
-<?php    
-  $exercice=$g_user->get_exercice();
-  if ( $exercice == 0 ) {
-    alert(_('Aucune periode par defaut'));
-  } else {
-    $periode=new Periode($cn);
-    $limit=$periode->limit_year($exercice);
-
-    $result=$rapport->get_row($limit['start'],$limit['end'],'periode');
-    $ix=0;
-    echo '<table border="0" width="100%">';
-    foreach ($result as $row) {
-      $ix++;
-	  $class=($ix%2==0)?' class="even" ':' class="odd" ';
-      echo '<tr '.$class.'>';
-
-      echo '<td> '.$row['desc'].'</td>'.
-	'<td style="text-align:right">'.nbm($row['montant'])." &euro;</td>";
-      echo '</tr>';
-    }
-    echo '</table>';
-  }
-  ?>
-  </fieldset>
-<?php
-  else :
-?>
-  <fieldset style="height:50%;width:80%;background-color:white"><legend><?php _('Aucun rapport défini')?></legend>
-  <a href="javascript:void(0)" class="cell" onclick="set_preference('<?php echo dossier::id()?>')"><?php echo _('Cliquez ici pour mettre à jour vos préférences')?></a>
-
-</fieldset>
-<?php
-endif;
-?>
-</div>
-</div>
 
 
 <div id="add_todo_list" >