From fef14b4077a7361bf486696edf2a91d5fa997ddb Mon Sep 17 00:00:00 2001
From: sparkyx <dany118@gmail.com>
Date: Fri, 2 Apr 2004 01:17:13 +0000
Subject: [PATCH] Payment

---
 html/modify_op.php |  3 +++
 include/jrn.php    | 18 ++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/html/modify_op.php b/html/modify_op.php
index f32601b87..0faca8ea7 100644
--- a/html/modify_op.php
+++ b/html/modify_op.php
@@ -70,6 +70,7 @@ if ( $action == 'update' ) {
     echo JS_CONCERNED_OP;
     $r ='<FORM METHOD="POST" ACTION="modify_op.php">';
     $r.=UpdateJrn($cn,$p_id);
+
     $r.='<INPUT TYPE="Hidden" name="action" value="update_record">';
     $r.='<input type="SUBMIT" name="update_record" value="Enregistre">';
     $r.='</FORM>';
@@ -82,6 +83,8 @@ if ( isset($_POST['update_record']) ) {
   // NO UPDATE except rapt & comment
   UpdateComment($cn,$_POST['jr_id'],$_POST['comment']);
   InsertRapt($cn,$_POST['jr_id'],$_POST['rapt']);
+  if ( isset ($_POST['is_paid'] ))
+       $Res=ExecSql($cn,"update jrn set jr_rapt='paid' where jr_id=".$_POST['jr_id']);
   echo ' <script> 
  window.close();
  self.opener.RefreshMe();
diff --git a/include/jrn.php b/include/jrn.php
index b7f1471b0..a9229cf6f 100644
--- a/include/jrn.php
+++ b/include/jrn.php
@@ -315,12 +315,15 @@ if ( $p_update == 0 )  echo "<TR><TD> <INPUT TYPE=\"SUBMIT\" VALUE=\"+ de line\"
 	$r.="<TD>";
 	$r.=$content['jr_internal'];
 	$r.="</TD>";
-	// Amount
-	// Internal
-// 	$r.="<TD>";
-// 	$r.="Montant  ".$content['jr_montant'];
-// 	$r.="</TD>";
 
+	if ( $content['jrn_def_type'] == 'ACH' or 
+	     $content['jrn_def_type'] == 'VEN' )
+	  {
+	    // Is Paid
+	    $r.="<TD>";
+	    $check=( $content['jr_rapt'] != null )?"CHECKED":"UNCHECKED";
+	    $r.='<TD>Payé <INPUT TYPE="CHECKBOX" name="is_paid" value="'.$check.'"></TD>';
+	  }
 	$r.="</TR>";
 	$r.="</TABLE>";
 	$r.="<TABLE>";
@@ -998,10 +1001,11 @@ function GetDataJrnJrId ($p_cn,$p_jr_id) {
                         jr_comment,
                         to_char(jr_ech,'DD.MM.YYYY') as jr_ech,
                         to_char(jr_date,'DD.MM.YYYY') as jr_date,
-                        jr_id,jr_internal
+                        jr_id,jr_internal, jr_rapt,jrn_def_type
                      from 
                           jrnx 
                         inner join jrn on j_grpt=jr_grpt_id 
+                        inner join jrn_def on jrn_def.jrn_def_id=jrn.jr_def_id
                         left outer join tmp_pcmn on  j_poste=pcm_val
                       where 
                          jr_id=$p_jr_id 
@@ -1020,6 +1024,8 @@ function GetDataJrnJrId ($p_cn,$p_jr_id) {
     $array['jr_internal']=$line['jr_internal'];
     $array['j_poste']=$line['j_poste'];
     $array['jr_montant']=$line['jr_montant'];
+    $array['jr_rapt']=$line['jr_rapt'];
+    $array['jrn_def_type']=$line['jrn_def_type'];
     //    $array['']=$line[''];
 
     $ret_array[$i]=$array;