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

Patch level : 12.0 400

Browse Source 
Files correlati     : ve6.exe ve6300a.msk

Aggiunto l'ordinamento per cliente nella generazione effetti.

git-svn-id: svn://10.65.10.50/branches/R_10_00@23837 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
bonazzi 2017-05-24 16:39:05 +00:00
parent 05c898c9a6
commit 6c2ea8f3e8
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ve/ve6300.cpp
View File

@ -515,19 +515,31 @@ void TGenerazioneEffetti_app::generate()
else else
if (sort_by_cli) if (sort_by_cli)
{ {
cursor_key = 4; cursor_key = 2;
const long codcfini = _msk->get_long(F_CODCF_INI);
const long codcffin = _msk->get_long(F_CODCF_FIN);
const TDate dataini = _msk->get_date(F_DATA_INI); const TDate dataini = _msk->get_date(F_DATA_INI);
const TDate datafin = _msk->get_date(F_DATA_FIN); const TDate datafin = _msk->get_date(F_DATA_FIN);
da.put(DOC_TIPOCF, "C"); da.put(DOC_TIPOCF, "C");
da.put(DOC_CODCF, _msk->get(F_CODCF_INI)); da.put(DOC_CODCF, codcfini);
da.put(DOC_ANNO, dataini.year()); da.put(DOC_ANNO, dataini.year());
da.put(DOC_DATADOC, dataini);
da.put(DOC_CODNUM, codnum); da.put(DOC_CODNUM, codnum);
a.put(DOC_TIPOCF, "C"); a.put(DOC_TIPOCF, "C");
a.put(DOC_CODCF, _msk->get(F_CODCF_FIN)); a.put(DOC_CODCF, codcffin);
a.put(DOC_ANNO, datafin.year()); a.put(DOC_ANNO, datafin.year());
a.put(DOC_DATADOC, datafin);
a.put(DOC_CODNUM, codnum); a.put(DOC_CODNUM, codnum);
filt_expr << "BETWEEN(" << DOC_DATADOC << ",\"" << dataini.string() << "\",\"" << datafin.string() << "\")"; filt_expr.cut(0);
if (codcfini != codcffin)
filt_expr << "(BETWEEN(" << DOC_ANNO << "," << dataini.year() << "," << datafin.year() << "))";
if (codcfini != codcffin || dataini != datafin)
filt_expr << (filt_expr.blank() ? "" : "&&") << "(BETWEEN(" << DOC_DATADOC << "," << dataini.date2ansi() << "," << datafin.date2ansi() << ")";
if (filt_expr.full())
filt_expr << ")";
} }