Clean code remove all the JS_ and IPopup
This commit is contained in:
parent
dfc97ae1d5
commit
f81f6167ce
30 changed files with 21 additions and 126 deletions
|
|
@ -93,3 +93,4 @@ if ( isset ($_REQUEST["action"]) )
|
|||
|
||||
html_page_stop();
|
||||
?>
|
||||
>
|
||||
|
|
@ -137,9 +137,6 @@ echo '</div>';
|
|||
|
||||
$cn=new Database($gDossier);
|
||||
|
||||
echo JS_LEDGER;
|
||||
echo JS_AJAX_FICHE;
|
||||
|
||||
//-----------------------------------------------------
|
||||
// p_action == pref
|
||||
//-----------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -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 "<h2 class=\"info\">".dossier::name()."</h2>";
|
||||
|
|
|
|||
|
|
@ -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 '</div>';
|
|||
echo ShowMenuAdvanced(7);
|
||||
$User->can_request(GEBQ,1);
|
||||
|
||||
echo JS_AJAX_FICHE;
|
||||
|
||||
echo '<div class="lmenu">';
|
||||
ShowMenuImport();
|
||||
echo '</div>';
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ require_once('class_dossier.php');
|
|||
$gDossier=dossier::id();
|
||||
|
||||
// Javascript
|
||||
echo JS_LEDGER;
|
||||
|
||||
if ( isset( $p_jrn ))
|
||||
{
|
||||
$p_jrn=$p_jrn;
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 '<div class="u_redcontent" style="margin-left:12%">';
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ class Anc_Operation
|
|||
$gDossier=dossier::id();
|
||||
$ret="";
|
||||
$ret.=$bar;
|
||||
$ret.=JS_LEDGER;
|
||||
|
||||
$count=0;
|
||||
$group=0;
|
||||
$oldgroup=0;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ if ( $sub_action == "list" )
|
|||
<?php
|
||||
echo dossier::hidden();
|
||||
$qcode=(isset($_GET['qcode']))?$_GET['qcode']:"";
|
||||
echo JS_LEDGER;
|
||||
|
||||
$w=new ICard();
|
||||
$w->name='qcode';
|
||||
$w->value=$qcode;
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ echo '<div class="content">';
|
|||
if ( isset($_POST['mod'])) echo hb('Information sauvée');
|
||||
|
||||
$adm=new Fiche($cn,$f_id);
|
||||
echo JS_INFOBULLE;
|
||||
|
||||
echo '<form method="post">';
|
||||
echo dossier::hidden();
|
||||
echo HtmlInput::hidden('sb','detail');
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ echo '<div class="content">';
|
|||
if ( isset($_POST['mod'])) echo hb(_('Information sauvée'));
|
||||
|
||||
$client=new Customer($cn,$f_id);
|
||||
echo JS_INFOBULLE;
|
||||
|
||||
echo '<form method="post">';
|
||||
echo dossier::hidden();
|
||||
echo HtmlInput::hidden('sb','detail');
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ echo '<div class="content">';
|
|||
if ( isset($_POST['mod'])) echo hb(_('Information sauvée'));
|
||||
|
||||
$supplier=new Supplier($cn,$f_id);
|
||||
echo JS_INFOBULLE;
|
||||
|
||||
echo '<form method="post">';
|
||||
echo dossier::hidden();
|
||||
echo HtmlInput::hidden('sb','detail');
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ if ( $sa == 'list' )
|
|||
$Res=$repo->show_dossier('all',$offset,$size);
|
||||
$compteur=1;
|
||||
$template="";
|
||||
echo JS_CONFIRM;
|
||||
|
||||
echo '<TABLE class="result" style="border-collapse:separate;border-spacing:4">';
|
||||
$r=th('ID').th('Nom du dossier ').th('Description').th('Taille').th('Nom base de données');
|
||||
$r=tr($r);
|
||||
|
|
|
|||
|
|
@ -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")."<br/><br/>";
|
||||
// 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);
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ $str_dossier=dossier::get();
|
|||
// show sub menu
|
||||
|
||||
echo "<DIV class=\"lmenu\">";
|
||||
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 */
|
||||
|
|
|
|||
|
|
@ -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),
|
||||
|
|
|
|||
|
|
@ -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 '<div class="content">';
|
||||
echo '<div id="search">';
|
||||
echo '<FORM METHOD="GET">';
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ if ( isset ($_POST['upd']) &&
|
|||
}
|
||||
$sa="list";
|
||||
}
|
||||
echo JS_CONFIRM;
|
||||
|
||||
$cn=new Database();
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,6 @@ echo '</div>';
|
|||
|
||||
|
||||
|
||||
echo JS_ACCOUNTING_ITEM;
|
||||
/* Store the p_start parameter */
|
||||
if ( ! isset ( $_SESSION['g_start']) )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ function show_direct_form($cn,$ledger,$p_array)
|
|||
echo '<div class="content">';
|
||||
|
||||
$id=(isset ($_REQUEST['p_jrn']))?$_REQUEST['p_jrn']:-1;
|
||||
echo JS_COMPUTE_DIRECT;
|
||||
|
||||
echo Acc_Reconciliation::$javascript;
|
||||
|
||||
// Show the predef operation
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,11 +1,5 @@
|
|||
<?php
|
||||
|
||||
echo JS_INFOBULLE;
|
||||
echo JS_LEDGER;
|
||||
echo JS_SHOW_TVA;
|
||||
echo JS_TVA;
|
||||
echo JS_AJAX_FICHE;
|
||||
|
||||
?>
|
||||
<fieldset>
|
||||
<legend><?=$f_legend ?>
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue