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

Patch level :10.0 4.0 868

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :modifiche per sistemare il problema indetraibilita' (fase 1)


git-svn-id: svn://10.65.10.50/trunk@16053 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2008-01-29 16:28:49 +00:00
parent 56f99c8481
commit e9ba5e7179
4 changed files with 55 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ve/bolacq.src
View File

@ -176,11 +176,12 @@ Col(12)=FR_PERCPROV
Col(13)=FR_IMPFISUN
Col(14)=FR_IMPFISSO
Col(15)=FR_CODIVA
Col(16)=FR_ADDIVA
Col(17)=FR_CAUS
Col(18)=FR_CODMAGC
Col(19)=FR_CODDEPC
Col(20)=FR_TIPORIGA
Col(16)=FR_TIPODET
Col(17)=FR_ADDIVA
Col(18)=FR_CAUS
Col(19)=FR_CODMAGC
Col(20)=FR_CODDEPC
Col(21)=FR_TIPORIGA
[RIGHE]

11
ve/fatacq.src
View File

@ -136,11 +136,12 @@ Col(12) = FR_PERCPROV
Col(13) = FR_IMPFISUN
Col(14) = FR_IMPFISSO
Col(15) = FR_CODIVA
Col(16) = FR_ADDIVA
Col(17) = FR_CAUS
Col(18) = FR_CODMAGC
Col(19) = FR_CODDEPC
Col(20)=FR_TIPORIGA
Col(16) = FR_TIPODET
Col(17) = FR_ADDIVA
Col(18) = FR_CAUS
Col(19) = FR_CODMAGC
Col(20) = FR_CODDEPC
Col(21)=FR_TIPORIGA
[RIGHE]

15
ve/ordinef.src
View File

@ -176,13 +176,14 @@ Col(15) = FR_PERCPROV
Col(16) = FR_IMPFISUN
Col(17) = FR_IMPFISSO
Col(18) = FR_CODIVA
Col(19) = FR_ADDIVA
Col(20) = FR_CAUS
Col(21) = FR_CODMAGC
Col(22) = FR_CODDEPC
Col(23) = FR_CODCMS
Col(24) = FR_FASCMS
Col(25) = FR_TIPORIGA
Col(19) = FR_TIPODET
Col(20) = FR_ADDIVA
Col(21) = FR_CAUS
Col(22) = FR_CODMAGC
Col(23) = FR_CODDEPC
Col(24) = FR_CODCMS
Col(25) = FR_FASCMS
Col(26) = FR_TIPORIGA
[DEFAULT]

65
ve/velib02.cpp
View File

@ -941,7 +941,7 @@ void TRiga_documento::autosave(TSheet_field& f)
const int prezzo_id = f.cid2index(FR_PREZZO);
real prezzo(row.get(prezzo_id));
const TString8 codiva(row.get(f.cid2index(FR_CODIVA)));
const TString4 codiva(row.get(f.cid2index(FR_CODIVA)));
if (doc().tipo().calcolo_lordo())
{
put(RDOC_PREZZOL, prezzo);
@ -992,40 +992,45 @@ void TRiga_documento::autosave(TSheet_field& f)
break;
fldref->write(fld.get(), *this);
}
TString codcms = get(RDOC_CODCMS); //dalla rigadoc
if (codcms.blank()) //se non la trova cerca nella maschera di testata
if (m.field(FR_TIPODET).shown()) //solo se attivo il campo di indetraibilita'...
{
TDocumento_mask& doc_mask = (TDocumento_mask&)f.mask();
const short cms_start = doc_mask.cms_start();
const short cms_end = doc_mask.cms_end();
codcms.cut(0);
for (short j = cms_start; j <= cms_end; j++)
const int tipodet = row.get_int( f.cid2index(FR_TIPODET));
put( RDOC_TIPODET, tipodet );
if (tipodet != 9)
{
const TEdit_field& fld = doc_mask.efield(j);
TString80 str = fld.get();
str.rpad(fld.size());
codcms << str;
}
codcms.rtrim();
}
if (codcms.full())
{
const TRectype& rec_cms = cache().get(LF_COMMESSE, codcms);
const TString& regiva = rec_cms.get(COMMESSE_REGIVA);
TString codcms = get(RDOC_CODCMS); //dalla rigadoc
if (codcms.blank()) //se non la trova cerca nella maschera di testata
{
TDocumento_mask& doc_mask = (TDocumento_mask&)f.mask();
const short cms_start = doc_mask.cms_start();
const short cms_end = doc_mask.cms_end();
codcms.cut(0);
for (short j = cms_start; j <= cms_end; j++)
{
const TEdit_field& fld = doc_mask.efield(j);
TString80 str = fld.get();
str.rpad(fld.size());
codcms << str;
}
codcms.rtrim();
}
if (codcms.full() && codiva.full())
{
const TRectype& rec_cms = cache().get(LF_COMMESSE, codcms);
const TString& regiva = rec_cms.get(COMMESSE_REGIVA);
if (regiva.full())
{
put( RDOC_TIPODET, 9 );
row.add(f.cid2index(FR_TIPODET), 9);
m.set(FR_TIPODET, 9);
}
else
put( RDOC_TIPODET, row.get( f.cid2index(FR_TIPODET)) );
}
if (regiva.full())
{
put( RDOC_TIPODET, 9 );
row.add(9, f.cid2index(FR_TIPODET));
}
}
} //if(tipodet!=9)
} //if(m.field(...
put( RDOC_CODAGG1, row.get( f.cid2index(FR_CODAGG1)) );
put( RDOC_CODAGG2, row.get( f.cid2index(FR_CODAGG2)) );
put( RDOC_CODAGG1, row.get(f.cid2index(FR_CODAGG1)) );
put( RDOC_CODAGG2, row.get(f.cid2index(FR_CODAGG2)) );
for (short jid = FR_JOLLY1; jid <= FR_JOLLY10; jid++)
{