diff --git a/html/admin_repo.php b/html/admin_repo.php index aaf46cdf8..9797caf39 100644 --- a/html/admin_repo.php +++ b/html/admin_repo.php @@ -93,3 +93,4 @@ if ( isset ($_REQUEST["action"]) ) html_page_stop(); ?> +> \ No newline at end of file diff --git a/html/commercial.php b/html/commercial.php index 367adb40b..ca76b22f9 100644 --- a/html/commercial.php +++ b/html/commercial.php @@ -137,9 +137,6 @@ echo ''; $cn=new Database($gDossier); -echo JS_LEDGER; -echo JS_AJAX_FICHE; - //----------------------------------------------------- // p_action == pref //----------------------------------------------------- diff --git a/html/extension.php b/html/extension.php index d6b78fc9f..958be1eab 100644 --- a/html/extension.php +++ b/html/extension.php @@ -44,7 +44,6 @@ $only_plugin=$user->check_dossier(dossier::id()); /* javascript file */ echo load_all_script(); -echo JS_INFOBULLE; /* show button to return to access */ echo "

".dossier::name()."

"; diff --git a/html/import.php b/html/import.php index 8e0d0e6db..4dbcb7598 100644 --- a/html/import.php +++ b/html/import.php @@ -39,7 +39,7 @@ $User->Check(); $User->check_dossier(dossier::id()); html_page_start($User->theme); -echo JS_PROTOTYPE; + /* Admin. Dossier */ @@ -54,7 +54,7 @@ echo ''; echo ShowMenuAdvanced(7); $User->can_request(GEBQ,1); -echo JS_AJAX_FICHE; + echo '
'; ShowMenuImport(); echo '
'; diff --git a/html/jrn_search.php b/html/jrn_search.php index c1df05064..726dfba44 100644 --- a/html/jrn_search.php +++ b/html/jrn_search.php @@ -39,7 +39,7 @@ require_once('class_dossier.php'); $gDossier=dossier::id(); // Javascript -echo JS_LEDGER; + if ( isset( $p_jrn )) { $p_jrn=$p_jrn; diff --git a/html/recherche.php b/html/recherche.php index c192e1bec..7c6ca9891 100644 --- a/html/recherche.php +++ b/html/recherche.php @@ -28,18 +28,7 @@ require_once('class_acc_ledger.php'); require_once('class_ipopup.php'); html_page_start($_SESSION['g_theme']); - - -echo js_include('prototype.js'); -echo js_include('acc_ledger.js'); -echo js_include('card.js'); -echo js_include('scripts.js'); -echo JS_INFOBULLE; -echo js_include('accounting_item.js'); -echo js_include('scriptaculous.js'); -echo js_include('effects.js'); -echo js_include('controls.js'); -echo js_include('dragdrop.js'); +load_all_script(); $search_card=new IPopup('ipop_card'); $search_card->title=_('Recherche de fiche'); diff --git a/include/adm.inc.php b/include/adm.inc.php index 9fd267035..0b98e5ebd 100644 --- a/include/adm.inc.php +++ b/include/adm.inc.php @@ -37,19 +37,6 @@ echo js_include('scriptaculous.js'); echo js_include('effects.js'); echo js_include('controls.js'); echo js_include('dragdrop.js'); -echo JS_CARD; -echo JS_AJAX_FICHE; -echo ICard::ipopup('ipop_newcard'); -$ip_cat=new IPopup('ipop_cat'); -$ip_cat->title=_('Ajout d\'une catégorie'); -$ip_cat->value=''; -echo $ip_cat->input(); -echo IPoste::ipopup('ipop_account'); -$search_card=new IPopup('ipop_card'); -$search_card->title=_('Recherche de fiche'); -$search_card->value=''; -echo $search_card->input(); -echo ICard::ipopup('ipopcard'); $low_action=(isset($_REQUEST['sb']))?$_REQUEST['sb']:"list"; /*! \file diff --git a/include/anc_od.inc.php b/include/anc_od.inc.php index db7af4e82..694f3f66e 100644 --- a/include/anc_od.inc.php +++ b/include/anc_od.inc.php @@ -134,7 +134,7 @@ if ( isset($_GET['new'])) //show the form for entering a new Anc_Operation //------------------------------------------ $a=new Anc_Group_Operation($cn); - echo JS_CAOD_COMPUTE; + $wSubmit=new IHidden("p_action","ca_od"); $wSubmit->table=0; echo '
'; diff --git a/include/class_acc_payment.php b/include/class_acc_payment.php index 29634f819..bf34ecb23 100644 --- a/include/class_acc_payment.php +++ b/include/class_acc_payment.php @@ -414,7 +414,7 @@ class Acc_Payment */ static function test_me() { - echo JS_LEDGER; + $cn=new Database(dossier::id()); $ac=new Acc_Payment($cn); $ac->set_parameter('type','ACH'); diff --git a/include/class_acc_reconciliation.php b/include/class_acc_reconciliation.php index 5d60f76b3..01fa9035b 100644 --- a/include/class_acc_reconciliation.php +++ b/include/class_acc_reconciliation.php @@ -37,7 +37,7 @@ class Acc_Reconciliation { var $db; /*!< database connection */ var $jr_id; /*!< jr_id */ - public static $javascript=JS_LEDGER; + function __construct($cn) { $this->db=$cn; @@ -300,12 +300,7 @@ class Acc_Reconciliation } return $ret; } - /*!\brief return the javascript function (static method) - * - static function javascript() { - return JS_LEDGER; - } - */ + static function test_me() { $cn=new Database(dossier::id()); diff --git a/include/class_anc_operation.php b/include/class_anc_operation.php index 9c3a4f6b8..d24baf1f8 100644 --- a/include/class_anc_operation.php +++ b/include/class_anc_operation.php @@ -183,7 +183,7 @@ class Anc_Operation $gDossier=dossier::id(); $ret=""; $ret.=$bar; - $ret.=JS_LEDGER; + $count=0; $group=0; $oldgroup=0; diff --git a/include/class_contact.php b/include/class_contact.php index 2593d5041..6209ca0f5 100644 --- a/include/class_contact.php +++ b/include/class_contact.php @@ -106,7 +106,7 @@ class contact extends Fiche $back_url=urlencode($_SERVER['REQUEST_URI']); if ( sizeof ($step_contact ) == 0 ) return $r; - echo JS_LEDGER; + foreach ($step_contact as $contact ) { $l_company=new Fiche($this->cn); diff --git a/include/contact.inc.php b/include/contact.inc.php index 6d09d75dc..ae31ecc1f 100644 --- a/include/contact.inc.php +++ b/include/contact.inc.php @@ -133,7 +133,7 @@ if ( $sub_action == "list" ) name='qcode'; $w->value=$qcode; diff --git a/include/detail_adm.inc.php b/include/detail_adm.inc.php index cb48b15c8..5e5adc1dd 100644 --- a/include/detail_adm.inc.php +++ b/include/detail_adm.inc.php @@ -50,7 +50,7 @@ echo '
'; if ( isset($_POST['mod'])) echo hb('Information sauvée'); $adm=new Fiche($cn,$f_id); -echo JS_INFOBULLE; + echo '
'; echo dossier::hidden(); echo HtmlInput::hidden('sb','detail'); diff --git a/include/detail_client.inc.php b/include/detail_client.inc.php index dd32be952..b9b69b17e 100644 --- a/include/detail_client.inc.php +++ b/include/detail_client.inc.php @@ -50,7 +50,7 @@ echo '
'; if ( isset($_POST['mod'])) echo hb(_('Information sauvée')); $client=new Customer($cn,$f_id); -echo JS_INFOBULLE; + echo ''; echo dossier::hidden(); echo HtmlInput::hidden('sb','detail'); diff --git a/include/detail_supplier.inc.php b/include/detail_supplier.inc.php index 441fed8e6..22917b635 100644 --- a/include/detail_supplier.inc.php +++ b/include/detail_supplier.inc.php @@ -50,7 +50,7 @@ echo '
'; if ( isset($_POST['mod'])) echo hb(_('Information sauvée')); $supplier=new Supplier($cn,$f_id); -echo JS_INFOBULLE; + echo ''; echo dossier::hidden(); echo HtmlInput::hidden('sb','detail'); diff --git a/include/dossier.inc.php b/include/dossier.inc.php index 344724bb1..bbc707adf 100644 --- a/include/dossier.inc.php +++ b/include/dossier.inc.php @@ -172,7 +172,7 @@ if ( $sa == 'list' ) $Res=$repo->show_dossier('all',$offset,$size); $compteur=1; $template=""; - echo JS_CONFIRM; + echo ''; $r=th('ID').th('Nom du dossier ').th('Description').th('Taille').th('Nom base de données'); $r=tr($r); diff --git a/include/import_inc.php b/include/import_inc.php index d5726ecd6..4049c09ee 100644 --- a/include/import_inc.php +++ b/include/import_inc.php @@ -34,20 +34,6 @@ require_once('class_acc_ledger.php'); require_once("class_acc_parm_code.php"); require_once('class_acc_operation.php'); require_once('class_ipopup.php'); -echo js_include('prototype.js'); -echo js_include('scriptaculous.js'); -echo js_include('effects.js'); -echo js_include('controls.js'); -echo js_include('dragdrop.js'); -echo js_include('bq_import.js'); -echo js_include('acc_ledger.js'); - -echo JS_CARD; -echo ICard::ipopup('ipopcard'); -$search_card=new IPopup('ipop_card'); -$search_card->title=_('Recherche de fiche'); -$search_card->value=''; -echo $search_card->input(); /*! * \brief Parse the file and insert the record @@ -187,9 +173,7 @@ function VerifImport($p_cn) $Num=Database::num_row($Res); echo $Num._(" opérations à complèter")."

"; // include javascript for popup - echo JS_CARD; - echo JS_LEDGER; - echo JS_AJAX_FICHE; + for ( $i=0;$i< $Num;$i++) { $val = Database::fetch_array($Res,$i); diff --git a/include/impress.inc.php b/include/impress.inc.php index bb95f73d7..1df5cd90d 100644 --- a/include/impress.inc.php +++ b/include/impress.inc.php @@ -27,7 +27,6 @@ $str_dossier=dossier::get(); // show sub menu echo "
"; -echo JS_AJAX_FICHE; $p_array=array(array ("?p_action=impress&type=jrn&".$str_dossier,_("Historique")), array("?p_action=impress&type=gl_comptes&".$str_dossier,_("Grand Livre")), /* AG */ diff --git a/include/letter.inc.php b/include/letter.inc.php index 001203b4b..62ea5586a 100644 --- a/include/letter.inc.php +++ b/include/letter.inc.php @@ -23,7 +23,7 @@ /*!\file * \brief file to include for the "lettrage" (lettering?) */ -echo JS_INFOBULLE; + $array=array( array('?'.dossier::get().'&p_action=let&sa=poste',_('Par poste'), _('Lettrage par poste'), 1), diff --git a/include/lettering.card.inc.php b/include/lettering.card.inc.php index 883abc0d6..073ba0b3e 100644 --- a/include/lettering.card.inc.php +++ b/include/lettering.card.inc.php @@ -23,23 +23,10 @@ /*!\file * \brief show the lettering by account */ -echo js_include('prototype.js'); -echo js_include('scriptaculous.js'); -echo js_include('effects.js'); -echo js_include('controls.js'); -echo js_include('dragdrop.js'); -echo js_include('accounting_item.js'); -echo js_include('acc_ledger.js'); require_once ('class_ipopup.php'); require_once('class_lettering.php'); -echo JS_CARD; -$search_card=new IPopup('ipop_card'); -$search_card->title=_('Recherche de fiche'); -$search_card->value=''; -echo $search_card->input(); - echo '
'; echo ''; -echo JS_ACCOUNTING_ITEM; /* Store the p_start parameter */ if ( ! isset ( $_SESSION['g_start']) ) { diff --git a/include/quick_writing.inc.php b/include/quick_writing.inc.php index 85c3787d7..07fe7a1f7 100644 --- a/include/quick_writing.inc.php +++ b/include/quick_writing.inc.php @@ -76,7 +76,7 @@ function show_direct_form($cn,$ledger,$p_array) echo '
'; $id=(isset ($_REQUEST['p_jrn']))?$_REQUEST['p_jrn']:-1; - echo JS_COMPUTE_DIRECT; + echo Acc_Reconciliation::$javascript; // Show the predef operation diff --git a/include/stock.inc.php b/include/stock.inc.php index a6438e964..ef009393f 100644 --- a/include/stock.inc.php +++ b/include/stock.inc.php @@ -119,7 +119,7 @@ if ( isset ($_POST['sub_change'])) $action="detail"; } } -echo JS_LEDGER; + // View the summary // if year is not set then use the year of the user's periode diff --git a/include/suivi_adm.inc.php b/include/suivi_adm.inc.php index 74d77500f..103782555 100644 --- a/include/suivi_adm.inc.php +++ b/include/suivi_adm.inc.php @@ -30,14 +30,6 @@ */ require_once('class_action.php'); $User->can_request(GECOUR); -echo js_include('prototype.js'); -echo js_include('scriptaculous.js'); -echo js_include('effects.js'); -echo js_include('controls.js'); -echo js_include('infobulle.js'); -echo js_include('acc_ledger.js'); -echo js_include('ajax_fiche.js'); -echo JS_CARD; /** *\note fix problem with ShowActionList, this function is local diff --git a/include/suivi_supplier.inc.php b/include/suivi_supplier.inc.php index 7d7dc46cc..96cb418bd 100644 --- a/include/suivi_supplier.inc.php +++ b/include/suivi_supplier.inc.php @@ -30,14 +30,6 @@ */ require_once('class_action.php'); $User->can_request(GECOUR); -echo js_include('prototype.js'); -echo js_include('scriptaculous.js'); -echo js_include('effects.js'); -echo js_include('controls.js'); -echo js_include('infobulle.js'); -echo js_include('acc_ledger.js'); -echo js_include('ajax_fiche.js'); -echo JS_CARD; /** *\note problem with ShowActionList, this function is local diff --git a/include/supplier.inc.php b/include/supplier.inc.php index d3a51a088..566233c8f 100644 --- a/include/supplier.inc.php +++ b/include/supplier.inc.php @@ -30,25 +30,6 @@ require_once('class_fiche_def.php'); require_once('class_iaction.php'); require_once('class_fiche_def.php'); require_once('class_ipopup.php'); -echo js_include('accounting_item.js'); -echo js_include('prototype.js'); -echo js_include('scriptaculous.js'); -echo js_include('effects.js'); -echo js_include('controls.js'); -echo js_include('dragdrop.js'); -echo JS_CARD; -echo JS_AJAX_FICHE; -echo ICard::ipopup('ipop_newcard'); -$ip_cat=new IPopup('ipop_cat'); -$ip_cat->title=_('Ajout d\'une catégorie'); -$ip_cat->value=''; -echo $ip_cat->input(); -echo IPoste::ipopup('ipop_account'); -$search_card=new IPopup('ipop_card'); -$search_card->title=_('Recherche de fiche'); -$search_card->value=''; -echo $search_card->input(); -echo ICard::ipopup('ipopcard'); $low_action=(isset($_REQUEST['sb']))?$_REQUEST['sb']:"list"; /*! \file diff --git a/include/template/form_ledger_detail.php b/include/template/form_ledger_detail.php index e45c2c742..fba8e63a1 100644 --- a/include/template/form_ledger_detail.php +++ b/include/template/form_ledger_detail.php @@ -1,11 +1,5 @@
diff --git a/include/user_action_gl.php b/include/user_action_gl.php index 26a6b7c8f..3acda3af6 100644 --- a/include/user_action_gl.php +++ b/include/user_action_gl.php @@ -28,7 +28,7 @@ include_once("class_user.php"); require_once("class_iselect.php"); require_once('class_acc_ledger.php'); $cn=new Database($gDossier); -echo JS_INFOBULLE; + require_once('class_iposte.php'); require_once('class_ipopup.php'); $search_card=new IPopup('ipop_card');