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:
Simone Palacino 2019-03-18 14:38:01 +01:00
commit ee493c3790
24 changed files with 285 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cd/test/cg0728.txt
View File

@ -1,4 +1,4 @@
cg5100a.msk
cg5200a.msk
cg5.exe
cg5300a.msk
Aggiunta maschere mancanti
Modifica prorata

140
cd/test/cg0728a.ini
View File

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

BIN
cd/test/cg0728a1.zip
View File

Binary file not shown.

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

@ -0,0 +1,9 @@
cg3.exe
cg4.exe
#25 Errore stampa mastrini con flag di competenza IVA
Corretta stampa e visualizzazione mastrini per competenza IVA
Ripristinata stampa componenti pro-rata.
Non ho rimesso i totali perchè ci sono già numeratore e denominatore

95
cd/test/cg0730a.ini Normal file
View File

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

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

Binary file not shown.

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

@ -0,0 +1,4 @@
fp0.exe
fp0100a.msk
Aggiunta possibilità di togliere sconto in righe documenti

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

@ -0,0 +1,20 @@
[Main]
Demo=0
[fp1]
File(0) = fp0.exe|X
File(1) = fp0100a.msk|X
Patch = 0732
Versione = 21511200
[fp]
Data = 15-03-2019
Descrizione = Fattura Elettronica
Dischi = 1
Moduli = cg,ve
OEM =
Patch = 732
PostProcess =
PreProcess =
Versione = 21511200

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

Binary file not shown.

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

@ -0,0 +1,3 @@
fp0.exe
Corretta lettura campi custom, si è presentato un errore con la nuova gestione "nascondi sconti in fattura", veniva letto sempre il campo di default e non passava per la funzione prezzo()

19
cd/test/fp0734a.ini Normal file
View File

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

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

Binary file not shown.

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

@ -0,0 +1,3 @@
xvtdb.dll
Aggiunta funzioni libreria DB

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

@ -0,0 +1,21 @@
[Main]
Demo=0
[sy1]
File(54) = xvtdb.dll|X
Patch = 732
Versione = 21511200
[sy]
Data = 15-03-2019
Descrizione = Sistema
Dischi = 1
Moduli =
OEM =
Patch = 732
PostProcess =
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

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

Binary file not shown.

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

@ -0,0 +1,3 @@
tf0.exe
Tolto controllo flag durante il salvataggio dei records

19
cd/test/tf0734a.ini Normal file
View File

@ -0,0 +1,19 @@
[Main]
Demo=0
[tf1]
File(0) = tf0.exe|X
Patch = 0734
Versione = 21511200
[tf]
Data = 18-03-2019
Descrizione = Trasferimento fatture
Dischi = 1
Moduli = cg
OEM =
Patch = 734
PostProcess =
PreProcess =
Versione = 21511200

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

Binary file not shown.

16
src/cg/cg3200.cpp
View File

@ -573,6 +573,9 @@ bool TMastrini_application::almeno_un_record()
rmov.put(RMV_CONTO, _conto);
rmov.put(RMV_SOTTOCONTO, _sottoc);
TCursor cur(&rel, "", 2, &rmov, &rmov);
TDate fine = _data_fine;
if (_data_liq_iva)
fine.addmonth();
const long items = cur.items();
cur.freeze();
for (cur = 0L; cur.pos() < items; ++cur)
@ -580,7 +583,7 @@ bool TMastrini_application::almeno_un_record()
const int annoes = rmov.get_int (RMV_ANNOES);
const TString4 provvis (mov.get(MOV_PROVVIS));
const TDate datareg = get_filter_date(mov, rmov);
if ( ((annoes==_annomsk) || (_annomsk==0)) && ((datareg>=_data_ini) && (datareg<=_data_fine)) && (_stampa_mov_prov || provvis.blank()))
if ( ((annoes==_annomsk) || (_annomsk==0)) && ((datareg>=_data_ini) && (datareg<=fine)) && (_stampa_mov_prov || provvis.blank()))
{
trovato = true;
break;
@ -1436,16 +1439,7 @@ bool TMastrini_application::preprocess_page(int file, int counter)
{
_sezione = rmov.get(RMV_SEZIONE);
_datareg = get_filter_date(mov, rmov.curr());
if (_data_liq_iva)
_datareg_stampa = _datareg;
else
{
if (_annomsk == 0)
_datareg_stampa = _datareg;
else
_datareg_stampa = mov.get(MOV_DATAREG);
}
_datareg_stampa = mov.get(MOV_DATAREG);
const TString4 provvis = mov.get(MOV_PROVVIS);

4
src/cg/cg3600.cpp
View File

@ -506,9 +506,11 @@ void TMastrino::read(const TBill& conto,
continue;
}
const TDate data = TDate(rmov_datareg);
TRiga_mastrino* r = new TRiga_mastrino(riga_mastrino,
rmov().recno(), mov().recno(),
_pdare_per, _pavere_per, data_corrente);
_pdare_per, _pavere_per, data);
_riga.append(r);
}
}

