root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'R12.00' of http://10.65.20.33/sirio/CAMPO/campo into R12.00

Browse Source
This commit is contained in:
Simoe 2022-04-07 17:30:53 +02:00
commit 30c6646be5
8 changed files with 230 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,4 @@
ca3.exe
ca3200a.rep
La stampa mastrini di tutte le commesse suddivisa per commessa non stampava nulla

22
cd/test/ca1134a.ini Normal file
View File

@ -0,0 +1,22 @@
[Main]
Demo=0
[ca3]
File(34) = ca3.exe|X
File(39) = ca3200a.rep|X
Patch = 1134
Versione = 21511200
[ca]
Data = 14-03-2022
Descrizione = Contabilita' Analitica
Dischi = 1
Moduli = ba,cg
OEM =
Patch = 1134
PostProcess =
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/ca1134a1.zip Normal file
View File

Binary file not shown.

26
cd/test/ve1134.txt Normal file
View File

@ -0,0 +1,26 @@
ve0.exe
veacc.rep
vefat.rep
verig02.ini
vecnford.rep
verig01.ini
verig04.ini
verig07.ini
verig03.ini
verig06.ini
verig09.ini
verig05.ini
verig08.ini
verig11.ini
verig10.ini
ve1.exe
verig13.ini
verig15.ini
verig14.ini
verig23.ini
verig21.ini
cg0.exe
cg0500a.msk
Modifata la logica per i campi di calcolo (IMPNS, IMPORTO, ecc) nei documenti interattivi.
Non dovrebbe essere cambiato nulla nel loro funzionamento.

163
cd/test/ve1134a.ini Normal file
View File

@ -0,0 +1,163 @@
[Main]
Demo=0
[ve0]
Edit_163 = ve0 -6
Edit_33 = ve0 -0
Edit_4 = ve0 -4
Edit_5 = ve0 -4
File(20) = ve0.exe|X
Patch = 1134
Versione = 21511200
[ve1]
File(44) = ve1.exe|X
File(100) = veacc.rep|X
File(107) = vecnford.rep|X
File(109) = vefat.rep|X
File(119) = verig01.ini|X
File(121) = verig02.ini|X
File(123) = verig03.ini|X
File(125) = verig04.ini|X
File(127) = verig05.ini|X
File(129) = verig06.ini|X
File(131) = verig07.ini|X
File(133) = verig08.ini|X
File(135) = verig09.ini|X
File(137) = verig10.ini|X
File(139) = verig11.ini|X
File(141) = verig13.ini|X
File(143) = verig14.ini|X
File(145) = verig15.ini|X
File(147) = verig21.ini|X
File(148) = verig23.ini|X
Patch = 1134
Versione = 21511200
[ve99]
Kill(0) = batbimb.msk|x
Kill(1) = batbacr.msk|x
Kill(2) = bastums.msk|x
Kill(3) = bastbnp.rep|x
Kill(4) = eftbbnp.msk|x
Kill(5) = bastfrm.rep|x
Kill(6) = ve7300a.msk|x
Kill(7) = batbcra.msk|x
Kill(8) = batbfca.msk|x
Kill(9) = bastcra.rep|x
Kill(10) = ve7400a.ini|x
Kill(11) = batbpro.msk|x
Kill(12) = batbnum.msk|x
Kill(13) = ve7400conf.ini|x
Kill(14) = bastrfc.rep|x
Kill(15) = bastbnp.msk|x
Kill(16) = ve7300a.frm|x
Kill(17) = batbfid.msk|x
Kill(18) = bastnum.msk|x
Kill(19) = ve7200a.msk|x
Kill(20) = batbmre.msk|x
Kill(21) = bastfrm.msk|x
Kill(22) = batbspt.msk|x
Kill(23) = batbgsa.msk|x
Kill(24) = basteld.rep|x
Kill(25) = basttri.msk|x
Kill(26) = bastcaa.rep|x
Kill(27) = ve7701a.ini|x
Kill(28) = bastfrd.rep|x
Kill(29) = basttri.rep|x
Kill(30) = bastfrd.msk|x
Kill(31) = batbgmc.msk|x
Kill(32) = batbtag.msk|x
Kill(33) = batbfrr.msk|x
Kill(34) = batbctr.msk|x
Kill(35) = bastcra.msk|x
Kill(36) = bastabe.rep|x
Kill(37) = batbfrd.msk|x
Kill(38) = batbbnp.msk|x
Kill(39) = bastimb.rep|x
Kill(40) = basttag.rep|x
Kill(41) = bastgca.msk|x
Kill(42) = ve7600a.msk|x
Kill(43) = ve7500a.msk|x
Kill(44) = bastums.rep|x
Kill(45) = basttag.msk|x
Kill(46) = batbubi.msk|x
Kill(47) = bastcau.rep|x
Kill(48) = batbcau.msk|x
Kill(49) = batbprv.msk|x
Kill(50) = bastctr.msk|x
Kill(51) = basteld.msk|x
Kill(52) = bastasf.rep|x
Kill(53) = batbasf.msk|x
Kill(54) = bastubi.msk|x
Kill(55) = bastfrr.msk|x
Kill(56) = batbtip.msk|x
Kill(57) = bastubi.rep|x
Kill(58) = bastrfa.msk|x
Kill(59) = batbprs.msk|x
Kill(60) = bastgmc.msk|x
Kill(61) = bastcau.msk|x
Kill(62) = bastgcg.msk|x
Kill(63) = batbstd.msk|x
Kill(64) = bastnum.rep|x
Kill(65) = bastctr.rep|x
Kill(66) = batbrfa.msk|x
Kill(67) = bastgca.rep|x
Kill(68) = basttip.rep|x
Kill(69) = ve7.exe|x
Kill(70) = batbfsa.msk|x
Kill(71) = batbtri.msk|x
Kill(72) = batbgcg.msk|x
Kill(73) = ve7700a.msk|x
Kill(74) = bastfca.rep|x
Kill(75) = bastprs.rep|x
Kill(76) = ve7100a.msk|x
Kill(77) = baststd.msk|x
Kill(78) = bastabe.msk|x
Kill(79) = efstbnp.rep|x
Kill(80) = bastasf.msk|x
Kill(81) = bastfrr.rep|x
Kill(82) = batbgca.msk|x
Kill(83) = ve7400a.msk|x
Kill(84) = batbrfc.msk|x
Kill(85) = batbfrm.msk|x
Kill(86) = bastcaa.msk|x
Kill(87) = ve7200a.frm|x
Kill(88) = bastfca.msk|x
Kill(89) = batbspp.msk|x
Kill(90) = bastprs.msk|x
Kill(91) = efstbnp.msk|x
Kill(92) = batbums.msk|x
Kill(93) = bastimb.msk|x
Kill(94) = bastrfc.msk|x
Kill(95) = bastgmc.rep|x
Kill(96) = basttip.msk|x
Kill(97) = batbabe.msk|x
Kill(98) = bastspp.rep|x
Kill(99) = batbcld.msk|x
Kill(100) = bastspp.msk|x
Kill(101) = baststd.rep|x
Kill(102) = batbeld.msk|x
Kill(103) = batbcaa.msk|x
Kill(104) = bastgcg.rep|x
Kill(105) = bastrfa.rep|x
[cg0]
File(0) = cg0.exe|X
File(5) = cg0500a.msk|X
Patch = 1134
Versione = 21511200
[ve]
Data = 05-04-2022
Descrizione = Vendite
Dischi = 1
Moduli = ba,cg0, cg9,pr9,mg9,sv9,in9,ef9
OEM =
Patch = 1134
PostProcess = bainst -0 VE
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/ve1134a1.zip Normal file
View File

