Re: Patch: Re: [Phpcompta-support] bug: balance des comptes vide dans la version 2.0.6

[Stan Pinte]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

et ci-joint encore un patch pour l'impression des journaux, qui
résouds le problème d'insertion à posteriori d'une période plus jeune
que celle max(p_id).
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFCpdQ/PmuubxPWAIRAnHmAJ4quBhAijOMDlUUNy3oCoj6FqZPqQCfUJSb
j0wocfAY0dSjg6VvxZS/mic=
=YTdh
-----END PGP SIGNATURE-----

--- ../phpcompta-dev/include/class_jrn.php      2006-08-04 09:18:50.669880000 
+0200
+++ include/class_jrn.php       2006-09-15 14:04:17.930604800 +0200
@@ -67,9 +67,15 @@
   echo_debug('class_jrn.php',__LINE__,"GetRow ( 
$p_from,$p_to,$cent,$p_limit,$p_offset)");
 
     if ( $p_from == $p_to ) 
-      $periode=" jr_tech_per = $p_from ";
-    else
-      $periode = "(jr_tech_per >= $p_from and jr_tech_per <= $p_to) ";
+      {
+        $periode=" jr_tech_per = $p_from ";
+      }
+      else
+      {
+        $periode = "p_start >= (select p_start from parm_periode where p_id = 
$p_from) ".
+          "and p_end <= (select p_end from parm_periode where p_id = $p_to)";  
      
+      }
+    
     $cond_limite=($p_limit!=-1)?" limit ".$p_limit." offset ".$p_offset:"";
 
     // Grand livre == 0
@@ -87,6 +93,7 @@
                 jr_rapt as oc, j_tech_per as periode from jrnx left join jrn 
on ".
                 "jr_grpt_id=j_grpt ".
                 " left join tmp_pcmn on pcm_val=j_poste ".
+     " left join parm_periode on j_tech_per = p_id".     
                 " where j_jrn_def=".$this->id.
               " and ".$periode." order by j_date::date asc,jr_internal,j_debit 
desc ".
                 $cond_limite);
@@ -109,7 +116,9 @@
             c_rapt as oc,
             c_periode as periode 
             from centralized left join jrn on ".
-               "jr_grpt_id=c_grp left join tmp_pcmn on pcm_val=c_poste where ".
+            "jr_grpt_id=c_grp left join tmp_pcmn on pcm_val=c_poste".
+            " left join parm_periode on j_tech_per = p_id".              
+            "where ".
                " c_jrn_def=".$this->id." and ".
                 $periode." order by c_order ";
       $Res=ExecSql($this->db,$Sql.$cond_limite);
@@ -129,7 +138,9 @@
                 jr_comment||' ('||jr_internal||')' as jr_comment,
                 jr_montant,
                 jr_rapt as oc, j_tech_per as periode from jrnx left join jrn 
on ".
-                "jr_grpt_id=j_grpt left join tmp_pcmn on pcm_val=j_poste where 
".
+                "jr_grpt_id=j_grpt left join tmp_pcmn on pcm_val=j_poste ".
+                " left join parm_periode on j_tech_per = p_id".                
  
+                "where ".                
               "  ".$periode." order by j_date::date,j_grpt,j_debit desc   ".
               $cond_limite);
 
@@ -154,7 +165,9 @@
             c_rapt as oc,
             c_periode as periode 
             from centralized left join jrn on ".
-               "jr_grpt_id=c_grp left join tmp_pcmn on pcm_val=c_poste where ".
+            "jr_grpt_id=c_grp left join tmp_pcmn on pcm_val=c_poste".
+            " left join parm_periode on j_tech_per = p_id".              
+            " where ".
                 $periode." order by c_order ";
     $Res=ExecSql($this->db,$Sql.$cond_limite);
     } // Grand Livre
@@ -247,9 +260,14 @@
     // Periode check
     //---
     if ( $p_from == $p_to ) 
-      $periode=" jr_tech_per = $p_from ";
-    else
-      $periode = "(jr_tech_per >= $p_from and jr_tech_per <= $p_to) ";
+      {
+        $periode=" jr_tech_per = $p_from ";
+      }
+      else
+      {
+        $periode = "p_start >= (select p_start from parm_periode where p_id = 
$p_from) ".
+          "and p_end <= (select p_end from parm_periode where p_id = $p_to)";  
      
+      }
     $cond_limite=($p_limit!=-1)?" limit ".$p_limit." offset ".$p_offset:"";
     // Grand-livre : id= 0
     //---
@@ -270,7 +288,8 @@
            jrn.jr_grpt_id as grpt_id, 
            jrn.jr_pj_name as pj,
             jrn_def_type
-   FROM jrn join jrn_def on (jrn_def_id=jr_def_id)
+            FROM jrn join jrn_def on (jrn_def_id=jr_def_id)
+            left join parm_periode on jr_tech_per = p_id
 where $periode $jrn order by jr_date";