From b45b13e2ec5a55c75f3f16afabb098324a14ad79 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Fri, 29 May 2020 11:14:01 +0200 Subject: [PATCH] Patch level : 12.0 962 Files correlati : ce3.exe ce3900a.rep ce3900.msk Commento : Aggiunto salto pagina opzionale nella stampa sintetica per categoria --- src/ce/ce3900.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ce/ce3900.cpp b/src/ce/ce3900.cpp index 04c9f71fb..b46fae056 100755 --- a/src/ce/ce3900.cpp +++ b/src/ce/ce3900.cpp @@ -139,13 +139,18 @@ void TStampa_sintetica_recordset::set_filter(const TStampa_sintetica_mask& msk) const int sort_type = msk.get_int(F_SORT); - if (!(sort_type & SORT_CAT)) + if (sort_type & SORT_CAT) { query << "\nBY "; if (sort_type & SORT_DATACOMP) - query << "DTCOMP|CODCAT|CODIMP|CODLOC|IDCESPITE"; + query << "CODCAT|DTCOMP|CODIMP|CODLOC|IDCESPITE"; else - query << "IDCESPITE"; + query << "CODCAT|IDCESPITE"; + } + else + { + if (sort_type & SORT_DATACOMP) + query << "\nBY DTCOMP|CODIMP|CODLOC|IDCESPITE"; } @@ -386,7 +391,7 @@ void TStampa_sintetica::main_loop() if (sort_type & SORT_CAT) { rep.load("ce3900a"); - rep.section('H', 1).force_page_break(mask.get_bool(F_BREAK)); + rep.section('H', 2).force_page_break(mask.get_bool(F_BREAK)); } else rep.load("ce3900b");