';
+echo '';
+echo ' Fiches Débit ';
+echo ' Fiches Crédit ';
+echo ' ';
+// Show the fiche in deb section
+for ($i=0;$i<$num;$i++) {
+ $res=pg_fetch_array($Res,$i);
+ $CHECKED=" unchecked";
+ foreach ( $rdeb as $element) {
+ if ( $element == $res['fd_id'] ) {
+ $CHECKED="CHECKED";
+ break;
+ }
+ }
+ echo '';
+ printf (' ',
+ $res['fd_id'],$CHECKED,$res['fd_label']);
+ $CHECKED=" unchecked";
+ foreach ( $rcred as $element) {
+ if ( $element == $res['fd_id'] ) {
+ $CHECKED="CHECKED";
+ break;
+ }
+ }
+
+ printf (' ',
+ $res['fd_id'],$CHECKED,$res['fd_label']);
+ echo ' ';
+}
+
+
+?>
+';
+/* Analyse ce qui est demandé */
+/* Effacement d'une ligne */
+if (isset ($_GET['action'])) {
+//-----------------------------------------------------
+// Action == remove a line
+ if ( $_GET['action']=="del" ) {
+ if ( isset ($_GET['l']) ) {
+ /* Ligne a enfant*/
+ $R=ExecSql($cn,"select pcm_val from tmp_pcmn where pcm_val_parent=".$_GET['l']);
+ if ( pg_NumRows($R) != 0 ) {
+ echo "";
+ } else {
+ /* Vérifier que le poste n'est pas utilisé qq part dans les journaux */
+ $Res=ExecSql($cn,"select * from jrnx where j_poste=".$_GET['l']);
+ if ( pg_NumRows($R) != 0 ) {
+ echo "";
+ }
+ else {
+ $Del=ExecSql($cn,"delete from tmp_pcmn where pcm_val=".$_GET['l']);
+ } // if pg_NumRows
+ } // if pg_NumRows
+ } // isset ($l)
+ } //$action == del
+} // isset action
+//-----------------------------------------------------
+/* Ajout d'une ligne */
+if ( isset ( $_POST["Add"] ) ) {
+ extract ($_POST);
+ $p_val=trim($p_val);
+ $p_parent=trim($p_parent);
+ if ( isset ( $p_val) && isset ( $p_lib ) && isNumber($p_val) && isNumber($p_parent) ) {
+ $p_val=trim($p_val);
+ $p_lib=FormatString(trim($p_lib));
+ $p_parent=$_POST["p_parent"];
+ if ( strlen ($p_val) != 0 && strlen ($p_lib) != 0 ) {
+ if (strlen ($p_val) == 1 ) {
+ $p_parent=0;
+ } else {
+ if ( strlen(trim($p_parent))==0 &&
+ (string) $p_parent != (string)(int) $p_parent) {
+ $p_parent=substr($p_val,0,strlen($p_val)-1);
+ }
+ echo_debug('pcmn_update.php',__LINE__,"Ajout valeur = $p_val parent = $p_parent");
+ }
+ /* Parent existe */
+ $Ret=ExecSql($cn,"select pcm_val from tmp_pcmn where pcm_val=$p_parent");
+ if ( pg_NumRows($Ret) == 0 ) {
+ echo '';
+ } else {
+ // Check if the account already exists
+
+ $Count=CountSql($cn,"select * from tmp_pcmn where pcm_val='".$p_val."'");
+ if ( $Count != 0 )
+ {
+ // Alert message account already exists
+ echo '';
+
+ } else
+ {
+ $Ret=ExecSql($cn,"insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent) values ('$p_val','$p_lib',$p_parent)");
+ }
+ }
+ } else {
+ echo '
Valeurs invalides ';
+ }
+ }
+}
+
+$Ret=ExecSql($cn,"select pcm_val,pcm_lib,pcm_val_parent from tmp_pcmn where substr(pcm_val::text,1,1)='".$_SESSION['g_start']."' order by pcm_val::text");
+$MaxRow=pg_NumRows($Ret);
+
+?>
+
+ ";
+echo "
';
+
+echo '
';
+for ($i = 0;$i < $MaxUser;$i++) {
+ $l_line=pg_fetch_array($User,$i);
+ // echo '';
+ if ( $i % 3 == 0 && $i != 0)
+ echo " ";
+
+ printf ('%s %s ( %s ) ";
+echo '
';
+$action="";
+
+if ( isset ($_GET["action"] )) {
+ $action=$_GET["action"];
+
+}
+
+// session_register set to off, so variable are undefined
+foreach ($_GET as $name=>$value)
+ ${"$name"}=$value;
+
+if ( $action == "change_jrn" ) {
+ // Check if the user can access that folder
+ if ( CheckDossier($_GET['login'],$gDossier) == 0 ) {
+ echo "
Cet utilisateur ne peut pas accéder ce dossier ";
+ $action="";
+ return;
+ }
+ $login=$_GET['login'];
+ $jrn=$_GET['jrn'];
+ $access=$_GET['access'];
+ $l_Db=sprintf("dossier%d",$gDossier);
+ echo_debug('user_sec.php',__LINE__,"select * from user_sec_jrn where uj_login='$login' and uj_jrn_id=$jrn");
+ $cn_dossier=DbConnect($gDossier);
+ $l2_Res=ExecSql($cn_dossier,
+ "select * from user_sec_jrn where uj_login='$login' and uj_jrn_id=$jrn");
+ $l2_count=pg_NumRows($l2_Res);
+ if ( $l2_count == 1 ) {
+ $Res=ExecSql($cn_dossier,"update user_sec_jrn set uj_priv='$access' where uj_login='$login' and uj_jrn_id=$jrn");
+ } else {
+ $Res=ExecSql($cn_dossier,"insert into user_sec_jrn(uj_login,uj_jrn_id,uj_priv) values( '$login' ,$jrn,'$access')");
+ }
+
+ $action="view";
+}
+if ( $action == "change_act" ) {
+ // Check if the user can access that folder
+ if ( CheckDossier($_GET['login'],$gDossier) == 0 ) {
+ echo "
he cannot access this folder ";
+ $action="";
+ return;
+ }
+ $l_Db=sprintf("dossier%d",$gDossier);
+ $cn_dossier=DbConnect($gDossier);
+ if ( $_GET['access']==0) {
+ echo_debug('user_sec.php',__LINE__,"delete right");
+ $Res=ExecSql($cn_dossier,
+ "delete from user_sec_act where ua_login='".$_GET['login']."' and ua_act_id=$act");
+ } else {
+ echo_debug('user_sec.php',__LINE__,"insert right");
+ if ( CountSql($cn_dossier,"select * from user_sec_act where ua_login='$login' and ua_act_id=$act") < 1 )
+ {
+ $Res=ExecSql($cn_dossier,
+ "insert into user_sec_act(ua_login,ua_act_id) values( '$login' ,$act)");
+ }
+ }
+ $action="view";
+}
+// Action == View detail for users
+if ( $action == "view" ) {
+ $l_Db=sprintf("dossier%d",$gDossier);
+ $cn_dossier=DbConnect($gDossier);
+ $cn=DbConnect();
+ $User=ExecSql($cn,
+ "select use_id,use_first_name,use_name,use_login
+ from ac_users where use_id=".$_GET['user_id']);
+ $MaxUser=pg_NumRows($User);
+ if ( $MaxUser == 0 ) return;
+ $l2_line=pg_fetch_array($User,0);
+
+ printf ('
Détail utilisateur %s %s (%s) ',
+ $l2_line['use_first_name'],
+ $l2_line['use_name'],
+ $l2_line['use_login']);
+ // Check if the user can access that folder
+ if ( CheckDossier($l2_line['use_login'],$gDossier) == 0 ) {
+ echo "
he cannot access this folder ";
+ $action="";
+ return;
+ }
+ // Print button
+
+ $sHref=sprintf ('sec_pdf.php?p_action=sec&user_id=%s&'.$str_dossier ,
+ $l2_line['use_id']
+ );
+ echo widget::button_href('Imprime',$sHref);
+ // Show access for journal
+ $Res=ExecSql($cn_dossier,"select jrn_def_id,jrn_def_name from jrn_def ");
+ $admin=CheckIsAdmin($l2_line['use_login']);
+
+ echo '
';
+ $MaxJrn=pg_NumRows($Res);
+ for ( $i =0 ; $i < $MaxJrn; $i++ ) {
+ $l_line=pg_fetch_array($Res,$i);
+ echo ' ';
+ if ( $i == 0 ) echo ' Journal ';else echo " $l_line[jrn_def_name] ";
+
+ $l_change="action=change_jrn&jrn=$l_line[jrn_def_id]&login=$l2_line[use_login]&user_id=$l2_line[use_id]";
+
+ if ( $admin == 0) {
+ $right= CheckJrn($gDossier,$l2_line['use_login'],$l_line['jrn_def_id'] );
+ echo_debug('user_sec.php',__LINE__,"Privilege is $right");
+ } else $right = 3;
+ if ( $right == 0 ) {
+ echo "";
+ echo "Pas d'accès";
+ echo " ";
+ echo ' Lecture ';
+ echo ' Ecriture ';
+
+ }
+ if ( $right == 1 ) {
+ echo ' Pas d\'accès ';
+ echo "";
+ echo "Lecture ";
+ echo " ";
+ echo ' Ecriture ';
+ }
+ if ( $right == 2 ) {
+ echo ' Pas d\'accès ';
+ echo ' Lecture ';
+
+ echo "";
+ echo "Ecriture ";
+ echo " ";
+
+ }
+ if ( $right == 3 ) {
+ echo ' Pas d\'accès ';
+ echo ' Lecture ';
+
+ echo "";
+ echo "Ecriture ";
+ echo " ";
+
+ }
+
+
+
+ echo ' ';
+ }
+
+ // Priv. for actions
+ $Res=ExecSql($cn_dossier,
+ "select ac_id, ac_description from action order by ac_id ");
+
+ $MaxJrn=pg_NumRows($Res);
+
+ for ( $i =0 ; $i < $MaxJrn; $i++ ) {
+ $l_line=pg_fetch_array($Res,$i);
+ echo ' ';
+ if ( $i == 0 ) echo ' Action ';
+ if ($i != 0 && $l_line['ac_id'] != 50 && $l_line['ac_id']!=60) echo " Compta. Analytique Module Budget ". $l_line['ac_description']." ";
+
+ $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=check_action($gDossier,$l2_line['use_login'],$l_line['ac_id']);
+ } else {
+ $right = 2;
+ }
+ if ( $right == 0 ) {
+ echo "";
+ echo "Pas d'accès";
+ echo " ";
+ $l_change=$l_change."&access=1";
+ echo ' Accès ';
+ }
+ if ( $right == 1) {
+ $l_change=$l_change."&access=0";
+ echo ' Pas d\'accès ';
+ echo "";
+ echo "Accès ";
+ echo " ";
+
+ }
+ if ( $right == 2) {
+
+ echo ' Change ';
+ echo "";
+ echo "Accès ";
+ echo " ";
+
+ }
+
+
+ echo '
';
+ echo widget::button_href('Imprime',$sHref);
+
+}
+echo "
';
+
+echo '
';
+for ($i = 0;$i < $MaxUser;$i++) {
+ $l_line=pg_fetch_array($User,$i);
+ // echo '';
+ if ( $i % 3 == 0 && $i != 0)
+ echo " ";
+
+ printf ('%s %s ( %s ) ";
+echo '
';
+$action="";
+
+if ( isset ($_GET["action"] )) {
+ $action=$_GET["action"];
+
+}
+
+// session_register set to off, so variable are undefined
+foreach ($_GET as $name=>$value)
+ ${"$name"}=$value;
+
+if ( $action == "change_jrn" ) {
+ // Check if the user can access that folder
+ if ( CheckDossier($_GET['login'],$gDossier) == 0 ) {
+ echo "
Cet utilisateur ne peut pas accéder ce dossier ";
+ $action="";
+ return;
+ }
+ $login=$_GET['login'];
+ $jrn=$_GET['jrn'];
+ $access=$_GET['access'];
+ $l_Db=sprintf("dossier%d",$gDossier);
+ echo_debug('user_sec.php',__LINE__,"select * from user_sec_jrn where uj_login='$login' and uj_jrn_id=$jrn");
+ $cn_dossier=DbConnect($gDossier);
+ $l2_Res=ExecSql($cn_dossier,
+ "select * from user_sec_jrn where uj_login='$login' and uj_jrn_id=$jrn");
+ $l2_count=pg_NumRows($l2_Res);
+ if ( $l2_count == 1 ) {
+ $Res=ExecSql($cn_dossier,"update user_sec_jrn set uj_priv='$access' where uj_login='$login' and uj_jrn_id=$jrn");
+ } else {
+ $Res=ExecSql($cn_dossier,"insert into user_sec_jrn(uj_login,uj_jrn_id,uj_priv) values( '$login' ,$jrn,'$access')");
+ }
+
+ $action="view";
+}
+if ( $action == "change_act" ) {
+ // Check if the user can access that folder
+ if ( CheckDossier($_GET['login'],$gDossier) == 0 ) {
+ echo "
he cannot access this folder ";
+ $action="";
+ return;
+ }
+ $l_Db=sprintf("dossier%d",$gDossier);
+ $cn_dossier=DbConnect($gDossier);
+ if ( $_GET['access']==0) {
+ echo_debug('user_sec.php',__LINE__,"delete right");
+ $Res=ExecSql($cn_dossier,
+ "delete from user_sec_act where ua_login='".$_GET['login']."' and ua_act_id=$act");
+ } else {
+ echo_debug('user_sec.php',__LINE__,"insert right");
+ if ( CountSql($cn_dossier,"select * from user_sec_act where ua_login='$login' and ua_act_id=$act") < 1 )
+ {
+ $Res=ExecSql($cn_dossier,
+ "insert into user_sec_act(ua_login,ua_act_id) values( '$login' ,$act)");
+ }
+ }
+ $action="view";
+}
+// Action == View detail for users
+if ( $action == "view" ) {
+ $l_Db=sprintf("dossier%d",$gDossier);
+ $cn_dossier=DbConnect($gDossier);
+ $cn=DbConnect();
+ $User=ExecSql($cn,
+ "select use_id,use_first_name,use_name,use_login
+ from ac_users where use_id=".$_GET['user_id']);
+ $MaxUser=pg_NumRows($User);
+ if ( $MaxUser == 0 ) return;
+ $l2_line=pg_fetch_array($User,0);
+
+ printf ('
Détail utilisateur %s %s (%s) ',
+ $l2_line['use_first_name'],
+ $l2_line['use_name'],
+ $l2_line['use_login']);
+ // Check if the user can access that folder
+ if ( CheckDossier($l2_line['use_login'],$gDossier) == 0 ) {
+ echo "
he cannot access this folder ";
+ $action="";
+ return;
+ }
+ // Print button
+
+ $sHref=sprintf ('sec_pdf.php?p_action=sec&user_id=%s&'.$str_dossier ,
+ $l2_line['use_id']
+ );
+ echo widget::button_href('Imprime',$sHref);
+ // Show access for journal
+ $Res=ExecSql($cn_dossier,"select jrn_def_id,jrn_def_name from jrn_def ");
+ $admin=CheckIsAdmin($l2_line['use_login']);
+
+ echo '
';
+ $MaxJrn=pg_NumRows($Res);
+ for ( $i =0 ; $i < $MaxJrn; $i++ ) {
+ $l_line=pg_fetch_array($Res,$i);
+ echo ' ';
+ if ( $i == 0 ) echo ' Journal ';else echo " $l_line[jrn_def_name] ";
+
+ $l_change="action=change_jrn&jrn=$l_line[jrn_def_id]&login=$l2_line[use_login]&user_id=$l2_line[use_id]";
+
+ if ( $admin == 0) {
+ $right= CheckJrn($gDossier,$l2_line['use_login'],$l_line['jrn_def_id'] );
+ echo_debug('user_sec.php',__LINE__,"Privilege is $right");
+ } else $right = 3;
+ if ( $right == 0 ) {
+ echo "";
+ echo "Pas d'accès";
+ echo " ";
+ echo ' Lecture ';
+ echo ' Ecriture ';
+
+ }
+ if ( $right == 1 ) {
+ echo ' Pas d\'accès ';
+ echo "";
+ echo "Lecture ";
+ echo " ";
+ echo ' Ecriture ';
+ }
+ if ( $right == 2 ) {
+ echo ' Pas d\'accès ';
+ echo ' Lecture ';
+
+ echo "";
+ echo "Ecriture ";
+ echo " ";
+
+ }
+ if ( $right == 3 ) {
+ echo ' Pas d\'accès ';
+ echo ' Lecture ';
+
+ echo "";
+ echo "Ecriture ";
+ echo " ";
+
+ }
+
+
+
+ echo ' ';
+ }
+
+ // Priv. for actions
+ $Res=ExecSql($cn_dossier,
+ "select ac_id, ac_description from action order by ac_id ");
+
+ $MaxJrn=pg_NumRows($Res);
+
+ for ( $i =0 ; $i < $MaxJrn; $i++ ) {
+ $l_line=pg_fetch_array($Res,$i);
+ echo ' ';
+ if ( $i == 0 ) echo ' Action ';
+ if ($i != 0 && $l_line['ac_id'] != 50) echo " Compta. Analytique ". $l_line['ac_description']." ";
+
+ $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=check_action($gDossier,$l2_line['use_login'],$l_line['ac_id']);
+ } else {
+ $right = 2;
+ }
+ if ( $right == 0 ) {
+ echo "";
+ echo "Pas d'accès";
+ echo " ";
+ $l_change=$l_change."&access=1";
+ echo ' Accès ';
+ }
+ if ( $right == 1) {
+ $l_change=$l_change."&access=0";
+ echo ' Pas d\'accès ';
+ echo "";
+ echo "Accès ";
+ echo " ";
+
+ }
+ if ( $right == 2) {
+
+ echo ' Change ';
+ echo "";
+ echo "Accès ";
+ echo " ";
+
+ }
+
+
+ echo '
';
+ echo widget::button_href('Imprime',$sHref);
+
+}
+echo "
';
$cn=DbConnect($gDossier);
//-----------------------------------------------------
@@ -33,12 +31,13 @@ $cn=DbConnect($gDossier);
$action="";
if ( isset($_REQUEST['action']))
$action=$_REQUEST['action'];
-
+$choose=(isset ($_GET['choose']))?$_GET['choose']:"no";
+if ($choose=='Valider') $choose='yes';
if ( $action=="change_per") {
foreach($_GET as $key=>$element)
${"$key"}=$element;
echo "
";
+ // $choose="yes";
}
if ( isset ($_POST["conf_chg_per"] ) ) {
- foreach($_POST as $key=>$element)
- ${"$key"}=$element;
+ extract($_POST);
+
if (isDate($p_date_start) == null ||
isDate($p_date_end) == null ||
strlen (trim($p_exercice)) == 0 ||
@@ -68,6 +68,7 @@ if ( isset ($_POST["conf_chg_per"] ) ) {
" where p_id=".$p_per);
+ $choose="yes";
}
if ( isset ($_POST["add_per"] )) {
@@ -89,13 +90,19 @@ if ( isset ($_POST["add_per"] )) {
$p_date_end,
$p_exercice));
+ $choose="yes";
}
echo_debug('periode.inc',__LINE__,"Action $p_action");
if ( $action=="closed") {
$p_per=$_GET['p_per'];
- $Res=ExecSql($cn,"update parm_periode set p_closed=true where p_id=$p_per");
+ $per=new Periode($cn);
+ $jrn_def_id=(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;
+ $per->set_jrn($jrn_def_id);
+ $per->set_periode($p_per);
+ $per->close();
+ $choose="yes";
}
if ( $action== "delete_per" ) {
@@ -107,9 +114,29 @@ if ( $action== "delete_per" ) {
{
$Res=ExecSql($cn,"delete from parm_periode where p_id=$p_per");
}
+ $choose="yes";
}
-
-
-ShowPeriode($cn);
+if ( $choose=="yes" ) {
+ echo widget::button_href('Autre Journal ?','?choose=no&p_action=periode&gDossier='.dossier::id());
+ $per=new Periode($cn);
+ $jrn=(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;
+ $per->set_jrn($jrn);
+
+ $per->display_form_periode();
+ } else {
+ echo '
";
+ echo '
Pour ajouter, effacer ou modifier une période, il faut choisir global
';
+ }
echo '
';
echo '';
echo '
';
}
-/*!
- * \brief Show all the periode and their status
- *
- * \param $p_cn database connection
- *
- * \return nothing
- *
- *
- */
-function ShowPeriode($p_cn)
-{
- $str_dossier=dossier::get();
- // echo "';
echo '
Journal : '.$ledger->get_name().' ';
echo widget::button_href('Autre journal','?p_action='.$_REQUEST['p_action'].'&'.dossier::get());
// User can write ?
+
if ( CheckJrn(dossier::id(),$_SESSION['g_user'],$id) != 2 ) {
echo "
";
exit -1;
}
-
if ( isset($_GET['show_form']) || isset($_POST['correct_it']) ) {
-$array=$_POST;
-$default_periode=$User->get_periode();
-list($date,$devnull)=get_periode($cn,$default_periode);
-$array['date']=$date;
+ $array=$_POST;
+ $default_periode=$User->get_periode();
+ /* check if the ledger is closed */
+ if ( $ledger->is_closed($default_periode)==1) {
+ echo '
Desole mais cette periode est fermee pour ce journal ';
+ exit();
+ }
+ list($date,$devnull)=get_periode($cn,$default_periode);
+ $array['date']=$date;
show_direct_form($cn,$ledger,$array);
exit();
}
diff --git a/include/user_action_ach.php b/include/user_action_ach.php
index 7df677df8..5b970f4cf 100644
--- a/include/user_action_ach.php
+++ b/include/user_action_ach.php
@@ -385,6 +385,7 @@ if ( $action == 'voir_jrn_non_paye' ) {
echo $list2;
echo $bar2;
$hid=new widget();
+ echo '
';
if ( $m != 0 )
echo $hid->Submit('paid','Mise à jour paiement');
echo '';
diff --git a/include/user_action_ods.php b/include/user_action_ods.php
index 37b3a1478..61ab2445e 100644
--- a/include/user_action_ods.php
+++ b/include/user_action_ods.php
@@ -60,6 +60,25 @@ if ( $action=="use_opd" ) {
echo '
';
echo $form;
+ //--------------------
+ // predef op.
+ echo '';
+
echo '
';
exit();
}
diff --git a/include/user_action_ven.php b/include/user_action_ven.php
index f9d2a3808..449526da6 100644
--- a/include/user_action_ven.php
+++ b/include/user_action_ven.php
@@ -384,7 +384,7 @@ if ( $action == 'voir_jrn_non_paye' ) {
$hid->value=$jrn_type;
echo $hid->IOValue();
-
+ echo '
';
if ( $m != 0 )
echo $hid->Submit('paid','Mise à jour paiement');
diff --git a/include/user_common.php b/include/user_common.php
index 407f7c77f..1af9b7060 100644
--- a/include/user_common.php
+++ b/include/user_common.php
@@ -859,14 +859,6 @@ function VerifyOperationDate($p_cn,$p_periode,$p_date) {
echo "";
return null;
}
- // Periode fermée
- if ( PeriodeClosed ($p_cn,$p_periode)=='t' )
- {
- $msg="This periode is closed please change your preference";
- echo_error($msg); echo_error($msg);
- echo "";
- return null;
- }
return $p_date;
}
diff --git a/include/user_form_ach.php b/include/user_form_ach.php
index e52bf6ada..16a167e92 100644
--- a/include/user_form_ach.php
+++ b/include/user_form_ach.php
@@ -33,6 +33,7 @@ require_once ('class_own.php');
require_once ('class_anc_operation.php');
require_once ('class_pre_op_ach.php');
require_once ('class_acc_ledger.php');
+require_once ('class_periode.php');
/*!
* \brief Display the form for a sell
@@ -172,11 +173,11 @@ echo_debug('user_form_ach.php',__LINE__,"Enter FormAchInput($p_cn,$p_jrn,$p_peri
$r.='
';
$r.="Code ";
- $r.="Dénomination ";
+ $r.="Dénomination ";
$r.="prix ";
$r.="tva ";
$r.="Montant TVA ";
- $r.="quantité ";
+ $r.="quantité ";
$r.=' ';
// For each article
// compute amount
@@ -360,7 +361,7 @@ function form_verify_input($p_cn,$p_jrn,$p_periode,$p_array,$p_number)
// compare hidden value and computed
if ( round($ca_amount-$hidden_amount,2) != 0 ) {
- $msg="Montant CA est différent total marchandise";
+ $msg="Montant CA est différent total marchandise";
echo "";
@@ -436,7 +437,7 @@ function form_verify_input($p_cn,$p_jrn,$p_periode,$p_array,$p_number)
{
if ( isNumber($non_dedu) == 0 || $non_dedu > 1.00 )
{
- $msg="La fiche ".${"e_march$i"}." a un pourcentage invalide,il doit être compris entre 0 et 1";
+ $msg="La fiche ".${"e_march$i"}." a un pourcentage invalide,il doit etre compris entre 0 et 1";
echo_error($msg); echo_debug('user_form_ach.php',__LINE__,$msg);
echo "";
return null;
@@ -449,7 +450,7 @@ function form_verify_input($p_cn,$p_jrn,$p_periode,$p_array,$p_number)
{
if ( isNumber($non_dedu) == 0 || $non_dedu > 1.00 )
{
- $msg="La fiche ".${"e_march$i"}." a un pourcentage invalide, il doit être compris entre 0 et 1";
+ $msg="La fiche ".${"e_march$i"}." a un pourcentage invalide, il doit etre compris entre 0 et 1";
echo_error($msg); echo_debug('user_form_ach.php',__LINE__,$msg);
echo "";
return null;
@@ -461,7 +462,7 @@ function form_verify_input($p_cn,$p_jrn,$p_periode,$p_array,$p_number)
{
if ( isNumber($non_dedu) == 0 || $non_dedu > 1.00 )
{
- $msg="La fiche ".${"e_march$i"}." a un pourcentage invalide, il doit être compris entre 0 et 1";
+ $msg="La fiche ".${"e_march$i"}." a un pourcentage invalide, il doit etre compris entre 0 et 1";
echo_error($msg); echo_debug('user_form_ach.php',__LINE__,$msg);
echo "";
return null;
@@ -485,14 +486,19 @@ function form_verify_input($p_cn,$p_jrn,$p_periode,$p_array,$p_number)
echo "";
return null;
}
- // Periode fermé
- if ( PeriodeClosed ($p_cn,$p_periode)=='t' )
- {
- $msg="This periode is closed please change your preference";
- echo_error($msg); echo_error($msg);
- echo "";
- return null;
- }
+ // Periode ferm�
+ $per=new Periode($p_cn);
+ $per->set_jrn($p_jrn);
+ $per->set_periode($p_periode);
+
+ // Periode fermé
+ if ( $per->is_open() == 0)
+ {
+ $msg="Cette periode est fermee pour ce journal";
+ echo_error($msg); echo_error($msg);
+ echo "";
+ return null;
+ }
return true;
}
/*!
@@ -572,7 +578,7 @@ function FormAchView ($p_cn,$p_jrn,$p_periode,$p_array,$p_submit,$p_number,$p_pi
// show all article, price vat and sum
$r.="
";
$r.="Article ";
- $r.="quantité ";
+ $r.="quantité ";
$r.="prix unit. ";
$r.="taux tva ";
$r.="Montant HTVA ";
@@ -705,7 +711,7 @@ function FormAchView ($p_cn,$p_jrn,$p_periode,$p_array,$p_submit,$p_number,$p_pi
$file->table=1;
$r.="";
- if ( $p_piece) $r.="".$file->IOValue("pj","","Pièce justificative")." ";
+ if ( $p_piece) $r.="".$file->IOValue("pj","","Pièce justificative")." ";
// propose to save the pre_operation
if ( $p_piece ) {
$chk=new widget('checkbox');
diff --git a/include/user_form_fin.php b/include/user_form_fin.php
index f8d8052d3..f5f3e82fd 100644
--- a/include/user_form_fin.php
+++ b/include/user_form_fin.php
@@ -25,7 +25,7 @@ require_once("fiche_inc.php");
require_once("user_common.php");
require_once ('class_pre_operation.php');
require_once ('class_acc_ledger.php');
-
+require_once ('class_periode.php');
/*! \file
* \brief Functions for the financial ledger
*/
@@ -107,13 +107,16 @@ function form_verify_input($p_cn,$p_jrn,$p_periode,$p_array,$p_number)
return null;
}
// Periode ferm�
- if ( PeriodeClosed ($p_cn,$p_periode)=='t' )
- {
- $msg="This periode is closed please change your preference";
- echo_debug('user_form_fin.php',__LINE__,$msg);
- echo "";
- return null;
- }
+ $per=new Periode($p_cn);
+ $per->set_jrn($p_jrn);
+ $per->set_periode($p_periode);
+ if ( $per->is_open()==0 )
+ {
+ $msg="Cette periode est fermee pour ce journal";
+ echo_debug('user_form_fin.php',__LINE__,$msg);
+ echo "";
+ return null;
+ }
return true;
}
diff --git a/include/user_form_ods.php b/include/user_form_ods.php
index 7e2e54f2e..c42143d67 100644
--- a/include/user_form_ods.php
+++ b/include/user_form_ods.php
@@ -30,7 +30,7 @@ require_once ('class_own.php');
require_once ('class_anc_operation.php');
require_once ('class_pre_op_ods.php');
require_once ('class_acc_ledger.php');
-
+require_once ('class_periode.php');
/*! \file
* \brief Functions for the ledger of misc. operation
*/
@@ -67,7 +67,19 @@ function FormODS($p_cn,$p_jrn,$p_periode,$p_submit,$p_array=null,$pview_only=tru
// $e_date=( ! isset($e_date) ) ?
// substr($l_date_start,2,8):$e_date;
$e_date=( ! isset($e_date) ) ? $l_date_start:$e_date;
-
+ $per=new Periode($p_cn);
+ $per->set_jrn($p_jrn);
+ $per->set_periode($p_periode);
+
+ // Periode ferme
+ if ( $per->is_open()==0)
+ {
+ $msg="Cette periode est fermee pour ce journal";
+ echo_error($msg); echo_error($msg);
+ echo "";
+ return null;
+ }
+
// Verify if valid date
if ( $flag==1 and VerifyOperationDate($p_cn,$p_periode,$e_date) == null) {
if ( $pview_only == true)
@@ -178,7 +190,7 @@ $r.="