From 0cc29d18818b715f0ef659b885fbee5520f065a9 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Thu, 29 Jul 2010 17:11:39 +0000
Subject: [PATCH] Bug : autocomplete do not work with FIN Bug impress date were
 not verified Cosmetic bug : table too large for impress->fiche->balance
 Cosmetic bug : table too large for impress->rapprochement Bug : protection
 against special char in card name, in autocomplete (fid.php fid_card.php)
 Improve : progression for the historic of card

---
 html/fid.php                                |  2 +-
 html/fid_card.php                           |  8 +--
 html/index.php                              |  4 +-
 html/style-color.css                        | 18 +++---
 html/style-light.css                        | 66 +++++++++------------
 html/style-print.css                        |  6 +-
 html/style.css                              | 15 +++--
 include/class_acc_ledger_fin.php            |  4 +-
 include/impress_fiche.inc.php               | 14 +++--
 include/impress_gl_comptes.inc.php          |  5 +-
 include/impress_poste.inc.php               |  4 ++
 include/template/impress_reconciliation.php |  2 +-
 12 files changed, 72 insertions(+), 76 deletions(-)

diff --git a/html/fid.php b/html/fid.php
index 7f6a186ae..9feb250e0 100644
--- a/html/fid.php
+++ b/html/fid.php
@@ -117,7 +117,7 @@ if ( isset($_SESSION['isValid']) && $_SESSION['isValid'] == 1)
   /* store the answer in an array and transform it later into a JSON object */
   $tmp=array();
   $tmp[]=array('flabel',$fLabel);
-  $tmp[]=array('name',$name);
+  $tmp[]=array('name',h($name));
   $tmp[]=array('ftva_id',$fTva_id);
   $tmp[]=array('tva_id',$tva_id);
   $tmp[]=array('fPrice_sale',$fPrice_sale);
