From a249f4f35a52d5d5fc367775b3467e6ae12f1bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Mestre?= Date: Wed, 10 Feb 2021 15:03:17 -0300 Subject: [PATCH 1/2] Fix #16241 Date filter resets on Miscellaneous Payments Changed $search_date_start and $search_date_end variables to get values from search_date_start and search_date_end GET parameters if no their value is empty after checking POST parameters --- htdocs/compta/bank/various_payment/list.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php index befe2fa6905..2960a27583c 100644 --- a/htdocs/compta/bank/various_payment/list.php +++ b/htdocs/compta/bank/various_payment/list.php @@ -53,6 +53,8 @@ $search_accountancy_account = GETPOST("search_accountancy_account"); if ($search_accountancy_account == - 1) $search_accountancy_account = ''; $search_accountancy_subledger = GETPOST("search_accountancy_subledger"); if ($search_accountancy_subledger == - 1) $search_accountancy_subledger = ''; +if (empty($search_date_start)) $search_date_start = GETPOST("search_date_start", 'int'); +if (empty($search_date_end)) $search_date_end = GETPOST("search_date_end", 'int'); $sortfield = GETPOST("sortfield", 'alpha'); $sortorder = GETPOST("sortorder", 'alpha'); From 83f9451b43e3c4dd9cb77c20a5d014c256b4638c Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Thu, 11 Feb 2021 13:17:20 +0100 Subject: [PATCH 2/2] FIX: Accountancy - Fix some problems on CEGID export --- htdocs/accountancy/class/accountancyexport.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php index 60f2d5576b9..6fd3518689d 100644 --- a/htdocs/accountancy/class/accountancyexport.class.php +++ b/htdocs/accountancy/class/accountancyexport.class.php @@ -332,9 +332,9 @@ class AccountancyExport print length_accountg($line->numero_compte).$separator; print length_accounta($line->subledger_account).$separator; print $line->sens.$separator; - print price($line->montant).$separator; - print $line->label_operation.$separator; - print $line->doc_ref; + print price2fec(abs($line->montant)).$separator; + print dol_string_unaccent($line->label_operation).$separator; + print dol_string_unaccent($line->doc_ref); print $end_line; } }