diff --git a/include/class_acc_account_ledger.php b/include/class_acc_account_ledger.php index 74fb40e23..744e07fc5 100644 --- a/include/class_acc_account_ledger.php +++ b/include/class_acc_account_ledger.php @@ -127,8 +127,7 @@ class Acc_Account_Ledger if ( $solded == 1) { $filter=str_replace('jrn_def_id','jr_def_id',$filter_sql); - $bal_sql=" select sum(amount_deb) as s_deb,sum(amount_cred) as s_cred, j_poste from - (select case when j_debit='t' then j_montant else 0 end as amount_deb, + $bal_sql="select sum(amount_deb) as s_deb,sum(amount_cred) as s_cred, j_poste from (select case when j_debit='t' then j_montant else 0 end as amount_deb, case when j_debit='f' then j_montant else 0 end as amount_cred, j_poste from jrnx join jrn on (j_grpt = jr_grpt_id) @@ -136,7 +135,7 @@ class Acc_Account_Ledger j_poste=$1 and $filter and ( to_date($2,'DD.MM.YYYY') <= j_date and - to_date($3,'DD.MM.YYYY') >= j_date )) as m + to_date($3,'DD.MM.YYYY') >= j_date )) as signed_amount group by j_poste "; $r=$this->db->get_array($bal_sql,array($this->id,$p_from,$p_to)); @@ -442,7 +441,7 @@ class Acc_Account_Ledger exit; } $hid=new IHidden(); - echo '
'; + echo ""; echo ''; $str_ople=(isset($_REQUEST['ople']))?HtmlInput::hidden('ople',$_REQUEST['ople']):''; @@ -469,13 +468,13 @@ class Acc_Account_Ledger if ( isset($_REQUEST['solded'] )) echo HtmlInput::hidden('solded','1'); if (isset($_REQUEST['from_poste'])) - echo $hid->input('from_poste',$_REQUEST['from_poste']); + echo HtmlInput::hidden('from_poste',$_REQUEST['from_poste']); if (isset($_REQUEST['to_poste'])) - echo $hid->input('to_poste',$_REQUEST['to_poste']); + echo HtmlInput::hidden('to_poste',$_REQUEST['to_poste']); if (isset($_REQUEST['poste_id'])) - echo $hid->input("poste_id",$_REQUEST['poste_id']); + echo HtmlInput::hidden("poste_id",$_REQUEST['poste_id']); if (isset($_REQUEST['poste_fille'])) echo $hid->input('poste_fille','on'); @@ -494,10 +493,13 @@ class Acc_Account_Ledger $hid->input("to_periode",$_REQUEST['to_periode']); if (isset($_REQUEST['from_poste'])) - echo $hid->input('from_poste',$_REQUEST['from_poste']); + echo HtmlInput::hidden('from_poste',$_REQUEST['from_poste']); if (isset($_REQUEST['to_poste'])) - echo $hid->input('to_poste',$_REQUEST['to_poste']); + echo HtmlInput::hidden('to_poste',$_REQUEST['to_poste']); + + if (isset($_REQUEST['poste_id'])) + echo HtmlInput::hidden("poste_id",$_REQUEST['poste_id']); if ( isset($_REQUEST['letter'] )) echo HtmlInput::hidden('letter','2'); if ( isset($_REQUEST['solded'] )) echo HtmlInput::hidden('solded','1'); @@ -509,8 +511,9 @@ class Acc_Account_Ledger if (isset($_REQUEST['poste_id'])) echo $hid->input("poste_id",$_REQUEST['poste_id']); echo ""; + echo ''; echo "
"; - echo '
'; + } /*! diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index a7a8b2d2f..3bfedcf86 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -629,12 +629,12 @@ class Acc_Ledger case 'da': // date asc $sort_date="$image_sel_asc Date $image_desc"; - $order=" order by jr_date_order asc,substring(jr_pj_number,\'\\\d+$\')::numeric asc "; + $order=' order by jr_date_order asc,substring(jr_pj_number,\'\\\d+$\')::numeric asc '; break; case 'dd': $sort_date=" $image_asc Date $image_sel_desc"; // date desc - $order=" order by jr_date_order desc,substring(jr_pj_number,\'\\\d+$\')::numeric desc "; + $order=' order by jr_date_order desc,substring(jr_pj_number,\'\\\d+$\')::numeric desc '; break; case 'ma': // montant asc diff --git a/include/class_fiche_attr.php b/include/class_fiche_attr.php index 2b80e49d3..eb7bae4ad 100644 --- a/include/class_fiche_attr.php +++ b/include/class_fiche_attr.php @@ -192,12 +192,12 @@ class Fiche_Attr public function delete() { if ($this->ad_id < 9000) return; - $sql=$this->cn->exec_sql("delete from fiche_detail where ad_id=$1 )", + $sql=$this->cn->exec_sql("delete from fiche_detail where ad_id=$1 ", array($this->ad_id)); - $sql="delete from jnt_fic_attr where ad_id=$1"; + $sql="delete from jnt_fic_attr where ad_id=$1"; $res=$this->cn->exec_sql($sql,array($this->ad_id)); - + $sql="delete from attr_def where ad_id=$1"; $res=$this->cn->exec_sql($sql,array($this->ad_id)); diff --git a/include/class_lettering.php b/include/class_lettering.php index da88a3d18..262ea2aa8 100644 --- a/include/class_lettering.php +++ b/include/class_lettering.php @@ -282,7 +282,7 @@ class Lettering { $j_debit=$this->db->get_value('select j_Debit from jrnx where j_id=$1',array($p_jid)); $amount_init=$this->db->get_value('select j_montant from jrnx where j_id=$1',array($p_jid)); - $this->get_filter(); + $this->get_filter($p_jid); // retrieve jnt_letter.id $sql="select distinct(jl_id) from jnt_letter left outer join letter_deb using (jl_id) left outer join letter_cred using (jl_id) where letter_deb.j_id = $1 or letter_cred.j_id=$2"; @@ -341,7 +341,7 @@ class Lettering_Account extends Lettering * - $this->end max date * - this->account: accounting */ - public function get_filter() + public function get_filter($p_jid=0) { $filter_deb=''; if (isset($this->fil_deb)) @@ -366,7 +366,7 @@ class Lettering_Account extends Lettering isNumber($this->fil_amount_max)==1 && isNumber($this->fil_amount_min)==1 && ($this->fil_amount_max != 0 || $this->fil_amount_min != 0) ) - $filter_amount=" and j_montant >= $this->fil_amount_min and j_montant<=$this->fil_amount_max "; + $filter_amount=" and (j_montant >= $this->fil_amount_min and j_montant<=$this->fil_amount_max or (coalesce(comptaproc.get_letter_jnt($p_jid),-1)= coalesce(comptaproc.get_letter_jnt(j_id),-1) and coalesce(comptaproc.get_letter_jnt($p_jid),-1) <> -1 )) "; $sql=" select j_id,j_date,to_char(j_date,'DD.MM.YYYY') as j_date_fmt, j_montant,j_debit,jr_comment,jr_internal,jr_id,jr_def_id, @@ -458,7 +458,7 @@ class Lettering_Card extends Lettering * - $this->end max date * - this->quick_code: quick_code */ - public function get_filter() + public function get_filter($p_jid=0) { $filter_deb=''; if (isset($this->fil_deb)) @@ -483,7 +483,7 @@ class Lettering_Card extends Lettering isNumber($this->fil_amount_max)==1 && isNumber($this->fil_amount_min)==1 && ($this->fil_amount_max != 0 || $this->fil_amount_min != 0) ) - $filter_amount=" and j_montant between $this->fil_amount_min and $this->fil_amount_max "; + $filter_amount=" and (j_montant between $this->fil_amount_min and $this->fil_amount_max or (coalesce(comptaproc.get_letter_jnt($p_jid),-1)= coalesce(comptaproc.get_letter_jnt(j_id),-1) and coalesce(comptaproc.get_letter_jnt($p_jid),-1) <> -1 )) "; $sql=" select j_id,j_date,to_char(j_date,'DD.MM.YYYY') as j_date_fmt, j_montant,j_debit,jr_comment,jr_internal,jr_id,jr_def_id, diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php index 1cbea73c6..302678070 100644 --- a/include/compta_ven.inc.php +++ b/include/compta_ven.inc.php @@ -112,13 +112,13 @@ if ( $def==1 || $def == 4 ) $chk=new ICheckBox(); $chk->selected=false; - echo '

'; + echo '

'; echo $chk->input('opd_save'); echo "Sauvez cette opération comme modèle d'opération ?"; echo '
'; $opd_name=new IText('opd_name'); echo "Nom du modèle ".$opd_name->input(); - echo '

'; + echo '
'; echo '
'; echo HtmlInput::submit("record",_("Enregistrement"),'onClick="return verify_ca(\'\');"'); echo HtmlInput::submit('correct',_("Corriger")); diff --git a/include/export_form_csv.php b/include/export_form_csv.php index 8d0f41aa1..f33267acf 100644 --- a/include/export_form_csv.php +++ b/include/export_form_csv.php @@ -29,6 +29,7 @@ require_once("impress_inc.php"); header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="rapport.csv"',FALSE); + require_once('class_dossier.php'); $gDossier=dossier::id(); @@ -71,7 +72,7 @@ else { $periode=getPeriodeName($cn,$e); if ( $periode == null ) continue; - $array[]=$Form->get_row($e,$e); + $array[]=$Form->get_row($e,$e,$_GET['type_periode']); $periode_name[]=$periode; } // Display column heading diff --git a/include/export_gl_csv.php b/include/export_gl_csv.php index 71ac93316..fc40161de 100644 --- a/include/export_gl_csv.php +++ b/include/export_gl_csv.php @@ -59,6 +59,7 @@ if ( isset($poste_id) && strlen(trim($poste_id)) != 0 && isNumber($poste_id) ) } else { + $cond_poste=''; $sql="select pcm_val from tmp_pcmn "; if ($from_poste != '') { @@ -79,6 +80,7 @@ else } $sql=$sql.$cond_poste.' order by pcm_val::text'; + $a_poste=$cn->get_array($sql); } diff --git a/include/export_gl_pdf.php b/include/export_gl_pdf.php index 51017cd1c..1731fb4d8 100644 --- a/include/export_gl_pdf.php +++ b/include/export_gl_pdf.php @@ -46,6 +46,7 @@ $User->can_request(IMPBIL,0); $sql="select pcm_val from tmp_pcmn "; extract($_GET); +$cond_poste=""; if ($from_poste != '') { $cond_poste = ' where '; diff --git a/include/impress_gl_comptes.inc.php b/include/impress_gl_comptes.inc.php index f5737045d..521789d5d 100644 --- a/include/impress_gl_comptes.inc.php +++ b/include/impress_gl_comptes.inc.php @@ -110,8 +110,10 @@ echo ''; //----------------------------------------------------- if ( isset( $_REQUEST['bt_html'] ) ) { - require_once("class_acc_account_ledger.php"); + require_once("class_acc_account_ledger.php"); + echo '
'; echo Acc_Account_Ledger::HtmlTableHeader("gl_comptes"); + echo '
'; $sql='select pcm_val from tmp_pcmn '; $cond_poste=''; diff --git a/include/impress_poste.inc.php b/include/impress_poste.inc.php index 56ae6ae90..e8fcb73ef 100644 --- a/include/impress_poste.inc.php +++ b/include/impress_poste.inc.php @@ -173,7 +173,9 @@ if ( isset( $_REQUEST['bt_html'] ) ) if ( ! isset($_REQUEST['oper_detail']) ) { Acc_Account_Ledger::HtmlTableHeader(); + echo '
'; $Poste->HtmlTable(null,$_GET['ople']); + echo '
'; echo Acc_Account_Ledger::HtmlTableHeader(); } else @@ -182,9 +184,11 @@ if ( isset( $_REQUEST['bt_html'] ) ) // Detail //---------------------------------------------------------------------- Acc_Account_Ledger::HtmlTableHeader(); + $Poste->get_row_date( $_GET['from_periode'], $_GET['to_periode'],$_GET['ople']); if ( empty($Poste->row)) exit(); $Poste->load(); + echo ''; echo ''; /* avoid duplicates */ @@ -201,6 +205,7 @@ if ( isset( $_REQUEST['bt_html'] ) ) echo $op->display_jrnx_detail(1); } echo '

'. $_GET['poste_id'].' '.h($Poste->label).'

'; + echo Acc_Account_Ledger::HtmlTableHeader(); } echo "";