diff --git a/html/fid_card.php b/html/fid_card.php
index c85e6e518..9de8b902a 100644
--- a/html/fid_card.php
+++ b/html/fid_card.php
@@ -68,7 +68,6 @@ if ( $jrn != -1 ) {
     case 'cred':
       $filter_jrn=$cn->make_list("select jrn_def_fiche_cred from jrn_def where jrn_def_id=$1",array($jrn));
       $filter_card=($filter_jrn != "")?" and fd_id in ($filter_jrn)":' and false ';
-      
       break;
     case 'deb':
       $filter_jrn=$cn->make_list("select jrn_def_fiche_deb from jrn_def where jrn_def_id=$1",array($jrn));
@@ -106,13 +105,14 @@ $sql_str="select f_id, vw_name,quick_code,vw_description ".
 
 $sql=$cn->get_array($sql_str
 		    ,array($_REQUEST['FID'],$_REQUEST['FID'],$_REQUEST['FID']));
+
 if (sizeof($sql) != 0 ) {
   echo "<ul>";
   for ($i =0;$i<12 && $i < count($sql) ;$i++) {
     /* Highlight the found pattern with bold format */
-    $name=str_ireplace($_REQUEST['FID'],'<em>'.$_REQUEST['FID'].'</em>',$sql[$i]['vw_name']);
-    $qcode=str_ireplace($_REQUEST['FID'],'<em>'.$_REQUEST['FID'].'</em>',$sql[$i]['quick_code']);
-    $desc=str_ireplace($_REQUEST['FID'],'<em>'.$_REQUEST['FID'].'</em>',$sql[$i]['vw_description']);
+    $name=str_ireplace($_REQUEST['FID'],'<em>'.$_REQUEST['FID'].'</em>',h($sql[$i]['vw_name']));
+    $qcode=str_ireplace($_REQUEST['FID'],'<em>'.$_REQUEST['FID'].'</em>',h($sql[$i]['quick_code']));
+    $desc=str_ireplace($_REQUEST['FID'],'<em>'.$_REQUEST['FID'].'</em>',h($sql[$i]['vw_description']));
     printf('<li id="%s">%s <span class="informal"> %s %s</span></li>',
 	   $sql[$i]['quick_code'],
 	   $qcode,
diff --git a/html/index.php b/html/index.php
index e24dc0a91..f281566d4 100644
--- a/html/index.php
+++ b/html/index.php
@@ -144,7 +144,7 @@ BODY {
 	margin:1px;
 }
 .button {
-	font-size:10;
+	font-size:10px;
 	color:white;
 	font-weight: bold;
 	
@@ -158,7 +158,7 @@ BODY {
 	
 	border-style:  outset ;
 	border-color:  blue ;
-	border-width:1;
+	border-width:1 1 1 1;
 	padding:2 4 2 4;
 	cursor:pointer;
 	margin:1 2 1 2;
diff --git a/html/style-color.css b/html/style-color.css
index e2d30aa0f..1862e5493 100644
--- a/html/style-color.css
+++ b/html/style-color.css
@@ -103,7 +103,7 @@ h1.title {
 }
 
 div.u_tmenu {
-  position: float;
+
   margin-top:1px;
   width:100%;	
   background-color:#879ED4;
@@ -151,7 +151,7 @@ div.lmenu {
 
 }
 div.lextmenu {
-	position: float;
+
 	float:left;
 	font-family:helvetica,arial,sans-serif;
 	font-size:9px;
@@ -174,7 +174,7 @@ div.recherche_form{
 
 }
 div.u_redcontent{ 	 
-         position: float; 	 
+
          float:left; 	 
 	 padding-top:7px;
 	 padding-left:8px;
@@ -184,7 +184,7 @@ div.u_redcontent{
 
 }
 div.content{ 	 
-         position: float; 	 
+
          float:left; 	 
 		padding-top:7px;
          width:100%; 	 	 
@@ -194,7 +194,7 @@ div.content{
 
 }
 div.content30{ 	 
-         position: float; 	 
+
          float:left; 	 
 	 padding-top:7px;
          width:35%; 	  
@@ -205,7 +205,7 @@ div.no span{
 	position:static;
 	font-family:helvetica,arial,sans-serif;	
 	font-weight:bold;
-	font-color:red;	
+	color:red;	
 	
 }
 
@@ -576,8 +576,6 @@ div.popup_back{
 	position:absolute;
 	top:0px;
 	left:0px;
-	opacity:0.6;
-	filter:alpha(opacity=60);	
 	width:100%;
 	height:100%;
 	z-index:1;
@@ -778,7 +776,7 @@ cursor:inherit;
 	cursor:pointer;
 	background-color:white;
 	border-style:  inset ;
-	font-color:blue;
+	color:blue;
 	margin:1 2 1 2;
 	}
 	td.tool {
@@ -819,7 +817,7 @@ a#anchorbutton :hover {
 	cursor:pointer;
 	background-color:white;
 	border-style:  inset ;
-	font-color:blue;
+	color:blue;
 	margin:1 2 1 2;
 	}
 /* </style> */
diff --git a/html/style-light.css b/html/style-light.css
index 7369778f6..22337fc30 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -13,7 +13,7 @@ BODY {
         }
 
 table.result  ,table.resultfooter {
-  color:blue;
+  color:#0000ff;
   /* border:blue solid 1px; */
   width:100%;
    border-spacing:  0px;
@@ -29,7 +29,7 @@ table.resultfooter tfoot {
 table.result th { 
   font-weight:bold;
   font-family:helvetica,arial,sans-serif;
- border-bottom:2px solid blue; 
+ border-bottom:2px solid #0000ff; 
  border-top:0;
  
   color:#25238F;
@@ -75,7 +75,6 @@ h2.info {
   text-align:center;
   padding:0px;
   margin:0px;
-  display:compact;
   border:1px solid grey;
   
 }
@@ -88,7 +87,7 @@ h3.info {
 }
 
 h2.info2 {
-  color:blue;
+  color:#0000ff;
   font-size:14px;
   text-align:center;
 
@@ -102,12 +101,11 @@ h2.error {
 }
 
 h1.title {
-	color: blue;
+	color: #0000ff;
 	font-size:25px;
 }
 
 div.u_tmenu {
-  position: float;
   margin-top:0px;
   width:100%;	
  /* background-color:#879ED4; */
@@ -128,7 +126,6 @@ div.u_tmenu div.u_tool {
 div.u_tool {
 	float:left;
 	width:  100%;
-	background-color:
 	
 	}
 div.u_tool div.name {
@@ -154,7 +151,6 @@ div.lmenu {
 
 }
 div.lextmenu {
-	position: float;
 	float:left;
 	font-family:helvetica,arial,sans-serif;
 	font-size:9px;
@@ -176,8 +172,7 @@ div.recherche_form{
   border-width:1px;
 
 }
-div.u_redcontent{ 	 
-         position: float; 	 
+div.u_redcontent{ 	 	 
          float:left; 	 
 	 padding-top:7px;
 	 padding-left:8px;
@@ -187,7 +182,6 @@ div.u_redcontent{
 
 }
 div.content{ 	 
-         position: float; 	 
          float:left; 	 
 		padding-top:7px;
          width:100%; 	 	 
@@ -197,7 +191,6 @@ div.content{
 
 }
 div.content30{ 	 
-         position: float; 	 
          float:left; 	 
 	 padding-top:7px;
          width:35%; 	  
@@ -208,12 +201,12 @@ div.no span{
 	position:static;
 	font-family:helvetica,arial,sans-serif;	
 	font-weight:bold;
-	font-color:red;	
+	color:red;	
 	
 }
 
 table.document {
-   color:blue;
+   color:#0000ff;
    width:100%;
    border-spacing:  0px;
    border-collapse:collapse;
@@ -222,7 +215,7 @@ table.document {
 table.document th{
   font-weight:bold;
   font-family:helvetica,arial,sans-serif;
-  border-bottom:2px solid blue;
+  border-bottom:2px solid #0000ff;
   border-top:0;
   color:#25238F;
   text-align: left;
@@ -263,7 +256,7 @@ td.msubtitle {
 }
 span.mtitle {
 	color:gray;
-	background-color:blue;
+	background-color:#0000ff;
 	font-size:10px;
 	border-style:groove
 }
@@ -279,14 +272,14 @@ span.even {
 tr.odd {
 	background-color:#DDE6FF;
 	font-size:10px;
-  border-size:0px;		
+  border-width:0px;		
 }
 tr {
 	font-size:10px;
 }
 td.odd{
 	background-color:#DDE6FF ;
-	border-size:0px;
+	border-width:0px;
 	font-size:10px;
 }
 td.even{
@@ -299,7 +292,7 @@ td.cell{
 }
 td.selectedcell{
 	border-style:inset;
-        border-color:blue;
+        border-color:#0000ff;
 	border-width:1pt ;
 	font-size:10px;
         background:#5D90CD ;
@@ -311,7 +304,7 @@ a.mtitle {
   font-size:10px;
   text-decoration:none;
   display:inline;
- color: blue;
+ color: #0000ff;
 	
 }
 a.mtitle:hover {
@@ -361,7 +354,7 @@ td.msubtitle:hover,td.msubtitle:hover a
 a.cell {
   text-decoration:none;
   display:block;
-  color:blue;
+  color:#0000ff;
   background-color:white;
   font-size:9px;
 }
@@ -401,7 +394,7 @@ a.detail
   font-family:helvetica,arial,sans-serif;
     text-decoration: none;
     display: block;
-    color: blue;
+    color: #0000ff;
 }
 
 a.detail:hover   
@@ -422,7 +415,7 @@ div.u_redcontent a {
   font-family:helvetica,arial,sans-serif;
   text-decoration: none;
   display: block;
-  color: blue;
+  color: #0000ff;
 
 }
 
@@ -438,7 +431,7 @@ div.content a {
   font-family:helvetica,arial,sans-serif;
   text-decoration: none;
   display: block;
-  color: blue;
+  color: #0000ff;
 padding: 1px ;
 	
 }
@@ -474,7 +467,7 @@ div.content a.mtitle {
   font-size:10px;
   text-decoration:none;
   display:inline;
-  color:blue;
+  color:#0000ff;
     
 
 
@@ -495,7 +488,7 @@ div.u_redcontent input.text {
   border-style:solid;
   background-color:orange;  
   border-width:1px;
-  color:blue; 
+  color:#0000ff; 
 }
 div.content input.text {
    font-family:helvetica,arial,sans-serif;
@@ -504,7 +497,7 @@ div.content input.text {
   border-style:solid;
   border-width:1px;
   background-color:orange;
-  color:blue; 
+  color:#0000ff; 
 }
 
 
@@ -534,7 +527,7 @@ a.document:hover {
 
 }
 .input_text {
-	   border:groove 1px blue;
+	   border:groove 1px #0000ff;
 	margin:1px;
 }
 legend {
@@ -548,7 +541,7 @@ fieldset fieldset legend {
 	 color:grey;
 	 }	
 select {
-border: 1px solid blue;
+border: 1px solid #0000ff;
 margin:2px;
 background-color:white;
 
@@ -600,8 +593,6 @@ div.popup_back{
 	position:absolute;
 	top:0px;
 	left:0px;
-	opacity:0.6;
-	filter:alpha(opacity=60);	
 	width:100%;
 	height:100%;
 	z-index:1;
@@ -688,7 +679,7 @@ div.autocomplete {
   
 }
 div.autocomplete em {
-	color:blue;
+	color:#0000ff;
 	font-weight:bold;
 }
 div.autocomplete ul {
@@ -795,7 +786,7 @@ cursor:inherit;
 	background-position: left;
 	
 	border-style:  outset ;
-	border-color:  blue ;
+	border-color:  #0000ff ;
 	border-width:0;
 	padding:2 4 2 4;
 	cursor:pointer;
@@ -807,7 +798,7 @@ cursor:inherit;
 	cursor:pointer;
 	background-color:white;
 	border-style:  inset ;
-	font-color:blue;
+	color:#0000ff;
 	margin:1 2 1 2;
 	}
 	td.tool {
@@ -841,7 +832,7 @@ a#anchorbutton {
 	background-position: left;
 	
 	border-style:  outset ;
-	border-color:  blue ;
+	border-color:  #0000ff ;
 	border-width:1;
 	padding:2 4 2 4;
 	cursor:pointer;
@@ -853,12 +844,13 @@ a#anchorbutton:hover {
 	cursor:pointer;
 	background-color:white;
 	border-style:  inset ;
-	font-color:blue;
+	color:#0000ff;
+	
 	margin:1 2 1 2;
 	}
 /* </style> */
 div.add_todo_list { 
-                    border:1px solid blue;
+                    border:1px solid #0000ff;
                     display:none;
                     background-color:#BFD0FF;
                     padding:3;
diff --git a/html/style-print.css b/html/style-print.css
index 5f39283d7..84fed8309 100644
--- a/html/style-print.css
+++ b/html/style-print.css
@@ -1,7 +1,3 @@
-/* <style type="text/css"> */
-
-@page { margin: 2cm; } ;
-
 form { 
   display:none;
  }
@@ -106,7 +102,7 @@ div.rmenu {
 }
 
 table.mtitle {
-	display;none;
+	display:	none;
 }
 td.mshort { 
 	display:none;
diff --git a/html/style.css b/html/style.css
index 786f026c3..5b3e920b7 100644
--- a/html/style.css
+++ b/html/style.css
@@ -107,7 +107,6 @@ h1.title {
 }
 
 div.u_tmenu {
-  position: float;
   margin-top:0px;
   width:100%;	
  /* background-color:#879ED4; */
@@ -154,7 +153,7 @@ div.lmenu {
 
 }
 div.lextmenu {
-	position: float;
+
 	float:left;
 	font-family:helvetica,arial,sans-serif;
 	font-size:9px;
@@ -177,7 +176,7 @@ div.recherche_form{
 
 }
 div.u_redcontent{ 	 
-         position: float; 	 
+   
          float:left; 	 
 	 padding-top:7px;
 	 padding-left:8px;
@@ -187,7 +186,7 @@ div.u_redcontent{
 
 }
 div.content{ 	 
-         position: float; 	 
+
          float:left; 	 
 		padding-top:7px;
          width:100%; 	 	 
@@ -197,7 +196,7 @@ div.content{
 
 }
 div.content30{ 	 
-         position: float; 	 
+   	 
          float:left; 	 
 	 padding-top:7px;
          width:35%; 	  
@@ -208,7 +207,7 @@ div.no span{
 	position:static;
 	font-family:helvetica,arial,sans-serif;	
 	font-weight:bold;
-	font-color:red;	
+	color:red;	
 	
 }
 
@@ -807,7 +806,7 @@ cursor:inherit;
 	cursor:pointer;
 	background-color:white;
 	border-style:  inset ;
-	font-color:blue;
+	color:blue;
 	margin:1 2 1 2;
 	}
 	td.tool {
@@ -853,7 +852,7 @@ a#anchorbutton:hover {
 	cursor:pointer;
 	background-color:white;
 	border-style:  inset ;
-	font-color:blue;
+	color:blue;
 	margin:1 2 1 2;
 	}
 /* </style> */
diff --git a/include/class_acc_ledger_fin.php b/include/class_acc_ledger_fin.php
index d7993f779..10c7fb356 100644
--- a/include/class_acc_ledger_fin.php
+++ b/include/class_acc_ledger_fin.php
@@ -298,8 +298,8 @@ class Acc_Ledger_Fin extends Acc_Ledger {
       $W1->label="";
       $W1->name="e_other".$i;
       $W1->value=$tiers;
-      $W1->extra='cred';  // credits
-      $W1->typecard='cred';
+      $W1->extra='deb';  // credits
+      $W1->typecard='deb';
       $W1->set_dblclick("fill_ipopcard(this);");
       $W1->set_attribute('ipopup','ipopcard');
 
diff --git a/include/impress_fiche.inc.php b/include/impress_fiche.inc.php
index 7d35ef5be..cc647f836 100644
--- a/include/impress_fiche.inc.php
+++ b/include/impress_fiche.inc.php
@@ -19,7 +19,7 @@
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 /*!\file
- * \brief printing of card 
+ * \brief printing of category of card  : balance, historic
  */
 include_once('class_database.php');
 include_once('class_fiche.php');
@@ -128,7 +128,7 @@ if ( $_GET['histo'] == 4 ) {
     exit;}
   $aCard=$cn->get_array("select f_id from vw_fiche_attr where fd_id=$1 order by vw_name ",array($_REQUEST['cat']));
   if ( empty($aCard)) { echo "Aucune fiche trouvée";exit;}
-  echo '<table class="result">';
+  echo '<table class="result" style="width:80%;margin-left:10%">';
   echo tr(
 	  th('Quick Code').
 	  th('Libellé').
@@ -195,9 +195,10 @@ foreach($array as $row) {
   echo th(_('Interne'));
   echo th(_('Comm'));
   echo th(_('Montant'),' colspan="2"');
+  echo th(_('Prog.'));
   echo th(_('Let.'));
   echo '</tr>';
-  $amount_deb=0;$amount_cred=0;
+  $amount_deb=0;$amount_cred=0;$prog=0;
   for ($i=0;$i<count($letter->content);$i++){
     if ($i%2 == 0 )
       echo '<tr class="even">';
@@ -209,14 +210,17 @@ foreach($array as $row) {
     echo td($row['jr_internal']);
     echo td($row['jr_comment']);
     if ( $row['j_debit'] == 't') {
-      echo td($row['j_montant'],' style="text-align:right"');
+      echo td(sprintf('%.2f',$row['j_montant']),' style="text-align:right"');
       $amount_deb+=$row['j_montant'];
+      $prog+=$row['j_montant'];
       echo td("");
     } else {
       echo td("");
-      echo td($row['j_montant'],' style="text-align:right"');
+      echo td(sprintf('%.2f',$row['j_montant']),' style="text-align:right"');
       $amount_cred+=$row['j_montant'];
+      $prog-=$row['j_montant'];
     }
+    echo td(sprintf('%.2f',$prog),'style="text-align:right"');
     if ($row['letter'] != -1 ) echo td($row['letter']); else echo td('');
     echo '</tr>';
   }
diff --git a/include/impress_gl_comptes.inc.php b/include/impress_gl_comptes.inc.php
index 6d77b7de5..c54cad78a 100644
--- a/include/impress_gl_comptes.inc.php
+++ b/include/impress_gl_comptes.inc.php
@@ -92,7 +92,10 @@ if ( isset( $_REQUEST['bt_html'] ) ) {
       die("Nothing here. Strange.");
       exit;
   }
-
+  if ( isDate($_REQUEST['from_periode'])==null || isDate($_REQUEST['to_periode'])==null){
+    echo alert('Date malformée, désolée');
+    exit();
+  }
   echo '<div class="content">';
 
 
diff --git a/include/impress_poste.inc.php b/include/impress_poste.inc.php
index cd7c43d2c..c52c866d8 100644
--- a/include/impress_poste.inc.php
+++ b/include/impress_poste.inc.php
@@ -129,6 +129,10 @@ echo '</div>';
 // after in pdf or cvs
 //-----------------------------------------------------
 if ( isset( $_REQUEST['bt_html'] ) ) {
+ if ( isDate($_REQUEST['from_periode'])==null || isDate($_REQUEST['to_periode'])==null){
+    echo alert('Date malformée, désolée');
+    exit();
+  }
   require_once("class_acc_account_ledger.php");
   $go=0;
 // we ask a poste_id
diff --git a/include/template/impress_reconciliation.php b/include/template/impress_reconciliation.php
index d8c4fcd06..4e2daa79e 100644
--- a/include/template/impress_reconciliation.php
+++ b/include/template/impress_reconciliation.php
@@ -1,4 +1,4 @@
-<table class="result">
+<table class="result" style="width:80%;margin-left:10%">
 <tr>
 <th>
 N°