[Phpcompta-dev] r5321 - phpcompta/tags/rel660/include

[phpcompta-dev]

Author: danydb
Date: 2013-06-09 19:39:13 +0200 (Sun, 09 Jun 2013)
New Revision: 5321

Modified:
   phpcompta/tags/rel660/include/class_acc_account_ledger.php
   phpcompta/tags/rel660/include/class_acc_ledger.php
   phpcompta/tags/rel660/include/class_fiche.php
   phpcompta/tags/rel660/include/export_histo_csv.php
Log:
bug #0000855: Ordre des pi?\195?\168ces justificatives

Modified: phpcompta/tags/rel660/include/class_acc_account_ledger.php
===================================================================
--- phpcompta/tags/rel660/include/class_acc_account_ledger.php  2013-06-09 
17:27:58 UTC (rev 5320)
+++ phpcompta/tags/rel660/include/class_acc_account_ledger.php  2013-06-09 
17:39:13 UTC (rev 5321)
@@ -159,7 +159,7 @@
                                  " ( to_date($2,'DD.MM.YYYY') <= j_date and ".
                                  "   to_date($3,'DD.MM.YYYY') >= j_date )".
                                  " and $filter_sql  $sql_let ".
-                                 " order by 
j_date,substring(jr_pj_number,'\\\\d+$') asc",array($this->id,$p_from,$p_to));
+                                 " order by 
j_date,substring(jr_pj_number,'[0-9]+$') asc",array($this->id,$p_from,$p_to));
         return $this->get_row_sql($Res);
     }
 

Modified: phpcompta/tags/rel660/include/class_acc_ledger.php
===================================================================
--- phpcompta/tags/rel660/include/class_acc_ledger.php  2013-06-09 17:27:58 UTC 
(rev 5320)
+++ phpcompta/tags/rel660/include/class_acc_ledger.php  2013-06-09 17:39:13 UTC 
(rev 5321)
@@ -391,7 +391,7 @@
                                        "jr_grpt_id=j_grpt " .
                                        " left join tmp_pcmn on pcm_val=j_poste 
" .
                                        " where j_jrn_def=" . $this->id .
-                                       " and " . $periode . " order by 
j_date::date asc,substring(jr_pj_number,'\\\\d+$')::numeric asc,j_grpt,j_debit 
desc " .
+                                       " and " . $periode . " order by 
j_date::date asc,substring(jr_pj_number,'[0-9]+$')::numeric asc,j_grpt,j_debit 
desc " .
                                        $cond_limite);
                }
                else
@@ -411,7 +411,7 @@
                                                                                
 join jrn_def on (jr_def_id=jrn_def_id)
                                                                                
 where " .
                                        $g_user->get_ledger_sql() . " and " .
-                                       "  " . $periode . " order by 
j_date::date,substring(jr_pj_number,'\\\\d+$') asc,j_grpt,j_debit desc   " .
+                                       "  " . $periode . " order by 
j_date::date,substring(jr_pj_number,'[0-9]+$') asc,j_grpt,j_debit desc   " .
                                        $cond_limite);
                }
 
@@ -545,7 +545,7 @@
              jrn_def_type,
              jrn.jr_tech_per
              FROM jrn join jrn_def on (jrn_def_id=jr_def_id)
-             WHERE $periode $jrn order by 
jr_date,substring(jrn.jr_pj_number,'\\\d+$')::numeric asc  $cond_limite";
+             WHERE $periode $jrn order by 
jr_date,substring(jrn.jr_pj_number,'[0-9]+$')::numeric asc  $cond_limite";
 
                $Res = $this->db->exec_sql($sql);
                $Max = Database::num_row($Res);
@@ -813,9 +813,9 @@
                // Sort
                $url = "?" . CleanUrl();
                $str_dossier = dossier::get();
