diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php index fccd746f2e8..3e8aab64479 100644 --- a/htdocs/accountancy/class/accountancyexport.class.php +++ b/htdocs/accountancy/class/accountancyexport.class.php @@ -359,9 +359,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; } } diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php index 6beb5caa1e2..6f3f8088a63 100644 --- a/htdocs/compta/facture/invoicetemplate_list.php +++ b/htdocs/compta/facture/invoicetemplate_list.php @@ -268,7 +268,7 @@ if ($search_status != '' && $search_status >= -1) if ($search_status == -1) $sql .= ' AND suspended = 1'; } $sql .= dolSqlDateFilter('f.date_last_gen', $search_day, $search_month, $search_year); -$sql .= dolSqlDateFilter('f.date_last_gen', $search_day_date_when, $search_month_date_when, $search_year_date_when); +$sql .= dolSqlDateFilter('f.date_when', $search_day_date_when, $search_month_date_when, $search_year_date_when); $sql .= $db->order($sortfield, $sortorder);