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

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

Browse Source
This commit is contained in:
Alessandro Bonazzi 2019-11-10 13:44:36 +01:00
commit 94dd6e348f
10 changed files with 275 additions and 2 deletions

4
cd/test/ba0896.txt Normal file

@ -0,0 +1,4 @@
recdesc\f180.trr
recdesc\f180.dir
File per conai

35
cd/test/ba0896a.ini Normal file

@ -0,0 +1,35 @@
[Main]
Demo=0
[ba1]
Edit_4 = ba3 -0
Edit_5 = ba3 -0
Edit_6 = ba4 -1
File(248) = recdesc\f180.dir|X
File(249) = recdesc\f180.trr|X
Patch = 896
Versione = 21511200
[ba99]
Kill(0) = wxmsw240.dll|x
Kill(1) = batbsce.txt|x
Kill(2) = bastfsc.rep|x
Kill(3) = bastfsc.msk|x
Kill(4) = bastcms.msk|x
Kill(5) = bastcms.rep|x
Kill(6) = bastuue.rep|x
Kill(7) = bastuue.msk|x
[ba]
Data = 06-11-2019
Descrizione = Base
Dischi = 1
Moduli = sy
OEM =
Patch = 0896
PostProcess = bainst -0 BA
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/ba0896a1.zip Normal file

Binary file not shown.

4
cd/test/fp0896.txt Normal file

@ -0,0 +1,4 @@
fp0.exe
Corretta esportazione fatture per esteri: TAnagrafica non valorizza lo stato paiv per certi esteri (o tutti?!):
modificato programma per esportazione corretta esteri con idpaese e idcodice (cod fiscale) valorizzati, e senza tag codice fiscale

19
cd/test/fp0896a.ini Normal file

@ -0,0 +1,19 @@
[Main]
Demo=0
[fp0]
File(0) = fp0.exe|X
Patch = 0896
Versione = 21511200
[fp]
Data = 06-11-2019
Descrizione = Fattura Elettronica
Dischi = 1
Moduli = cg,ve
OEM =
Patch = 896
PostProcess =
PreProcess =
Versione = 21511200

BIN
cd/test/fp0896a1.zip Normal file

Binary file not shown.

38
cd/test/ve0896.txt Normal file

@ -0,0 +1,38 @@
ve0.exe
verig00.msk
verig.msk
verig02.msk
verig05.msk
verig02.ini
verig05.ini
verig01.msk
verig01.ini
verig04.msk
verig07.msk
verig04.ini
verig07.ini
verig03.msk
verig06.msk
verig03.ini
verig06.ini
verig09.msk
verig09.ini
verig08.msk
verig08.ini
ve6.exe
ve1.exe
ve2.exe
verig10.msk
verig10.ini
verig13.msk
verig23.ini
verig13.ini
verig11.msk
verig11.ini
verig15.msk
verig15.ini
verig14.msk
verig14.ini
verig23.msk
Gestione conai

168
cd/test/ve0896a.ini Normal file

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

BIN
cd/test/ve0896a1.zip Normal file

Binary file not shown.

9
src/fp/fplib01.cpp

@ -1548,9 +1548,14 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
}
else if(cliente.stato_partita_IVA() != "IT")
{
paf0400f.set("P4_FISCIVAPAESE", cliente.stato_partita_IVA());
const TString& stato_paiv = cliente.stato_partita_IVA();
paf0400f.set("P4_FISCIVAPAESE", stato_paiv.full() ? stato_paiv : cliente.stato_residenza_ISO());
paf0400f.set("P4_FISCIVACOD", cliente.codice_fiscale());
}
paf0400f.set("P4_CODFISC", cliente.codice_fiscale());
else
{
paf0400f.set("P4_CODFISC", cliente.codice_fiscale());
}
#else
paf0400f.set("P4_FISCIVAPAESE", "IT");
paf0400f.set("P4_FISCIVACOD", "00261170039");