diff --git a/src/ce/ce3900.cpp b/src/ce/ce3900.cpp index b5e5866f3..6bce065bb 100755 --- a/src/ce/ce3900.cpp +++ b/src/ce/ce3900.cpp @@ -273,8 +273,8 @@ bool TStampa_sintetica_rep::get_usr_val(const TString& name, TVariant& var) cons { const TRectype& rec_ammmv = (const TRectype&)array_ammmv[i]; quote_ammmv += rec_ammmv.get_real(AMMMV_QNOR) + rec_ammmv.get_real(AMMMV_QACC) + - rec_ammmv.get_real(AMMMV_QANT) + rec_ammmv.get_real(AMMMV_QPERSE) + - rec_ammmv.get_real(AMMMV_QPPRIVATE) + rec_ammmv.get_real(AMMMV_FPRIVATO); + rec_ammmv.get_real(AMMMV_QANT) + rec_ammmv.get_real(AMMMV_QPERSE) + + rec_ammmv.get_real(AMMMV_QPPRIVATE); // +rec_ammmv.get_real(AMMMV_FPRIVATO); } var = quote_ammmv; return true; @@ -282,9 +282,9 @@ bool TStampa_sintetica_rep::get_usr_val(const TString& name, TVariant& var) cons if (name == "#QAMM") //quote ammortamento esercizio corrente { const TRectype& rec_ammce = _cespite.amm_pro(); - real quote_amm = real(rec_ammce.get_real(AMMCE_QNOR) + rec_ammce.get_real(AMMCE_QACC) + - rec_ammce.get_real(AMMCE_QANT) + rec_ammce.get_real(AMMCE_QPERSE) + - rec_ammce.get_real(AMMCE_QPPRIVATE) + rec_ammce.get_real(AMMCE_FPRIVATO)); + real quote_amm = real(rec_ammce.get_real(AMMCE_QNOR) + rec_ammce.get_real(AMMCE_QACC) + + rec_ammce.get_real(AMMCE_QANT) + rec_ammce.get_real(AMMCE_QPERSE) + + rec_ammce.get_real(AMMCE_QPPRIVATE)); // +rec_ammce.get_real(AMMCE_FPRIVATO)); var = quote_amm; return true; } diff --git a/src/ce/ce3900a.rep b/src/ce/ce3900a.rep index 5393a0f66..a1166bd0f 100755 --- a/src/ce/ce3900a.rep +++ b/src/ce/ce3900a.rep @@ -165,8 +165,8 @@ MESSAGE ADD,F4.102 MESSAGE ADD,F3.103 MESSAGE ADD,F4.103 - - #QAMM+#QAMMMV-#QAMM_FPRIVATO + + -#QAMM_FPRIVATO MESSAGE ADD,F2.104 MESSAGE ADD,F3.104 MESSAGE ADD,F4.104 diff --git a/src/ce/ce3900b.rep b/src/ce/ce3900b.rep index 03bcafebb..c498e0ec4 100644 --- a/src/ce/ce3900b.rep +++ b/src/ce/ce3900b.rep @@ -93,7 +93,7 @@ MESSAGE ADD,F1.103 - #QAMM+#QAMMMV-#QAMM_FPRIVATO + #QAMM-#QAMM_FPRIVATO MESSAGE ADD,F1.104