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

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

Browse Source
This commit is contained in:
Alessandro Bonazzi 2022-09-08 01:04:26 +02:00
commit 18a34f0f78
24 changed files with 545 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,3 @@
cg4.exe
Nella stampa dei registri riepilogativi non stampava più i prgressivi dei registri

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

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

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

Binary file not shown.

3
cd/test/fp1186a.ini
View File

@ -6,6 +6,9 @@ File(0) = fp0.exe|X
Patch = 1186
Versione = 21511200
[fp99]
Kill(0) = fppro.msk|X
[fp]
Data = 26-07-2022
Descrizione = Fattura Elettronica

5
cd/test/fp1188.txt Normal file
View File

@ -0,0 +1,5 @@
fp0.exe
Nella videata "Magazzino" di ve0-0 (Documenti interattivi) aggiunti al campo "Collegamento documento P.A." due nuovi valori: "Ricezione" e "Fatt.Coll."
Modificato leggermente il programma di fatturazione in relazione a questa aggiunta

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

@ -0,0 +1,22 @@
[Main]
Demo=0
[fp0]
File(0) = fp0.exe|X
Patch = 1188
Versione = 21511200
[fp99]
Kill(0) = fppro.msk|x
[fp]
Data = 02-09-2022
Descrizione = Fattura Elettronica
Dischi = 1
Moduli = cg,ve
OEM =
Patch = 1188
PostProcess =
PreProcess =
Versione = 21511200

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

Binary file not shown.

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

@ -0,0 +1,3 @@
lv2.exe
Corretto un bug che faceva crashare il programma di Fatturazione di prova

21
cd/test/lv1188a.ini Normal file
View File

@ -0,0 +1,21 @@
[Main]
Demo=0
[lv2]
File(121) = lv2.exe|X
Patch = 1188
Versione = 21511200
[lv]
Data = 25-08-2022
Descrizione = Gestione lavanderie
Dischi = 1
Moduli = ve,mg
OEM = 2
Patch = 1188
PostProcess = bainst -0 LV
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

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

Binary file not shown.

9
cd/test/sy1188.txt Normal file
View File

@ -0,0 +1,9 @@
ba1.exe
xi.dll
xvaga.dll
xvtdb.dll
Le cache di file si aggiornano meglio, abbiamo aggiornato la data di modifica dei file ad ogni srittura cion la nuova funzione xvt_fsys_set_file_time in xvaga.
le relapp per default aggiornano le cache di file
La compattazione di tutti i file non mostrava più la scelta ditta

27
cd/test/sy1188a.ini Normal file
View File

@ -0,0 +1,27 @@
[Main]
Demo=0
[sy1]
File(12) = ba1.exe|X
File(55) = xi.dll|X
File(56) = xvaga.dll|X
File(57) = xvtdb.dll|X
Patch = 1188
Versione = 21511200
[sy99]
Kill(0) = setup\teamviewerqs_it.exe|x
[sy]
Data = 18-06-2022
Descrizione = Sistema
Dischi = 1
Moduli =
OEM =
Patch = 1188
PostProcess =
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

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

Binary file not shown.

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

@ -0,0 +1,4 @@
ve0.exe
ve6.exe
Le fatture di acquisto con reverse charge parziale non venivano contabilizzate bene

138
cd/test/ve1186a.ini Normal file
View File

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

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

Binary file not shown.

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

@ -0,0 +1,6 @@
fatturac.ini
fatturac.msk
ve0300a.ini
Nella videata "Magazzino" di ve0-0 (Documenti interattivi) aggiunti al campo "Collegamento documento P.A." due nuovi valori: "Ricezione" e "Fatt.Coll."
Modificato leggermente il programma di fatturazione in relazione a questa aggiunta

135
cd/test/ve1188a.ini Normal file
View File

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

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

Binary file not shown.

2
src/fp/fp0300.cpp
View File

@ -480,7 +480,7 @@ void TPA_mask::export_paf()
ndocs++;
else
{
if (!yesno_box("L'ultima fattura non è stata esportata, continuare?"))
if (!yesno_box("L'ultima fattura non e' stata esportata, continuare?"))
break;
}
}

104
src/fp/fplib01.cpp
View File

