admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged revisions 4193-4197 via svnmerge from

Browse source 
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
........
This commit is contained in:
Dany De Bontridder 2011-09-15 08:59:10 +00:00
parent d736caf61c
commit 395865032b
6 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
html/access.php
View file

@ -114,6 +114,7 @@ echo '<div class="content">';
$cal=new Calendar(); $cal=new Calendar();
$cal->get_preference(); $cal->get_preference();
$Ledger=new Acc_Ledger($cn,0); $Ledger=new Acc_Ledger($cn,0);
$last_ledger=array();
if ( $user->check_action(GESTION)==1) if ( $user->check_action(GESTION)==1)
{ {
$Operation=new Action($cn); $Operation=new Action($cn);

2
html/js/calc.js
View file

@ -22,7 +22,7 @@
/*! \file /*! \file
* \brief This file show a little online calculator, in the caller * \brief This file show a little online calculator, in the caller
* the span id result, listing, the id form calc_line and the * 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=""; var p_history="";

10
html/test.php
View file

@ -28,6 +28,8 @@ include_once("ac_common.php");
require_once('class_database.php'); require_once('class_database.php');
require_once ('class_dossier.php'); require_once ('class_dossier.php');
require_once('class_html_input.php'); require_once('class_html_input.php');
require_once ('function_javascript.php');
load_all_script();
if ( ! file_exists('authorized_debug') ) if ( ! file_exists('authorized_debug') )
{ {
@ -144,7 +146,6 @@ case 17:
case 18: case 18:
require_once('class_todo_list.php'); require_once('class_todo_list.php');
require_once ('constant.php'); require_once ('constant.php');
echo JS_PROTOTYPE;
Todo_List::test_me(); Todo_List::test_me();
echo '<script src="js/todo_list.js"></script>'; echo '<script src="js/todo_list.js"></script>';
echo '<form method="get">'; echo '<form method="get">';
@ -181,14 +182,10 @@ case 23:
case 24: case 24:
require_once('class_icard.php'); require_once('class_icard.php');
require_once ('constant.php'); require_once ('constant.php');
echo JS_PROTOTYPE;
echo JS_AJAX_FICHE;
echo JS_CARD;
ICard::test_me(); ICard::test_me();
break; break;
case 25: case 25:
require_once('class_acc_ledger.php'); require_once('class_acc_ledger.php');
echo JS_PROTOTYPE;
Acc_Ledger::test_me('search'); Acc_Ledger::test_me('search');
break; break;
@ -250,9 +247,6 @@ case 28:
break; break;
case 29: case 29:
require_once('class_itva_popup.php'); require_once('class_itva_popup.php');
echo JS_PROTOTYPE;
echo JS_AJAX_FICHE;
echo JS_CARD;
echo js_include('scripts.js'); echo js_include('scripts.js');
echo js_include('scriptaculous.js'); echo js_include('scriptaculous.js');
echo js_include('effects.js'); echo js_include('effects.js');

3
include/class_acc_ledger_fin.php
View file

@ -877,9 +877,6 @@ class Acc_Ledger_Fin extends Acc_Ledger
$current=(isset($_GET['p_periode']))?$_GET['p_periode']:-1; $current=(isset($_GET['p_periode']))?$_GET['p_periode']:-1;
$w->selected=$current; $w->selected=$current;
echo JS_LEDGER;
echo JS_PROTOTYPE;
echo JS_AJAX_FICHE;
echo '<form>'; echo '<form>';
echo 'Période '.$w->input("p_periode",$periode_start); echo 'Période '.$w->input("p_periode",$periode_start);
$wLedger=$this->select_ledger('fin',3); $wLedger=$this->select_ledger('fin',3);

2
include/class_extension.php
View file

@ -281,7 +281,7 @@ class Extension
if ( ! isset ($version_phpcompta) || $version_phpcompta < $i ) if ( ! isset ($version_phpcompta) || $version_phpcompta < $i )
{ {
alert('Cette extension ne fonctionne pas sur cette version de PhpCompta'. 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(); exit();
} }
} }

4
include/class_icard.php
View file

@ -21,12 +21,12 @@
// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
/*!\file /*!\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 : * How to use :
* - label is the label in the button * - 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 * - extra contents the type (all, deb or cred, a list of FD_ID between parent. or a SQL clause