cg6900.cpp Invio movimenti provvisori solo se e' il caso

cg6900.h      Aggiunto flag spedizione provvisori
cgtrcpc.ini   Aggiunto campo PROVVIS


git-svn-id: svn://10.65.10.50/trunk@4935 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1997-07-28 07:29:34 +00:00
parent 31a7594004
commit 04d3381aaa
3 changed files with 29 additions and 10 deletions

View File

@ -754,6 +754,8 @@ bool TInv_cont::tabella_ditta()
if (ind.get_bool("B5") && (_part->items() != 0) )
_files << "B";
_flag_provvis = ind.get_bool("B6");
_flag_bollato = ind.get_bool("B7");
// Compila l'array contenente le causali di corrispondenza per l'invio extracontabile
@ -1479,7 +1481,7 @@ void TInv_cont::scrivi_righePN(long numreg)
void TInv_cont::movPN2tempfile(TString& key, TMask& m)
{
int size = 1024;
int size = 1024;
_tras_file.open(_header);
@ -1501,13 +1503,21 @@ void TInv_cont::movPN2tempfile(TString& key, TMask& m)
for(; !_mov->eof(); _mov->next())
{
_prog->addstatus(1);
long nreg = _mov->get_long(MOV_NUMREG);
if ( _mov->get_bool(MOV_INVIATO) )
continue;
if (_mov->get_char(MOV_PROVVIS) > ' ')
{
if (_scelta == 'S' || !_flag_provvis)
continue;
}
TDate datareg (_mov->get_date(MOV_DATAREG));
if (datareg > _datalimsk )
continue;
if ( _mov->get_bool(MOV_INVIATO) || datareg > _datalimsk ) continue;
const long nreg = _mov->get_long(MOV_NUMREG);
_tmov->curr() = _mov->curr();
if (_tmov->read() == NOERR)
@ -1610,6 +1620,7 @@ void TInv_cont::movIVA2tempfile(TString& key, TMask& m)
TString ocfpi;
TDate datareg;
bool inviva;
bool provvis;
int size = 1024;
_tras_file.open(_header);
@ -1636,7 +1647,7 @@ void TInv_cont::movIVA2tempfile(TString& key, TMask& m)
{
_prog->addstatus(1);
long nreg = _rmoviva->get_long(RMI_NUMREG);
const long nreg = _rmoviva->get_long(RMI_NUMREG);
if (nreg != nreg_p)
{
@ -1648,12 +1659,19 @@ void TInv_cont::movIVA2tempfile(TString& key, TMask& m)
datareg = _mov->get_date(MOV_DATAREG);
inviva = _mov->get_bool(MOV_INVIVA);
ocfpi = _mov->get (MOV_OCFPI);
provvis = _mov->get_char(MOV_PROVVIS) > ' ';
}
}
else
inviva = FALSE;
// Controlla data limite invio
if ( inviva || datareg > _datalimsk )
continue;
if ( inviva || datareg > _datalimsk ) continue;
// Controlla se deve inviare i movimenti provvisori
if (provvis && (_scelta == 'S' || !_flag_provvis))
continue;
if (ocfpi.not_empty())
occasionali(ocfpi);

View File

@ -79,7 +79,7 @@ class TInv_cont : public TApplication
TString _control_rec, _header, _trasf, _std, _stato, _marker, _nome_simbolico;
TString _files, _codcaus, _numdoc, _reg, _codpag, _tipodoc, _codcausm, _sigle,_cpg_nc;
TString _ocfpi, _ragsococc, _indocc, _capocc, _localocc, _provocc, _codvali, _codval;
bool _esiste_ditta, _esiste_record, _inviato, _flag_bollato;
bool _esiste_ditta, _esiste_record, _inviato, _flag_provvis, _flag_bollato;
long _ditta, _protiva, _uprotiva, _codcf, _numrec, _tot_rec;
long _dim_tot, _dim_disk,_dittaAS;
long _numrec_cau,_numrec_clifo,_numrec_pcon,_numrec_pn,_numrec_iva,_numrec_sc;

View File

@ -165,8 +165,9 @@ Z1|28|400|403|18|COM|4||
Z1|29|454|458|18|CAP|4||
Z1|30|459|466|18|DNASC|4||
Z1|31|467|469|18|STATONASC|4||
Z1|32|470|473|18|COMNASC|4||
Z1|33|524|524|23|PROVVIS|||
Z1|32|470|473|18|COMNASC|4||
Z1|33|474|523|18||||
Z1|34|524|524|23|PROVVIS|||
Z2|1|3|9|24|NUMREG|||
Z2|2|10|12|24|NUMRIG|||
Z2|3|61|61|24|SEZIONE|||