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

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

Browse Source
This commit is contained in:
smen 2023-02-28 11:35:42 +01:00
commit b097371d5f
13 changed files with 292 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cd/test/cg1245.txt Normal file
View File

@ -0,0 +1,11 @@
cg4.exe
cg5.exe
cg5500d.msk
cg5500c.msk
Ricorretta ventilazione dei corrispettivi
Considerato anche il credito utilizzato iva durante l'anno nell'annuale
Interno :
Bisogna provare qualche liquidazione con utilizzo del credito iva

105
cd/test/cg1245a.ini Normal file
View File

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

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

Binary file not shown.

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

@ -0,0 +1,6 @@
ve0.exe
vetbtip.msk
ve5.exe
ve6.exe
Aggiunto un flag sui tipi documenti per caricare opozionalmente le date di riferimento periodo di fatturazione

148
cd/test/ve1246a.ini Normal file
View File

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

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

Binary file not shown.

2
src/cg/cg4303.cpp
View File

@ -162,7 +162,7 @@ void TLiquidazione_app::recalc_ventilation(int month, const char* codatt)
if (tipocr == 1 && (mese == m) && att == curr_att) if (tipocr == 1 && (mese == m) && att == curr_att)
{ {
if (!civa.iva_da_ventilare()) if (tipoiva != "NS" && tipoiva != "NI" && tipoiva != "ES")
{ {
real lurd = _pim->get_real("R0"); real lurd = _pim->get_real("R0");
lurd += _pim->get_real("R1"); lurd += _pim->get_real("R1");

1
src/ve/velib.h
View File

@ -379,6 +379,7 @@ public:
bool auto_add() const { return get_bool("B11"); } bool auto_add() const { return get_bool("B11"); }
bool invio_xml() const { return get_bool("B13"); } bool invio_xml() const { return get_bool("B13"); }
bool esponi_dicitura_fe() const { return !get_bool("B14"); } bool esponi_dicitura_fe() const { return !get_bool("B14"); }
bool rif_fatt_automatici() const { return get("S14").left(1).full(); }
const TString& stringa_descrizione_documento() const { return _str_desc_doc; } const TString& stringa_descrizione_documento() const { return _str_desc_doc; }
const TString& stringa_descrizione_riga() const { return _str_desc_rdoc; } const TString& stringa_descrizione_riga() const { return _str_desc_rdoc; }

7
src/ve/velib04a.cpp
View File

@ -657,8 +657,11 @@ bool TFatturazione_bolle::elabora(TLista_documenti& doc_in, TLista_documenti& do
TDocumento& d = doc_out[i]; TDocumento& d = doc_out[i];
d.update_esenzione(); d.update_esenzione();
d.put(DOC_DATAINIRIF, inirif); if (d.tipo().rif_fatt_automatici())
d.put(DOC_DATAFINRIF, finrif); {
d.put(DOC_DATAINIRIF, inirif);
d.put(DOC_DATAFINRIF, finrif);
}
} }
return doc_out.items() > 0; return doc_out.items() > 0;
} }

11
src/ve/velib04d.cpp
View File

@ -904,10 +904,13 @@ bool TConsegna_ordini::elabora(TLista_documenti& doc_in, TLista_documenti& doc_o
TDocumento& d = doc_out[i]; TDocumento& d = doc_out[i];
d.update_esenzione(); d.update_esenzione();
if (!d.get_date(DOC_DATAINIRIF).ok() || d.get_date(DOC_DATAINIRIF) > inirif) if (d.tipo().rif_fatt_automatici())
d.put(DOC_DATAINIRIF, inirif); {
if (!d.get_date(DOC_DATAFINRIF).ok() || d.get_date(DOC_DATAFINRIF) > inirif) if (!d.get_date(DOC_DATAINIRIF).ok() || d.get_date(DOC_DATAINIRIF) > inirif)
d.put(DOC_DATAFINRIF, finrif); d.put(DOC_DATAINIRIF, inirif);
if (!d.get_date(DOC_DATAFINRIF).ok() || d.get_date(DOC_DATAFINRIF) > inirif)
d.put(DOC_DATAFINRIF, finrif);
}
} }
} }
} }

2
src/ve/velib06a.cpp
View File

@ -482,7 +482,7 @@ bool data_hndl( TMask_field& field, KEY key )
if (!datadoc.ok()) if (!datadoc.ok())
return field.error_box("La data documento deve essere comunque indicata."); return field.error_box("La data documento deve essere comunque indicata.");
if (m.id2pos(F_DATAINIRIF) > 0 && m.id2pos(F_DATAFINRIF) > 0) if (m.doc().tipo().rif_fatt_automatici() && m.id2pos(F_DATAINIRIF) > 0 && m.id2pos(F_DATAFINRIF) > 0)
{ {
const TDate inirif = m.get_date(F_DATAINIRIF); const TDate inirif = m.get_date(F_DATAINIRIF);
const TDate finrif = m.get_date(F_DATAFINRIF); const TDate finrif = m.get_date(F_DATAFINRIF);

1
src/ve/vetbtip.h
View File

@ -49,6 +49,7 @@
#define F_DESCELABD 159 #define F_DESCELABD 159
#define F_CODELABK 160 #define F_CODELABK 160
#define F_DESCELABK 161 #define F_DESCELABK 161
#define F_RIFFATTAUTO 162
#define F_STATOI_MOD_1 201 #define F_STATOI_MOD_1 201
#define F_STATOI_MOD_2 202 #define F_STATOI_MOD_2 202

7
src/ve/vetbtip.uml
View File

@ -386,6 +386,12 @@ BEGIN
FIELD B12 FIELD B12
END END
BOOLEAN F_RIFFATTAUTO
BEGIN
PROMPT 2 20 "Date di riferimanto fattura automatiche"
FIELD S14[1,1]
END
ENDPAGE ENDPAGE
PAGE "Stati validi" 0 2 0 0 PAGE "Stati validi" 0 2 0 0
@ -1240,7 +1246,6 @@ END
ENDPAGE ENDPAGE
PAGE "Cod.IVA / Configurazioni" 0 2 0 0 PAGE "Cod.IVA / Configurazioni" 0 2 0 0
GROUPBOX DLG_NULL 32 7 GROUPBOX DLG_NULL 32 7