From ecea726323b695197955d1fd01544aa7aa26cfbb Mon Sep 17 00:00:00 2001 From: atm-lena Date: Fri, 7 Feb 2020 14:53:42 +0100 Subject: [PATCH 1/2] FIX CA by prod list filter --- htdocs/compta/stats/cabyprodserv.php | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php index e7a3d4da480..a2a8b734b17 100644 --- a/htdocs/compta/stats/cabyprodserv.php +++ b/htdocs/compta/stats/cabyprodserv.php @@ -122,22 +122,24 @@ $year_end = $tmpe['year']; $nbofyear = ($year_end - $year_start) + 1; $commonparams=array(); -$commonparams['modecompta']=$modecompta; -$commonparams['sortorder'] = $sortorder; -$commonparams['sortfield'] = $sortfield; +if(!empty($modecompta)) $commonparams['modecompta']=$modecompta; +if(!empty($sortorder)) $commonparams['sortorder'] = $sortorder; +if(!empty($sortfield)) $commonparams['sortfield'] = $sortfield; $headerparams = array(); -$headerparams['date_startyear'] = $date_startyear; -$headerparams['date_startmonth'] = $date_startmonth; -$headerparams['date_startday'] = $date_startday; -$headerparams['date_endyear'] = $date_endyear; -$headerparams['date_endmonth'] = $date_endmonth; -$headerparams['date_endday'] = $date_endday; +if(!empty($date_startyear)) $headerparams['date_startyear'] = $date_startyear; +if(!empty($date_startmonth)) $headerparams['date_startmonth'] = $date_startmonth; +if(!empty($date_startday)) $headerparams['date_startday'] = $date_startday; +if(!empty($date_endyear)) $headerparams['date_endyear'] = $date_endyear; +if(!empty($date_endmonth)) $headerparams['date_endmonth'] = $date_endmonth; +if(!empty($date_endday)) $headerparams['date_endday'] = $date_endday; +if(!empty($year)) $headerparams['year'] = $year; +if(!empty($month)) $headerparams['month'] = $month; $headerparams['q'] = $q; $tableparams = array(); -$tableparams['search_categ'] = $selected_cat; -$tableparams['search_type'] = $selected_type; +if(!empty($selected_cat)) $tableparams['search_categ'] = $selected_cat; +if(!empty($selected_type)) $tableparams['search_type'] = $selected_type; $tableparams['subcat'] = ($subcat === true)?'yes':''; // Adding common parameters From 72e59e6fe2be1ddce1261eeb278f619fa8d02719 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Fri, 14 Feb 2020 16:07:06 +0100 Subject: [PATCH 2/2] FIX: Force FEC export to txt format --- htdocs/accountancy/tpl/export_journal.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php index ca3c9c49ea0..810d95a9ca3 100644 --- a/htdocs/accountancy/tpl/export_journal.tpl.php +++ b/htdocs/accountancy/tpl/export_journal.tpl.php @@ -55,7 +55,7 @@ if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == "11" && $type_export == "genera $endaccountingperiod = dol_print_date(dol_get_last_day($tmparray['year'], $tmparray['mon']), 'dayxcard'); - $completefilename = $siren . "FEC" . $endaccountingperiod . "." . $format; + $completefilename = $siren . "FEC" . $endaccountingperiod . ".txt"; } else {