diff --git a/html/annulation.php b/html/annulation.php
index d1a848d50..757688763 100644
--- a/html/annulation.php
+++ b/html/annulation.php
@@ -113,13 +113,13 @@ if ( isset ($annul) ) {
$Res=ExecSql($cn,$sql);
// delete from jrnx & jrn
- $sql="delete from jrnx where j_grpt=".$_POST['p_id'];
+ $sql="update jrnx set j_montant = 0 where j_grpt=".$_POST['p_id'];
$Res=ExecSql($cn,$sql);
// build the sql stmt for jrn
- $sql= "delete from jrn where jr_grpt_id=".$_POST['p_id'];
+ $sql= "update jrn set jr_montant = 0, jr_valid='f',jr_comment='Erreur:'||jr_comment where jr_grpt_id=".$_POST['p_id'];
$Res=ExecSql($cn,$sql);
echo '
Opération Effacée
';
@@ -142,7 +142,7 @@ $a=InputType("Date","text", "op_date",$e_op_date,false);
//echo 'Date : '.$e_op_date;
echo $a;
echo '';
-$a=InputType("Description:","text","comment",$e_comment,false);
+$a=InputType("Description:","text_big","comment",$e_comment,false);
echo $a;
echo '
';
diff --git a/html/style-elegant.css b/html/style-elegant.css
index f119b49fa..da13d287b 100644
--- a/html/style-elegant.css
+++ b/html/style-elegant.css
@@ -147,6 +147,7 @@ td.odd{
border:Opt
}
td.cell{
+
border-style:solid;
border-width:1pt;
font-size:11pt;
@@ -167,7 +168,6 @@ a.mtitle:link {
a.mtitle:visited {
text-decoration:none;
color:black;
-
width:100px;
}
a.mtitle2:active {
diff --git a/html/style-light.css b/html/style-light.css
index 2b2d5b6dd..8a4db0192 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -102,15 +102,15 @@ div.debit{
}
div.redcontent{
position: absolute;
- top:130px;
+ top:150px;
left:250px;
width:600px;
font-size:12px;
- overflow:auto;
+
}
div.u_redcontent{
position: absolute;
- top:130px;
+ top:160px;
left:150px;
width:700px;
font-size:9pt;
@@ -159,6 +159,7 @@ td.mtitle {
width:75px;
font-size:10px;
border: 1px solid;
+ padding:3px;
background-color:#DDE6FF;
}
span.mtitle2 {
@@ -190,7 +191,8 @@ td.odd{
border:0px;
}
td.cell{
- border:1px solid blue;
+// border:1px solid blue;
+ padding: 4px;
}
td.selectedcell{
border-style:solid;
diff --git a/html/test.php b/html/test.php
index 067126f9b..b01bfdc8f 100644
--- a/html/test.php
+++ b/html/test.php
@@ -41,6 +41,33 @@ if ( $a==false) {
}
if ( ($Res=ExecSql($a,"select * from ac_users") ) == false ) {
exit ("__LINE__ test has failed !!!
");
+} else
+ print "Connect to database success
";
+
+// Verify some PHP parameters
+// magic_quotes_gpc = Off
+// magic_quotes_runtime = Off
+// magic_quotes_sybase = Off
+// include_path
+// register_global
+foreach (array('magic_quotes_gpc','magic_quotes_runtime') as $a) {
+
+ if ( ini_get($a) == false ) print $a.': Ok
';
+ else {
+ print ("$a has a bad value !!!
");
+ }
+
}
+if ( ini_get('register_globals') != true )
+ print ("register_globals has a bad value !!!
");
+ else
+ print 'register_globals : Ok
';
+
+if ( ereg("\.\.\/include",ini_get('include_path')) == false )
+ print ("include_path incorrect !!!".ini_get('include_path')."
");
+ else
+ print 'include_path : ok ('.ini_get('include_path').')
';
+
echo " Congratulation : Test successfull
";
+
?>
diff --git a/html/user_jrn.php b/html/user_jrn.php
index a6eb397f5..005f11316 100644
--- a/html/user_jrn.php
+++ b/html/user_jrn.php
@@ -64,15 +64,7 @@ if ( $g_UserProperty['use_admin'] == 0 ) {
}
// if show
if ( isset ($_GET['show'])) {
-
- $p_array=array(array("user_jrn.php?JRN_TYPE=VEN" ,"Entrée"),
- array("user_jrn.php?JRN_TYPE=ACH","Dépense"),
- array("user_jrn.php?JRN_TYPE=FIN","Financier"),
- array("user_jrn.php?JRN_TYPE=OD","Op. Diverses"),
- array("impress.php","Impression"),
- array("","Recherche")
- );
- $result=ShowItem($p_array,'H',"cell","mtitle");
+ $result=ShowJrn();
echo "";
@@ -82,14 +74,7 @@ if ( isset ($_GET['show'])) {
if ( isset ($_GET['JRN_TYPE'] ) ) {
$jrn_type=$_GET['JRN_TYPE'];
- $p_array=array(array("user_jrn.php?JRN_TYPE=VEN" ,"Entrée"),
- array("user_jrn.php?JRN_TYPE=ACH","Dépense"),
- array("user_jrn.php?JRN_TYPE=FIN","Financier"),
- array("user_jrn.php?JRN_TYPE=OD","Op. Diverses"),
- array("impress.php","Impression"),
- array("","Recherche")
- );
- $result=ShowItem($p_array,'H',"cell","mtitle","user_jrn.php?JRN_TYPE=".$jrn_type);
+ $result=ShowJrn("user_jrn.php?JRN_TYPE=".$jrn_type);
echo "