6
src/fp/fplib.h
View File

@ -325,9 +325,9 @@ public:
static void save_sheet(TSheet_field& sheet_field);
static void load_sheet(TSheet_field& sheet_field);
const TString get_qta(const TString& codriga, const TString& tipodoc) { return get(codriga, tipodoc)._col_qta; }
const TString get_prezzo(const TString& codriga, const TString& tipodoc) { return get(codriga, tipodoc)._col_prezzo; }
const TString get_imponibile(const TString& codriga, const TString& tipodoc) { return get(codriga, tipodoc)._col_imponibile; }
const TString& get_qta(const TString& codriga, const TString& tipodoc) { return get(codriga, tipodoc)._col_qta; }
const TString& get_prezzo(const TString& codriga, const TString& tipodoc) { return get(codriga, tipodoc)._col_prezzo; }
const TString& get_imponibile(const TString& codriga, const TString& tipodoc) { return get(codriga, tipodoc)._col_imponibile; }
TFP_righe_custom();
};

8
src/fp/fplib01.cpp
View File

@ -1168,11 +1168,11 @@ void TDoc_fp::set_qta_prezzo(TPaf_record& paf1800f, TRiga_documento* rdoc) const
static TFP_righe_custom righe_custom;
const TString field_qta = righe_custom.get_qta(rdoc->tipo().codice(), rdoc->doc().tipo().codice());
const TString field_prezzo = righe_custom.get_prezzo(rdoc->tipo().codice(), rdoc->doc().tipo().codice());
const TString field_imponibile = righe_custom.get_imponibile(rdoc->tipo().codice(), rdoc->doc().tipo().codice());
const TString& field_qta = righe_custom.get_qta(rdoc->tipo().codice(), rdoc->doc().tipo().codice());
const TString& field_prezzo = righe_custom.get_prezzo(rdoc->tipo().codice(), rdoc->doc().tipo().codice());
const TString& field_imponibile = righe_custom.get_imponibile(rdoc->tipo().codice(), rdoc->doc().tipo().codice());
const bool custom_prezzo = field_prezzo != RDOC_PREZZO;
const bool custom_prezzo = field_prezzo.full();
real qta = rdoc->get_real(field_qta);
// Prendendo la stringa non ho problemi in scrittura della query, a volte accadono cose stupide

3
src/fp/fplib02.cpp
View File

@ -281,9 +281,6 @@ TFP_righe_custom::TCustCol& TFP_righe_custom::get_no_custom()
if(default_cust_col == nullptr)
{
default_cust_col = new TCustCol();
default_cust_col->_col_qta = FP_SHT_DEF_QTA;
default_cust_col->_col_prezzo = FP_SHT_DEF_PREZZO;
default_cust_col->_col_imponibile = FP_SHT_DEF_IMPONIBILE;
}
return *default_cust_col;
}

2
src/tf/tf0101.cpp
View File

@ -432,7 +432,7 @@ bool TTrFa_mask::save_all() const
return false;
}
// Salvo il valore di invio se è stato modificato
else if(strcmp(strarr->get(_invio), FLAG_INVIO) != 0)
else
{
TRectype rmov = cache().get(LF_MOV, strarr->get(_numero));
rmov.put("TFINVIO", strarr->get(_invio));