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

Patch level : 12.0 528

Browse Source 
Files correlati     : ce3.exe ce3900.msk ce4.exe

richieste da CRPA
Stampa registro cespiti sintetico : aggiunto ordinamento per data di acquisto (completamento)
Stampa cespiti per analitica : sistemato il calcolo del costo storico

git-svn-id: svn://10.65.10.50/branches/R_10_00@24357 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
bonazzi 2018-02-08 19:32:36 +00:00
parent 1e8b5f8113
commit aadb01c663
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ce/ce3900.cpp
View File

@ -133,8 +133,15 @@ void TStampa_sintetica_recordset::set_filter(const TStampa_sintetica_mask& msk)
query << "&&(STR(BETWEEN(CODCAT,#DACAT,#ACAT)))"; query << "&&(STR(BETWEEN(CODCAT,#DACAT,#ACAT)))";
} }
//ordinamenti //ordinamenti
if (!msk.get_bool(F_SORT_BY_CESP)) if (!msk.get_bool(F_SORT_BY_CESP))
query << "\nBY CODCAT|CODIMP|CODLOC|IDCESPITE"; {
query << "\nBY ";
if (msk.get_bool(F_SORT_BY_DTCOMP))
query << "DTCOMP|";
query << "CODCAT|CODIMP|CODLOC|IDCESPITE";
}
//setta la nuova complicata query nel report (che avrebbe solo USE CESPI) //setta la nuova complicata query nel report (che avrebbe solo USE CESPI)
set(query); set(query);

1
src/ce/ce3900.h
View File

@ -27,3 +27,4 @@
#define F_REPORT 126 #define F_REPORT 126
#define F_SORT_BY_CESP 127 #define F_SORT_BY_CESP 127
#define F_SORT_BY_DTCOMP 128

7
src/ce/ce3900.uml
View File

@ -164,6 +164,13 @@ END
BOOLEAN F_SORT_BY_CESP BOOLEAN F_SORT_BY_CESP
BEGIN BEGIN
PROMPT 2 17 "Per cespite" PROMPT 2 17 "Per cespite"
MESSAGE TRUE "",F_SORT_BY_DTCOMP
END
BOOLEAN F_SORT_BY_DTCOMP
BEGIN
PROMPT 20 17 "Per data completamento"
MESSAGE TRUE "",F_SORT_BY_CESP
END END
ENDPAGE ENDPAGE

2
src/ce/ce4500.cpp
View File

@ -224,7 +224,7 @@ bool TPrint_anal_cespi_rep::get_usr_val(const TString& name, TVariant& var) cons
if (name.starts_with("#COSTOI")) //variazione del valore annuale (saldo finale - saldo iniziale) if (name.starts_with("#COSTOI")) //variazione del valore annuale (saldo finale - saldo iniziale)
{ {
const real val_fin = val_amm(_cespite.sal_ini()); const real val_fin = _cespite.sal_ini().get_real(SALCE_CSTO);
var = val_fin * percutil; var = val_fin * percutil;
return true; return true;