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-01-14 11:12:03 +01:00
commit bd88710d17
25 changed files with 345 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cd/test/cg1106.txt Normal file
View File

@ -0,0 +1,3 @@
cg4.exe
Nella stampa dei registri sbagliava la stampa del flag fattura di cassa scaduta

98
cd/test/cg1106a.ini Normal file
View File

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

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

Binary file not shown.

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

@ -0,0 +1,4 @@
fp0.exe
fp0700a.rep
Implementazione regolarizzazioni e relativa stampa

20
cd/test/fp1104a.ini Normal file
View File

@ -0,0 +1,20 @@
[Main]
Demo=0
[fp0]
File(0) = fp0.exe|X
File(18) = fp0700a.rep|X
Patch = 1104
Versione = 21511200
[fp]
Data = 10-01-2022
Descrizione = Fattura Elettronica
Dischi = 1
Moduli = cg,ve
OEM =
Patch = 1104
PostProcess =
PreProcess =
Versione = 21511200

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

Binary file not shown.

7
cd/test/li1106.txt Normal file
View File

@ -0,0 +1,7 @@
li0500a.rep
li0.exe
li0200a.rep
li0200a.msk
li0500a.msk
Corretta la stampa degli elenchi delle lettere d'intento

23
cd/test/li1106a.ini Normal file
View File

@ -0,0 +1,23 @@
[Main]
Demo=0
[li0]
File(1) = li0.exe|X
File(3) = li0200a.msk|X
File(4) = li0200a.rep|X
File(7) = li0500a.msk|X
File(8) = li0500a.rep|X
Patch = 1106
Versione = 21511200
[li]
Data = 01-01-2022
Descrizione = Dichiarazioni d'intento
Dischi = 1
Moduli = cg9
OEM =
Patch = 1106
PostProcess =
PreProcess =
Versione = 21511200

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

Binary file not shown.

4
cd/test/mg1070.txt
View File

@ -1,4 +0,0 @@
mg1.exe
mg1200.msk
Ricostruzione saldi per aticolo

31
cd/test/mg1070a.ini
View File

@ -1,31 +0,0 @@
[Main]
Demo=0
[mg1]
Edit_110 = mg1 -0
File(36) = mg1.exe|X
File(39) = mg1200.msk|X
Patch = 1070
Versione = 21511200
[mg99]
Kill(0) = batbfcg.msk|x
Kill(1) = batbubi.msk|x
Kill(2) = efstbnp.rep|x
Kill(3) = efstbnp.msk|x
Kill(4) = eftbbnp.msk|x
Kill(5) = bastfcg.msk|x
[mg]
Data = 27-07-2021
Descrizione = Magazzino
Dischi = 1
Moduli = ba,cg9,ve9,pr9,ef9
OEM =
Patch = 1070
PostProcess = bainst -0 MG
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/mg1070a1.zip
View File

Binary file not shown.

25
cd/test/mg1106a.ini
View File

@ -1,25 +1,24 @@
[Main]
Demo=0
[mg1]
Edit_110 = mg1 -0
File(36) = cg0200a.msk|X
Patch = 1106
Versione = 21511200
[mg99]
Kill(0) = batbubi.msk|x
Kill(1) = batbfcg.msk|x
Kill(2) = bastfcg.msk|x
Kill(3) = eftbbnp.msk|x
Kill(4) = efstbnp.msk|x
Kill(5) = efstbnp.rep|x
Kill(0) = batbfcg.msk|x
Kill(1) = batbubi.msk|x
Kill(2) = efstbnp.rep|x
Kill(3) = efstbnp.msk|x
Kill(4) = eftbbnp.msk|x
Kill(5) = bastfcg.msk|x
[cg0]
File(2) = cg0200a.msk|X
Patch = 1104
Versione = 21511200
[mg]
Data = 10-01-2022
Descrizione = Magazzino
Dischi = 1
Moduli = ba,cg9,ve9,pr9,ef9
Moduli = ba,cg0,cg9,ve9,pr9,ef9
OEM =
Patch = 1106
PostProcess = bainst -0 MG

BIN
cd/test/mg1106a1.zip
View File

Binary file not shown.

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

@ -0,0 +1,4 @@
ve1.exe
cg0200a.msk
La stampa dei documneti coi form dai documenti non funzionava più

134
cd/test/ve1106a.ini Normal file
View File

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

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

Binary file not shown.

14
src/cg/cg4400.cpp
View File

@ -2155,7 +2155,19 @@ bool TStampa_registri_app::print_IVAxCassa(int da_month, int a_month)
print_real(riga, imponibile, 85);
riga.put(rec.get(ID_CODIVA), 102);
print_real(riga, imposta, 107);
riga.put(rec.get_int(ID_NUMPRO) >= 999 ? "X" : "", 123);
const TRectype & mov = cache().get(LF_MOV, rec.get_long(MOV_NUMREG));
if (mov.full())
{
TDate datalim = mov.get_date(MOV_DATADOC);
const TDate datareg = mov.get_date(MOV_DATAREG);
if (!datalim.ok() || datalim > datareg)
datalim = datareg;
datalim.addyear();
riga.put(datalim <= _data_a ? "X" : "", 123);
}
if (_tipo_stampa == prova)
riga.put(format("%6ld", rec.get_long(MOV_NUMREG)), 125);
pr.print(riga);

