remove unused file

fix warning in the jrn file
fix bug in jrn table (jr_rapt text)
fix bug in jrn_search problem when checking if a number is valid

cvs-set

@@ -1 +0,0 @@
-CVSROOT=/home/danpo/CVSDIR

html/enc_jrn.php

@@ -227,8 +227,12 @@ if ( isset($_POST['add_record']) ) {
 
     
     // si rappt
+    if ( ! isset ($p_rapt) ) 
+    	$p_rapt="";
     if ( trim($p_rapt) != '' ) {
       $jrn_id=GetNextJrnId($cn,'jr_id')+1;
+    if ( ! isset ($p_ech) ) 
+    	$p_ech="";
       $l_date=isDate($p_ech);
       if ( $l_date == null) {
 	$p_ech='null';
@@ -408,6 +412,7 @@ if ( isset($_POST['update_record']) ) {
       $Sql=sprintf("update jrn set jr_rapt=null where jr_internal='%s'",$l_src);
       $Res=ExecSql($cn,$Sql);
     }
+    }// strlen (trim (p_rapt
     if ( !isset ($p_ech) ) $p_ech="";
     $l_date=isDate($p_ech);
     if ( $l_date == null ) {
@@ -440,13 +445,12 @@ if ( isset($_POST['update_record']) ) {
 	$Sql=sprintf("update  jrn set jr_comment='%s',
                        jr_date=%s,jr_rapt=null,jr_montant=%f where jr_id=%d",
 		     $comment,
-		     $l_date,$tot_deb,
+		     $l_date,$p_sum_deb,
 		     $p_jr_id);
 	$Res=ExecSql($cn,$Sql);
 	
 	
-      }
+}
-  } // if strlen(p_rappt
   if ($Res) {
     Commit($cn); 
     EndSql($cn);

html/jrn_search.php

@@ -49,6 +49,7 @@ $cn=DbConnect($l_Db);
 if ( isset ($_POST["search"]) ) {
   $c1=0;
   foreach( $HTTP_POST_VARS as $key=>$element){
+    echo_debug("$key = $element");
     ${"$key"}=$element;
   }
 
@@ -56,8 +57,10 @@ if ( isset ($_POST["search"]) ) {
     $c_comment=" $part pcm_lib like '%$p_comment%'";
     $part=" and ";
   }
-  if ( strlen(trim($p_montant)) != 0 &&
+  if ( ereg ("^[0-9]*\.[0-9]*$",$p_montant) )
-       (string) $p_montant == (int)(string) $p_montant) {
+  /*if ( strlen(trim($p_montant)) != 0  &&
+       (string) $p_montant == (int)(string) $p_montant ) 
+       */{
     $c_montant=sprintf(" $part j_montant %s %s",$p_montant_sel,$p_montant);
     $part="  and ";
     }

include/jrn.php

@@ -224,9 +224,18 @@ if ( $p_update == 0 )  echo "<TR><TD> <INPUT TYPE=\"SUBMIT\" VALUE=\"+ de line\"
 
   $search='<INPUT TYPE="BUTTON" VALUE="Cherche" OnClick="SearchJrn(\''.$sessid."')\">";
   echo_debug("search $search");
+  // To avoid problem with unknown variable
+  if ( ! isset ($e_rapt) ) {
+  	$e_rapt="";
+  }
+
   echo '<TR><TD>rapprochement : <INPUT TYPE="TEXT" name="rapt" value="'.$e_rapt.'">'.$search.'</TD></TR>';
   echo "</TABLE>";
   echo '</DIV>';
+  // To avoid problem with unknown variable
+  if ( ! isset ($e_comment) ) {
+  	$e_comment="";
+  }
   echo '<TEXTAREA" rows="5" cols="50" NAME="comment">';
   echo $e_comment;
   echo "</TEXTAREA>";
@@ -239,6 +248,16 @@ if ( $p_update == 0 )  echo "<TR><TD> <INPUT TYPE=\"SUBMIT\" VALUE=\"+ de line\"
   }
    echo '<input type="reset" Value="Efface">';
    //   echo '<SCRIPT> CheckTotal()</SCRIPT>';   
+
+   // To avoid problem with unknown variable
+    if ( ! isset ($e_sum_deb) ) {
+                 $e_sum_deb=0;
+    }
+
+   // To avoid problem with unknown variable
+     if ( ! isset ($e_sum_cred) ) {
+                 $e_sum_cred=0;
+      }
    echo '<input type="TEXT" NAME="sum_deb" VALUE="'.$e_sum_deb.'" onChange="CheckTotal()">';
    echo '<input type="TEXT" NAME="sum_cred" VALUE="'.$e_sum_cred.'" onChange="CheckTotal()">';
    echo '<SPAN ID="diff"></SPAN>';
@@ -414,6 +433,9 @@ echo '<TR><TD> Date : <INPUT TYPE="TEXT" NAME="op_date" VALUE="'.$e_op_date.'">'
 	
     echo "</SELECT>";
     echo "</TD>";
+    if ( ! isset (  ${"e_text_cred$i"} ) ) {
+     ${"e_text_cred$i"}="";
+     }
     printf('<TD><INPUT TYPE="TEXT" NAME="text_cred%d" VALUE="%s"></TD>',
 	   $i,
 	   ${"e_text_cred$i"});
@@ -987,11 +1009,13 @@ function VerifData($p_cn,$p_array,$p_user)
     // Rapprochement demandé et vérif
     if ( strlen(trim($p_rapt)) != 0 ){ 
       $l_dest=GetRapt($p_cn,$p_rapt);
-      if ( $l_dest != -1 ) {
+      if ( $l_dest != -1 && $l_dest != $p_jr_id ) {
 	return RAPPT_ALREADY_USED;
       }
       // Get Amount 
+
       $l_mont=GetAmount($p_cn,$p_rapt);
+      echo_debug ("amount = $tot_deb $l_mont");
       if ( $l_mont == -1 ) {
 	return RAPPT_NOT_EXIST;
       }

log

@@ -1,503 +0,0 @@
-Verification des outil
-----------------------
-Verif. psql...Success
-Verif. createdb...Success
-Creation de la base de donnee
-CREATE USER
-CREATE DATABASE
-./install.sh: sql/create_repository.sql: No such file or directory
-./install.sh: sql/ac_pcmn.sql: No such file or directory
-CREATE SEQUENCE
-NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index 'ac_users_pkey' for table 'ac_users'
-NOTICE:  CREATE TABLE / UNIQUE will create implicit index 'ac_users_use_login_key' for table 'ac_users'
-CREATE TABLE
-INSERT 18549 1
-GRANT
-ERROR:  table "tmp_pcmn" does not exist
-NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index 'tmp_pcmn_pkey' for table 'tmp_pcmn'
-CREATE TABLE
-INSERT 18559 1
-INSERT 18560 1
-INSERT 18561 1
-INSERT 18562 1
-INSERT 18563 1
-INSERT 18564 1
-INSERT 18565 1
-INSERT 18566 1
-INSERT 18567 1
-INSERT 18568 1
-INSERT 18569 1
-INSERT 18570 1
-INSERT 18571 1
-INSERT 18572 1
-INSERT 18573 1
-INSERT 18574 1
-INSERT 18575 1
-INSERT 18576 1
-INSERT 18577 1
-INSERT 18578 1
-INSERT 18579 1
-INSERT 18580 1
-INSERT 18581 1
-INSERT 18582 1
-INSERT 18583 1
-INSERT 18584 1
-INSERT 18585 1
-INSERT 18586 1
-INSERT 18587 1
-INSERT 18588 1
-INSERT 18589 1
-INSERT 18590 1
-INSERT 18591 1
-INSERT 18592 1
-INSERT 18593 1
-INSERT 18594 1
-INSERT 18595 1
-INSERT 18596 1
-INSERT 18597 1
-INSERT 18598 1
-INSERT 18599 1
-INSERT 18600 1
-INSERT 18601 1
-INSERT 18602 1
-INSERT 18603 1
-INSERT 18604 1
-INSERT 18605 1
-INSERT 18606 1
-INSERT 18607 1
-INSERT 18608 1
-INSERT 18609 1
-INSERT 18610 1
-INSERT 18611 1
-INSERT 18612 1
-INSERT 18613 1
-INSERT 18614 1
-INSERT 18615 1
-INSERT 18616 1
-INSERT 18617 1
-INSERT 18618 1
-INSERT 18619 1
-INSERT 18620 1
-INSERT 18621 1
-INSERT 18622 1
-INSERT 18623 1
-INSERT 18624 1
-INSERT 18625 1
-INSERT 18626 1
-INSERT 18627 1
-INSERT 18628 1
-INSERT 18629 1
-INSERT 18630 1
-INSERT 18631 1
-INSERT 18632 1
-INSERT 18633 1
-INSERT 18634 1
-INSERT 18635 1
-INSERT 18636 1
-INSERT 18637 1
-INSERT 18638 1
-INSERT 18639 1
-INSERT 18640 1
-INSERT 18641 1
-INSERT 18642 1
-INSERT 18643 1
-INSERT 18644 1
-INSERT 18645 1
-INSERT 18646 1
-INSERT 18647 1
-INSERT 18648 1
-INSERT 18649 1
-INSERT 18650 1
-INSERT 18651 1
-INSERT 18652 1
-INSERT 18653 1
-INSERT 18654 1
-INSERT 18655 1
-INSERT 18656 1
-INSERT 18657 1
-INSERT 18658 1
-INSERT 18659 1
-INSERT 18660 1
-INSERT 18661 1
-INSERT 18662 1
-INSERT 18663 1
-INSERT 18664 1
-INSERT 18665 1
-INSERT 18666 1
-INSERT 18667 1
-INSERT 18668 1
-INSERT 18669 1
-INSERT 18670 1
-INSERT 18671 1
-INSERT 18672 1
-INSERT 18673 1
-INSERT 18674 1
-INSERT 18675 1
-INSERT 18676 1
-INSERT 18677 1
-INSERT 18678 1
-INSERT 18679 1
-INSERT 18680 1
-INSERT 18681 1
-INSERT 18682 1
-INSERT 18683 1
-INSERT 18684 1
-INSERT 18685 1
-INSERT 18686 1
-INSERT 18687 1
-INSERT 18688 1
-INSERT 18689 1
-INSERT 18690 1
-INSERT 18691 1
-INSERT 18692 1
-INSERT 18693 1
-INSERT 18694 1
-INSERT 18695 1
-INSERT 18696 1
-INSERT 18697 1
-INSERT 18698 1
-INSERT 18699 1
-INSERT 18700 1
-INSERT 18701 1
-INSERT 18702 1
-INSERT 18703 1
-INSERT 18704 1
-INSERT 18705 1
-INSERT 18706 1
-INSERT 18707 1
-INSERT 18708 1
-INSERT 18709 1
-INSERT 18710 1
-INSERT 18711 1
-INSERT 18712 1
-INSERT 18713 1
-INSERT 18714 1
-INSERT 18715 1
-INSERT 18716 1
-INSERT 18717 1
-INSERT 18718 1
-INSERT 18719 1
-INSERT 18720 1
-INSERT 18721 1
-INSERT 18722 1
-INSERT 18723 1
-INSERT 18724 1
-INSERT 18725 1
-INSERT 18726 1
-INSERT 18727 1
-INSERT 18728 1
-INSERT 18729 1
-INSERT 18730 1
-INSERT 18731 1
-INSERT 18732 1
-INSERT 18733 1
-INSERT 18734 1
-INSERT 18735 1
-INSERT 18736 1
-INSERT 18737 1
-INSERT 18738 1
-INSERT 18739 1
-INSERT 18740 1
-INSERT 18741 1
-INSERT 18742 1
-INSERT 18743 1
-INSERT 18744 1
-INSERT 18745 1
-INSERT 18746 1
-INSERT 18747 1
-INSERT 18748 1
-INSERT 18749 1
-INSERT 18750 1
-INSERT 18751 1
-INSERT 18752 1
-INSERT 18753 1
-INSERT 18754 1
-INSERT 18755 1
-INSERT 18756 1
-INSERT 18757 1
-INSERT 18758 1
-INSERT 18759 1
-INSERT 18760 1
-INSERT 18761 1
-INSERT 18762 1
-INSERT 18763 1
-INSERT 18764 1
-INSERT 18765 1
-INSERT 18766 1
-INSERT 18767 1
-INSERT 18768 1
-INSERT 18769 1
-INSERT 18770 1
-INSERT 18771 1
-INSERT 18772 1
-INSERT 18773 1
-INSERT 18774 1
-INSERT 18775 1
-INSERT 18776 1
-INSERT 18777 1
-INSERT 18778 1
-INSERT 18779 1
-INSERT 18780 1
-INSERT 18781 1
-INSERT 18782 1
-INSERT 18783 1
-INSERT 18784 1
-INSERT 18785 1
-INSERT 18786 1
-INSERT 18787 1
-INSERT 18788 1
-INSERT 18789 1
-INSERT 18790 1
-INSERT 18791 1
-INSERT 18792 1
-INSERT 18793 1
-INSERT 18794 1
-INSERT 18795 1
-INSERT 18796 1
-INSERT 18797 1
-INSERT 18798 1
-INSERT 18799 1
-INSERT 18800 1
-INSERT 18801 1
-INSERT 18802 1
-INSERT 18803 1
-INSERT 18804 1
-INSERT 18805 1
-INSERT 18806 1
-INSERT 18807 1
-INSERT 18808 1
-INSERT 18809 1
-INSERT 18810 1
-INSERT 18811 1
-INSERT 18812 1
-INSERT 18813 1
-INSERT 18814 1
-INSERT 18815 1
-INSERT 18816 1
-INSERT 18817 1
-INSERT 18818 1
-INSERT 18819 1
-INSERT 18820 1
-INSERT 18821 1
-INSERT 18822 1
-INSERT 18823 1
-INSERT 18824 1
-INSERT 18825 1
-INSERT 18826 1
-INSERT 18827 1
-INSERT 18828 1
-INSERT 18829 1
-INSERT 18830 1
-INSERT 18831 1
-INSERT 18832 1
-INSERT 18833 1
-INSERT 18834 1
-INSERT 18835 1
-INSERT 18836 1
-INSERT 18837 1
-INSERT 18838 1
-INSERT 18839 1
-INSERT 18840 1
-INSERT 18841 1
-INSERT 18842 1
-INSERT 18843 1
-INSERT 18844 1
-INSERT 18845 1
-INSERT 18846 1
-INSERT 18847 1
-INSERT 18848 1
-INSERT 18849 1
-INSERT 18850 1
-INSERT 18851 1
-INSERT 18852 1
-INSERT 18853 1
-INSERT 18854 1
-INSERT 18855 1
-INSERT 18856 1
-INSERT 18857 1
-INSERT 18858 1
-INSERT 18859 1
-INSERT 18860 1
-INSERT 18861 1
-INSERT 18862 1
-INSERT 18863 1
-INSERT 18864 1
-INSERT 18865 1
-INSERT 18866 1
-INSERT 18867 1
-INSERT 18868 1
-INSERT 18869 1
-INSERT 18870 1
-INSERT 18871 1
-INSERT 18872 1
-INSERT 18873 1
-INSERT 18874 1
-INSERT 18875 1
-INSERT 18876 1
-INSERT 18877 1
-INSERT 18878 1
-INSERT 18879 1
-INSERT 18880 1
-INSERT 18881 1
-INSERT 18882 1
-INSERT 18883 1
-INSERT 18884 1
-INSERT 18885 1
-INSERT 18886 1
-INSERT 18887 1
-INSERT 18888 1
-INSERT 18889 1
-INSERT 18890 1
-INSERT 18891 1
-INSERT 18892 1
-INSERT 18893 1
-INSERT 18894 1
-INSERT 18895 1
-INSERT 18896 1
-INSERT 18897 1
-INSERT 18898 1
-INSERT 18899 1
-INSERT 18900 1
-INSERT 18901 1
-INSERT 18902 1
-INSERT 18903 1
-INSERT 18904 1
-INSERT 18905 1
-INSERT 18906 1
-INSERT 18907 1
-INSERT 18908 1
-INSERT 18909 1
-INSERT 18910 1
-INSERT 18911 1
-INSERT 18912 1
-INSERT 18913 1
-INSERT 18914 1
-INSERT 18915 1
-INSERT 18916 1
-INSERT 18917 1
-INSERT 18918 1
-INSERT 18919 1
-INSERT 18920 1
-INSERT 18921 1
-INSERT 18922 1
-INSERT 18923 1
-INSERT 18924 1
-INSERT 18925 1
-INSERT 18926 1
-INSERT 18927 1
-INSERT 18928 1
-INSERT 18929 1
-INSERT 18930 1
-INSERT 18931 1
-INSERT 18932 1
-INSERT 18933 1
-INSERT 18934 1
-INSERT 18935 1
-INSERT 18936 1
-INSERT 18937 1
-INSERT 18938 1
-INSERT 18939 1
-INSERT 18940 1
-INSERT 18941 1
-INSERT 18942 1
-INSERT 18943 1
-INSERT 18944 1
-INSERT 18945 1
-INSERT 18946 1
-INSERT 18947 1
-INSERT 18948 1
-INSERT 18949 1
-INSERT 18950 1
-INSERT 18951 1
-INSERT 18952 1
-INSERT 18953 1
-INSERT 18954 1
-INSERT 18955 1
-INSERT 18956 1
-INSERT 18957 1
-INSERT 18958 1
-INSERT 18959 1
-INSERT 18960 1
-INSERT 18961 1
-INSERT 18962 1
-INSERT 18963 1
-INSERT 18964 1
-INSERT 18965 1
-INSERT 18966 1
-INSERT 18967 1
-INSERT 18968 1
-INSERT 18969 1
-INSERT 18970 1
-INSERT 18971 1
-INSERT 18972 1
-INSERT 18973 1
-INSERT 18974 1
-INSERT 18975 1
-INSERT 18976 1
-INSERT 18977 1
-INSERT 18978 1
-INSERT 18979 1
-INSERT 18980 1
-INSERT 18981 1
-INSERT 18982 1
-INSERT 18983 1
-INSERT 18984 1
-INSERT 18985 1
-INSERT 18986 1
-INSERT 18987 1
-INSERT 18988 1
-INSERT 18989 1
-INSERT 18990 1
-INSERT 18991 1
-INSERT 18992 1
-INSERT 18993 1
-INSERT 18994 1
-INSERT 18995 1
-INSERT 18996 1
-INSERT 18997 1
-INSERT 18998 1
-INSERT 18999 1
-INSERT 19000 1
-INSERT 19001 1
-INSERT 19002 1
-INSERT 19003 1
-INSERT 19004 1
-INSERT 19005 1
-INSERT 19006 1
-INSERT 19007 1
-INSERT 19008 1
-INSERT 19009 1
-INSERT 19010 1
-INSERT 19011 1
-INSERT 19012 1
-INSERT 19013 1
-INSERT 19014 1
-INSERT 19015 1
-INSERT 19016 1
-INSERT 19017 1
-INSERT 19018 1
-INSERT 19019 1
-INSERT 19020 1
-INSERT 19021 1
-INSERT 19022 1
-INSERT 19023 1
-INSERT 19024 1
-INSERT 19025 1
-INSERT 19026 1
-INSERT 19027 1
-INSERT 19028 1
-INSERT 19029 1
-INSERT 19030 1
-INSERT 19031 1
-INSERT 19032 1
-CREATE SEQUENCE
-NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index 'ac_dossier_pkey' for table 'ac_dossier'
-NOTICE:  CREATE TABLE / UNIQUE will create implicit index 'ac_dossier_dos_name_key' for table 'ac_dossier'
-CREATE TABLE
-INSERT 19047 1
-GRANT
-NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index 'jnt_use_dos_pkey' for table 'jnt_use_dos'
-NOTICE:  CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
-CREATE TABLE
-INSERT 19060 1
-Installing source

sql/journal.sql

@@ -79,7 +79,7 @@ create table jrnx (
        j_montant float default 0,
        j_poste int not null references tmp_pcmn(pcm_val),
        j_grpt integer not null,
-      j_rapt integer,
+      j_rapt text,
        j_jrn_def int4 not null references jrn_def(jrn_def_id),
        j_debit bool default true,
        j_text	text,