-               $table->add("Date", $url, 'order by jr_date 
asc,substring(jr_pj_number,\'\\\d+$\')::numeric asc', 'order by  jr_date 
desc,substring(jr_pj_number,\'\\\d+$\')::numeric desc', "da", "dd");
+               $table->add("Date", $url, 'order by jr_date 
asc,substring(jr_pj_number,\'[0-9]+$\')::numeric asc', 'order by  jr_date 
desc,substring(jr_pj_number,\'[0-9]+$\')::numeric desc', "da", "dd");
                $table->add('Echeance', $url, " order by  jr_ech asc", " order 
by  jr_ech desc", 'ea', 'ed');
-               $table->add('PJ', $url, ' order by  
substring(jr_pj_number,\'\\\d+$\')::numeric asc ', ' order by  
substring(jr_pj_number,\'\\\d+$\')::numeric desc ', "pja", "pjd");
+               $table->add('PJ', $url, ' order by  
substring(jr_pj_number,\'[0-9]+$\')::numeric asc ', ' order by  
substring(jr_pj_number,\'[0-9]+$\')::numeric desc ', "pja", "pjd");
                $table->add('Tiers', $url, " order by  name asc", " order by  
name desc", 'na', 'nd');
                $table->add('Montant', $url, " order by jr_montant asc", " 
order by jr_montant desc", "ma", "md");
                $table->add("Description", $url, "order by jr_comment asc", 
"order by jr_comment desc", "ca", "cd");
@@ -2857,7 +2857,7 @@
                                " from jrn join jrn_def on 
(jr_def_id=jrn_def_id) where  " .
                                " jr_date >= (select p_start from parm_periode 
where p_id = $1)
                                 and  jr_date <= (select p_end from 
parm_periode where p_id  = $2)" .
-                               '  ' . $jrn . ' order by 
jr_date,substring(jr_pj_number,\'\\\d+$\')::numeric asc';
+                               '  ' . $jrn . ' order by 
jr_date,substring(jr_pj_number,\'[0-9]+$\')::numeric asc';
                $ret = $this->db->get_array($sql, array($p_from, $p_to));
                return $ret;
        }

Modified: phpcompta/tags/rel660/include/class_fiche.php
===================================================================
--- phpcompta/tags/rel660/include/class_fiche.php       2013-06-09 17:27:58 UTC 
(rev 5320)
+++ phpcompta/tags/rel660/include/class_fiche.php       2013-06-09 17:39:13 UTC 
(rev 5321)
@@ -1119,7 +1119,7 @@
         }
 
         $qcode=$this->strAttribut(ATTR_DEF_QUICKCODE);
-        $Res=$this->cn->exec_sql("select distinct 
substring(jr_pj_number,'\\\\d+$'),j_id,j_date,to_char(j_date,'DD.MM.YYYY') as 
j_date_fmt,j_qcode,".
+        $Res=$this->cn->exec_sql("select distinct 
substring(jr_pj_number,'[0-9]+$'),j_id,j_date,to_char(j_date,'DD.MM.YYYY') as 
j_date_fmt,j_qcode,".
                                  "case when j_debit='t' then j_montant else 0 
end as deb_montant,".
                                  "case when j_debit='f' then j_montant else 0 
end as cred_montant,".
                                  " jr_comment as description,jrn_def_name as 
jrn_name,".
@@ -1134,7 +1134,7 @@
                                  " ( to_date($2,'DD.MM.YYYY') <= j_date and ".
                                  "   to_date($3,'DD.MM.YYYY') >= j_date )".
                                  " and $filter_sql $sql_let ".
-                                 " order by 
j_date,substring(jr_pj_number,'\\\\d+$')",array($qcode,$p_from,$p_to));
+                                 " order by 
j_date,substring(jr_pj_number,'[0-9]+$')",array($qcode,$p_from,$p_to));
 
         return $this->get_row_result($Res);
     }
@@ -1910,7 +1910,7 @@
        }
        function get_all_account()
        {
-               
+
        }
 }
 

Modified: phpcompta/tags/rel660/include/export_histo_csv.php
===================================================================
--- phpcompta/tags/rel660/include/export_histo_csv.php  2013-06-09 17:27:58 UTC 
(rev 5320)
+++ phpcompta/tags/rel660/include/export_histo_csv.php  2013-06-09 17:39:13 UTC 
(rev 5321)
@@ -31,7 +31,7 @@
 $ledger=new Acc_Ledger($cn,0);
 list($sql,$where)=$ledger->build_search_sql($_GET);
 
-$order=" order by jr_date_order asc,substring(jr_pj_number,'\\\d+$')::numeric 
asc ";
+$order=" order by jr_date_order asc,substring(jr_pj_number,'[0-9]+$')::numeric 
asc ";
 
 $res=$cn->get_array($sql.$order);
 



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu