[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r4196 - in phpcompta/branches/rel560: html html/js inclu
From: |
phpcompta-dev |
Subject: |
[Phpcompta-dev] r4196 - in phpcompta/branches/rel560: html html/js include |
Date: |
Mon, 12 Sep 2011 22:15:28 +0200 (CEST) |
Author: danydb
Date: 2011-09-12 22:15:27 +0200 (Mon, 12 Sep 2011)
New Revision: 4196
Modified:
phpcompta/branches/rel560/html/js/calc.js
phpcompta/branches/rel560/html/test.php
phpcompta/branches/rel560/include/class_acc_ledger_fin.php
phpcompta/branches/rel560/include/class_html_input.php
phpcompta/branches/rel560/include/class_icard.php
phpcompta/branches/rel560/include/constant.php
Log:
Code cleaning, remove JS_ definition +
Modified: phpcompta/branches/rel560/html/js/calc.js
===================================================================
--- phpcompta/branches/rel560/html/js/calc.js 2011-09-12 19:00:00 UTC (rev
4195)
+++ phpcompta/branches/rel560/html/js/calc.js 2011-09-12 20:15:27 UTC (rev
4196)
@@ -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/branches/rel560/html/test.php
===================================================================
--- phpcompta/branches/rel560/html/test.php 2011-09-12 19:00:00 UTC (rev
4195)
+++ phpcompta/branches/rel560/html/test.php 2011-09-12 20:15:27 UTC (rev
4196)
@@ -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/branches/rel560/include/class_acc_ledger_fin.php
===================================================================
--- phpcompta/branches/rel560/include/class_acc_ledger_fin.php 2011-09-12
19:00:00 UTC (rev 4195)
+++ phpcompta/branches/rel560/include/class_acc_ledger_fin.php 2011-09-12
20:15:27 UTC (rev 4196)
@@ -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/branches/rel560/include/class_html_input.php
===================================================================
--- phpcompta/branches/rel560/include/class_html_input.php 2011-09-12
19:00:00 UTC (rev 4195)
+++ phpcompta/branches/rel560/include/class_html_input.php 2011-09-12
20:15:27 UTC (rev 4196)
@@ -49,23 +49,7 @@
* - TEXTAREA
* - RICHTEXT
* - FILE
- * - JS_SEARCH_POSTE call a popup window for searching the account
- * - JS_SEARCH call a popup window for searching a quickcode or to add one
- * - JS_SEARCH_ONLY like JS_SEARCH but without adding a quickcode
- * - JS_LEDGER_CTRL like js_search_only but the tag to update is given
* - SPAN
- * - JS_TVA open a popup window for the VAT
- * - JS_CONCERNED open a popup window for search a operation, if extra
== 0 then
- * get the amount thx javascript
- * - js_DATE show a calendar
- *
- * For JS_SEARCH_POST,JS_SEARCH or JS_SEARCH_ONLY
- * - $extra contains 'cred', 'deb', 'all' or a list of fiche_def_ref
(frd_id)
- * to filter the search/add for the card
- *
- * - $extra2 filter on the card parameter, which are given in
Avance->journaux menu,
- * it is the journal id. If empty, there is no link with a ledger
- *
*/
class HtmlInput
{
Modified: phpcompta/branches/rel560/include/class_icard.php
===================================================================
--- phpcompta/branches/rel560/include/class_icard.php 2011-09-12 19:00:00 UTC
(rev 4195)
+++ phpcompta/branches/rel560/include/class_icard.php 2011-09-12 20:15:27 UTC
(rev 4196)
@@ -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
Modified: phpcompta/branches/rel560/include/constant.php
===================================================================
--- phpcompta/branches/rel560/include/constant.php 2011-09-12 19:00:00 UTC
(rev 4195)
+++ phpcompta/branches/rel560/include/constant.php 2011-09-12 20:15:27 UTC
(rev 4196)
@@ -32,15 +32,14 @@
global $g_captcha;
$g_captcha=false;
-/* set to none for production */
+/*set to none for production */
/* uncomment for production */
-$version_phpcompta=SVNINFO;
-define ("DEBUG",false);
-/*
+//$version_phpcompta=SVNINFO;
+//define ("DEBUG",false);
+
define ("DEBUG",true);
$version_phpcompta=4014;
-*/
define ("DBVERSION",97);
define ("DBVERSIONREPO",13);
@@ -130,85 +129,12 @@
define ("FICHE_TYPE_ACH_SER",3);
-
-define ("JS_CONFIRM",
- "<SCRIPT language=\"javascript\" src=\"js/confirm.js\">
</SCRIPT>");
-define ("JS_ACCOUNTING_ITEM",
- "<SCRIPT language=\"javascript\" src=\"js/accounting_item.js\">
</SCRIPT>");
-
-
-define ("JS_LEDGER","
- <script language=\"javascript\" src=\"js/acc_ledger.js\"></script>
- ");
-define ("JS_CARD","
- <script language=\"javascript\" src=\"js/card.js\"></script>
- ");
-
-
-define ('JS_CALENDAR','
- <script type="text/javascript" language="javascript"
src="js/jrn_concerned.js">
- </script>');
-
-define ('JS_COMPUTE_DIRECT','
- <script type="text/javascript" language="javascript"
src="js/compute_direct.js">
- </script>');
-
-
-define ('JS_CAOD_COMPUTE','
- <script type="text/javascript" language="javascript"
src="js/caod_compute.js">
- </script>');
-
define ('JS_INFOBULLE','
<DIV id="bulle" class="infobulle"></DIV>
<script type="text/javascript" language="javascript"
src="js/infobulle.js">
</script>');
-// One line calculator
-define ("JS_CALC_LINE",'
- <script type="text/javascript" language="javascript" src="js/calc.js">
- </script>
- <form name="calc_line" method="GET" onSubmit="cal();return false;" >
- Cette calculatrice vous permet de calculer, écrivez simplement les
opérations que vous voulez puis
- la touche retour.
- exemple : 1+2+3*(1/5)
-
- <input style="border:solid 1px;" type="text" size="30" id="inp"
name="calculator">
- <input type="button" value="Efface tout" onClick="Clean();return
false;" >
- </form>
- <span id="result"> </span><br>
- <span id="sub_total"> Taper une formule (ex 20*5.1) puis enter
</span><br>
- <span id="listing"> </span>
- '
- );
-define ("JS_COMPUTE_ODS",
- "<SCRIPT language=\"javascript\" src=\"js/compute.js\">
</SCRIPT>");
-
-define ("JS_SHOW_TVA","<SCRIPT language=\"javascript\">
- function ShowTva(p_dossier,ctl)
- {
- var
win=window.open('show_tva.php?ctl='+ctl+'&gDossier='+p_dossier,'Montre','scrollbar,toolbar=no,width=300,height=300,resizable=yes');
- }
- function GetIt(ctl,tva_id) {
- self.opener.SetValue(ctl,tva_id)
- window.close();
- }
- </script>");
-
-define ("JS_TVA","<script language=\"javascript\">
- function ChangeTVA(p_ctl,p_value) {
- if (document.getElementById(p_ctl) ) {
- var f=document.getElementsByName(p_value);
- for ( var i=0; i < f.length ; i++) {
- document.getElementById(p_ctl).innerHTML=f[i].value;
- }
- }
- }
-
- </script>");
-define ("JS_AJAX_FICHE",'<script language="javascript"
src="js/ajax_fiche.js"></script>');
-define ("JS_TODO",'<script language="javascript"
src="js/todo_list.js"></script>');
-define ("JS_PROTOTYPE",'<script language="javascript"
src="js/prototype.js"></script>');
// Sql string
define ("SQL_LIST_ALL_INVOICE","");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpcompta-dev] r4196 - in phpcompta/branches/rel560: html html/js include,
phpcompta-dev <=