T4640 fix amount_total and date

Merged Ariel Caruso requested to merge 12.0-fix into 12.0

Merge request reports