diff --git a/html/annulation.php b/html/annulation.php index 529746450..c39911f1b 100644 --- a/html/annulation.php +++ b/html/annulation.php @@ -117,8 +117,8 @@ return; } if ($p_id != -1 ) { // A // userPref contient la periode par default - $userPref=$User->GetPeriode($cn); - list ($l_date_start,$l_date_end)=GetPeriode($cn,$userPref); + $userPref=$User->get_periode($cn); + list ($l_date_start,$l_date_end)=get_periode($cn,$userPref); // Periode fermée if ( PeriodeClosed ($cn,$userPref)=='t' ) diff --git a/html/bal_csv.php b/html/bal_csv.php index 8d9424058..2948740e3 100644 --- a/html/bal_csv.php +++ b/html/bal_csv.php @@ -36,7 +36,7 @@ $cn=DbConnect($gDossier); require_once ('class_user.php'); $User=new cl_user(DbConnect()); $User->Check(); -if ( $User->CheckAction($cn,BALANCE) == 0) +if ( $User->check_action($cn,BALANCE) == 0) { NoAccess(); exit; diff --git a/html/bilan.php b/html/bilan.php index d24bfdfff..e9553b3c2 100644 --- a/html/bilan.php +++ b/html/bilan.php @@ -40,7 +40,7 @@ $User->Check(); // TODO a specific level of security for the "bilan" ??? // Change must be done here if ( $User->admin == 0 ) { - if ($User->CheckAction($cn,IMP) + if ($User->check_action($cn,IMP) ==0 ) { diff --git a/html/budget.php b/html/budget.php index ce873da22..5d2203ff4 100644 --- a/html/budget.php +++ b/html/budget.php @@ -84,7 +84,7 @@ echo ''; $cn=DbConnect($gDossier); /*! \todo module budget add the security - *$User->AccessRequest($cn,BUDGET); + *$User->can_request($cn,BUDGET); */ //----------------------------------------------------- // p_action == hypo diff --git a/html/central.php b/html/central.php index d93e1c803..e9dc0d92f 100644 --- a/html/central.php +++ b/html/central.php @@ -49,7 +49,7 @@ include_once("central_inc.php"); echo '
'; echo ShowMenuAdvanced("central.php?".dossier::get()); echo '
'; -$User->AccessRequest($cn,CENTRALIZE); +$User->can_request($cn,CENTRALIZE); diff --git a/html/commercial.php b/html/commercial.php index 62a4daf51..ef04c4017 100644 --- a/html/commercial.php +++ b/html/commercial.php @@ -109,7 +109,7 @@ echo ShowItem(array( echo ''; $cn=DbConnect($gDossier); -$User->AccessRequest($cn,SEC_GESTION); +$User->can_request($cn,SEC_GESTION); echo JS_VIEW_JRN_MODIFY; echo JS_AJAX_FICHE; @@ -178,7 +178,7 @@ if ( $p_action=='quick_writing') { // Impression if ( $p_action == 'impress') { - if ( $User->CheckAction($cn,IMP) == 0) + if ( $User->check_action($cn,IMP) == 0) { NoAccess(); exit; diff --git a/html/compta.php b/html/compta.php index fbfbd883e..2fc54c548 100644 --- a/html/compta.php +++ b/html/compta.php @@ -52,7 +52,7 @@ echo ''; // call impress sub-menu if ( $action == 'impress' ) { - $User->AccessRequest($cn,IMP) ; + $User->can_request($cn,IMP) ; require_once('impress.inc.php'); } diff --git a/html/comptanalytic.php b/html/comptanalytic.php index 733c92238..b0a9cd035 100644 --- a/html/comptanalytic.php +++ b/html/comptanalytic.php @@ -64,15 +64,15 @@ if ( isset ($_REQUEST['p_action'])) switch ($_REQUEST['p_action']) { case 'ca_pa': - $User->AccessRequest($cn,CA_ACCESS); + $User->can_request($cn,CA_ACCESS); $def=0; break; case 'ca_od': - $User->AccessRequest($cn,CA_ODS); + $User->can_request($cn,CA_ODS); $def=1; break; case 'ca_imp': - $User->AccessRequest($cn,CA_IMPRESSION); + $User->can_request($cn,CA_IMPRESSION); $def=2; break; case 'ca_groupe': diff --git a/html/ecrit_ouv.php b/html/ecrit_ouv.php index 757e360fa..f6c393c51 100644 --- a/html/ecrit_ouv.php +++ b/html/ecrit_ouv.php @@ -47,7 +47,7 @@ echo ''; echo ShowMenuAdvanced(8); -$User->AccessRequest($cn,EXP_IMP_ECR); +$User->can_request($cn,EXP_IMP_ECR); echo '
'; @@ -183,7 +183,7 @@ if ( isset ($_GET['import'])) { // submit button in the form $submit=' '; - $r=FormODS($cn,$_POST['p_jrn'],$User->GetPeriode(),$submit, + $r=FormODS($cn,$_POST['p_jrn'],$User->get_periode(),$submit, $array_ods,false,$idx,$p_saved=false); echo $r; diff --git a/html/export_ouv.php b/html/export_ouv.php index 7b0c77f22..e8328d7a0 100644 --- a/html/export_ouv.php +++ b/html/export_ouv.php @@ -42,7 +42,7 @@ include_once ("user_menu.php"); $cn=DbConnect($gDossier); -$User->AccessRequest($cn,EXP_IMP_ECR); +$User->can_request($cn,EXP_IMP_ECR); if ( !isset ($_GET['p_periode'])) { echo 'Erreur : aucune periode demandée'; diff --git a/html/fiche.php b/html/fiche.php index 5b1f63131..900353754 100644 --- a/html/fiche.php +++ b/html/fiche.php @@ -63,8 +63,8 @@ include_once("fiche_inc.php"); $cn=DbConnect($_SESSION['g_dossier']); // Security check -$read=$User->CheckAction($cn,FICHE_READ); -$write=$User->CheckAction($cn,FICHE_WRITE); +$read=$User->check_action($cn,FICHE_READ); +$write=$User->check_action($cn,FICHE_WRITE); if ($read+$write == 0 ){ /* Cannot Access */ NoAccess(); diff --git a/html/fiche_csv.php b/html/fiche_csv.php index 417f4a447..cd2ea3f7f 100644 --- a/html/fiche_csv.php +++ b/html/fiche_csv.php @@ -39,7 +39,7 @@ require_once ('class_user.php'); $User=new cl_user($rep); $User->Check(); -$User->AccessRequest($cn,FICHE_READ); +$User->can_request($cn,FICHE_READ); if ( isset ($_POST['fd_id'])) { diff --git a/html/fiche_new.php b/html/fiche_new.php index f62914c74..42e588343 100644 --- a/html/fiche_new.php +++ b/html/fiche_new.php @@ -41,7 +41,7 @@ $gDossier=dossier::id(); $cn=DbConnect($gDossier); // TODO add security here // Get The priv on the selected folder -if ( $User->CheckAction($cn,FICHE_WRITE)== 0) { +if ( $User->check_action($cn,FICHE_WRITE)== 0) { /* Cannot Access */ echo '

Vous ne pouvez pas ajouter de fiche

'; return; diff --git a/html/fiche_search.php b/html/fiche_search.php index 9862f97ef..aef30680e 100644 --- a/html/fiche_search.php +++ b/html/fiche_search.php @@ -49,7 +49,7 @@ $gDossier=dossier::id(); include_once ("check_priv.php"); $cn=DbConnect($gDossier); // Get The priv on the selected folder -if ( $User->CheckAction($cn,FICHE_READ) == 0 ){ +if ( $User->check_action($cn,FICHE_READ) == 0 ){ /* Cannot Access */ echo '

Vous n\' avez pas accès

'; return; diff --git a/html/form.php b/html/form.php index 1767cc989..7baf0c231 100644 --- a/html/form.php +++ b/html/form.php @@ -48,7 +48,7 @@ include ("check_priv.php"); $cn=DbConnect($gDossier); echo ShowMenuAdvanced(6); // Get The priv on the selected folder -$User->AccessRequest($cn,FORM); +$User->can_request($cn,FORM); diff --git a/html/import.php b/html/import.php index 7aa96710b..6c6904de0 100644 --- a/html/import.php +++ b/html/import.php @@ -53,7 +53,7 @@ echo '
'; echo ShowMenuAdvanced(7); -$User->AccessRequest($cn,IMP_BQE); +$User->can_request($cn,IMP_BQE); echo JS_AJAX_FICHE; echo '
'; @@ -90,7 +90,7 @@ if ( isset ($_GET["action"]) ) { echo '
'; // TransferCSV($cn, - ConfirmTransfert($cn,$User->GetPeriode()); + ConfirmTransfert($cn,$User->get_periode()); echo "
"; } } @@ -102,14 +102,14 @@ if ( isset ($_POST['action'])) { $action=$_POST['action']; if ($action == "transfer" ) { echo '
'; - TransferCSV($cn, $User->GetPeriode()); + TransferCSV($cn, $User->get_periode()); echo "
"; } if ($action == "remove" ) { echo '
'; RemoveCSV($cn); - ConfirmTransfert($cn,$User->GetPeriode()); + ConfirmTransfert($cn,$User->get_periode()); echo "
"; } diff --git a/html/jrn_add.php b/html/jrn_add.php index d63b729d2..8eb17ab41 100644 --- a/html/jrn_add.php +++ b/html/jrn_add.php @@ -47,7 +47,7 @@ echo '
'; $cn=DbConnect($gDossier); -$User->AccessRequest($cn,GJRN); +$User->can_request($cn,GJRN); echo JS_SEARCH_POSTE; diff --git a/html/jrn_csv.php b/html/jrn_csv.php index 728e33255..dc6ab7a09 100644 --- a/html/jrn_csv.php +++ b/html/jrn_csv.php @@ -38,7 +38,7 @@ $rep=DbConnect(); require_once ('class_user.php'); $User=new cl_user($rep); $User->Check(); -if ( $User->CheckAction($cn,IMP) == 0 || +if ( $User->check_action($cn,IMP) == 0 || $User->AccessJrn($cn,$_GET['jrn_id']) == false){ /* Cannot Access */ NoAccess(); diff --git a/html/jrn_detail.php b/html/jrn_detail.php index 8f883677c..f9589ee49 100644 --- a/html/jrn_detail.php +++ b/html/jrn_detail.php @@ -44,7 +44,7 @@ echo ''; include_once("check_priv.php"); $cn=DbConnect($gDossier); -$User->AccessRequest($cn,GJRN); +$User->can_request($cn,GJRN); // Javascript echo JS_SEARCH_POSTE; diff --git a/html/jrn_pdf.php b/html/jrn_pdf.php index 746d8b07e..86a20fa03 100644 --- a/html/jrn_pdf.php +++ b/html/jrn_pdf.php @@ -55,7 +55,7 @@ $User=new cl_user(DbConnect()); $User->Check(); // Security -if ($User->CheckAction($cn,IMP) == 0 || +if ($User->check_action($cn,IMP) == 0 || $User->AccessJrn($cn,$_GET['jrn_id']) == false){ /* Cannot Access */ NoAccess(); diff --git a/html/jrn_update.php b/html/jrn_update.php index 05271d30c..2b5e96b79 100644 --- a/html/jrn_update.php +++ b/html/jrn_update.php @@ -50,7 +50,7 @@ $cn=DbConnect($gDossier); echo '
'; echo ShowMenuAdvanced("jrn_update.php?".dossier::get()); echo '
'; -$User->AccessRequest($cn,GJRN); +$User->can_request($cn,GJRN); echo '
'; diff --git a/html/line_update.php b/html/line_update.php index 114928597..a413f1136 100644 --- a/html/line_update.php +++ b/html/line_update.php @@ -35,7 +35,7 @@ $User=new cl_user($rep); $User->Check(); html_page_start($User->theme,"onLoad='window.focus();'"); -$User->AccessRequest(DbConnect($gDossier),MPCMN); +$User->can_request(DbConnect($gDossier),MPCMN); include ("user_menu.php"); diff --git a/html/listing_client.php b/html/listing_client.php index 051d728e9..66298893b 100644 --- a/html/listing_client.php +++ b/html/listing_client.php @@ -37,7 +37,7 @@ $User->Check(); // TODO a specific level of security for the "bilan" ??? // Change must be done here -$User->AccessRequest($cn,IMP); +$User->can_request($cn,IMP); header('Content-type: application/bin'); header('Content-Disposition: attachment;filename="declaration.bin"',FALSE); diff --git a/html/parametre.php b/html/parametre.php index 3db759a8a..5597e8ec3 100644 --- a/html/parametre.php +++ b/html/parametre.php @@ -52,7 +52,7 @@ include_once ("check_priv.php"); $cn=DbConnect($gDossier); -$User->AccessRequest($cn,PARM); +$User->can_request($cn,PARM); // First action $p_action=""; diff --git a/html/pcmn_update.php b/html/pcmn_update.php index 3bb83db70..0eb1731e1 100644 --- a/html/pcmn_update.php +++ b/html/pcmn_update.php @@ -60,7 +60,7 @@ echo '
'; echo ShowMenuAdvanced(4); echo '
'; -$User->AccessRequest($cn,MPCMN); +$User->can_request($cn,MPCMN); echo '
'; diff --git a/html/print_balance.php b/html/print_balance.php index b1a4193ea..83d9cccd2 100644 --- a/html/print_balance.php +++ b/html/print_balance.php @@ -49,7 +49,7 @@ $User=new cl_user($rep); $User->Check(); $bal=new Acc_Balance($cn); -$User->AccessRequest($cn,BALANCE); +$User->can_request($cn,BALANCE); echo_debug('print_balance.php',__LINE__,"imp pdf journaux"); foreach ($_POST as $key=>$element) { @@ -81,8 +81,8 @@ if ( sizeof($array) == 0 ) { exit(); } -$a=GetPeriode($cn,$from_periode); -$b=GetPeriode($cn,$to_periode); +$a=get_periode($cn,$from_periode); +$b=get_periode($cn,$to_periode); $per_text=" période du ".$a['p_start']." au ".$b['p_end']; $pdf=new Cezpdf('a4'); $pdf->selectFont('./addon/fonts/Helvetica.afm'); diff --git a/html/sec_pdf.php b/html/sec_pdf.php index 114b34d4a..8f2ee4c72 100755 --- a/html/sec_pdf.php +++ b/html/sec_pdf.php @@ -41,7 +41,7 @@ include_once ("class_user.php"); $User=new cl_user($rep); $User->Check(); // Check Priv -$User->AccessRequest($cn,SECU); +$User->can_request($cn,SECU); //----------------------------------------------------- // Get User's info @@ -105,7 +105,7 @@ $Max=pg_NumRows($Res); for ( $i =0 ; $i < $Max; $i++ ) { $l_line=pg_fetch_array($Res,$i); $action['lib']=$l_line['ac_description']; - $right=CheckAction($gDossier,$SecUser->login,$l_line['ac_id']); + $right=check_action($gDossier,$SecUser->login,$l_line['ac_id']); switch ($right) { case 0: $action['priv']="Pas d'accès"; diff --git a/html/show_fiche.php b/html/show_fiche.php index da5817054..cf30fb204 100644 --- a/html/show_fiche.php +++ b/html/show_fiche.php @@ -47,7 +47,7 @@ if ( ! isset ($_REQUEST['q'])) { } // connect to the database $cn=DbConnect($gDossier); -if ( $User->CheckAction($cn,FICHE_READ) == 0 ){ +if ( $User->check_action($cn,FICHE_READ) == 0 ){ /* Cannot Access */ echo '

Vous n\' avez pas accès

'; return; diff --git a/html/user_advanced.php b/html/user_advanced.php index cd6d37b5b..79c459ef7 100644 --- a/html/user_advanced.php +++ b/html/user_advanced.php @@ -73,7 +73,7 @@ switch ($p_action) { echo ShowMenuAdvanced($high); if ($p_action == "periode" ) { - if ( $User->admin == 0 && CheckAction($gDossier,$_SESSION['g_user'],GESTION_PERIODE) == 0 ) + if ( $User->admin == 0 && check_action($gDossier,$_SESSION['g_user'],GESTION_PERIODE) == 0 ) NoAccess(); $p_action=$_REQUEST['p_action']; diff --git a/html/user_jrn.php b/html/user_jrn.php index 942ace57c..cbedeb6c9 100644 --- a/html/user_jrn.php +++ b/html/user_jrn.php @@ -57,7 +57,7 @@ echo '
'; if ( $User->admin == 0 ) { // check if user can access // Acces Grand livre - if ($jrn_type== 'NONE' && CheckAction($gDossier,$_SESSION['g_user'],ENCJRN) == 0 ){ + if ($jrn_type== 'NONE' && check_action($gDossier,$_SESSION['g_user'],ENCJRN) == 0 ){ /* Cannot Access */ NoAccess(); diff --git a/html/user_sec.php b/html/user_sec.php index 592d3be74..c6e964f1a 100644 --- a/html/user_sec.php +++ b/html/user_sec.php @@ -42,7 +42,7 @@ include_once ("user_menu.php"); $cn_dossier=DbConnect($gDossier); -if ( $User->CheckAction($cn_dossier,GJRN) == 0 ) { +if ( $User->check_action($cn_dossier,GJRN) == 0 ) { /* Cannot Access */ NoAccess(); exit -1; @@ -240,7 +240,7 @@ if ( $action == "view" ) { $l_change="action=change_act&act=".$l_line['ac_id']."&login=".$l2_line['use_login']."&user_id=".$l2_line['use_id']; if ( $admin ==0 ) { - $right=CheckAction($gDossier,$l2_line['use_login'],$l_line['ac_id']); + $right=check_action($gDossier,$l2_line['use_login'],$l_line['ac_id']); } else { $right = 2; } diff --git a/include/ac_common.php b/include/ac_common.php index 112d18cb2..436b97829 100644 --- a/include/ac_common.php +++ b/include/ac_common.php @@ -441,8 +441,8 @@ function sql_filter_per($p_cn,$p_from,$p_to,$p_form='p_id',$p_field='jr_tech_per if ( $p_form == 'p_id' ) { // retrieve the date - $a_start=GetPeriode($p_cn,$p_from); - $a_end=GetPeriode($p_cn,$p_to); + $a_start=get_periode($p_cn,$p_from); + $a_end=get_periode($p_cn,$p_to); if ( $a_start == null or $a_end == null ) { echo_debug(__FILE__,__LINE__,'Attention periode '. diff --git a/include/action.inc.php b/include/action.inc.php index 0b1078607..17ba992ce 100644 --- a/include/action.inc.php +++ b/include/action.inc.php @@ -21,7 +21,7 @@ /*! \file * \brief Page who manage the different action (meeting, letter) */ -$User->AccessRequest($cn,SEC_ACTION); +$User->can_request($cn,SEC_ACTION); //----------------------------------------------------- // Action diff --git a/include/admin.inc.php b/include/admin.inc.php index d5b08ffe2..833f11892 100644 --- a/include/admin.inc.php +++ b/include/admin.inc.php @@ -22,7 +22,7 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr require_once("class_admin.php"); $sub_action=(isset($_REQUEST['sa']))?$_REQUEST['sa']:""; -$User->AccessRequest($cn,ADMIN); +$User->can_request($cn,ADMIN); /*! \file * \brief Called from the module "Gestion" to manage the customer diff --git a/include/balance.inc.php b/include/balance.inc.php index 0687e48df..20d0865d3 100644 --- a/include/balance.inc.php +++ b/include/balance.inc.php @@ -30,7 +30,7 @@ include_once ("ac_common.php"); include_once("preference.php"); include_once ("class_widget.php"); include_once("class_acc_balance.php"); -$User->AccessRequest($cn,BALANCE); +$User->can_request($cn,BALANCE); echo '
'; @@ -78,7 +78,7 @@ echo dossier::hidden(); $w=new widget("select"); $w->table=1; // filter on the current year -$filter_year=" where p_exercice='".$User->getExercice()."'"; +$filter_year=" where p_exercice='".$User->get_exercice()."'"; $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end"); $w->label="Depuis"; @@ -146,8 +146,8 @@ if ( isset($_POST['view'] ) ) { $row=$bal->get_row($_POST['from_periode'], $_POST['to_periode']); - $a=GetPeriode($cn,$_POST['from_periode']); - $b=GetPeriode($cn,$_POST['to_periode']); + $a=get_periode($cn,$_POST['from_periode']); + $b=get_periode($cn,$_POST['to_periode']); echo "

période du ".$a['p_start']." au ".$b['p_end']."

"; echo ''; diff --git a/include/bank.inc.php b/include/bank.inc.php index 8766e1dca..1b960edfe 100644 --- a/include/bank.inc.php +++ b/include/bank.inc.php @@ -94,7 +94,7 @@ if ( $sub_action == "solde" ) echo "
"; // Filter the saldo // on the current year - $filter_year=" and j_tech_per in (select p_id from parm_periode where p_exercice='".$User->getExercice()."')"; + $filter_year=" and j_tech_per in (select p_id from parm_periode where p_exercice='".$User->get_exercice()."')"; // for each account for ( $i = 0; $i < pg_NumRows($ResAccount);$i++) { @@ -154,11 +154,11 @@ if ( $sub_action == "list") $w=new widget("select"); // filter on the current year - $filter_year=" where p_exercice='".$User->getExercice()."'"; + $filter_year=" where p_exercice='".$User->get_exercice()."'"; $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end",1); // User is already set User=new cl_user($cn); - $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode(); + $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode(); $w->selected=$current; echo 'Période '.$w->IOValue("p_periode",$periode_start); @@ -184,7 +184,7 @@ if ( $sub_action == "list") else { $filter_per=" and jr_tech_per in (select p_id from parm_periode where p_exercice=". - $User->getExercice().")"; + $User->get_exercice().")"; } // Show list of sell @@ -233,7 +233,7 @@ if ( $sub_action=="use_opd" ) { $submit=''. ''; - $form=FormFin($cn,$_GET['p_jrn'],$User->GetPeriode(),$submit,$p_post,false,$p_post['nb_item']); + $form=FormFin($cn,$_GET['p_jrn'],$User->get_periode(),$submit,$p_post,false,$p_post['nb_item']); echo '
'; echo $form; echo '
'; @@ -258,8 +258,8 @@ if ( isset ($_POST['add_item']) || isset ($_POST['correct']) ) // Submit button in the form $submit=''; - $form=FormFin($cn,$p_jrn,$User->GetPeriode(),$submit,$_POST,false, $nb_item); - //$form=FormFin($cn,$p_jrn,$User->GetPeriode(),$submit,$_POST,false, $nb_number); + $form=FormFin($cn,$p_jrn,$User->get_periode(),$submit,$_POST,false, $nb_item); + //$form=FormFin($cn,$p_jrn,$User->get_periode(),$submit,$_POST,false, $nb_number); echo '
'; echo $form; @@ -283,7 +283,7 @@ if ( isset($_POST['save'])) $submit='

Opération '.$r.' enregistré

'; - $form=FormFin($cn,$p_jrn,$User->GetPeriode(),$submit,$_POST,true,$nb_number,true); + $form=FormFin($cn,$p_jrn,$User->get_periode(),$submit,$_POST,true,$nb_number,true); echo '
'; echo $form; @@ -306,15 +306,15 @@ if ( isset ($_POST['view_invoice']) ) $nb_number=$_POST["nb_item"]; $submit=''; $submit.=''; - if ( form_verify_input ($cn,$p_jrn,$User->GetPeriode(),$_POST,$nb_number) != null ) { + if ( form_verify_input ($cn,$p_jrn,$User->get_periode(),$_POST,$nb_number) != null ) { // Should use a read only view instead of FormFin // where we can check - $form=FormFin($cn,$p_jrn,$User->GetPeriode(),$submit,$_POST,true, $nb_number,false); + $form=FormFin($cn,$p_jrn,$User->get_periode(),$submit,$_POST,true, $nb_number,false); } else { // if something goes wrong, correct it $submit=' '; - $form=FormFin($cn,$p_jrn,$User->GetPeriode(),$submit,$_POST,false, $nb_number); + $form=FormFin($cn,$p_jrn,$User->get_periode(),$submit,$_POST,false, $nb_number); } @@ -341,7 +341,7 @@ if ( $p_jrn != -1 ) $submit=' '; // Show an empty form of invoice - $form=FormFin($cn,$p_jrn,$User->GetPeriode(),$submit,null,false,$jrn->GetDefLine('deb')); + $form=FormFin($cn,$p_jrn,$User->get_periode(),$submit,null,false,$jrn->GetDefLine('deb')); echo '
'; echo $form; echo '
'; diff --git a/include/bud_card.inc.php b/include/bud_card.inc.php index 498bb154e..a99bc6a36 100644 --- a/include/bud_card.inc.php +++ b/include/bud_card.inc.php @@ -45,21 +45,21 @@ $msg=""; if ( isset($_POST['remove'])){ $obj=new Bud_Card($cn); - $obj->load_from_array($_POST); + $obj->get_from_array($_POST); $msg=$obj->delete(); } if ( isset($_POST['add'])){ $obj=new Bud_Card($cn); - $obj->load_from_array($_POST); + $obj->get_from_array($_POST); $msg=$obj->add(); } if ( isset($_POST['update'])){ $obj=new Bud_Card($cn); - $obj->load_from_array($_POST); + $obj->get_from_array($_POST); $msg= $obj->update(); diff --git a/include/bud_hypo.inc.php b/include/bud_hypo.inc.php index 63a8ab9ae..cb733331b 100644 --- a/include/bud_hypo.inc.php +++ b/include/bud_hypo.inc.php @@ -29,21 +29,21 @@ require_once ('class_widget.php'); if ( isset($_POST['remove'])){ $obj=new Bud_Hypo($cn); - $obj->load_from_array($_POST); + $obj->get_from_array($_POST); $obj->delete(); } if ( isset($_POST['add'])){ $obj=new Bud_Hypo($cn); - $obj->load_from_array($_POST); + $obj->get_from_array($_POST); $obj->add(); } if ( isset($_POST['update'])){ $obj=new Bud_Hypo($cn); - $obj->load_from_array($_POST); + $obj->get_from_array($_POST); $obj->update(); } diff --git a/include/ca_group.inc.php b/include/ca_group.inc.php index 98482f97e..c7c003595 100644 --- a/include/ca_group.inc.php +++ b/include/ca_group.inc.php @@ -47,7 +47,7 @@ if ( isset ($_POST['remove'])) { // INSERT if ( isset($_POST['add'])) { $obj=new Anc_Group($cn); - $obj->load_from_array($_POST); + $obj->get_from_array($_POST); $obj->insert(); } $array=$r->myList(); diff --git a/include/ca_od.inc.php b/include/ca_od.inc.php index 6c239266b..c22869a03 100644 --- a/include/ca_od.inc.php +++ b/include/ca_od.inc.php @@ -88,11 +88,11 @@ echo ' $w=new widget("select"); $w->name="p_periode"; // filter on the current year - $filter_year=" where p_exercice='".$User->getExercice()."'"; + $filter_year=" where p_exercice='".$User->get_exercice()."'"; $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end",1); $User=new cl_user($cn); - $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode(); + $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode(); $w->selected=$current; echo 'Période '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_submit','Valider').''; @@ -110,7 +110,7 @@ if ( isset($_POST['save'])) { 'Opération sauvée'; $a=new Anc_Group_Operation($cn); - $a->load_from_array($_POST); + $a->get_from_array($_POST); $a->save(); echo $a->show(); diff --git a/include/ca_pa.inc.php b/include/ca_pa.inc.php index 4f834e0fa..ab4f35648 100644 --- a/include/ca_pa.inc.php +++ b/include/ca_pa.inc.php @@ -141,7 +141,7 @@ if ( isset($_REQUEST['sa'])) { // var_dump($_POST); $po=new Anc_Account($cn); - $po->load_from_array($_POST); + $po->get_from_array($_POST); $po->add(); $sa="list"; @@ -179,7 +179,7 @@ if ( isset($_REQUEST['sa'])) if ( $sa=="po_update") { $po=new Anc_Account($cn); - $po->load_from_array($_POST); + $po->get_from_array($_POST); $po->update(); $sa="list"; } diff --git a/include/check_priv.php b/include/check_priv.php index 690b73b39..45ed5df0b 100644 --- a/include/check_priv.php +++ b/include/check_priv.php @@ -134,8 +134,8 @@ function CheckJrn($p_dossier,$p_user,$p_jrn,$p_detail=False) /*! * \brief Check if an user is allowed to do an action, * this function is only used by the user_sec.php, - * otherwise you have to use cl_user->CheckAction - * or $cl_user->AccessRequest + * otherwise you have to use cl_user->check_action + * or $cl_user->can_request * * \param p_dossier dossier id * \param p_login user's login @@ -146,7 +146,7 @@ function CheckJrn($p_dossier,$p_user,$p_jrn,$p_detail=False) * - 1 priv granted * */ -function CheckAction ( $p_dossier,$p_login,$p_action_id) +function check_action ( $p_dossier,$p_login,$p_action_id) { if ( CheckIsAdmin ($p_login) ) return 1; $cn=DbConnect($p_dossier); diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index 7e607d317..3f014e774 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -982,7 +982,7 @@ function get_propertie() if ( isDate($date) == null ) { throw new AcException('Date invalide', 2); } - list ($l_date_start,$l_date_end)=GetPeriode($this->db,$user->GetPeriode()); + list ($l_date_start,$l_date_end)=get_periode($this->db,$user->get_periode()); // Date dans la periode active if ( cmpDate($date,$l_date_start)<0 || @@ -991,7 +991,7 @@ function get_propertie() throw new AcException('Pas dans la periode active',5); } // Periode ferm� - if ( PeriodeClosed ($this->db,$user->GetPeriode())=='t' ) + if ( PeriodeClosed ($this->db,$user->get_periode())=='t' ) { return new AcException('Periode fermee',6); } diff --git a/include/class_acc_operation.php b/include/class_acc_operation.php index bb2ba1b1a..db6a15873 100644 --- a/include/class_acc_operation.php +++ b/include/class_acc_operation.php @@ -51,7 +51,7 @@ var $jr_id; /*!< pk of jrn */ $this->qcode=""; $this->user=$_SESSION['g_user']; $user=new cl_user($this->db); - $this->periode=$user->GetPeriode(); + $this->periode=$user->get_periode(); } /* ************************************************** *\brief Insert into the table Jrn diff --git a/include/class_anc_account.php b/include/class_anc_account.php index 90ac896e6..5ed79b49a 100644 --- a/include/class_anc_account.php +++ b/include/class_anc_account.php @@ -264,7 +264,7 @@ class Anc_Account return $r; } - function load_from_array($p_array) + function get_from_array($p_array) { $this->name=(isset ($p_array['po_name']))?$p_array['po_name']:""; $this->description=(isset ($p_array['po_description']))?$p_array['po_description']:""; diff --git a/include/class_anc_group.php b/include/class_anc_group.php index ca6d9b4dd..cb0fa5fba 100644 --- a/include/class_anc_group.php +++ b/include/class_anc_group.php @@ -87,7 +87,7 @@ class Anc_Group { * \brief fill the object thanks an array * \param array */ - function load_from_array($p_array) { + function get_from_array($p_array) { $this->ga_id=$p_array['ga_id']; $this->ga_description=$p_array['ga_description']; } @@ -98,7 +98,7 @@ class Anc_Group { if ( ! empty($array)) { foreach ($array as $m ) { $obj= new Anc_Group($this->db); - $obj->load_from_array($m); + $obj->get_from_array($m); $res[]=clone $obj; } } diff --git a/include/class_anc_group_operation.php b/include/class_anc_group_operation.php index a3049d454..a15cdcc95 100644 --- a/include/class_anc_group_operation.php +++ b/include/class_anc_group_operation.php @@ -161,7 +161,7 @@ class Anc_Group_Operation /*!\brief fill row from $_POST data * */ - function load_from_array($p_array) { + function get_from_array($p_array) { $Plan=new Anc_Plan($this->db); $aPlan=$Plan->get_list(); @@ -217,7 +217,7 @@ class Anc_Group_Operation if ( isset($_POST['go'])) { $b=new Anc_Group_Operation($cn); - $b->load_from_array($_POST); + $b->get_from_array($_POST); exit(); } diff --git a/include/class_anc_operation.php b/include/class_anc_operation.php index add337092..bde72ec7d 100644 --- a/include/class_anc_operation.php +++ b/include/class_anc_operation.php @@ -159,7 +159,7 @@ class Anc_Operation if ($p_from=="") { $from="";$to="";} else - list($from,$to)=GetPeriode($this->db,$p_from); + list($from,$to)=get_periode($this->db,$p_from); $array=$this->get_list($from,$to); diff --git a/include/class_bud_card.php b/include/class_bud_card.php index f57daed8a..17736262e 100644 --- a/include/class_bud_card.php +++ b/include/class_bud_card.php @@ -102,7 +102,7 @@ class Bud_Card { * corresponding property will be null * \param $p_array array to convert */ - function load_from_array($p_array) { + function get_from_array($p_array) { if ( empty($p_array) ) return; foreach (array ('bh_id','bc_id','bc_code','bc_description','bc_price_unit','bc_unit') as $key ){ @@ -128,7 +128,7 @@ class Bud_Card { if ( pg_NumRows($res) == 0 ) return null; $a=pg_fetch_array($res,0); - $this->load_from_array($a); + $this->get_from_array($a); } static function get_list($p_cn,$p_bh_id) { @@ -143,7 +143,7 @@ class Bud_Card { foreach ($get as $row ) { $obj=new Bud_Card($p_cn); - $obj->load_from_array($row); + $obj->get_from_array($row); $result[]=clone $obj; } return $result; diff --git a/include/class_bud_hypo.php b/include/class_bud_hypo.php index f37e6f655..49ce19b9c 100644 --- a/include/class_bud_hypo.php +++ b/include/class_bud_hypo.php @@ -106,7 +106,7 @@ class Bud_Hypo { ExecSql($this->db,$sql); } - function load_from_array($p_array) { + function get_from_array($p_array) { $this->bh_id=(isset($p_array['bh_id']))?$p_array['bh_id']:0; $this->bh_saldo=(isset($p_array['bh_saldo']))?$p_array['bh_saldo']:0; $this->bh_description=(isset($p_array['bh_description']))?$p_array['bh_description']:0; diff --git a/include/class_customer.php b/include/class_customer.php index 077dba7fe..eae46c538 100644 --- a/include/class_customer.php +++ b/include/class_customer.php @@ -250,7 +250,7 @@ where /* Filter on the default year */ $User=new cl_user($this->cn); $filter_year=" j_tech_per in (select p_id from parm_periode ". - "where p_exercice='".$User->getExercice()."')"; + "where p_exercice='".$User->get_exercice()."')"; $a=$post->get_solde_detail($filter_year); $r.=sprintf('
',$a['debit']); diff --git a/include/class_supplier.php b/include/class_supplier.php index 9939e5d2b..d75e31b49 100644 --- a/include/class_supplier.php +++ b/include/class_supplier.php @@ -133,7 +133,7 @@ class Supplier extends fiche{ /* Filter on the default year */ $User=new cl_user($this->cn); $filter_year=" j_tech_per in (select p_id from parm_periode ". - "where p_exercice='".$User->getExercice()."')"; + "where p_exercice='".$User->get_exercice()."')"; $a=$post->get_solde_detail($filter_year); $r.=sprintf('',$a['debit']); $r.=sprintf('',$a['credit']); diff --git a/include/class_user.php b/include/class_user.php index b396f741c..64c3982a7 100644 --- a/include/class_user.php +++ b/include/class_user.php @@ -112,7 +112,7 @@ class cl_user { $this->admin=$_SESSION['use_admin']; $this->name=$_SESSION['use_name']; $this->first_name=$_SESSION['use_first_name']; - $this->GetGlobalPref(); + $this->load_global_pref(); } @@ -206,7 +206,7 @@ jrn_def_name,jrn_def_class_deb,jrn_def_class_cred,jrn_type_id,jrn_desc,uj_priv, * \param - $p_user * */ -function SetPeriode($p_periode) { +function set_periode($p_periode) { $sql="update user_local_pref set parameter_value='$p_periode' where user_id='$this->id' and parameter_type='PERIODE'"; $Res=ExecSql($this->db,$sql); } @@ -220,8 +220,8 @@ function SetPeriode($p_periode) { * */ -function GetPeriode() { - $array=$this->GetPreferences(); +function get_periode() { + $array=$this->get_preference(); return $array['PERIODE']; } /*! @@ -232,7 +232,7 @@ function GetPeriode() { * \param $p_user * \return array of (parameter_type => parameter_value) */ -function GetPreferences () +function get_preference () { // si preference n'existe pas, les créer $sql="select parameter_type,parameter_value from user_local_pref where user_id='".$this->id."'"; @@ -244,7 +244,7 @@ function GetPreferences () $this->id); $Res=ExecSql($this->db,$sql); - $l_array=$this->GetPreferences(); + $l_array=$this->get_preference(); } else { for ( $i =0;$i < pg_NumRows($Res);$i++) { $row= pg_fetch_array($Res,0); @@ -264,7 +264,7 @@ function GetPreferences () * - 1 priv granted * */ - function CheckAction ( $p_cn,$p_action_id) + function check_action ( $p_cn,$p_action_id) { if ( $this->admin==1 ) return 1; @@ -285,9 +285,9 @@ function GetPreferences () */ -function GetGlobalPref() +function load_global_pref() { - echo_debug('class_user.php',__LINE__,"function GetGlobalPref"); + echo_debug('class_user.php',__LINE__,"function load_global_pref"); $cn=Dbconnect(); // Load everything in an array $Res=ExecSql ($cn,"select parameter_type,parameter_value from @@ -296,7 +296,7 @@ function GetGlobalPref() $Max=pg_NumRows($Res); if ( $Max == 0 ) { $this->insert_default_global_pref(); - $this->GetGlobalPref(); + $this->load_global_pref(); return; } // Load value into array @@ -312,7 +312,7 @@ function GetGlobalPref() if ( ! isset ($line[$parameter]) ) { echo_debug("Missing pref : ".$parameter); $this->insert_default_global_pref($parameter); - $this->GetGlobalPref(); + $this->load_global_pref(); return; } $_SESSION[$name]=$line[$parameter]; @@ -375,9 +375,9 @@ function update_global_pref($p_type,$p_value="") { * it is the parm_periode.p_exercice col * if an error occurs return 0 */ -function getExercice() +function get_exercice() { - $sql="select p_exercice from parm_periode where p_id=".$this->GetPeriode(); + $sql="select p_exercice from parm_periode where p_id=".$this->get_periode(); $Ret=ExecSql($this->db,$sql); if (pg_NumRows($Ret) == 1) { @@ -395,9 +395,9 @@ function getExercice() * \param $p_js = 1 javascript, or 0 just a text * \return nothing the program exits automatically */ -function AccessRequest($p_cn,$p_action,$p_js=0) +function can_request($p_cn,$p_action,$p_js=0) { - if ( $this->CheckAction($p_cn,$p_action)==0 ) + if ( $this->check_action($p_cn,$p_action)==0 ) { if ( $p_js == 1 ) { diff --git a/include/client.inc.php b/include/client.inc.php index 7dd29563d..c52424dec 100644 --- a/include/client.inc.php +++ b/include/client.inc.php @@ -24,7 +24,7 @@ $sub_action=(isset($_REQUEST['sa']))?$_REQUEST['sa']:""; /*! \file * \brief Called from the module "Gestion" to manage the customer */ -$User->AccessRequest($cn,CLIENT); +$User->can_request($cn,CLIENT); ?> diff --git a/include/depense.inc.php b/include/depense.inc.php index f66fe3962..f2f51d188 100644 --- a/include/depense.inc.php +++ b/include/depense.inc.php @@ -65,8 +65,8 @@ if ( $sub_action=="use_opd" ) { $submit=''; - $form=FormAchInput($cn,$_GET['p_jrn'],$User->GetPeriode(),$p_post,$submit,false,$p_post['nb_item']); - // $form=FormAchInput($cn,$p_jrn,$User->GetPeriode(),$_POST,$submit,false,$nb_item); + $form=FormAchInput($cn,$_GET['p_jrn'],$User->get_periode(),$p_post,$submit,false,$p_post['nb_item']); + // $form=FormAchInput($cn,$p_jrn,$User->get_periode(),$_POST,$submit,false,$nb_item); echo '
'; echo $form; @@ -135,11 +135,11 @@ if ( $sub_action == "list") $w=new widget("select"); // filter on the current year - $filter_year=" where p_exercice='".$User->getExercice()."'"; + $filter_year=" where p_exercice='".$User->get_exercice()."'"; $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end",1); // User is already set User=new cl_user($cn); - $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode(); + $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode(); $w->selected=$current; echo 'Période '.$w->IOValue("p_periode",$periode_start); @@ -168,7 +168,7 @@ if ( $sub_action == "list") else { $filter_per=" and jr_tech_per in (select p_id from parm_periode where p_exercice=". - $User->getExercice().")"; + $User->get_exercice().")"; } $sql=SQL_LIST_ALL_INVOICE." $filter_per and jr_def_type='ACH'" ; @@ -226,7 +226,7 @@ if ( isset ($_POST['add_item']) || isset ($_POST["correct"]) ) $submit=' '; - $form=FormAchInput($cn,$p_jrn,$User->GetPeriode(),$_POST,$submit,false,$nb_item); + $form=FormAchInput($cn,$p_jrn,$User->get_periode(),$_POST,$submit,false,$nb_item); echo '
'; echo $form; echo $msg_tva; @@ -245,10 +245,10 @@ if ( isset($_POST['save'])) exit -1; } $nb_number=$_POST["nb_item"]; - if ( form_verify_input ($cn,$p_jrn,$User->GetPeriode(),$_POST,$nb_number) == true ) { + if ( form_verify_input ($cn,$p_jrn,$User->get_periode(),$_POST,$nb_number) == true ) { // we save the expense list ($internal,$c)=RecordSell($cn,$_POST,$User,$p_jrn); - $form=FormAchView($cn,$p_jrn,$User->GetPeriode(),$_POST,"",$_POST['nb_item'],false); + $form=FormAchView($cn,$p_jrn,$User->get_periode(),$_POST,"",$_POST['nb_item'],false); echo '
'; echo '

Opération '.$internal.' enregistré

'; echo $form; @@ -264,7 +264,7 @@ if ( isset($_POST['save'])) if ( $own->MY_ANALYTIC != "nu" ) $submit.=''; $submit.=''; - $form=FormAchView($cn,$p_jrn,$User->GetPeriode(),$_POST,$submit,$nb_number,true); + $form=FormAchView($cn,$p_jrn,$User->get_periode(),$_POST,$submit,$nb_number,true); echo '
'; echo $form; echo '
'; @@ -285,15 +285,15 @@ if ( isset ($_POST['view_invoice']) ) $nb_number=$_POST["nb_item"]; $submit=''; $submit.=''; - if ( form_verify_input ($cn,$p_jrn,$User->GetPeriode(),$_POST,$nb_number) == true ) { + if ( form_verify_input ($cn,$p_jrn,$User->get_periode(),$_POST,$nb_number) == true ) { // Should use a read only view instead of FormAch // where we can check - $form=FormAchView($cn,$p_jrn,$User->GetPeriode(),$_POST,$submit,$nb_number); + $form=FormAchView($cn,$p_jrn,$User->get_periode(),$_POST,$submit,$nb_number); } else { // if something goes wrong, correct it $submit=' '; - $form=FormAchInput($cn,$p_jrn,$User->GetPeriode(),$_POST,$submit, false, $nb_number); + $form=FormAchInput($cn,$p_jrn,$User->get_periode(),$_POST,$submit, false, $nb_number); } echo '
'; @@ -319,7 +319,7 @@ if ( $p_jrn != -1 ) $submit=' '; // Show an empty form of invoice - $form=FormAchInput($cn,$p_jrn,$User->GetPeriode(),null,$submit,false,$jrn->getDefLine()); + $form=FormAchInput($cn,$p_jrn,$User->get_periode(),null,$submit,false,$jrn->getDefLine()); echo '
'; echo $form; echo $msg_tva; diff --git a/include/facture.inc.php b/include/facture.inc.php index 86194153f..cdc444229 100644 --- a/include/facture.inc.php +++ b/include/facture.inc.php @@ -115,12 +115,12 @@ if ( $sub_action == "list") $w=new widget("select"); // Add filter on the year - $filter_year=" where p_exercice='".$User->getExercice()."'"; + $filter_year=" where p_exercice='".$User->get_exercice()."'"; $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') ". " from parm_periode $filter_year order by p_start,p_end",1); // User is already set User=new cl_user($cn); - $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode(); + $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode(); $w->selected=$current; echo 'Période '.$w->IOValue("p_periode",$periode_start); @@ -141,7 +141,7 @@ echo $w->Submit('gl_submit','Rechercher'); // Show list of sell // Date - date of payment - Customer - amount if ( $current == -1) { - $cond=" and jr_tech_per in (select p_id from parm_periode where p_exercice='".$User->getExercice()."')"; + $cond=" and jr_tech_per in (select p_id from parm_periode where p_exercice='".$User->get_exercice()."')"; } else { $cond=" and jr_tech_per=".$current; } @@ -187,7 +187,7 @@ if ( $sub_action=="use_opd" ) { $op->set_od_id($_REQUEST['pre_def']); $p_post=$op->compute_array(); echo_debug(__FILE__.':'.__LINE__.'- ','p_post = ',$p_post); - $form=FormVenInput($cn,$_GET['p_jrn'],$User->GetPeriode(),$p_post,false,$p_post['nb_item']); + $form=FormVenInput($cn,$_GET['p_jrn'],$User->get_periode(),$p_post,false,$p_post['nb_item']); echo '
'; echo $form; echo '
'; @@ -208,7 +208,7 @@ if ( isset ($_POST['add_item']) || isset ($_POST["correct_new_invoice"]) ) $nb_item=$_POST['nb_item']; if ( isset ($_POST['add_item'])) $nb_item++; - $form=FormVenInput($cn,$p_jrn,$User->GetPeriode(),$_POST,false,$nb_item); + $form=FormVenInput($cn,$p_jrn,$User->get_periode(),$_POST,false,$nb_item); echo '
'; echo $form; echo '
'; @@ -226,9 +226,9 @@ if ( isset($_POST['record_and_print_invoice'])) $nb_number=$_POST['nb_item']; // First we save the invoice, the internal code will be used to change the description // and upload the file - if ( form_verify_input($cn,$p_jrn,$User->GetPeriode(),$_POST,$nb_number)== true) { + if ( form_verify_input($cn,$p_jrn,$User->get_periode(),$_POST,$nb_number)== true) { list ($internal,$e)=RecordInvoice($cn,$_POST,$User,$p_jrn); - $form=FormVenteView($cn,$p_jrn,$User->GetPeriode(),$_POST,$_POST['nb_item'],'noform',''); + $form=FormVenteView($cn,$p_jrn,$User->get_periode(),$_POST,$_POST['nb_item'],'noform',''); echo '
'; echo '

Opération '.$internal.' enregistré

'; @@ -254,7 +254,7 @@ if ( isset($_POST['record_and_print_invoice'])) } else { echo("A cause d'erreur la facture ne peut-ètre validé "); - $form=FormVenteView($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,$nb_number,"form"); + $form=FormVenteView($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,$nb_number,"form"); } @@ -275,14 +275,14 @@ if ( isset ($_POST['view_invoice']) ) exit -1; } $nb_number=$_POST["nb_item"]; - if ( form_verify_input($cn,$p_jrn,$User->GetPeriode(),$_POST,$nb_number) == true) + if ( form_verify_input($cn,$p_jrn,$User->get_periode(),$_POST,$nb_number) == true) { - $form=FormVenteView($cn,$p_jrn,$User->GetPeriode(),$_POST,$nb_number); + $form=FormVenteView($cn,$p_jrn,$User->get_periode(),$_POST,$nb_number); } else { // Check failed : invalid date or quantity echo_error("Cannot validate "); - $form=FormVenInput($cn,$p_jrn,$User->GetPeriode(),$_POST,false,$nb_number); + $form=FormVenInput($cn,$p_jrn,$User->get_periode(),$_POST,false,$nb_number); } echo '
'; @@ -305,7 +305,7 @@ if ( $p_jrn != -1 ) $jrn=new Acc_Ledger($cn, $p_jrn); echo_debug('facture.inc.php.php',__LINE__,"Blank form"); // Show an empty form of invoice - $form=FormVenInput($cn,$p_jrn,$User->GetPeriode(),null,false,$jrn->GetDefLine()); + $form=FormVenInput($cn,$p_jrn,$User->get_periode(),null,false,$jrn->GetDefLine()); echo '
'; echo $form; diff --git a/include/fiche.inc.php b/include/fiche.inc.php index e16a32b31..9a317c205 100644 --- a/include/fiche.inc.php +++ b/include/fiche.inc.php @@ -45,8 +45,8 @@ include_once("fiche_inc.php"); $cn=DbConnect($gDossier); echo_debug(__FILE__,__LINE__,"Connected"); // Security check -$read=$User->CheckAction($cn,FICHE_READ); -$write=$User->CheckAction($cn,FICHE_WRITE); +$read=$User->check_action($cn,FICHE_READ); +$write=$User->check_action($cn,FICHE_WRITE); if ($read+$write == 0 ){ /* Cannot Access */ NoAccess(); diff --git a/include/import_inc.php b/include/import_inc.php index f79170a72..885d1a208 100644 --- a/include/import_inc.php +++ b/include/import_inc.php @@ -244,7 +244,7 @@ function ConfirmTransfert($p_cn,$periode){ function TransferCSV($p_cn, $periode){ //on obtient la période courante $User=new cl_user($p_cn); - $periode = $User->GetPeriode(); + $periode = $User->get_periode(); // on trouve les dates frontières de cette période $sql = "select to_char(p_start,'DD-MM-YYYY') as p_start,to_char(p_end,'DD-MM-YYYY') as p_end". diff --git a/include/impress.inc.php b/include/impress.inc.php index 8a2835b5f..57f2b94ee 100644 --- a/include/impress.inc.php +++ b/include/impress.inc.php @@ -46,7 +46,7 @@ echo $result; echo "
"; $cn=DbConnect($gDossier); -$User->AccessRequest($cn,IMP); +$User->can_request($cn,IMP); include_once("impress_inc.php"); diff --git a/include/impress_bilan.inc.php b/include/impress_bilan.inc.php index 01761f398..794a28d5c 100644 --- a/include/impress_bilan.inc.php +++ b/include/impress_bilan.inc.php @@ -36,7 +36,7 @@ include_once("postgres.php"); //----------------------------------------------------- // Form //----------------------------------------------------- -$filter_year=" where p_exercice='".$User->getExercice()."'"; +$filter_year=" where p_exercice='".$User->get_exercice()."'"; $bilan=new Acc_Bilan($cn); echo '
'; echo '
'; diff --git a/include/impress_fiche.inc.php b/include/impress_fiche.inc.php index da8013807..4cf29302b 100644 --- a/include/impress_fiche.inc.php +++ b/include/impress_fiche.inc.php @@ -60,7 +60,7 @@ if ( isset ($_REQUEST['fd_id'])) { if ( $fiche_def->HasAttribute(ATTR_DEF_ACCOUNT) == true ) { echo ''.dossier::hidden(); // filter on the current year - $filter_year=" where p_exercice='".$User->getExercice()."'"; + $filter_year=" where p_exercice='".$User->get_exercice()."'"; $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end"); diff --git a/include/impress_jrn.inc.php b/include/impress_jrn.inc.php index 3aca5f2b2..f1fa30191 100644 --- a/include/impress_jrn.inc.php +++ b/include/impress_jrn.inc.php @@ -218,7 +218,7 @@ print $w->IOValue("jrn_id",$ret); print '
'; print ''; // filter on the current year -$filter_year=" where p_exercice='".$User->getExercice()."'"; +$filter_year=" where p_exercice='".$User->get_exercice()."'"; $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end"); $w->label="Depuis"; diff --git a/include/impress_poste.inc.php b/include/impress_poste.inc.php index 42df8fc67..9181d91e2 100644 --- a/include/impress_poste.inc.php +++ b/include/impress_poste.inc.php @@ -139,7 +139,7 @@ print ''; // filter on the current year $select=new widget("select"); $select->table=1; -$filter_year=" where p_exercice='".$User->getExercice()."'"; +$filter_year=" where p_exercice='".$User->get_exercice()."'"; $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end"); $select->label="Depuis"; print $select->IOValue('from_periode',$periode_start); diff --git a/include/impress_rapport.inc.php b/include/impress_rapport.inc.php index 7e8b92769..732c9f2b0 100644 --- a/include/impress_rapport.inc.php +++ b/include/impress_rapport.inc.php @@ -166,7 +166,7 @@ print $w->IOValue("form_id",$ret); print ''; print ''; // filter on the current year -$filter_year=" where p_exercice='".$User->getExercice()."'"; +$filter_year=" where p_exercice='".$User->get_exercice()."'"; $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end"); $w->label="Période comptable : Depuis"; diff --git a/include/pref.inc.php b/include/pref.inc.php index b86478517..0c5919637 100644 --- a/include/pref.inc.php +++ b/include/pref.inc.php @@ -108,11 +108,11 @@ else if ( isset ($_POST["sub_periode"] ) ) { $periode=$_POST["periode"]; - $User->SetPeriode($periode); + $User->set_periode($periode); echo_debug('pref.inc',__LINE__,"Periode returns ".PeriodeClosed($cn,$periode)); } - $l_user_per=$User->GetPeriode(); + $l_user_per=$User->get_periode(); // if periode is closed then warns the users if ( PeriodeClosed($cn,$l_user_per)=='t') { diff --git a/include/preference.php b/include/preference.php index 47a123dd0..2dc97b3a9 100644 --- a/include/preference.php +++ b/include/preference.php @@ -112,7 +112,7 @@ function FormPeriode($p_cn,$l_default=0,$p_type=OPEN,$p_suff="") $ret.=""; return $ret; } -/*! GetPeriode +/*! get_periode * \brief Give the start & end date of a periode * * \param p_connection @@ -122,7 +122,7 @@ function FormPeriode($p_cn,$l_default=0,$p_type=OPEN,$p_suff="") * * */ -function GetPeriode($p_cn,$p_periode) +function get_periode($p_cn,$p_periode) { $sql="select to_char(p_start,'DD.MM.YYYY') as p_start, to_char(p_end,'DD.MM.YYYY') as p_end diff --git a/include/quick_writing.inc.php b/include/quick_writing.inc.php index b0218ed87..6a3c5cb2f 100644 --- a/include/quick_writing.inc.php +++ b/include/quick_writing.inc.php @@ -112,8 +112,8 @@ if ( CheckJrn(dossier::id(),$_SESSION['g_user'],$id) != 2 ) { if ( isset($_GET['show_form']) || isset($_POST['correct_it']) ) { $array=$_POST; -$default_periode=$User->GetPeriode(); -list($date,$devnull)=GetPeriode($cn,$default_periode); +$default_periode=$User->get_periode(); +list($date,$devnull)=get_periode($cn,$default_periode); $array['date']=$date; show_direct_form($cn,$ledger,$array); exit(); diff --git a/include/stock.inc.php b/include/stock.inc.php index 61b9c7e2b..665fc4632 100644 --- a/include/stock.inc.php +++ b/include/stock.inc.php @@ -60,7 +60,7 @@ if ($href=='compta.php') echo $left_menu; } // Get The priv on the selected folder -$User->AccessRequest($cn,STOCK_READ); +$User->can_request($cn,STOCK_READ); $action= ( isset ($_GET['action']))? $_GET['action']:""; @@ -69,7 +69,7 @@ include_once("stock_inc.php"); // Adjust the stock if ( isset ($_POST['sub_change'])) { - if ( CheckAction($gDossier,$_SESSION['g_user'],STOCK_WRITE) == 0 ) + if ( check_action($gDossier,$_SESSION['g_user'],STOCK_WRITE) == 0 ) { /* Cannot Access */ NoAccess(); @@ -91,7 +91,7 @@ if ( isset ($_POST['sub_change'])) } else { // Check if User Can change the stock - if ( CheckAction($gDossier,$_SESSION['g_user'],STOCK_WRITE) == 0 ) { + if ( check_action($gDossier,$_SESSION['g_user'],STOCK_WRITE) == 0 ) { NoAccess(); exit (-1); } @@ -133,7 +133,7 @@ echo JS_VIEW_JRN_MODIFY; // if year is not set then use the year of the user's periode if ( ! isset ($_GET['year']) ) { // get defaut periode - $a=$User->GetPeriode(); + $a=$User->get_periode(); // get exercice of periode $year=GetExercice($cn,$a); } else @@ -144,14 +144,14 @@ if ( ! isset ($_GET['year']) ) { // View details if ( $action == 'detail' ) { // Check if User Can see the stock - if ( CheckAction($gDossier,$_SESSION['g_user'],STOCK_READ) == 0 ) { + if ( check_action($gDossier,$_SESSION['g_user'],STOCK_READ) == 0 ) { NoAccess(); exit (-1); } $sg_code=(isset ($_GET['sg_code'] ))?$_GET['sg_code']:$_POST['sg_code']; $year=(isset($_GET['year']))?$_GET['year']:$_POST['year']; $a=ViewDetailStock($cn,$sg_code,$year); - $write=CheckAction($gDossier,$_SESSION['g_user'],STOCK_WRITE); + $write=check_action($gDossier,$_SESSION['g_user'],STOCK_WRITE); $b=""; @@ -186,7 +186,7 @@ for ( $i = 0; $i < pg_NumRows($Res);$i++) { } // Check if User Can see the stock -if ( CheckAction($gDossier,$_SESSION['g_user'],STOCK_READ) == 0 ) { +if ( check_action($gDossier,$_SESSION['g_user'],STOCK_READ) == 0 ) { NoAccess(); exit (-1); } diff --git a/include/supplier.inc.php b/include/supplier.inc.php index efe690004..d7dc51c7b 100644 --- a/include/supplier.inc.php +++ b/include/supplier.inc.php @@ -27,7 +27,7 @@ $sub_action=(isset($_REQUEST['sa']))?$_REQUEST['sa']:""; * \brief Called from the module "Gestion" to manage the customer */ -$User->AccessRequest($cn,SUPPL); +$User->can_request($cn,SUPPL); ?> '; - $form=FormAchInput($cn,$_GET['p_jrn'],$User->GetPeriode(),$p_post,$submit,false,$p_post['nb_item']); + $form=FormAchInput($cn,$_GET['p_jrn'],$User->get_periode(),$p_post,$submit,false,$p_post['nb_item']); echo '
'; echo $form; echo '
'; @@ -72,7 +72,7 @@ if ( $action == 'new' ) { $submit=''; $jrn=new Acc_Ledger($cn, $_GET['p_jrn']); - $r=FormAchInput($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,$submit,false,$jrn->getDefLine()); + $r=FormAchInput($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,$submit,false,$jrn->getDefLine()); //-------------------- // predef op. $op=new Pre_operation($cn); @@ -117,7 +117,7 @@ if ( $action == 'new' ) { $submit=''; - $r=FormAchInput($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,$submit,false, + $r=FormAchInput($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,$submit,false, $nb_number); echo '
'; echo $r; @@ -135,7 +135,7 @@ if ( $action == 'new' ) { $submit=' '; - $r=FormAchInput($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,$submit,false, $nb_number); + $r=FormAchInput($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,$submit,false, $nb_number); echo '
'; echo $r; echo $msg_tva; @@ -154,15 +154,15 @@ if ( $action == 'new' ) { if ( $own->MY_ANALYTIC != "nu" ) $submit.=''; $submit.=''; - if ( form_verify_input ($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,$nb_number) == true ) { + if ( form_verify_input ($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,$nb_number) == true ) { // Should use a read only view instead of FormAch // where we can check - $r=FormAchView($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,$submit,$nb_number); + $r=FormAchView($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,$submit,$nb_number); } else { // if something goes wrong, correct it $submit=' '; - $r=FormAchInput($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,$submit, false, $nb_number); + $r=FormAchInput($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,$submit, false, $nb_number); } echo '
'; echo $r; @@ -175,13 +175,13 @@ if ( $action == 'new' ) { if ( isset($_POST['save'] )) { // Get number of lines $nb_number=$_POST["nb_item"]; - if (form_verify_input ($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,$nb_number) + if (form_verify_input ($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,$nb_number) == true ) { list($internal,$comment)=RecordSell($cn,$_POST,$User,$_GET['p_jrn']); // submit button in the form $submit='

Opération '.$internal.'

'; - $r=FormAchView($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,"",$nb_number,false); + $r=FormAchView($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,"",$nb_number,false); echo '
'; echo $submit; echo $r; @@ -193,7 +193,7 @@ if ( $action == 'new' ) { $submit.=''; - $r=FormAchView($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,$submit,$nb_number); + $r=FormAchView($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,$submit,$nb_number); echo '
'; // echo $submit; echo $r; @@ -234,11 +234,11 @@ echo $hid->IOValue(); $w=new widget("select"); $w->name="p_periode"; // filter on the current year -$filter_year=" where p_exercice='".$User->getExercice()."'"; +$filter_year=" where p_exercice='".$User->get_exercice()."'"; $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end",1); $User=new cl_user($cn); -$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode(); +$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode(); $w->selected=$current; echo 'Période '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_submit','Valider'); @@ -276,7 +276,7 @@ echo 'Période '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_s echo_debug ("user_action_ach.php"); // Date - date of payment - Customer - amount if ( $current == -1) { - $cond=" and jr_tech_per in (select p_id from parm_periode where p_exercice='".$User->getExercice()."')"; + $cond=" and jr_tech_per in (select p_id from parm_periode where p_exercice='".$User->get_exercice()."')"; } else { $cond=" and jr_tech_per=".$current; } diff --git a/include/user_action_fin.php b/include/user_action_fin.php index 057102d77..b6f6ae18f 100644 --- a/include/user_action_fin.php +++ b/include/user_action_fin.php @@ -54,7 +54,7 @@ if ( $action=="use_opd" ) { $submit=''. ''; - $form=FormFin($cn,$_GET['p_jrn'],$User->GetPeriode(),$submit,$p_post,false,$p_post['nb_item']); + $form=FormFin($cn,$_GET['p_jrn'],$User->get_periode(),$submit,$p_post,false,$p_post['nb_item']); echo '
'; echo $form; echo '
'; @@ -80,7 +80,7 @@ if ( $action == 'new' ) { $p_jrn=$_GET['p_jrn']; $jrn=new Acc_Ledger($cn, $p_jrn); - $r=FormFin($cn,$p_jrn,$User->GetPeriode(),$submit,null,false,$jrn->GetDefLine()); + $r=FormFin($cn,$p_jrn,$User->get_periode(),$submit,null,false,$jrn->GetDefLine()); echo '
'; echo $r; echo "
"; @@ -120,7 +120,7 @@ if ( $action == 'new' ) { $submit=' '; - $r=FormFin($cn,$_GET['p_jrn'],$User->GetPeriode(),$submit,$_POST,false, $nb_number); + $r=FormFin($cn,$_GET['p_jrn'],$User->get_periode(),$submit,$_POST,false, $nb_number); echo '
'; echo $r; echo "

On-line calculator

".JS_CALC_LINE."
"; @@ -136,7 +136,7 @@ if ( $action == 'new' ) { $submit=' '; - $r=FormFin($cn,$_GET['p_jrn'],$User->GetPeriode(),$submit,$_POST,false, $nb_number); + $r=FormFin($cn,$_GET['p_jrn'],$User->get_periode(),$submit,$_POST,false, $nb_number); echo '
'; echo $r; echo "

On-line calculator

".JS_CALC_LINE."
"; @@ -148,7 +148,7 @@ if ( $action == 'new' ) { // View the charge and show a submit button to save it if ( isset ($_POST['view_invoice']) ) { $nb_number=$_POST["nb_item"]; - $r=form_verify_input($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,$nb_number); + $r=form_verify_input($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,$nb_number); // if something goes wrong correct it if ( $r == null ) { @@ -156,14 +156,14 @@ if ( $action == 'new' ) { $submit=' '; - $r=FormFin($cn,$_GET['p_jrn'],$User->GetPeriode(),$submit,$_POST,false, $nb_number); + $r=FormFin($cn,$_GET['p_jrn'],$User->get_periode(),$submit,$_POST,false, $nb_number); } else { $submit=''; $submit.=''; - $r=FormFin($cn,$_GET['p_jrn'],$User->GetPeriode(),$submit,$_POST,true,$nb_number); + $r=FormFin($cn,$_GET['p_jrn'],$User->get_periode(),$submit,$_POST,true,$nb_number); } echo '
'; @@ -180,7 +180,7 @@ if ( $action == 'new' ) { // submit button in the form $submit='

Recorded '.$r.'

'; - $r.=FormFin($cn,$_GET['p_jrn'],$User->GetPeriode(),$submit,$_POST,true, $nb_number,true); + $r.=FormFin($cn,$_GET['p_jrn'],$User->get_periode(),$submit,$_POST,true, $nb_number,true); echo '
'; echo $r; echo "
"; @@ -223,11 +223,11 @@ echo $hid->IOValue(); $w=new widget("select"); // filter on the current year -$filter_year=" where p_exercice='".$User->getExercice()."'"; +$filter_year=" where p_exercice='".$User->get_exercice()."'"; $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end",1); $User=new cl_user($cn); -$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode(); +$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode(); $w->selected=$current; echo 'Période '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_submit','Valider'); @@ -238,7 +238,7 @@ echo 'P // Show list of sell echo_debug ("user_action_jrn.php"); if ( $current == -1) { - $cond=" and jr_tech_per in (select p_id from parm_periode where p_exercice='".$User->getExercice()."')"; + $cond=" and jr_tech_per in (select p_id from parm_periode where p_exercice='".$User->get_exercice()."')"; } else { $cond=" and jr_tech_per=".$current; } diff --git a/include/user_action_gl.php b/include/user_action_gl.php index 9c5aec426..bf5439de9 100644 --- a/include/user_action_gl.php +++ b/include/user_action_gl.php @@ -48,17 +48,17 @@ echo $hid->IOValue(); $w=new widget("select"); // filter on the current year -$filter_year=" where p_exercice='".$User->getExercice()."'"; +$filter_year=" where p_exercice='".$User->get_exercice()."'"; $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end",1); -$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode(); +$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode(); $w->selected=$current; echo 'Période '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_submit','Valider'); ?> getExercice()."')"; + $cond=" and jr_tech_per in (select p_id from parm_periode where p_exercice='".$User->get_exercice()."')"; } else { $cond=" and jr_tech_per=".$current; } diff --git a/include/user_action_ods.php b/include/user_action_ods.php index fdcb03f69..37b3a1478 100644 --- a/include/user_action_ods.php +++ b/include/user_action_ods.php @@ -55,8 +55,8 @@ if ( $action=="use_opd" ) { $submit=''. ''; - // $form=FormVenInput($cn,$_GET['p_jrn'],$User->GetPeriode(),$p_post,false,$p_post['nb_item']); - $form=FormODS($cn,$_REQUEST['p_jrn'],$User->GetPeriode(),$submit,$p_post,false,$p_post['nb_item']); + // $form=FormVenInput($cn,$_GET['p_jrn'],$User->get_periode(),$p_post,false,$p_post['nb_item']); + $form=FormODS($cn,$_REQUEST['p_jrn'],$User->get_periode(),$submit,$p_post,false,$p_post['nb_item']); echo '
'; echo $form; @@ -81,7 +81,7 @@ if ( $action == 'new' ) { $jrn=new Acc_Ledger($cn,$_GET['p_jrn']); $prop=$jrn->get_propertie(); $line=$prop['jrn_deb_max_line']; - $r=FormODS($cn,$_REQUEST['p_jrn'],$User->GetPeriode(),$submit,null,false,$line); + $r=FormODS($cn,$_REQUEST['p_jrn'],$User->get_periode(),$submit,null,false,$line); echo '
'; echo $r; echo "
"; @@ -120,7 +120,7 @@ if ( $action == 'new' ) { $submit=' '; - $r=FormODS($cn,$_POST['p_jrn'],$User->GetPeriode(),$submit,$_POST,false, $nb_number); + $r=FormODS($cn,$_POST['p_jrn'],$User->get_periode(),$submit,$_POST,false, $nb_number); echo '
'; echo $r; echo "

On-line calculator

".JS_CALC_LINE."
"; @@ -135,7 +135,7 @@ if ( $action == 'new' ) { $submit=' '; - $r=FormODS($cn,$_POST['p_jrn'],$User->GetPeriode(),$submit,$_POST,false, $nb_number); + $r=FormODS($cn,$_POST['p_jrn'],$User->get_periode(),$submit,$_POST,false, $nb_number); echo '
'; echo $r; echo "

On-line calculator

".JS_CALC_LINE."
"; @@ -153,7 +153,7 @@ if ( $action == 'new' ) { $submit.=''; $submit.=''; - $r=FormODS($cn,$_POST['p_jrn'],$User->GetPeriode(),$submit,$_POST,true,$nb_number); + $r=FormODS($cn,$_POST['p_jrn'],$User->get_periode(),$submit,$_POST,true,$nb_number); // if something goes wrong, correct it if ( $r == null ) { @@ -161,7 +161,7 @@ if ( $action == 'new' ) { $submit=' '; - $r=FormODS($cn,$_POST['p_jrn'],$User->GetPeriode(),$submit,$_POST,false, $nb_number); + $r=FormODS($cn,$_POST['p_jrn'],$User->get_periode(),$submit,$_POST,false, $nb_number); }else { $submit=' '; @@ -182,7 +182,7 @@ if ( $action == 'new' ) { // submit button in the form $submit='

Recorded'.$r.'

'; - $r.=FormODS($cn,$_POST['p_jrn'],$User->GetPeriode(),$submit,$_POST,true, $nb_number,true); + $r.=FormODS($cn,$_POST['p_jrn'],$User->get_periode(),$submit,$_POST,true, $nb_number,true); }else { // CA incorrecte $submit=''; @@ -190,7 +190,7 @@ if ( $action == 'new' ) { $submit.=''; $submit.=''; - $r=FormODS($cn,$_POST['p_jrn'],$User->GetPeriode(),$submit,$_POST,true,$nb_number); + $r=FormODS($cn,$_POST['p_jrn'],$User->get_periode(),$submit,$_POST,true,$nb_number); } echo '
'; @@ -237,11 +237,11 @@ echo $hid->IOValue(); $w=new widget("select"); // filter on the current year -$filter_year=" where p_exercice='".$User->getExercice()."'"; +$filter_year=" where p_exercice='".$User->get_exercice()."'"; $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end",1); $User=new cl_user($cn); -$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode(); +$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode(); $w->selected=$current; echo 'Période '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_submit','Valider'); @@ -249,7 +249,7 @@ echo 'P getExercice()."')"; + $cond=" and jr_tech_per in (select p_id from parm_periode where p_exercice='".$User->get_exercice()."')"; } else { $cond=" and jr_tech_per=".$current; } diff --git a/include/user_action_ven.php b/include/user_action_ven.php index afe78d027..36ff78165 100644 --- a/include/user_action_ven.php +++ b/include/user_action_ven.php @@ -53,7 +53,7 @@ if ( $action=="use_opd" ) { $p_post=$op->compute_array(); echo_debug(__FILE__.':'.__LINE__.'- ','p_post = ',$p_post); - $form=FormVenInput($cn,$_GET['p_jrn'],$User->GetPeriode(),$p_post,false,$p_post['nb_item']); + $form=FormVenInput($cn,$_GET['p_jrn'],$User->get_periode(),$p_post,false,$p_post['nb_item']); echo '
'; echo $form; echo '
'; @@ -67,7 +67,7 @@ if ( $action == 'insert_vente' ) { $nb_number=$_POST["nb_item"]; $nb_number++; - $form=FormVenInput($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,false,$nb_number); + $form=FormVenInput($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,false,$nb_number); echo '
'; echo $form; echo '
'; @@ -77,13 +77,13 @@ if ( $action == 'insert_vente' ) { // We want to see the encoded invoice if ( isset ($_POST["view_invoice"])) { $nb_number=$_POST["nb_item"]; - if ( form_verify_input($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,$nb_number) == true) + if ( form_verify_input($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,$nb_number) == true) { - $form=FormVenteView($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,$nb_number); + $form=FormVenteView($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,$nb_number); // Check failed : invalid date or quantity } else { echo_debug(__FILE__.':'.__LINE__," Impossible d'accepter le formulaire"); - $form=FormVenInput($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,false,$nb_number); + $form=FormVenInput($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,false,$nb_number); } echo '
'; echo $form; @@ -97,7 +97,7 @@ if ( $action == 'insert_vente' ) { $jrn=new Acc_Ledger($cn, $_GET['p_jrn']); echo_debug('user_action_ven.php',__LINE__,"Blank form"); // Show an empty form of invoice - $form=FormVenInput($cn,$_GET['p_jrn'],$User->GetPeriode(),null,false,$jrn->GetDefLine()); + $form=FormVenInput($cn,$_GET['p_jrn'],$User->get_periode(),null,false,$jrn->GetDefLine()); echo '
'; echo $form; //-------------------- @@ -143,7 +143,7 @@ if (isset ($_POST['correct_new_invoice'])) { } $nb=$_POST['nb_item']; - $form=FormVenInput($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,false,$nb); + $form=FormVenInput($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,false,$nb); echo '
'; echo $form; echo '
'; @@ -158,14 +158,14 @@ if ( isset($_POST["record_and_print_invoice"])) { $nb_number=$_POST["nb_item"]; echo_debug(__FILE__.':'.__LINE__.'- record_and_print_invoice'); - if ( form_verify_input($cn,$p_jrn,$User->GetPeriode(),$_POST,$nb_number)== true) { + if ( form_verify_input($cn,$p_jrn,$User->get_periode(),$_POST,$nb_number)== true) { $comment=RecordInvoice($cn,$_POST,$User,$_GET['p_jrn']); - $form=FormVenteView($cn,$p_jrn,$User->GetPeriode(),$_POST,$nb_number,'noform',$comment); + $form=FormVenteView($cn,$p_jrn,$User->get_periode(),$_POST,$nb_number,'noform',$comment); } else { echo("A cause d'erreur la facture ne peut-ètre validé "); - $form=FormVenteView($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,$nb_number,"form"); + $form=FormVenteView($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,$nb_number,"form"); } echo '
'; @@ -211,11 +211,11 @@ echo $hid->IOValue(); $w=new widget("select"); // filter on the current year -$filter_year=" where p_exercice='".$User->getExercice()."'"; +$filter_year=" where p_exercice='".$User->get_exercice()."'"; $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end",1); // User is already set User=new cl_user($cn); -$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode(); +$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode(); $w->selected=$current; echo 'Période '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_submit','Valider'); @@ -251,7 +251,7 @@ echo 'P // Show list of sell // Date - date of payment - Customer - amount if ( $current == -1) { - $cond=" and jr_tech_per in (select p_id from parm_periode where p_exercice='".$User->getExercice()."')"; + $cond=" and jr_tech_per in (select p_id from parm_periode where p_exercice='".$User->get_exercice()."')"; } else { $cond=" and jr_tech_per=".$current; } diff --git a/include/user_common.php b/include/user_common.php index 1351a93a0..51f64aa7e 100644 --- a/include/user_common.php +++ b/include/user_common.php @@ -847,7 +847,7 @@ function VerifyOperationDate($p_cn,$p_periode,$p_date) { return null; } // userPref contient la periode par default - list ($l_date_start,$l_date_end)=GetPeriode($p_cn,$p_periode); + list ($l_date_start,$l_date_end)=get_periode($p_cn,$p_periode); // Date dans la periode active echo_debug ("date start periode $l_date_start date fin periode $l_date_end date demandée $p_date"); diff --git a/include/user_form_ach.php b/include/user_form_ach.php index 475218878..6fb448ffa 100644 --- a/include/user_form_ach.php +++ b/include/user_form_ach.php @@ -68,7 +68,7 @@ echo_debug('user_form_ach.php',__LINE__,"Enter FormAchInput($p_cn,$p_jrn,$p_peri extract($p_array); } // The date - list ($l_date_start,$l_date_end)=GetPeriode($p_cn,$p_periode); + list ($l_date_start,$l_date_end)=get_periode($p_cn,$p_periode); // $op_date=( ! isset($e_date) ) // ?substr($l_date_start,2,8):$e_date; $op_date=( ! isset($e_date) ) ?$l_date_start:$e_date; @@ -473,7 +473,7 @@ function form_verify_input($p_cn,$p_jrn,$p_periode,$p_array,$p_number) // Verify the userperiode // p_periode contient la periode par default - list ($l_date_start,$l_date_end)=GetPeriode($p_cn,$p_periode); + list ($l_date_start,$l_date_end)=get_periode($p_cn,$p_periode); // Date dans la periode active echo_debug ('user_form_ach',__LINE__,"date start periode $l_date_start date fin periode $l_date_end date demande $e_date"); @@ -764,7 +764,7 @@ function RecordSell($p_cn,$p_array,$p_user,$p_jrn) } // Get the default period - $periode=$p_user->GetPeriode(); + $periode=$p_user->get_periode(); $amount=0.0; $amount_jrn=0.0; $sum_tva_nd=0.0; diff --git a/include/user_form_fin.php b/include/user_form_fin.php index a0536a374..585772739 100644 --- a/include/user_form_fin.php +++ b/include/user_form_fin.php @@ -94,7 +94,7 @@ function form_verify_input($p_cn,$p_jrn,$p_periode,$p_array,$p_number) // Verify the userperiode // p_periode contient la periode par default - list ($l_date_start,$l_date_end)=GetPeriode($p_cn,$p_periode); + list ($l_date_start,$l_date_end)=get_periode($p_cn,$p_periode); // Date dans la periode active echo_debug ('user_form_fin',__LINE__,"date start periode $l_date_start date fin periode $l_date_end date demande $e_date"); @@ -144,7 +144,7 @@ function FormFin($p_cn,$p_jrn,$p_periode,$p_submit,$p_array=null,$pview_only=tru } } // The date - list ($l_date_start,$l_date_end)=GetPeriode($p_cn,$p_periode); + list ($l_date_start,$l_date_end)=get_periode($p_cn,$p_periode); $flag=(isset($e_date))?1:0; // $e_date=( ! isset($e_date) ) ? substr($l_date_start,2,8):$e_date; $e_date=( ! isset($e_date) ) ? $l_date_start:$e_date; @@ -378,7 +378,7 @@ function RecordFin($p_cn,$p_array,$p_user,$p_jrn) { ${"$v"}=$e; } // Get the default period - $periode=$p_user->GetPeriode(); + $periode=$p_user->get_periode(); // Debit = banque $poste_bq=GetFicheAttribut($p_cn,$e_bank_account,ATTR_DEF_ACCOUNT); diff --git a/include/user_form_ods.php b/include/user_form_ods.php index 55cbaa8f3..7e2e54f2e 100644 --- a/include/user_form_ods.php +++ b/include/user_form_ods.php @@ -62,7 +62,7 @@ function FormODS($p_cn,$p_jrn,$p_periode,$p_submit,$p_array=null,$pview_only=tru $own = new Own($p_cn); // The date - list ($l_date_start,$l_date_end)=GetPeriode($p_cn,$p_periode); + list ($l_date_start,$l_date_end)=get_periode($p_cn,$p_periode); $flag=(isset($e_date))?1:0; // $e_date=( ! isset($e_date) ) ? // substr($l_date_start,2,8):$e_date; @@ -319,7 +319,7 @@ function RecordODS($p_cn,$p_array,$p_user,$p_jrn) ${"$v"}=$e; } // Get the default period - $periode=$p_user->GetPeriode(); + $periode=$p_user->get_periode(); $amount=0.0; // Computing total customer diff --git a/include/user_form_ven.php b/include/user_form_ven.php index 914494462..168dc9b30 100644 --- a/include/user_form_ven.php +++ b/include/user_form_ven.php @@ -55,7 +55,7 @@ function FormVenInput($p_cn,$p_jrn,$p_periode,$p_array=null,$pview_only=true,$p_ } } // The date - list ($l_date_start,$l_date_end)=GetPeriode($p_cn,$p_periode); + list ($l_date_start,$l_date_end)=get_periode($p_cn,$p_periode); // $op_date=( ! isset($e_date) ) // ?substr($l_date_start,2,8):$e_date; $op_date=( ! isset($e_date) ) ?$l_date_start:$e_date; @@ -399,7 +399,7 @@ function form_verify_input($p_cn,$p_jrn,$p_periode,$p_array,$p_number) // Verify the userperiode // p_periode contient la periode par default - list ($l_date_start,$l_date_end)=GetPeriode($p_cn,$p_periode); + list ($l_date_start,$l_date_end)=get_periode($p_cn,$p_periode); // Date dans la periode active echo_debug ('user_form_ven',__LINE__,"date start periode $l_date_start date fin periode $l_date_end date demande $e_date"); @@ -698,7 +698,7 @@ function RecordInvoice($p_cn,$p_array,$p_user,$p_jrn) } // Get the default period - $periode=$p_user->GetPeriode(); + $periode=$p_user->get_periode(); $amount=0.0; $own=new own($p_cn); $group=NextSequence($p_cn,"s_oa_group");
%15.2f€ %15.2f€ %15.2f€