Binary file not shown.

19
src/ca/ca3200.cpp
View File

@ -658,8 +658,6 @@ void TPrint_mastrini_ca::execute_print(TReport_book & book, TAutomask & mask, TR
TAssoc_array codici_buoni;
TString query;
query << "USE RMOVANA KEY 2\n";
query << "FROM CODCONTO=#DACONTO\n";
query << "TO CODCONTO=#ACONTO";
TISAM_recordset rmovana(query);
TString80 daconto, aconto;
for (int i = 0; _mask->id2pos(F_CDC1_INI+i) > 0; i++)
@ -667,8 +665,13 @@ void TPrint_mastrini_ca::execute_print(TReport_book & book, TAutomask & mask, TR
daconto << _mask->get(F_CDC1_INI+i);
aconto << _mask->get(F_CDC1_FIN+i);
}
rmovana.set_var("#DACONTO", daconto);
rmovana.set_var("#ACONTO", aconto);
// rmovana.set_var("#DACONTO", daconto);
// rmovana.set_var("#ACONTO", aconto);
if (!daconto.blank())
query << "FROM " << CDC_CODCONTO << "=\"" << (const char*) daconto << "\"\n";
if (!daconto.blank())
query << "TO " << CDC_CODCONTO << "=\"" << (const char*)aconto << "\"\n";
const long items = rmovana.items();
if (items > 0)
{
@ -694,10 +697,14 @@ void TPrint_mastrini_ca::execute_print(TReport_book & book, TAutomask & mask, TR
TProgress_monitor pi(set.items(), msg, true);
for (bool sok = set.move_first(); pi.add_status() && sok; sok = set.move_next()) //fighissimo metodo per scandire un file in 1 riga!
{
if (skip_closed && set.get(COMMESSE_CHIUSA).as_bool())
if (skip_closed && set.get_bool(COMMESSE_CHIUSA))
continue;
row = set.get_string(0u); //prende il valore del primo campo del file (CDC o CMS code)
// row = set.get_string(0u);
if (logic1 == LF_CDC)
row = set.get_string(CDC_CODCOSTO);
else
row = set.get_string(COMMESSE_CODCMS); //prende il valore del primo campo del file (CDC o CMS code)
if (!codici_buoni.is_key(row))
continue;

4
src/ca/ca3200a.rep
View File

@ -121,7 +121,7 @@ THEN</prescript>
<prescript description="H3 PRESCRIPT">MESSAGE RESET,F3.103</prescript>
</section>
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Body" level="" hidden="" page_break="" can_break="" pattern="1" />
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Body" level="1" hidden="" height="1" page_break="" can_break="" pattern="1">
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Body" level="1" hidden="" page_break="" can_break="" pattern="1">
<condition>NUMREG != 0</condition>
<font face="Arial" size="8" />
<field x="1" deactivated="" type="Data" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="">
@ -214,7 +214,7 @@ THEN
<source>#FASE</source>
<prescript description="B1.203 PRESCRIPT">CA_FORMAT_FASE</prescript>
</field>
<field x="230" deactivated="" type="Stringa" hidden="1" link="" dynamic_height="" shade_offset="" width="13" codval="" id="204" pattern="1" hide_zero="" text="">
<field x="230" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="13" codval="" id="204" pattern="1" hide_zero="" text="">
<font face="Arial" bold="1" size="9" />
<modules>NP</modules>
<source>#CONTSEP</source>