diff --git a/html/access.php b/html/access.php index 54549f372..4732f8d5d 100644 --- a/html/access.php +++ b/html/access.php @@ -114,6 +114,7 @@ echo '
'; $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); diff --git a/html/js/calc.js b/html/js/calc.js index 9637fc980..933470f3e 100644 --- a/html/js/calc.js +++ b/html/js/calc.js @@ -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=""; diff --git a/html/test.php b/html/test.php index abc388fdc..7773ac164 100644 --- a/html/test.php +++ b/html/test.php @@ -28,6 +28,8 @@ include_once("ac_common.php"); 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 17: case 18: require_once('class_todo_list.php'); require_once ('constant.php'); - echo JS_PROTOTYPE; Todo_List::test_me(); echo ''; echo '
'; @@ -181,14 +182,10 @@ case 23: 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 @@ case 28: 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'); diff --git a/include/class_acc_ledger_fin.php b/include/class_acc_ledger_fin.php index 920b096ef..7b2e7552b 100644 --- a/include/class_acc_ledger_fin.php +++ b/include/class_acc_ledger_fin.php @@ -877,9 +877,6 @@ class Acc_Ledger_Fin extends Acc_Ledger $current=(isset($_GET['p_periode']))?$_GET['p_periode']:-1; $w->selected=$current; - echo JS_LEDGER; - echo JS_PROTOTYPE; - echo JS_AJAX_FICHE; echo ''; echo 'Période '.$w->input("p_periode",$periode_start); $wLedger=$this->select_ledger('fin',3); diff --git a/include/class_extension.php b/include/class_extension.php index 5b06c0f13..e848e57e9 100644 --- a/include/class_extension.php +++ b/include/class_extension.php @@ -281,7 +281,7 @@ class Extension 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(); } } diff --git a/include/class_icard.php b/include/class_icard.php index 79db2e513..bf8954e76 100644 --- a/include/class_icard.php +++ b/include/class_icard.php @@ -21,12 +21,12 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr /*!\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