[Phpcompta-dev] r4198 - in phpcompta/trunk: . html html/js include

[phpcompta-dev]

Author: danydb
Date: 2011-09-15 10:59:10 +0200 (Thu, 15 Sep 2011)
New Revision: 4198

Modified:
   phpcompta/trunk/
   phpcompta/trunk/html/access.php
   phpcompta/trunk/html/js/calc.js
   phpcompta/trunk/html/test.php
   phpcompta/trunk/include/class_acc_ledger_fin.php
   phpcompta/trunk/include/class_extension.php
   phpcompta/trunk/include/class_icard.php
Log:
Merged revisions 4193-4197 via svnmerge from 
file:///home/developper/svn/phpcompta/branches/rel560

........
  r4194 | danydb | 2011-09-02 09:51:23 +0200 (Fri, 02 Sep 2011) | 2 lines
  
  show needed version
........
  r4195 | danydb | 2011-09-12 21:00:00 +0200 (Mon, 12 Sep 2011) | 1 line
  
  fix bug when user has no ledger.
........
  r4196 | danydb | 2011-09-12 22:15:27 +0200 (Mon, 12 Sep 2011) | 1 line
  
  Code cleaning, remove JS_ definition +
........
  r4197 | danydb | 2011-09-12 22:24:14 +0200 (Mon, 12 Sep 2011) | 1 line
  
  update constant.php : ready for prod
........



Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /phpcompta/branches/rel560:1-4192
   + /phpcompta/branches/rel560:1-4197

Modified: phpcompta/trunk/html/access.php
===================================================================
--- phpcompta/trunk/html/access.php     2011-09-12 20:24:14 UTC (rev 4197)
+++ phpcompta/trunk/html/access.php     2011-09-15 08:59:10 UTC (rev 4198)
@@ -114,6 +114,7 @@
 $cal=new Calendar();
 $cal->get_preference();
 $Ledger=new Acc_Ledger($cn,0);
+$last_ledger=array();
 if ( $user->check_action(GESTION)==1)
   {
     $Operation=new Action($cn);

Modified: phpcompta/trunk/html/js/calc.js
===================================================================
--- phpcompta/trunk/html/js/calc.js     2011-09-12 20:24:14 UTC (rev 4197)
+++ phpcompta/trunk/html/js/calc.js     2011-09-15 08:59:10 UTC (rev 4198)
@@ -22,7 +22,7 @@
 /*! \file
  * \brief This file show a little online calculator, in the caller
  *        the span id result, listing, the id form calc_line and the
- *        input id inp must exist see constant.php JS_CALC_LINE
+ *       
  *
  */
 var p_history="";

Modified: phpcompta/trunk/html/test.php
===================================================================
--- phpcompta/trunk/html/test.php       2011-09-12 20:24:14 UTC (rev 4197)
+++ phpcompta/trunk/html/test.php       2011-09-15 08:59:10 UTC (rev 4198)
@@ -28,6 +28,8 @@
 require_once('class_database.php');
 require_once ('class_dossier.php');
 require_once('class_html_input.php');
+require_once ('function_javascript.php');
+load_all_script();
 
 if ( ! file_exists('authorized_debug') )
 {
@@ -144,7 +146,6 @@
 case 18:
     require_once('class_todo_list.php');
     require_once ('constant.php');
-    echo JS_PROTOTYPE;
     Todo_List::test_me();
     echo '<script src="js/todo_list.js"></script>';
     echo '<form method="get">';
@@ -181,14 +182,10 @@
 case 24:
     require_once('class_icard.php');
     require_once ('constant.php');
-    echo JS_PROTOTYPE;
-    echo JS_AJAX_FICHE;
-    echo JS_CARD;
     ICard::test_me();
     break;
 case 25:
     require_once('class_acc_ledger.php');
-    echo JS_PROTOTYPE;
 
     Acc_Ledger::test_me('search');
     break;
@@ -250,9 +247,6 @@
     break;
 case 29:
     require_once('class_itva_popup.php');
-    echo JS_PROTOTYPE;
-    echo JS_AJAX_FICHE;
-    echo JS_CARD;
     echo js_include('scripts.js');
     echo js_include('scriptaculous.js');
     echo js_include('effects.js');

Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_fin.php    2011-09-12 20:24:14 UTC 
(rev 4197)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php    2011-09-15 08:59:10 UTC 
(rev 4198)
@@ -877,9 +877,6 @@
         $current=(isset($_GET['p_periode']))?$_GET['p_periode']:-1;
         $w->selected=$current;
 
-        echo JS_LEDGER;
-        echo JS_PROTOTYPE;
-        echo JS_AJAX_FICHE;
         echo '<form>';
         echo 'Période  '.$w->input("p_periode",$periode_start);
         $wLedger=$this->select_ledger('fin',3);

Modified: phpcompta/trunk/include/class_extension.php
===================================================================
--- phpcompta/trunk/include/class_extension.php 2011-09-12 20:24:14 UTC (rev 
4197)
+++ phpcompta/trunk/include/class_extension.php 2011-09-15 08:59:10 UTC (rev 
4198)
@@ -281,7 +281,7 @@
         if ( ! isset ($version_phpcompta) || $version_phpcompta < $i )
         {
             alert('Cette extension ne fonctionne pas sur cette version de 
PhpCompta'.
-                  ' Veuillez mettre votre programme a jour');
+                  ' Veuillez mettre votre programme a jour. Version minimum 
'.$i);
             exit();
         }
     }

Modified: phpcompta/trunk/include/class_icard.php
===================================================================
--- phpcompta/trunk/include/class_icard.php     2011-09-12 20:24:14 UTC (rev 
4197)
+++ phpcompta/trunk/include/class_icard.php     2011-09-15 08:59:10 UTC (rev 
4198)
@@ -21,12 +21,12 @@
 // Copyright Author Dany De Bontridder address@hidden
 
 /*!\file
- * \brief Input HTML for the card show buttons, in the file, you have to add 
JS_CARD
+ * \brief Input HTML for the card show buttons
  *
  */
 
 /*!
- * \brief Input HTML for the card show buttons, in the file, you have to add 
JS_CARD
+ * \brief Input HTML for the card show buttons, in the file, you have to add 
card.js
  * How to use :
  * - label is the label in the button
  * - extra contents the type (all, deb or cred, a list of FD_ID between 
parent.  or a SQL clause