From 8017228c5d07dcc8b2d7b4b431c02834021ded6f Mon Sep 17 00:00:00 2001 From: ijet Date: Mon, 13 Feb 2023 16:05:04 +0300 Subject: [PATCH] Some fixes --- Report/report.fr3 | 6 +++--- Script/otchety.pas | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Report/report.fr3 b/Report/report.fr3 index b485314..da74d1b 100644 --- a/Report/report.fr3 +++ b/Report/report.fr3 @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/Script/otchety.pas b/Script/otchety.pas index f12303f..f3a65d8 100755 --- a/Script/otchety.pas +++ b/Script/otchety.pas @@ -107,7 +107,7 @@ procedure PrepareReport; 'ROUND(ifnull(tar_job_viplaty_comp.summa, 0) + (tar_job_summa.nagruzka / 100 * ifnull(tar_job_viplaty_comp.percent, 0)), 2), '+ 'ROUND(ifnull(tar_job_summa.kategory_summa, 0) + ifnull(tar_job_viplaty_stim.summa, 0) + (tar_job_summa.nagruzka / 100 * ifnull(tar_job_viplaty_stim.percent, 0)), 2) ) as viplaty_string, '+ - 'printf("Итого.: %s"||char(10)||"Комп.: %s"||char(10)||"Стим.: %s", '+ + 'printf("Зрп.: %s"||char(10)||"Комп.: %s"||char(10)||"Стим.: %s", '+ 'ROUND(total_tar_job.total_summa, 2), '+ 'ROUND(ifnull(total_tar_comp_stim.total_comp, 0), 2), '+ 'ROUND(ifnull(total_tar_comp_stim.total_stim, 0), 2) ) as itog_zarplata '+