From b87e928a2e2d5b25528d3f16797b59f3c2fe4abc Mon Sep 17 00:00:00 2001 From: sparkyx Date: Tue, 22 Jan 2008 16:12:24 +0000 Subject: [PATCH] Fix last bugs --- html/bud_csv.php | 7 +-- html/bud_search_poste.php | 4 +- html/js/jrn_concerned.js | 12 +++++ html/poste_csv.php | 4 +- html/poste_pdf.php | 4 +- include/balance.inc.php | 77 ++++++++++++++------------- include/bud_detail.inc.php | 2 +- include/bud_sga.inc.php | 2 + include/ca_imp.inc.php | 3 +- include/ca_od.inc.php | 15 +++--- include/class_acc_ledger.php | 7 +-- include/class_anc_group_operation.php | 2 +- include/class_bud_card.php | 2 +- include/class_bud_data.php | 3 +- include/class_bud_synthese_anc.php | 1 + include/class_bud_synthese_hypo.php | 45 +++++++++++++++- include/class_fiche.php | 4 +- include/constant.php | 2 +- include/impress_poste.inc.php | 6 ++- include/postgres.php | 2 +- include/supplier.inc.php | 2 +- include/user_action_ach.php | 14 ++--- include/user_form_ach.php | 4 +- include/user_form_fin.php | 2 +- 24 files changed, 147 insertions(+), 79 deletions(-) diff --git a/html/bud_csv.php b/html/bud_csv.php index 576fd7365..81bffa897 100644 --- a/html/bud_csv.php +++ b/html/bud_csv.php @@ -46,14 +46,15 @@ if ( $do == 'po') { } /* 2nd Synthese */ if ( $do == 'ga') { + header('Content-type: application/csv'); + header('Content-Disposition: attachment;filename="bud_groupe.csv"',FALSE); require_once ('class_bud_synthese_hypo.php'); + $obj=new Bud_Synthese_Hypo($cn); $obj->from_array($_GET); $res=$obj->load(); - header('Content-type: application/csv'); - header('Content-Disposition: attachment;filename="bud_groupe.csv"',FALSE); - + echo $obj->display_csv($res); } diff --git a/html/bud_search_poste.php b/html/bud_search_poste.php index abe9c9162..ff2ca8398 100644 --- a/html/bud_search_poste.php +++ b/html/bud_search_poste.php @@ -57,9 +57,9 @@ if ( isset($_GET['search']) ) { if ( isset($p_comment) && strlen(trim($p_comment)) != 0 ) { $condition=" where (upper(pcm_lib) like upper('%$p_comment%') or ". " pcm_val::text like '$p_comment%') ". - " and (pcm_val::text like '7%' or pcm_val::text like '6%' or pcm_val::text like '5%') "; + " and (pcm_val::text like '7%' or pcm_val::text like '6%') "; } else { - $condition="where pcm_val::text like '7%' or pcm_val::text like '6%' or pcm_val::text like '5%' "; + $condition="where pcm_val::text like '7%' or pcm_val::text like '6%' "; } } diff --git a/html/js/jrn_concerned.js b/html/js/jrn_concerned.js index 611ac8c23..0298c28d8 100644 --- a/html/js/jrn_concerned.js +++ b/html/js/jrn_concerned.js @@ -52,6 +52,18 @@ function SearchJrn(p_sessid,p_dossier,p_ctl,p_montant,p_paid) } } } + if ( p_montant == 0 && document.forms[1]) { + + for ( i=0; i < document.forms[1].length; i++) + { + var e=document.forms[1].elements[i]; + if ( e.name == ctl_montant_name ) { + p_montant=e.value; + break; + } + } + } + } diff --git a/html/poste_csv.php b/html/poste_csv.php index 8fa347df2..5096d0f0d 100644 --- a/html/poste_csv.php +++ b/html/poste_csv.php @@ -38,11 +38,11 @@ $User=new User($cn); $User->Check(); if ( isset ( $_POST['poste_fille']) ) { //choisit de voir tous les postes - $a_poste=getarray($cn,"select pcm_val from tmp_pcmn where pcm_val like '".$_POST["poste_id"]."%'"); + $a_poste=get_array($cn,"select pcm_val from tmp_pcmn where pcm_val like '".$_POST["poste_id"]."%'"); } else { - $a_poste=getarray($cn,"select pcm_val from tmp_pcmn where pcm_val = '".$_POST['poste_id']."'"); + $a_poste=get_array($cn,"select pcm_val from tmp_pcmn where pcm_val = '".$_POST['poste_id']."'"); } if ( count($a_poste) == 0 ) exit; diff --git a/html/poste_pdf.php b/html/poste_pdf.php index 68be58d63..f94473200 100644 --- a/html/poste_pdf.php +++ b/html/poste_pdf.php @@ -38,9 +38,9 @@ foreach ($_POST as $key=>$element) { ${"$key"}=$element; } if ( isset ( $poste_fille) ){ //choisit de voir tous les postes - $a_poste=getarray($cn,"select pcm_val from tmp_pcmn where pcm_val like '$poste_id%'"); + $a_poste=get_array($cn,"select pcm_val from tmp_pcmn where pcm_val like '$poste_id%'"); } else - $a_poste=getarray($cn,"select pcm_val from tmp_pcmn where pcm_val = '$poste_id'"); + $a_poste=get_array($cn,"select pcm_val from tmp_pcmn where pcm_val = '$poste_id'"); $ret=""; diff --git a/include/balance.inc.php b/include/balance.inc.php index 3e26c7a87..f6aed3423 100644 --- a/include/balance.inc.php +++ b/include/balance.inc.php @@ -35,43 +35,6 @@ $User->can_request($cn,BALANCE); echo '
'; -//----------------------------------------------------- -// Form -//----------------------------------------------------- -// Show the export button -if ( isset ($_POST['view'] ) ) { - $submit=new widget(); - $hid=new widget("hidden"); - - echo ""; - echo ''; - echo '"; - echo '"; - - echo ""; - - echo "
'. - dossier::hidden(). - widget::submit('bt_pdf',"Export PDF"). - $hid->IOValue("p_action","impress"). - $hid->IOValue("from_periode",$_POST['from_periode']). - $hid->IOValue("to_periode",$_POST['to_periode']). - $hid->IOValue("p_jrn",$_POST['p_jrn']). - $hid->IOValue("from_poste",$_POST['from_poste']). - $hid->IOValue("to_poste",$_POST['to_poste']); - echo "
'. - widget::submit('bt_csv',"Export CSV"). - dossier::hidden(). - $hid->IOValue("p_action","impress"). - $hid->IOValue("from_periode",$_POST['from_periode']). - $hid->IOValue("to_periode",$_POST['to_periode']). - $hid->IOValue("p_jrn",$_POST['p_jrn']). - $hid->IOValue("from_poste",$_POST['from_poste']). - $hid->IOValue("to_poste",$_POST['to_poste']); - - echo "
"; -} - // Show the form for period echo '
'; echo dossier::hidden(); @@ -123,7 +86,45 @@ echo "
"; //$a=FormPeriodeMult($cn); //echo $a; -echo ''; +echo ''; +echo ''; + +//----------------------------------------------------- +// Form +//----------------------------------------------------- +// Show the export button +if ( isset ($_POST['view'] ) ) { + $submit=new widget(); + $hid=new widget("hidden"); + + echo ""; + echo ''; + echo '"; + echo '"; + + echo ""; + + echo "
'. + dossier::hidden(). + widget::submit('bt_pdf',"Export PDF"). + $hid->IOValue("p_action","impress"). + $hid->IOValue("from_periode",$_POST['from_periode']). + $hid->IOValue("to_periode",$_POST['to_periode']). + $hid->IOValue("p_jrn",$_POST['p_jrn']). + $hid->IOValue("from_poste",$_POST['from_poste']). + $hid->IOValue("to_poste",$_POST['to_poste']); + echo "
'. + widget::submit('bt_csv',"Export CSV"). + dossier::hidden(). + $hid->IOValue("p_action","impress"). + $hid->IOValue("from_periode",$_POST['from_periode']). + $hid->IOValue("to_periode",$_POST['to_periode']). + $hid->IOValue("p_jrn",$_POST['p_jrn']). + $hid->IOValue("from_poste",$_POST['from_poste']). + $hid->IOValue("to_poste",$_POST['to_poste']); + + echo "
"; +} //----------------------------------------------------- diff --git a/include/bud_detail.inc.php b/include/bud_detail.inc.php index 14015d621..36d6d12cc 100644 --- a/include/bud_detail.inc.php +++ b/include/bud_detail.inc.php @@ -104,7 +104,7 @@ if ( $po_id !== -1 ) { echo "Poste Analytique ".$wPo_id->IOValue(); } echo $button_other; -//echo http://localhost/phpcompta-dev/phpcompta/html/budget.php?gDossier=21&bh_id=3&recherche=recherche&p_action=detail// + if ( isset ($_GET['po_id'] ) ) $str_po_id="&po_id=".$_REQUEST['po_id']; else diff --git a/include/bud_sga.inc.php b/include/bud_sga.inc.php index 5b0312aa9..1cb9ed795 100644 --- a/include/bud_sga.inc.php +++ b/include/bud_sga.inc.php @@ -44,6 +44,8 @@ if ( isset($_GET['display'])) { $obj->from_array($_GET); $res=$obj->load(); echo $obj->display_html($res); + echo '

Resume

'; + echo $obj->summary_html($res); echo '
'; echo $obj->hidden(); echo widget::hidden('do','ga'); diff --git a/include/ca_imp.inc.php b/include/ca_imp.inc.php index 3e81f8896..061227050 100644 --- a/include/ca_imp.inc.php +++ b/include/ca_imp.inc.php @@ -38,8 +38,9 @@ $menu=array(array("?p_action=ca_imp&sub=listing&$str_dossier","Listing","Listing array("?p_action=ca_imp&sub=bc2&$str_dossier","Balance croisé","Balance croisé de 2 plans analytiques","bc2") ); $sub=(isset($_GET['sub']))?$_GET['sub']:'no'; +echo '
'; echo ShowItem($menu,"H","mtitle","mtitle",$sub); - +echo '
'; $hidden=new widget("hidden"); $str_hidden=$hidden->IOValue("p_action","ca_imp"); $str_hidden.=$hidden->IOValue("sub",$sub); diff --git a/include/ca_od.inc.php b/include/ca_od.inc.php index c82168734..47006f676 100644 --- a/include/ca_od.inc.php +++ b/include/ca_od.inc.php @@ -36,15 +36,14 @@ require_once ("class_anc_group_operation.php"); $pa=new Anc_Plan($cn); $m=$pa->get_list(); if ( ! $m ) { echo '

Aucun plan analytique défini

';exit();} -echo '
'; -echo ''; -echo ''; -echo ''; + + //---------------------------------------------------------------------- // show the left menu //---------------------------------------------------------------------- echo ' +
@@ -56,7 +55,10 @@ echo '
-
'; + + +'; + //---------------------------------------------------------------------- // the pa_id is set // @@ -93,8 +95,9 @@ echo ' $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 User($cn); $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode(); + $w->value=$periode_start; $w->selected=$current; - + echo $w->IOValue(); echo 'Période '.widget::submit('gl_submit','Valider').'
'; echo '
'; diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index 798b8caed..6ffc75480 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -207,7 +207,8 @@ class Acc_Ledger { c_grp as grp, c_comment||' ('||c_internal||' '||jr_opid||')' as comment, c_rapt as oc, - c_periode as periode + j_qcode, + c_periode as periode from centralized left join jrn on ". "jr_grpt_id=c_grp left join tmp_pcmn ". " on (pcm_val=c_poste) ". @@ -488,7 +489,7 @@ class Acc_Ledger { echo_debug('class_acc_ledger',__LINE__,$code['j_qcode'].'est F ou C'); $p_array['TVAC']=$code['j_montant']; - $p_array['client']=($trunc==0)?$fiche->get_name():substr($fiche->get_name(),0,20); + $p_array['client']=($trunc==0)?$fiche->getName():substr($fiche->getName(),0,20); $p_array['reversed']=false; if ( $fiche_def_id == FICHE_TYPE_CLIENT && $code['j_debit']=='f') { @@ -511,7 +512,7 @@ class Acc_Ledger { echo_debug('class_acc_ledger',__LINE__,$code['j_qcode']."n 'est PAS F ou C"); $p_array['TVAC']=$code['j_montant']; - $p_array['client']= ($trunc==0)?$fiche->get_name():substr($fiche->get_name(),0,20); + $p_array['client']= ($trunc==0)?$fiche->getName():substr($fiche->getName(),0,20); $p_array['reversed']=false; if ($p_jrn_type == 'ACH' && $code['j_debit']=='t') { diff --git a/include/class_anc_group_operation.php b/include/class_anc_group_operation.php index a15cdcc95..7af0720e0 100644 --- a/include/class_anc_group_operation.php +++ b/include/class_anc_group_operation.php @@ -171,7 +171,7 @@ class Anc_Group_Operation { $idx=$d['id']; $p=new Anc_Operation($this->db); - $p->oa_amount=$_array["pamount$i"]; + $p->oa_amount=$p_array["pamount$i"]; $p->oa_description=$p_array["pdesc"]; $p->oa_date=$_POST['pdate']; diff --git a/include/class_bud_card.php b/include/class_bud_card.php index 26a94de53..3cd3e5bad 100644 --- a/include/class_bud_card.php +++ b/include/class_bud_card.php @@ -98,7 +98,7 @@ class Bud_Card { ); try { ExecSqlParam($this->db,$sql,$array); - print_r(DEBUG); + }catch (Exception $e) { if ( DEBUG == 'true' ) print_r($e); return 'Impossible de sauver'; diff --git a/include/class_bud_data.php b/include/class_bud_data.php index 9d728abf6..6a7a1817d 100644 --- a/include/class_bud_data.php +++ b/include/class_bud_data.php @@ -134,6 +134,7 @@ class Bud_Data { $p_id=$r['p_id']; $ret->amount[$p_id]=0; } + return $ret; } /*!\brief convert the array loaded from the database into data member @@ -277,7 +278,7 @@ class Bud_Data { if ( ! isset ($this->header ) ){ $r=''; $r.=""; - $periode=get_array($this->cn,"select to_char(p_start,'MM/YY')as d from parm_periode "); + $periode=get_array($this->cn,"select to_char(p_start,'MM/YY')as d from parm_periode order by p_start,p_end "); foreach ($periode as $row) $r.=''; diff --git a/include/class_bud_synthese_anc.php b/include/class_bud_synthese_anc.php index 9d57e18a9..6deca935f 100644 --- a/include/class_bud_synthese_anc.php +++ b/include/class_bud_synthese_anc.php @@ -157,6 +157,7 @@ class Bud_Synthese_Anc extends Bud_Synthese { " join parm_periode using (p_id) ". " where bc_id=$1 and $per and pcm_val=$2 group by p_id,p_start order by p_start"); + if ( empty( $aBudCard) ) return array(); // foreach card get the detail per pcm_val and periode foreach ($aBudCard as $rBudCard) { $line=array(); diff --git a/include/class_bud_synthese_hypo.php b/include/class_bud_synthese_hypo.php index 596a08128..1075676ee 100644 --- a/include/class_bud_synthese_hypo.php +++ b/include/class_bud_synthese_hypo.php @@ -195,10 +195,10 @@ Array $group_id=$rGroup['ga_id']; $sub[$group_id]=(isset($sub[$group_id]))?$sub[$group_id]:0; $sub[$group_id]+=$row[$group_id]; - print_r("$key pcm_val :".$pcm_val."gr.".$group_id." ".$row[$group_id]."sub ".$sub[$group_id]); + // print_r("$key pcm_val :".$pcm_val."gr.".$group_id." ".$row[$group_id]."sub ".$sub[$group_id]); $sub['total']=(isset($sub['total']))?$sub['total']:0; $sub['total']+=$row[$group_id]; - print_r('sub_total = '.$sub['total'].'
'); + //print_r('sub_total = '.$sub['total'].'
'); } if (isset( $array[$pcm_val])) { $new_array=array(); @@ -329,7 +329,48 @@ Array $r.=widget::hidden($e,$this->$e); return $r; } + /*!\brief the same as summary but show it in html */ + function summary_html($p_array) { + if ( empty ($p_array))return ''; + $summary_array=$this->summary($p_array); + arsort($summary_array); + $aGroup=get_array($this->cn,"select distinct ga_id from bud_detail join poste_analytique ". + " using (po_id) where bh_id=".$this->bh_id." order by ga_id "); + $per_acc=sql_filter_per($this->cn,$this->from,$this->to,'p_id','j_tech_per'); + $heading=''; + $heading.=''; + foreach ($aGroup as $rGroup ) + $heading.=''; + $heading.=''; + $r='
'.$row['d'].'
CE '.$rGroup['ga_id'].''; + $heading.='Total LigneResult. CE
'; + $r.=$heading; + + + + foreach ($summary_array as $key=>$aRow) { + $amount_row=0; + $r.="'; + + + foreach ($aGroup as $gr) { + $idx=$gr['ga_id']; + $r.=''; + $amount_row+=$aRow[$idx]; + } + $r.="'; + $acc_account->id=$acc_account->id."%"; + $r.="'; + $r.=""; + } + $r.="
"; + + $acc_account=new Acc_Account_Ledger($this->cn,$key); + $acc_account->load(); + $r.=$key." - ".$acc_account->label.''.$aRow[$idx].'".$amount_row.'".$acc_account->get_solde($per_acc).'
"; + return $r; + } static function test_me() { $cn=DbConnect(dossier::id()); $obj=new Bud_Synthese_Hypo($cn); diff --git a/include/class_fiche.php b/include/class_fiche.php index 810980945..d05171cbb 100644 --- a/include/class_fiche.php +++ b/include/class_fiche.php @@ -626,7 +626,7 @@ class fiche { if ( $exercice == 0 ) throw Exception ('Annee invalide erreur'); $str_stock=sprintf('insert into stock_goods(f_id,sg_comment,sg_code,sg_type,sg_exercice) '. - ' values (%d,upper(\'%s\'),\'d\',\'%s\')', + ' values (%d,upper(\'%s\'),upper(\'%s\'),\'d\',%s)', $this->id, 'initial', FormatString($value), @@ -729,7 +729,7 @@ class fiche { // if the card is used do not removed it $qcode=$this->strAttribut(ATTR_DEF_QUICKCODE); - if ( CountSql($this->cn,"select * from jrnx where j_qcode='$qcode'") != 0) + if ( CountSql($this->cn,"select * from jrnx where j_qcode='".pg_escape_string($qcode)."'") != 0) { echo ""; return; diff --git a/include/constant.php b/include/constant.php index b413b7acc..1c735c347 100644 --- a/include/constant.php +++ b/include/constant.php @@ -32,7 +32,7 @@ define ("phpcompta_psql_port","5432"); define ("phpcompta_user","phpcompta"); // // the domain can't start by a number !!! -define ("domaine",""); +define ("domaine","beta31"); define ("MAX_COMPTE",4); define ('MAX_BUD_DETAIL',20); diff --git a/include/impress_poste.inc.php b/include/impress_poste.inc.php index 5e4a33aee..b91b057c0 100644 --- a/include/impress_poste.inc.php +++ b/include/impress_poste.inc.php @@ -43,6 +43,7 @@ $span=new widget("span"); $w=new widget("js_search_poste"); $w->table=1; +$w->value=(isset($_REQUEST['poste_id']))?$_REQUEST['poste_id']:""; $w->label="Choississez le poste"; print $w->IOValue("poste_id"); echo $span->IOValue('poste_id_label'); @@ -50,6 +51,7 @@ $w_poste=new widget("js_search_only"); $w_poste->table=1; $w_poste->label="Ou Choississez la fiche"; $w_poste->extra='all'; +$w_poste->value=(isset($_REQUEST['f_id']))?$_REQUEST['f_id']:""; print $w_poste->IOValue("f_id"); echo $span->IOValue('f_id_label'); print ''; @@ -60,9 +62,11 @@ $select->table=1; $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"; +$select->selected=(isset($_REQUEST['from_periode']))?$_REQUEST['from_periode']:""; print $select->IOValue('from_periode',$periode_start); $select->label=" jusqu'à "; $periode_end=make_array($cn,"select p_id,to_char(p_end,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end"); +$select->selected=(isset($_REQUEST['to_periode']))?$_REQUEST['to_periode']:""; print $select->IOValue('to_periode',$periode_end); print ""; print ""; @@ -90,7 +94,7 @@ if ( isset( $_POST['bt_html'] ) ) { if ( isset ($_POST['poste_fille']) ) { $parent=$_POST['poste_id']; - $a_poste=getarray($cn,"select pcm_val from tmp_pcmn where pcm_val like '$parent%'"); + $a_poste=get_array($cn,"select pcm_val from tmp_pcmn where pcm_val like '$parent%' order by pcm_val::text"); $go=3; } // Check if the post is numeric and exists diff --git a/include/postgres.php b/include/postgres.php index 1c7f2ba0a..1f7954d87 100644 --- a/include/postgres.php +++ b/include/postgres.php @@ -166,7 +166,7 @@ function ExecSqlParam($p_connection, $p_string,$p_array) { $r=$p_string."array ".var_export($p_array,TRUE); throw new Exception (" SQL ERROR $r",1); } - ob_flush(); + ob_end_clean(); return $ret; } diff --git a/include/supplier.inc.php b/include/supplier.inc.php index fb55fffa1..991454f90 100644 --- a/include/supplier.inc.php +++ b/include/supplier.inc.php @@ -76,7 +76,7 @@ if ( $sub_action == "" ) if ( $sub_action=="blank") { $retour=sprintf('', - "commercial.php?p_action=fournisseur"); + "commercial.php?p_action=fournisseur&".dossier::get()); echo '
'; echo $retour; diff --git a/include/user_action_ach.php b/include/user_action_ach.php index 15db3be37..2f14e52de 100644 --- a/include/user_action_ach.php +++ b/include/user_action_ach.php @@ -69,7 +69,7 @@ if ( $action=="use_opd" ) { echo $hid->IOValue("jrn_type","ACH"); if ($op->count() != 0 ) - echo widget::submit('use_opd','Utilisez une op.prédéfinie'); + echo widget::submit('use_opd','Utilisez une op.prédéfinie'); echo $op->show_button(); echo ''; @@ -118,7 +118,7 @@ if ( $action == 'new' ) { echo $hid->IOValue("jrn_type","ACH"); if ($op->count() != 0 ) - echo widget::submit('use_opd','Utilisez une op.prédéfinie'); + echo widget::submit('use_opd','Utilisez une op.prédéfinie'); echo $op->show_button(); echo ''; @@ -202,7 +202,7 @@ if ( $action == 'new' ) { list($internal,$comment)=RecordSell($cn,$_POST,$User,$_GET['p_jrn']); // submit button in the form - $submit='

Opération '.$internal.'

'; + $submit='

Opération '.$internal.'

'; $r=FormAchView($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,"",$nb_number,false); echo '
'; echo $submit; @@ -319,7 +319,7 @@ echo 'Période '.$w->IOValue("p_periode",$periode_start).widget::submit(' echo "$bar
"; $hid=new widget(); if ( $max_ligne != 0 ) - echo widget::submit('paid','Mise à jour paiement'); + echo widget::submit('paid','Mise à jour paiement'); echo ''; echo '
'; } @@ -374,20 +374,20 @@ if ( $action == 'voir_jrn_non_paye' ) { $bar2=jrn_navigation_bar($offset,$m,$step,$page); echo '
'; - echo '

Echeance dépassée

'; + echo '

Echeance dépassée

'; echo '
'; echo dossier::hidden(); echo $bar2; echo $list; - echo '

Non Payée

'; + echo '

Non Payée

'; echo $list2; echo $bar2; $hid=new widget(); echo '
'; if ( $m != 0 ) - echo widget::submit('paid','Mise à jour paiement'); + echo widget::submit('paid','Mise à jour paiement'); echo '
'; echo '
'; diff --git a/include/user_form_ach.php b/include/user_form_ach.php index 34ec45d16..0b11a47be 100644 --- a/include/user_form_ach.php +++ b/include/user_form_ach.php @@ -303,7 +303,7 @@ function form_verify_input($p_cn,$p_jrn,$p_periode,$p_array,$p_number) { echo_error("Invalid date $e_date"); echo_debug('user_form_ach.php',__LINE__,"Invalid date $e_date"); - echo ""; + echo ""; return null; } $tot=0; @@ -314,7 +314,7 @@ function form_verify_input($p_cn,$p_jrn,$p_periode,$p_array,$p_number) { echo_debug('user_form_ach.php',__LINE__,"invalid quantity ".${"e_quant$o"}); echo_error("invalid quantity ".${"e_quant$o"}); - echo ""; + echo ""; return null; } // check if vat is correct diff --git a/include/user_form_fin.php b/include/user_form_fin.php index 1fa90502b..07f18691a 100644 --- a/include/user_form_fin.php +++ b/include/user_form_fin.php @@ -311,7 +311,7 @@ $r.=""; $r.=""; $r.="
"; $chk=new widget('checkbox'); - $chk->selected=true; + $chk->selected=false; $r.="Sauvez l'opération ?"; $r.=$chk->IOValue('opd_save');