Merge branch 'R_10_00' of http://10.65.20.33/sirio/CAMPO/campo into R_10_00

This commit is contained in:
Simone Palacino 2020-05-29 13:47:19 +02:00
commit 57441dcce9
10 changed files with 155 additions and 5 deletions

6
cd/test/ba0966.txt Normal file
View File

@ -0,0 +1,6 @@
recdesc\f183.dir
recdesc\f183.trr
recdesc\f181.dir
recdesc\f181.trr
Aggiunta tabella per annessi f9

34
cd/test/ba0966a.ini Normal file
View File

@ -0,0 +1,34 @@
[Main]
Demo=0
[ba1]
File(537) = recdesc\f181.trr|X
File(538) = recdesc\f181.dir|X
File(539) = recdesc\f183.trr|X
File(540) = recdesc\f183.dir|X
Patch = 0966
Versione = 21511200
[ba99]
Kill(0) = batbsce.txt|x
Kill(1) = wxmsw240.dll|x
Kill(2) = bastcms.rep|x
Kill(3) = bastcms.msk|x
Kill(4) = bastfsc.msk|x
Kill(5) = bastfsc.rep|x
Kill(6) = bastuue.msk|x
Kill(7) = bastuue.rep|x
[ba]
Data = 28-05-2020
Descrizione = Base
Dischi = 1
Moduli = sy
OEM =
Patch = 966
PostProcess = bainst -0 BA
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/ba0966a1.zip Normal file

Binary file not shown.

View File

@ -14,7 +14,7 @@ Descrizione = Cespiti
Dischi = 1
Moduli = ba,cg
OEM =
Patch = 962
Patch = 0962
PostProcess = bainst -0 CE
PreProcess =
Prezzo(1) =

Binary file not shown.

4
cd/test/cg0966.txt Normal file
View File

@ -0,0 +1,4 @@
cg5300a.msk
cg5.exe
Modificata la gestione dei parametri liquidazione per aggiungere e togliere attività da un anno

99
cd/test/cg0966a.ini Normal file
View File

@ -0,0 +1,99 @@
[Main]
Demo=0
[cg5]
File(107) = cg5.exe|X
File(111) = cg5300a.msk|X
Patch = 0966
Versione = 21511200
[cg99]
Kill(0) = batbins.msk|x
Kill(1) = bastpor.rep|x
Kill(2) = batbcfi.msk|x
Kill(3) = batbntb.msk|x
Kill(4) = bastleg.msk|x
Kill(5) = batbdel.msk|x
Kill(6) = bastnot.msk|x
Kill(7) = bastvet.rep|x
Kill(8) = bastpor.msk|x
Kill(9) = bastcve.msk|x
Kill(10) = batbpdb.msk|x
Kill(11) = batbpor.msk|x
Kill(12) = bastivd.msk|x
Kill(13) = batbind.msk|x
Kill(14) = batblbu.msk|x
Kill(15) = bastdpn.msk|x
Kill(16) = batbleg.msk|x
Kill(17) = bastcfi.msk|x
Kill(18) = batbdpn.msk|x
Kill(19) = bastcam.msk|x
Kill(20) = bastcco.msk|x
Kill(21) = batbvet.msk|x
Kill(22) = bastarb.msk|x
Kill(23) = bastesc.rep|x
Kill(24) = cg2fppro.msk|x
Kill(25) = bastver.msk|x
Kill(26) = batbtit.msk|x
Kill(27) = batbcco.msk|x
Kill(28) = bastzon.rep|x
Kill(29) = bastndo.msk|x
Kill(30) = bastreg.rep|x
Kill(31) = batbndo.msk|x
Kill(32) = bastscc.rep|x
Kill(33) = batbnot.msk|x
Kill(34) = batbscc.msk|x
Kill(35) = bastntb.rep|x
Kill(36) = batbivd.msk|x
Kill(37) = bastnot.rep|x
Kill(38) = batbtra.msk|x
Kill(39) = bastver.rep|x
Kill(40) = bastcam.rep|x
Kill(41) = batbmsp.msk|x
Kill(42) = bastmsp.rep|x
Kill(43) = bastvet.msk|x
Kill(44) = batbesc.msk|x
Kill(45) = bastpdb.msk|x
Kill(46) = bastleg.rep|x
Kill(47) = batblia.msk|x
Kill(48) = bastpdb.rep|x
Kill(49) = bastarb.rep|x
Kill(50) = bastcfi.rep|x
Kill(51) = bastntb.msk|x
Kill(52) = cgtbcon.msk|x
Kill(53) = bastcve.rep|x
Kill(54) = batbver.msk|x
Kill(55) = batbzon.msk|x
Kill(56) = batbcve.msk|x
Kill(57) = batbcam.msk|x
Kill(58) = bastesc.msk|x
Kill(59) = batbinl.msk|x
Kill(60) = bastivd.rep|x
Kill(61) = batbarb.msk|x
Kill(62) = bastmsp.msk|x
Kill(63) = bastscc.msk|x
Kill(64) = bastndo.rep|x
Kill(65) = bastdpn.rep|x
Kill(66) = bastzon.msk|x
Kill(67) = batblia.msk|x
Kill(68) = batbreg.msk|x
Kill(69) = bastreg.msk|x
Kill(70) = bastcco.rep|x
[cg]
Data = 13-05-2020
Descrizione = Contabilita' Generale
Dischi = 1
Edit_19 = cg0 -0
Edit_20 = cg0 -1
Edit_26 = cg0 -4
Edit_5 = cg0 -5
Moduli = ba
OEM =
Patch = 966
PostProcess = bainst -0 CG
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/cg0966a1.zip Normal file

Binary file not shown.

View File

@ -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");

View File

@ -5,6 +5,7 @@
#include <defmask.h>
#include <msksheet.h>
#include <relapp.h>
#include <utility.h>
#include <tabutil.h>
#include <recarray.h>
@ -14,6 +15,7 @@
#include <attiv.h>
#include <nditte.h>
#define TAB_LIA "%LIA"
#define TAB_PLA "%PLA"