@ -207,7 +207,7 @@ TString_array & get_paf_names()
if (__paf_names.items() == 0)
{
const char * names[] = { "PAF0100F", "PAF0200F", "PAF0400F", "PAF0700F", "PAF0800F", "PAF0900F", "PAF1000F", "PAF1100F", "PAF1200F",
const char * names[] = { "PAF0100F", "PAF0200F", "PAF0400F", "PAF0700F", "PAF0800F", "PAF0900F", "PAF1000F", "PAF1100F", "PAF1200F", "PAF1300F",
"PAF1400F", "PAF1600F", "PAF1700F", "PAF1800F", "PAF1900F", "PAF2000F", "PAF2100F", "PAF2200F",
"PAF2400F", "PAF2500F", "PAF2600F", "PAF2700F", "PAF3000F", "PAF3200F", "PAF3400F", "PAF3400F",
"PAFW300F", nullptr };
@ -801,6 +801,8 @@ const char* TPaf_container::paf_to_prefix(const char * paf)
return "PA";
if (paf_name == "PAF1200F")
return "PB";
if (paf_name == "PAF1300F")
return "PC";
if (paf_name == "PAF1400F")
return "PD";
if (paf_name == "PAF1600F")
@ -854,12 +856,14 @@ TPaf_container::TPaf_container()
_pafs.insert(std::pair<const char *, TPaf_record>("PAF0800F", TPaf_record("PAF0800F")));
// Sconto in fattura
_pafs.insert(std::pair<const char *, TPaf_record>("PAF0900F", TPaf_record("PAF0900F")));
// Contratti
_pafs.insert(std::pair<const char *, TPaf_record>("PAF1000F", TPaf_record("PAF1000F")));
// Convenzioni
_pafs.insert(std::pair<const char *, TPaf_record>("PAF1100F", TPaf_record("PAF1100F")));
// Ordini
_pafs.insert(std::pair<const char *, TPaf_record>("PAF1000F", TPaf_record("PAF1000F")));
// Contratti
_pafs.insert(std::pair<const char *, TPaf_record>("PAF1100F", TPaf_record("PAF1100F")));
// Convenzioni
_pafs.insert(std::pair<const char *, TPaf_record>("PAF1200F", TPaf_record("PAF1200F")));
// Ricezioni
_pafs.insert(std::pair<const char *, TPaf_record>("PAF1300F", TPaf_record("PAF1300F")));
// DatiFattureCollegate
_pafs.insert(std::pair<const char *, TPaf_record>("PAF1400F", TPaf_record("PAF1400F")));
// DDT Testata
@ -2002,12 +2006,12 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
// <DatiOrdineAcquisto>
if ((doc.is_nota_credito() || get_send_all_rifs()) && doc.get(DOC_NUMDOCRIF).full())
{
TPaf_record& paf1400f = _paf_container.get_paf("PAF1400F");
TPaf_record& paf1000f = _paf_container.get_paf("PAF1000F");
reset(paf1400f);
paf1400f.set("PD_IDDOC", doc.get(DOC_NUMDOCRIF));
paf1400f.set("PD_DATADOC", doc.get_date(DOC_DATADOCRIF));
ok &= insert(paf1400f);
reset(paf1000f);
paf1000f.set("P0_IDDOC", doc.get(DOC_NUMDOCRIF));
paf1000f.set("P0_DATADOC", doc.get_date(DOC_DATADOCRIF));
ok &= insert(paf1000f);
}
// </DatiOrdineAcquisto>
// </DatiGenerali>
@ -2043,15 +2047,23 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
// SEMPRE
// Azzera contratti
// Azzera ordini
TPaf_record& paf1000f = _paf_container.get_paf("PAF1000F");
paf1000f.set("P0_RIFNUMLINEA", 0L);
// Azzera convenzioni
// Azzera contratti
TPaf_record& paf1100f = _paf_container.get_paf("PAF1100F");
paf1100f.set("PA_RIFNUMLINEA", 0L);
// Azzera ordini
// Azzera convenzioni
TPaf_record& paf1200f = _paf_container.get_paf("PAF1200F");
paf1200f.set("PB_RIFNUMLINEA", 0L);
// Azzera Ricezione
TPaf_record& paf1300f = _paf_container.get_paf("PAF1300F");
paf1300f.set("PC_RIFNUMLINEA", 0L);
// Azzera Fatture Collegate
TPaf_record& paf1400f = _paf_container.get_paf("PAF1400F");
paf1400f.set("PD_RIFNUMLINEA", 0L);
TString80 con = doc.get(DOC_CONTRATTO);
if (con.full() || cup.full() || cig.full())
{
@ -2069,6 +2081,7 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
if (con.blank())
con = cup;
}
if (tcon == 'O')
{
paf1000f.set("P0_RIFNUMLINEA", 0L);
@ -2077,33 +2090,50 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
paf1000f.set("P0_COMMESSACONV", com);
paf1000f.set("P0_CODCUP", cup);
paf1000f.set("P0_CODCIG", cig);
paf1000f.set("P0_GESTIONE", stato_paf());
ok &= insert(paf1000f);
}
else
if (tcon == 'C')
{
paf1100f.set("PA_RIFNUMLINEA", 0L);
paf1100f.set("PA_IDDOC", con);
paf1100f.set("PA_DATADOCU", datadoc);
paf1100f.set("PA_COMMCONVENZ", com);
paf1100f.set("PA_CODCUP", cup);
paf1100f.set("PA_CODCIG", cig);
paf1100f.set("PA_GESTIONE", stato_paf());
ok &= insert(paf1100f);
}
else
{
paf1200f.set("PB_RIFNUMLINEA", 0L);
paf1200f.set("PB_IDDOC", con);
paf1200f.set("PB_DATADOCO", datadoc);
paf1200f.set("PB_COMMCONVENZ", com);
paf1200f.set("PB_CODCUP", cup);
paf1200f.set("PB_CODCIG", cig);
paf1200f.set("PB_GESTIONE", stato_paf());
ok &= insert(paf1200f);
}
else if (tcon == 'C')
{
paf1100f.set("PA_RIFNUMLINEA", 0L);
paf1100f.set("PA_IDDOC", con);
paf1100f.set("PA_DATADOC", datadoc);
paf1100f.set("PA_COMMCONVENZ", com);
paf1100f.set("PA_CODCUP", cup);
paf1100f.set("PA_CODCIG", cig);
ok &= insert(paf1100f);
}
else if(tcon == 'V')
{
paf1200f.set("PB_RIFNUMLINEA", 0L);
paf1200f.set("PB_IDDOC", con);
paf1200f.set("PB_DATADOC", datadoc);
paf1200f.set("PB_COMMCONVENZ", com);
paf1200f.set("PB_CODCUP", cup);
paf1200f.set("PB_CODCIG", cig);
ok &= insert(paf1200f);
}
else if (tcon == 'R')
{
paf1300f.set("PC_RIFNUMLINEA", 0L);
paf1300f.set("PC_IDDOC", con);
paf1300f.set("PC_DATADOC", datadoc);
paf1300f.set("PC_COMMCONVENZ", com);
paf1300f.set("PC_CODCUP", cup);
paf1300f.set("PC_CODCIG", cig);
ok &= insert(paf1300f);
}
else if (tcon == 'F')
{
paf1400f.set("PD_RIFNUMLINEA", 0L);
paf1400f.set("PD_IDDOC", con);
paf1400f.set("PD_DATADOC", datadoc);
paf1400f.set("PD_COMMCONVENZ", com);
paf1400f.set("PD_CODCUP", cup);
paf1400f.set("PD_CODCIG", cig);
ok &= insert(paf1400f);
}
}
if (_is_pa && cup.blank() && cig.blank())
_log.log(1, "CIG e CUP assenti");
// <DatiBeniServizi>

2
src/lv/lv2500.cpp
View File

@ -2293,7 +2293,7 @@ void TFatturazione_lav_app::main_loop()
for (bool ok = recset.move_first(); ok && pi->add_status(); ok = recset.move_next())
{
TDocumento & doc =(TDocumento &) recset.cursor()->curr();
const TCli_for &cli = doc.clifor();
const TCli_for cli = doc.clifor();
const long codcli = cli.codice();
//preparo la chiave e recupero da CFVEN i dati di quel cliente

2
src/ve/fatturac.src
View File

@ -11,7 +11,7 @@ CALCOLI=*
TOTPROVV =
// modifica
// Indica se il documento è indirizzato ad un cliente o ad un fornitore
TIPOCF=C
TIPOCF=C
//modulo di riferimento
MODULE=ve

2
src/ve/ve0300a.src
View File

@ -1971,7 +1971,7 @@ Y=3
MSKID=F_PATIPOCON
PROMPT="Collegamento documento P.A. "
FIELDNAME=MODPAG
ITEMS=C|Contratto@V|Convenzione@O|Ordine
ITEMS=C|Contratto@V|Convenzione@O|Ordine@R|Ricezione@F|Fatt. Coll.
HELP=Inserire un tipo contratto/convenzione/ordine
SPECIAL=MO PA