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

[phpcompta-dev]

Author: danydb
Date: 2013-06-10 18:17:15 +0200 (Mon, 10 Jun 2013)
New Revision: 5324

Modified:
   phpcompta/tags/rel660/include/class_acc_ledger.php
   phpcompta/tags/rel660/include/compta_ods.inc.php
   phpcompta/tags/rel660/include/operation_ods_new.inc.php
Log:
Probleme journaux ODS: mauvais filtre pour les fiches

Modified: phpcompta/tags/rel660/include/class_acc_ledger.php
===================================================================
--- phpcompta/tags/rel660/include/class_acc_ledger.php  2013-06-09 18:21:57 UTC 
(rev 5323)
+++ phpcompta/tags/rel660/include/class_acc_ledger.php  2013-06-10 16:17:15 UTC 
(rev 5324)
@@ -3382,6 +3382,7 @@
                                break;
                        case 'ODS':
                                $this->jrn_def_class_deb = $p_jrn_class_deb;
+                               $this->jrn_def_fiche_cred=null;
                                break;
                        case 'FIN':
                                $a = new Fiche($this->db);
@@ -3500,6 +3501,7 @@
                                break;
                        case 'ODS':
                                $this->jrn_def_class_deb = $p_jrn_class_deb;
+                               $this->jrn_def_fiche_cred = null;
                                break;
                        case 'FIN':
                                $a = new Fiche($this->db);

Modified: phpcompta/tags/rel660/include/compta_ods.inc.php
===================================================================
--- phpcompta/tags/rel660/include/compta_ods.inc.php    2013-06-09 18:21:57 UTC 
(rev 5323)
+++ phpcompta/tags/rel660/include/compta_ods.inc.php    2013-06-10 16:17:15 UTC 
(rev 5324)
@@ -39,15 +39,15 @@
 
 $cn = new Database(dossier::id());
 
-$id = (isset($_REQUEST['p_jrn'])) ? $_REQUEST['p_jrn'] : -1;
-$id = (isset($_REQUEST['p_jrn_predef'])) ? $_REQUEST['p_jrn_predef'] : -1;
-$ledger = new Acc_Ledger($cn, $id);
+$id_predef = (isset($_REQUEST['p_jrn_predef'])) ? $_REQUEST['p_jrn_predef'] : 
-1;
+$id_ledger = (isset($_REQUEST['p_jrn'])) ? $_REQUEST['p_jrn'] : $id_predef;
+$ledger = new Acc_Ledger($cn, $id_ledger);
 $first_ledger = $ledger->get_first('ODS');
 if ( empty ($first_ledger))
 {
        exit('Pas de journal disponible');
 }
-$ledger->id = ($ledger->id == -1) ? $first_ledger['jrn_def_id'] : $id;
+$ledger->id = ($ledger->id == -1) ? $first_ledger['jrn_def_id'] : $id_ledger;
 
 /**\brief show a form for quick_writing */
 $def = -1;

Modified: phpcompta/tags/rel660/include/operation_ods_new.inc.php
===================================================================
--- phpcompta/tags/rel660/include/operation_ods_new.inc.php     2013-06-09 
18:21:57 UTC (rev 5323)
+++ phpcompta/tags/rel660/include/operation_ods_new.inc.php     2013-06-10 
16:17:15 UTC (rev 5324)
@@ -31,11 +31,11 @@
 global $g_user,$g_parameter;
 $cn=new Database(dossier::id());
 
-$id = (isset($_REQUEST['p_jrn'])) ? $_REQUEST['p_jrn'] : -1;
-$id = (isset($_REQUEST['p_jrn_predef'])) ? $_REQUEST['p_jrn_predef'] : -1;
-$ledger=new Acc_Ledger($cn,$id);
+$id_predef = (isset($_REQUEST['p_jrn_predef'])) ? $_REQUEST['p_jrn_predef'] : 
-1;
+$id_ledger = (isset($_REQUEST['p_jrn'])) ? $_REQUEST['p_jrn'] : $id_predef;
+$ledger = new Acc_Ledger($cn, $id_ledger);
 $first_ledger=$ledger->get_first('ODS');
-$ledger->id=($ledger->id==-1)?$first_ledger['jrn_def_id']:$id;
+$ledger->id = ($ledger->id == -1) ? $first_ledger['jrn_def_id'] : $id_ledger;
 
 // check if we can write in the ledger
 if ( $g_user->check_jrn($ledger->id)=='X')



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