[Phpcompta-dev] r4563 - in phpcompta/trunk/include: . template

[phpcompta-dev]

Author: danydb
Date: 2011-12-05 22:37:14 +0100 (Mon, 05 Dec 2011)
New Revision: 4563

Modified:
   phpcompta/trunk/include/class_lettering.php
   phpcompta/trunk/include/template/letter_prop.php
Log:
show lettered operation first


Modified: phpcompta/trunk/include/class_lettering.php
===================================================================
--- phpcompta/trunk/include/class_lettering.php 2011-12-05 21:36:52 UTC (rev 
4562)
+++ phpcompta/trunk/include/class_lettering.php 2011-12-05 21:37:14 UTC (rev 
4563)
@@ -143,24 +143,7 @@
     @code
     'gDossier' => string '13' (length=2)
     'letter_j_id' =>
-      array
-        0 => string '5' (length=1)
-        1 => string '23' (length=2)
-        2 => string '67' (length=2)
-        3 => string '136' (length=3)
-        4 => string '139' (length=3)
-        5 => string '145' (length=3)
-        6 => string '374' (length=3)
-        7 => string '148' (length=3)
-        8 => string '156' (length=3)
-        9 => string '254' (length=3)
-        10 => string '277' (length=3)
-    'ck0' => string 'on' (length=2)
-    'ck1' => string 'on' (length=2)
-    'ck10' => string 'on' (length=2)
-    'j_id' => string '142' (length=3)
-    'jnt_id' => string '-2' (length=2)
-    'record' => string 'Sauver' (length=6)
+       ck => array
     @endcode
     */
     public function save($p_array)
@@ -188,20 +171,20 @@
         // save dest
         for($i=0;$i<count($p_array['letter_j_id']);$i++)
         {
-            if (isset($p_array['ck'.$i]))
+            if (isset ($p_array['ck'][$i]) && $p_array['ck'][$i] !="-2")
             { //if 1
                 // save the dest
-                $deb=$this->db->get_value('select j_debit,j_montant from jrnx 
where j_id=$1',array($p_array['letter_j_id'][$i]));
+                $deb=$this->db->get_value('select j_debit,j_montant from jrnx 
where j_id=$1',array($p_array['ck'][$i]));
                 if ( $deb == 't')
                 {
                     $count++;
                     // save into letter_deb
-                    $ld_id=$this->db->get_value('insert into 
letter_deb(j_id,jl_id) values($1,$2) returning 
ld_id',array($p_array['letter_j_id'][$i],$jl_id));
+                    $ld_id=$this->db->get_value('insert into 
letter_deb(j_id,jl_id) values($1,$2) returning 
ld_id',array($p_array['ck'][$i],$jl_id));
                 }
                 else
                 {
                     $count++;
-                    $lc_id=$this->db->get_value('insert into 
letter_cred(j_id,jl_id)  values($1,$2) returning 
lc_id',array($p_array['letter_j_id'][$i],$jl_id));
+                    $lc_id=$this->db->get_value('insert into 
letter_cred(j_id,jl_id)  values($1,$2) returning 
lc_id',array($p_array['ck'][$i],$jl_id));
                 }
             } //end if 1
         } //end for
@@ -251,7 +234,8 @@
                         where
                         j_id in (select j_id from letter_cred where jl_id=$1
                                        union all
-                                       select j_id from letter_deb where 
jl_id=$1)";
+                                       select j_id from letter_deb where 
jl_id=$1)
+                                       order by j_date";
 
                $this->linked=$this->db->get_array($sql,array($p_jlid));
        }

Modified: phpcompta/trunk/include/template/letter_prop.php
===================================================================
--- phpcompta/trunk/include/template/letter_prop.php    2011-12-05 21:36:52 UTC 
(rev 4562)
+++ phpcompta/trunk/include/template/letter_prop.php    2011-12-05 21:37:14 UTC 
(rev 4563)
@@ -84,14 +84,16 @@
   <tr <? echo "class=\"$class\""; ?> >
 <td>
 <?php
-echo HtmlInput::hidden('letter_j_id[]',$this->content[$i]['j_id']);
 
    if ($this->content[$i]['j_id']==$p_jid) continue;
-$check=new ICheckbox('ck'.$i);
+if ( $jnt_id == $this->content[$i]['letter'] && $i >= $linked_limit) continue;
+
+$check=new ICheckbox('ck[]',$this->content[$i]['j_id']);
 if ( $jnt_id == $this->content[$i]['letter'] && $i < $linked_limit) 
$check->selected=true; else $check->selected=false;
 
 if ( $this->content[$i]['letter'] == -1 ||  $check->selected == true )
        echo $check->input();
+echo HtmlInput::hidden('letter_j_id[]',$this->content[$i]['j_id']);
 ?>
 </td>
 <td>
@@ -100,7 +102,7 @@
 ?>
 <?=$letter?>
 </td>
-<td> <?=$this->content[$i]['j_date_fmt']?> </td>
+<td> <?=smaller_date($this->content[$i]['j_date_fmt'])?> </td>
 <?php
 $r=sprintf('<A class="detail" style="text-decoration:underline"  
HREF="javascript:viewOperation(\'%s\',\'%s\')" >%s</A>',
           $this->content[$i]['jr_id'], $gDossier,  
$this->content[$i]['jr_internal']);