4
src/li/li0200.cpp
View File

@ -14,7 +14,6 @@
#define CONFIG_DICINT "DICINT.ini"
class TLista_dichiarazioni : public TSkeleton_application
{
void elab(TSimpleAutomask& m);
@ -24,7 +23,8 @@ public:
void TLista_dichiarazioni::elab(TSimpleAutomask& m)
{
TProgram_report rep("li0200a");
TFilename repname(m.get(DLG_REPORT));
TProgram_report rep(repname);
TReport_book book;
rep.mask2report(m);

2
src/li/li0200a.rep
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<report libraries="" page_merge="" save_printer="" name="li0200a" use_printer_font="" orientation="2" page_split="" lpi="6" command="" class="">
<report libraries="" page_merge="" save_printer="" name="li0200a" use_printer_font="" orientation="2" page_split="" lpi="6" command="" class="li0200a">
<description>registro dichiarazioni d'intento</description>
<font face="Arial" size="8" />
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="" hidden="" page_break="" can_break="" pattern="1">

11
src/li/li0200a.uml
View File

@ -6,8 +6,6 @@ ENDPAGE
PAGE "Riepilogo dichiarazioni di intento" 0 2 0 0
NUMBER F_ANNO 4
BEGIN
PROMPT 1 2 "Anno : "
@ -44,6 +42,15 @@ BEGIN
GROUP 2
END
STRING DLG_REPORT 256 66
BEGIN
PROMPT 1 -2 "Report "
FLAGS "B"
RSELECT "li0200a"
CHECKTYPE REQUIRED
WARNING "Impossibile trovare un report compatibile"
END
ENDPAGE
ENDMASK

16
src/li/li0500.cpp
View File

@ -26,7 +26,7 @@ protected:
public:
TPrint_letint_mask();
virtual ~TPrint_letint_mask() {}
virtual ~TPrint_letint_mask() { }
};
TPrint_letint_mask::TPrint_letint_mask()
@ -181,7 +181,7 @@ protected:
virtual word last_printed_page() const { return _last_printed_page; }
public:
TLetint_report(int last_printed_page) : TProgram_report("li0500a") , _last_printed_page(last_printed_page) {}
TLetint_report(const TString & repname, int last_printed_page) : TProgram_report(repname) , _last_printed_page(last_printed_page) {}
~TLetint_report() {}
};
@ -256,12 +256,12 @@ bool TPrint_letint::create()
void TPrint_letint::main_loop()
{
TFilename path;
TPrint_letint_mask m;
while (m.run() == K_ENTER)
{
TReport_book book;
word last_page = 0;
const int anno = m.get_int(F_ANNO);
@ -272,17 +272,11 @@ void TPrint_letint::main_loop()
if (!_a_data.ok())
_a_data = TDate(31, 12, anno);
TLetint_report rep(last_page);
path = m.get(F_REPORT);
if (path.empty())
path = "li0500a";
TLetint_report rep(m.get(DLG_REPORT), last_page);
rep.mask2report(m);
rep.recordset()->set_var("#DADATA", TVariant(_da_data));
rep.recordset()->set_var("#ADATA", TVariant(_a_data));
book.add(rep);
book.print_or_preview();
}

2
src/li/li0500a.rep
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<report name="li0500a" orientation="2" lpi="6">
<report name="li0500a" orientation="2" lpi="6" class="li0500a">
<description>registro dichiarazioni d'intento</description>
<font face="Arial" size="8" />
<section type="Head" pattern="1">

14
src/li/li0500a.uml
View File

@ -18,23 +18,25 @@ END
DATE F_DAL
BEGIN
PROMPT 15 3 "Dal "
PROMPT 1 5 "Dal "
GROUP 1
END
DATE F_AL
BEGIN
PROMPT 47 3 "Al "
PROMPT 1 7 "Al "
GROUP 1
VALIDATE DATE_CMP_FUNC >= F_DAL
WARNING "Specificare una 'Data fine periodo' non inferiore alla 'Data inizio perodo'"
END
STRING F_REPORT 70 60
STRING DLG_REPORT 256 66
BEGIN
PROMPT 1 5 "Report "
RSELECT "li0500"
CHECKTYPE NORMAL
PROMPT 1 -2 "Report "
FLAGS "B"
RSELECT "li0500a"
CHECKTYPE REQUIRED
WARNING "Impossibile trovare un report compatibile"
END
ENDPAGE

1
src/ve/ve1100.cpp
View File

@ -2049,6 +2049,7 @@ bool TStampaDoc_application::create()
_interattivo = true;
}
xvt_vobj_show(TASK_WIN);
print_selected(K_ENTER);
return false;
}