Merge branch 'R_10_00' of http://10.65.20.33/sirio/CAMPO/campo into R_10_00

src/ce/ce0400.cpp

@@ -1,10 +1,12 @@
 #include <automask.h>
 #include <confapp.h>
 #include <lffiles.h>
+#include <recarray.h>
 #include <prefix.h>
 #include <sheet.h>
 
 #include "ce0400a.h"
+#include "../cg/cglib.h"
 
 //------------------------------------------------------
 //  Maschera di configurazione
@@ -23,6 +25,17 @@ bool TConfig_mask::on_field_event(TOperable_field& f, TField_event e, long jolly
 { 
   switch (f.dlg())
   {
+/*  case F_ESERCORR:
+    if (e == fe_init)
+    {
+      const TEsercizio &  esc = esercizi().esercizio(f.get_int());
+      bool covid_19 = esc.inizio().year() > 2019;
+
+      show(F_SOSPAMM, covid_19);
+      if (!covid_19)
+        reset(F_SOSPAMM);
+    }
+    break; */
   case F_NAME_USER:
     if (e == fe_button)
     {

src/ce/ce0400a.h

@@ -13,6 +13,7 @@
 #define F_DATACONS    110
 #define F_ANNOTUIR    111
 #define F_AMMPROP     112 
+#define F_SOSPAMM     113 
 
 //Pagina 2
 //sheet elenco files personalizzati e relative righe

src/ce/ce0400a.uml

@@ -134,6 +134,12 @@ BEGIN
   FIELD AMMPROP
 END
 
+BOOLEAN F_SOSPAMM
+BEGIN
+  PROMPT 1 10 "Sospensione ammortamento per COVID-19"
+  FIELD SOSPAMM
+END
+
 ENDPAGE
 
 //-----------------------------------------------------------------------------------------------//

src/ce/ce1400.cpp

@@ -86,14 +86,18 @@ bool TSac_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
     if (e == fe_modify || e == fe_close)
     {               
       TDitta_cespiti& dc = ditta_cespiti();
+      const int ese = get_int(F_ESERCIZIO);
       const int gr = get_int(F_GRUPPO);
-      const char* sp = get(F_SPECIE);
+      const TString16 sp = get(F_SPECIE);
       const int ca = get_int(F_CATEGORIA2);
       const TRectype& cac = dc.categoria(gr, sp, ca);  
       bool ok = !cac.empty();
-      if (ok && (o.dlg() == F_CATEGORIA || o.dlg() == F_CATEGORIA2))
+      const short dlg = o.dlg();
+
+      if (ok && (dlg == F_CATEGORIA || dlg == F_CATEGORIA2))
       {
-        set(o.dlg() == F_CATEGORIA ? F_DESC_CAT : F_DESC_CAT2, cac.get("S0"));
+        set(dlg == F_CATEGORIA ? F_DESC_CAT : F_DESC_CAT2, cac.get("S0"));
+        const bool sospamm = ini_get_bool(CONFIG_DITTA, "ce", "SOSPAMM", false) && ese == 2020;
       
         if (cac.get_bool("B0"))
           return error_box(TR("Categoria non ammortizzabile"));
@@ -105,7 +109,8 @@ bool TSac_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
         case 1:  // Beni immateriali            
           {
             const bool amm_per_anni = cac.get_int("I1") <= 1;
-            if (amm_per_anni)
+
+            if (!sospamm && amm_per_anni)
               return error_box(TR("La categoria prevede un ammortamento per anni:\n"
                                "Effettuare le scelte sul cespite"));
           }
@@ -113,7 +118,8 @@ bool TSac_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
         case 2:  // Costi pluriennali
           {
             const int vincolo = cac.get_int("I2");
-            if (vincolo == 3)  // Quote
+
+            if (!sospamm && vincolo == 3)  // Quote
               return error_box(TR("La categoria prevede un ammortamento per quote costanti:\n"
                                "Effettuare le scelte sul cespite"));
           }
@@ -122,11 +128,18 @@ bool TSac_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
           break;  
         }
       }
-      if (!ok && !o.empty() && o.dlg() == F_CATEGORIA2)
+      if (ok)
-        return error_box(TR("E' neccessario specificare una categoria valida"));
+      {
-      if (ok && e == fe_button && o.dlg() == F_CATEGORIA)
+        if (dlg == F_CATEGORIA)
           send_key(K_ENTER, 0);
       }
+      else
+      {
+        if (ca > 0 && dlg == F_CATEGORIA2)
+          return error_box(TR("E' neccessario specificare una categoria valida"));
+      }
+
+    }
     break;
   default:
     break;  
@@ -278,7 +291,7 @@ protected:
   virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
 
 public:  
-  TImm_mask() : TAutomask("ce1400c") { }
+  TImm_mask() : TAutomask("ce1400c") {}
 };
 
 bool TImm_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
@@ -307,7 +320,7 @@ protected:
   virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
 
 public:  
-  TPlu_mask() : TAutomask("ce1400d") { }
+  TPlu_mask() : TAutomask("ce1400d") {}
 };
 
 bool TPlu_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
@@ -419,23 +432,36 @@ void TScelta_amm_cat::init_mask(TMask& m)
   const int gru = _msk[0]->get_int(F_GRUPPO);
   const char* spe = _msk[0]->get(F_SPECIE);
   const int cat = _msk[0]->get_int(F_CATEGORIA2);
+  
   dc.set_attivita(ese, gru, spe);
   dc.init_mask(m);
   m.set(F_CATEGORIA, cat);
     
   const TRectype& cac = dc.categoria(gru, spe, cat);
+
   switch (_tipo)
   {
   case 1:  // Immateriali
+    {
       m.set(F_TIPOAMM, cac.get("I1"));
       m.set(F_MAX_AMM, cac.get("R13"));
       m.set(F_ANNI, cac.get("I3"));
+
+      const bool amm_per_anni = cac.get_int("I1") <= 1;
+
+      m.enable(F_NORFIS, !amm_per_anni);
+    }
     break;
   case 2:  // Pluriennali
-    m.set(F_TIPOVINC, cac.get("I2"));
+    {
+      const int vincolo = cac.get_int("I2");
+
+      m.set(F_TIPOVINC, vincolo);
       m.set(F_MIN_AMM, cac.get("R14"));
       m.set(F_MAX_AMM, cac.get("R15"));
       m.set(F_ANNI, cac.get("I3"));
+      m.enable(F_NORFIS, vincolo != 3);
+    }
     break;
   default: // Materiali   
     {

src/ce/ce2101.cpp

@@ -1,3 +1,4 @@
+#include <config.h>
 #include <currency.h>
 #include <diction.h>
 #include <recarray.h>
@@ -925,12 +926,19 @@ real TCespite::calc_quota(const real& valamm, const real& perric,
 
 // Calcolo delle quote perse
 // Certified 50%
-real TCespite::calc_quote_perse(const real& valamm, const real& peric, const real& residuo, 
+// non piu' previste dalla legge tolto nel 2021
+/* real TCespite::calc_quote_perse(const real& valamm, const real& peric, const real& residuo, 
                                 const real& quotamm, bool mov_vend, const TDate& dtmov)
 {
   const TDitta_cespiti& cce = ditta_cespiti();
   const real coeff_durata = cce.coefficiente_durata_esercizio();
   real quota = valamm * coeff_durata * peric / CENTO;
+  const bool skip = _tipo_sit != 1 && _sosp_covid && cce.esercizio_corrente() == 2020;
+
+  if (skip)
+    quota = ZERO;
+  else
+  {
     if (mov_vend)
     {
       TDate inies, fines;
@@ -952,9 +960,10 @@ real TCespite::calc_quote_perse(const real& valamm, const real& peric, const rea
     }
     else
       quota = ZERO;
-  
+  }
   return quota;
 }
+*/
 
 void TCespite::agg_quota(const real& movvalamm, TRectype& rec, const char* field, bool calcq)
 {
@@ -992,18 +1001,20 @@ void TCespite::agg_quota(const real& movvalamm, TRectype& rec, const char* field
   }
 }
 
+const char * rewrite_fname(const char* name, int sit)
+{
+  TString16 fname = get_tmp_string(20);
+
+  fname = name;
+  if (fname.starts_with("PF") && sit != 1)
+    fname.overwrite("PC", 0);
+  return fname;
+}
+
 HIDDEN const TString& catdi_get(const TRectype* pcatdi, const char* name, int sit)
 {
-  if (pcatdi != NULL)
+  if (pcatdi != nullptr)
-  {
+    return pcatdi->get(rewrite_fname(name, sit)); 
-    if (sit != 1) 
-    {
-      TString16 fname(name); 
-      fname.overwrite("PC", 0); 
-      return pcatdi->get(fname); 
-    }
-    return pcatdi->get(name); 
-  }
   else
     CHECK(false, "NULL CATDI record");
 
@@ -1024,6 +1035,7 @@ const TString& TCespite::ammini_get(const char* pstar) const
     const TDitta_cespiti& dc = ditta_cespiti();
     const TRectype* pcatdi = NULL;
     const TRectype* pcac = NULL;
+    const bool sospamm = _sosp_covid && dc.esercizio_corrente() == 2020;
   
     // L'utente fa le sue scelte: ma saranno sensate e coerenti?    
     int scelte = _ammini.get_int(AMMCE_SCELTE);
@@ -1035,6 +1047,10 @@ const TString& TCespite::ammini_get(const char* pstar) const
       const int categ       = get_int(CESPI_CODCAT);
       TString80 key; key.format("%d|%d|%s|%d", anno, gruppo, (const char*)specie, categ);
       const TRectype& catdi = cache().get(LF_CATDI, key);
+
+      if (get_int(CESPI_IDCESPITE) == 452 && _tipo_sit != 3)
+        int i = 1;
+
       if (!catdi.empty())
       {
         pcatdi = &catdi;
@@ -1085,12 +1101,14 @@ const TString& TCespite::ammini_get(const char* pstar) const
           }
           break;
         case tc_immateriale:
+ //         if (scelte == 2 || (_tipo_sit != 1 && sospamm))
           if (scelte == 2)
             val = catdi_get(pcatdi, CATDI_PFNORVN, _tipo_sit);
           else
             val = pcac->get("R13");
           break;
         case tc_pluriennale:
+//          if (scelte == 2 || (_tipo_sit != 1 && sospamm))
           if (scelte == 2)
           val = catdi_get(pcatdi, CATDI_PFNORVN, _tipo_sit);
           else
@@ -1312,7 +1330,8 @@ void TCespite::calc_perc(TRelation& rel, const TRectype& tmv, const TRectype& tm
       
       // Calcolare quote perse
       const TDate dtmov = tmv.get_date(MOVCE_DTMOV);
-      const real quote_perse = calc_quote_perse(valamm, per_eff, resamm, qnor, true, dtmov);
+      // non piu' previste dalla legge tolto nel 2021
+ //     const real quote_perse = calc_quote_perse(valamm, per_eff, resamm, qnor, true, dtmov);
   
       if (_tipo_sit == 1 && get_int(CESPI_USOPROM) > 1)
         agg_quota(valamm, ammmv, "QNOR", true);
@@ -1864,8 +1883,9 @@ void TCespite::calc_amm_residui(bool is_valid)
         _ammpro.put(AMMCE_QNOR, qnor);
         ammpro_put_perc(AMMCE_PNOR, per_eff);
                        
-        const real quote_perse = calc_quote_perse(valamm, pmat, resamm, qnor, false, TDate());
+        // non piu' previste dalla legge tolto nel 2021
-        _ammpro.put(AMMCE_QPERSE, quote_perse);
+//        const real quote_perse = calc_quote_perse(valamm, pmat, resamm, qnor, false, TDate());
+       _ammpro.zero(AMMCE_QPERSE);
                                 
         const int uso_promiscuo = get_int(CESPI_USOPROM);
         if (_tipo_sit == 1 && uso_promiscuo > 1)
@@ -1875,7 +1895,7 @@ void TCespite::calc_amm_residui(bool is_valid)
         resamm -= qnor + _ammpro.get_real(AMMCE_FPRIVATO);  
         
         const real pacc = _ammpro.get_real(AMMCE_PACC);
-        if (resamm > ZERO && pacc > ZERO && quote_perse.is_zero())
+        if (resamm > ZERO && pacc > ZERO) // non piu' previste dalla legge tolto nel 2021 && quote_perse.is_zero())
         {
           const real qacc = calc_quota(val_amm(), pacc, resamm, per_eff);
           _ammpro.put(AMMCE_QACC, qacc);
@@ -2060,6 +2080,7 @@ bool TCespite::calc_amm(int tipo_sit, const TDate& data_limite,
   const TString16 idcespite = get(CESPI_IDCESPITE);  // Keep it handy for debug purposes
   log(FR("* Inizio calcolo situazione %d cespite %s"), tipo_sit, (const char*)idcespite);
 
+ 
 #ifdef DBG
   if (tipo_sit == 1 && atol(idcespite) == 1362)
     tipo_sit = 1;  // Put your breakpoint here
@@ -2175,15 +2196,18 @@ void TCespite::load_saldi(const int tiposit, const int esercizio)
 TCespite::TCespite() 
         : TRectype(LF_CESPI), _salini(LF_SALCE), _salpro(LF_SALCE), _ammini(LF_AMMCE), _ammpro(LF_AMMCE)
 {
+  _sosp_covid = ini_get_bool(CONFIG_DITTA, "ce", "SOSPAMM", false);
 }
 
 TCespite::TCespite(const char* id)
         : TRectype(LF_CESPI), _salini(LF_SALCE), _salpro(LF_SALCE), _ammini(LF_AMMCE), _ammpro(LF_AMMCE)
 {
+  _sosp_covid = ini_get_bool(CONFIG_DITTA, "ce", "SOSPAMM", false);
   read(id);
 }
 
 TCespite::TCespite(const TRectype& rec)
         : TRectype(rec), _salini(LF_SALCE), _salpro(LF_SALCE), _ammini(LF_AMMCE), _ammpro(LF_AMMCE)
 {
+  _sosp_covid = ini_get_bool(CONFIG_DITTA, "ce", "SOSPAMM", false);
 }

src/ce/ce2101.h

@@ -12,6 +12,7 @@ enum TTipoVeicolo    { tv_nessuno, tv_automobile, tv_motociclo, tv_ciclomotore,
 class TCespite : public TRectype
 {
   int _tipo_sit;
+  bool _sosp_covid;
   TRectype _salini, _salpro;
   TRectype _ammini, _ammpro;
   

src/ce/ce3900.cpp

@@ -32,11 +32,13 @@
 class TStampa_sintetica_mask : public TAutomask
 {
   bool _preview;
+  bool _excel;
 
 protected:
   bool on_field_event(TOperable_field& o, TField_event e, long jolly);
 public:
   bool preview() const { return _preview; }
+  bool excel() const { return _excel; }
   TStampa_sintetica_mask();
 };
 
@@ -82,12 +84,23 @@ bool TStampa_sintetica_mask::on_field_event(TOperable_field& o, TField_event e,
     break;
   case DLG_PRINT:
     if (e == fe_button)
+    {
       _preview = false;
+      _excel = false;
+    }
     break;
   case DLG_PREVIEW:
     if (e == fe_button)
     {
       _preview = true;
+      _excel = false;
+      stop_run(K_ENTER);
+    }
+    break;
+  case DLG_EXPORT_EXCEL:
+    if (e == fe_button)
+    {
+      _excel = true;
       stop_run(K_ENTER);
     }
     break;
@@ -96,7 +109,7 @@ bool TStampa_sintetica_mask::on_field_event(TOperable_field& o, TField_event e,
   return ok;
 }
 
-TStampa_sintetica_mask::TStampa_sintetica_mask() : TAutomask("ce3900"), _preview(false)
+TStampa_sintetica_mask::TStampa_sintetica_mask() : TAutomask("ce3900"), _preview(false), _excel(false)
 {
 }
 
@@ -236,6 +249,8 @@ bool TStampa_sintetica_rep::get_usr_val(const TString& name, TVariant& var) cons
 {
 	const TRecordset& recset = *recordset();
 	const TString& idcespite = recset.get(CESPI_IDCESPITE).as_string();
+
+
   if (idcespite != _cespite.get(CESPI_IDCESPITE))
 	{
 		TCespite& c = (TCespite&)_cespite;
@@ -411,9 +426,26 @@ void TStampa_sintetica::main_loop()
       rep.load("ce3900b");
 
 		rep.set_filter(mask);
+    if (mask.excel())
+    {
+      rep.section('H', 2).hide();
+      rep.section('H', 3).hide();
+      rep.section('H', 4).hide();
+      rep.section('F', 2).hide();
+      rep.section('F', 3).hide();
+      rep.section('F', 4).hide();
+    }
 		book.add(rep);
 
     //stampa il book dei report
+    if (mask.excel())
+    {
+      TFilename out;
+
+      out.tempdir(); out.add("cespsint.xls");
+      book.export_excel(out, false, true, true);
+    }
+    else
       if (mask.preview())
         book.preview();
       else

src/ce/ce3900.uml

@@ -1,6 +1,9 @@
 #include "ce3900.h"
 
 TOOLBAR "topbar" 0 0 0 2
+
+#define EXPORT_EXCEL
+
 #include <aprintbar.h>
 ENDPAGE
 

src/ce/ce3900a.rep

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <report libraries="" page_merge="" save_printer="" name="ce3900a" use_printer_font="" orientation="2" page_split="" lpi="6" command="" class="">
  <description>Registro cespiti sintetico</description>
- <font face="Arial Narrow" size="8" />
+ <font face="Arial Narrow" size="7" />
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="" hidden="" page_break="" can_break="" pattern="1">
   <font face="Arial Narrow" bold="1" size="8" />
   <field x="18.5" y="0.5" deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="Date" />
   <field x="83" y="0.5" deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="8" codval="" id="" pattern="1" hide_zero="" text="Valori" />
   <field x="124" y="0.5" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="20" codval="" id="" pattern="1" hide_zero="" text="Fondo Ammortamento" />
-  <field x="157" y="0.75" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Residuo da" />
+  <field x="169" y="0.75" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Residuo da" />
   <field x="1" y="1.5" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="Codice" />
   <field x="11" y="1.5" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="Alienazione" />
   <field x="21" y="1.5" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="Acquisto" />
@@ -20,18 +20,19 @@
   <field x="109" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Es. corr." />
   <field x="121" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Fine es.prec" />
   <field x="133" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Cessioni" />
-  <field x="145" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Totale" />
+  <field x="146" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" id="" pattern="1" hide_zero="" text="Quote indeducibili" />
-  <field x="157" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="ammortizzare" />
+  <field x="157" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Totale" />
-  <field border="1" x="1" y="2.5" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="168" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
+  <field x="169" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="ammortizzare" />
+  <field border="1" x="1" y="2.5" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="180" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="1" hidden="" page_break="" can_break="" pattern="1">
   <font face="Arial" size="8" />
   <prescript description="H1 PRESCRIPT">MESSAGE RESET,F1
 </prescript>
-  <field border="1" radius="100" x="12" y="0.5" deactivated="" type="Testo" valign="center" hidden="" align="center" link="" dynamic_height="" shade_offset="25" width="148" codval="" height="2.5" id="" pattern="2" hide_zero="" text="REGISTRO CESPITI SINTETICO">
+  <field border="1" radius="100" x="18" y="0.5" deactivated="" type="Testo" valign="center" hidden="" align="center" link="" dynamic_height="" shade_offset="25" width="148" codval="" height="2.5" id="" pattern="2" hide_zero="" text="REGISTRO CESPITI SINTETICO">
    <font face="Times New Roman" bold="1" size="16" />
   </field>
-  <field border="2" x="1" y="4" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="168" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
+  <field border="2" x="1" y="4" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="180" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
   <field x="1" y="4.5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="" pattern="1" hide_zero="" text="">
    <font italic="1" face="Arial" bold="1" size="8" />
    <source>#SYSTEM.RAGSOC</source>
@@ -62,7 +63,7 @@
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="2" hidden="" bg_color="#000000" page_break="" can_break="" pattern="10" sh_angle="270">
   <groupby>CODCAT</groupby>
-  <font face="Arial" bold="1" size="8" />
+  <font face="Arial" bold="1" size="7" />
   <prescript description="H2 PRESCRIPT">MESSAGE RESET,F2
 </prescript>
   <field x="1" deactivated="" type="Testo" hidden="" link="" bg_color="#000000" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Categoria:" />
@@ -77,7 +78,7 @@
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="3" hidden="1" bg_color="#808080" sh_color="#C0C0C0" page_break="" can_break="" pattern="10" sh_angle="270">
   <groupby>CODIMP</groupby>
-  <font face="Arial" size="8" />
+  <font face="Arial" size="7" />
   <prescript description="H3 PRESCRIPT">#GROUP_CODIMP @
 IF
 "H3" SHOW
@@ -105,7 +106,7 @@ THEN
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="4" hidden="1" bg_color="#C0C0C0" sh_color="#FFFFFF" page_break="" can_break="" pattern="10" sh_angle="270">
   <groupby>CODLOC</groupby>
-  <font face="Arial" bold="1" size="8" />
+  <font face="Arial" bold="1" size="7" />
   <prescript description="H4 PRESCRIPT">#GROUP_CODLOC @
 IF
 "H4" SHOW
@@ -184,32 +185,38 @@ MESSAGE ADD,F3.106
 MESSAGE ADD,F4.106</postscript>
   </field>
   <field x="145" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="107" pattern="1" hide_zero="" text="#########,@@">
-   <source>#104+#105-#106</source>
+   <source>#QAMM_FPRIVATO</source>
    <postscript description="B1.107 POSTSCRIPT">MESSAGE ADD,F2.107
 MESSAGE ADD,F3.107
 MESSAGE ADD,F4.107</postscript>
   </field>
   <field x="157" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="108" pattern="1" hide_zero="" text="#########,@@">
-   <source>#RESAMM-#QAMM</source>
+   <source>#104+#105-#106+#107</source>
    <postscript description="B1.108 POSTSCRIPT">MESSAGE ADD,F2.108
 MESSAGE ADD,F3.108
 MESSAGE ADD,F4.108</postscript>
   </field>
+  <field x="169" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="109" pattern="1" hide_zero="" text="#########,@@">
+   <source>#COSTOFIN-#108</source>
+   <postscript description="B1.109 POSTSCRIPT">MESSAGE ADD,F2.109
+MESSAGE ADD,F3.109
+MESSAGE ADD,F4.109</postscript>
+  </field>
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Foot" level="" hidden="" page_break="" can_break="" pattern="1">
-  <field border="1" x="1" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="168" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
+  <field border="1" x="1" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="180" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
-  <field x="140" y="0.25" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="5" codval="" id="" pattern="1" hide_zero="" text="Pag.">
+  <field x="152" y="0.25" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="5" codval="" id="" pattern="1" hide_zero="" text="Pag.">
    <font italic="1" face="Courier New" size="9" />
   </field>
-  <field x="146" y="0.25" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="3" codval="" id="" pattern="1" hide_zero="" text="">
+  <field x="158" y="0.25" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="3" codval="" id="" pattern="1" hide_zero="" text="">
    <font italic="1" face="Courier New" bold="1" size="9" />
    <source>#REPORT.PAGE</source>
   </field>
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Foot" level="1" hidden="" bg_color="#000000" page_break="" can_break="" pattern="2">
-  <font italic="1" face="Arial" bold="1" size="8" />
+  <font italic="1" face="Arial" bold="1" size="7" />
-  <field border="2" x="1" deactivated="" type="Linea" hidden="" link="" fg_color="#FFFFFF" dynamic_height="" shade_offset="" width="168" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
   <field x="1" deactivated="" type="Testo" hidden="" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="25" codval="" id="" pattern="1" hide_zero="" text="Totali generali" />
+  <field border="2" x="1" deactivated="" type="Linea" hidden="" link="" fg_color="#FFFFFF" dynamic_height="" shade_offset="" width="180" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
   <field x="66" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="101" pattern="1" hide_zero="" text="#########,@@" />
   <field x="90" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="102" pattern="1" hide_zero="" text="#########,@@" />
   <field x="78" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="103" pattern="1" hide_zero="" text="#########,@@" />
@@ -218,9 +225,10 @@ MESSAGE ADD,F4.108</postscript>
   <field x="133" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="106" pattern="1" hide_zero="" text="#########,@@" />
   <field x="145" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="107" pattern="1" hide_zero="" text="#########,@@" />
   <field x="157" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="108" pattern="1" hide_zero="" text="#########,@@" />
+  <field x="169" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="109" pattern="1" hide_zero="" text="#########,@@" />
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Foot" level="2" hidden="" bg_color="#000000" height="2" page_break="" can_break="" pattern="10" sh_angle="90">
-  <font face="Arial" bold="1" size="8" />
+  <font face="Arial" bold="1" size="7" />
   <field x="1" deactivated="" type="Testo" hidden="" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Totale Categoria" />
   <field x="17" deactivated="" type="Stringa" hidden="" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="2" codval="" id="97" pattern="1" hide_zero="" text="" />
   <field x="20" deactivated="" type="Stringa" hidden="" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="30" codval="" id="98" pattern="1" hide_zero="" text="">
@@ -250,9 +258,12 @@ MESSAGE ADD,F4.108</postscript>
   <field x="157" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="108" pattern="1" hide_zero="" text="#########,@@">
    <postscript description="F2.108 POSTSCRIPT">MESSAGE ADD,F1.108</postscript>
   </field>
+  <field x="169" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="109" pattern="1" hide_zero="" text="#########,@@">
+   <postscript description="F2.109 POSTSCRIPT">MESSAGE ADD,F1.109</postscript>
+  </field>
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Foot" level="3" hidden="1" bg_color="#808080" sh_color="#C0C0C0" page_break="" can_break="" pattern="10" sh_angle="90">
-  <font italic="1" face="Arial" bold="1" size="8" />
+  <font italic="1" face="Arial" bold="1" size="7" />
   <field x="4" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Totale impianto" />
   <field border="2" x="1" y="1" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="168" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
   <field x="20" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="97" pattern="1" hide_zero="" text="" />
@@ -267,9 +278,10 @@ MESSAGE ADD,F4.108</postscript>
   <field x="133" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="106" pattern="1" hide_zero="" text="#########,@@" />
   <field x="145" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="107" pattern="1" hide_zero="" text="#########,@@" />
   <field x="157" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="108" pattern="1" hide_zero="" text="#########,@@" />
+  <field x="169" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="109" pattern="1" hide_zero="" text="#########,@@" />
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Foot" level="4" hidden="1" bg_color="#C0C0C0" sh_color="#FFFFFF" page_break="" can_break="" pattern="10" sh_angle="90">
-  <font italic="1" face="Arial" bold="1" size="8" />
+  <font italic="1" face="Arial" bold="1" size="7" />
   <field x="7" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Totale localit&#E0;" />
   <field x="23.5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="97" pattern="1" hide_zero="" text="" />
   <field x="36.5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="20" codval="" id="98" pattern="1" hide_zero="" text="">
@@ -283,6 +295,7 @@ MESSAGE ADD,F4.108</postscript>
   <field x="133" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="106" pattern="1" hide_zero="" text="#########,@@" />
   <field x="145" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="107" pattern="1" hide_zero="" text="#########,@@" />
   <field x="157" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="108" pattern="1" hide_zero="" text="#########,@@" />
+  <field x="169" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="109" pattern="1" hide_zero="" text="#########,@@" />
  </section>
  <sql>USE CESPI KEY 2</sql>
 </report>

src/ce/ce3900b.rep

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <report libraries="" page_merge="" save_printer="" name="ce3900b" use_printer_font="" orientation="2" page_split="" lpi="6" command="" class="">
  <description>Registro cespiti sintetico per codice cespite</description>
- <font face="Arial Narrow" size="8" />
+ <font face="Arial Narrow" size="7" />
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="" hidden="" page_break="" can_break="" pattern="1">
   <font face="Arial Narrow" bold="1" size="8" />
   <field x="18.5" y="0.5" deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="Date" />
   <field x="83" y="0.5" deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="8" codval="" id="" pattern="1" hide_zero="" text="Valori" />
   <field x="124" y="0.5" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="20" codval="" id="" pattern="1" hide_zero="" text="Fondo Ammortamento" />
-  <field x="157" y="0.75" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Residuo da" />
+  <field x="169" y="0.75" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Residuo da" />
   <field x="1" y="1.5" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="Codice" />
   <field x="11" y="1.5" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="Alienazione" />
   <field x="21" y="1.5" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="Acquisto" />
@@ -20,18 +20,19 @@
   <field x="109" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Es. corr." />
   <field x="121" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Fine es.prec" />
   <field x="133" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Cessioni" />
-  <field x="145" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Totale" />
+  <field x="146" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" id="" pattern="1" hide_zero="" text="Quote indeducibili" />
-  <field x="157" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="ammortizzare" />
+  <field x="157" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Totale" />
-  <field border="1" x="1" y="2.5" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="168" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
+  <field x="169" y="1.5" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="ammortizzare" />
+  <field border="1" x="1" y="2.5" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="180" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="1" hidden="" page_break="" can_break="" pattern="1">
   <font face="Arial" size="8" />
   <prescript description="H1 PRESCRIPT">MESSAGE RESET,F1
 </prescript>
-  <field border="1" radius="100" x="12" y="0.5" deactivated="" type="Testo" valign="center" hidden="" align="center" link="" dynamic_height="" shade_offset="25" width="148" codval="" height="2.5" id="" pattern="2" hide_zero="" text="REGISTRO CESPITI SINTETICO">
+  <field border="1" radius="100" x="18" y="0.5" deactivated="" type="Testo" valign="center" hidden="" align="center" link="" dynamic_height="" shade_offset="25" width="148" codval="" height="2.5" id="" pattern="2" hide_zero="" text="REGISTRO CESPITI SINTETICO">
    <font face="Times New Roman" bold="1" size="16" />
   </field>
-  <field border="2" x="1" y="4" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="168" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
+  <field border="2" x="1" y="4" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="180" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
   <field x="1" y="4.5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="" pattern="1" hide_zero="" text="">
    <font italic="1" face="Arial" bold="1" size="8" />
    <source>#SYSTEM.RAGSOC</source>
@@ -62,7 +63,7 @@
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="2" hidden="" bg_color="#000000" page_break="" can_break="" pattern="10" sh_angle="270">
   <groupby>CODCAT</groupby>
-  <font face="Arial" bold="1" size="8" />
+  <font face="Arial" bold="1" size="7" />
   <prescript description="H2 PRESCRIPT">MESSAGE RESET,F2
 </prescript>
   <field x="1" deactivated="" type="Testo" hidden="" link="" bg_color="#000000" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Categoria:" />
@@ -77,7 +78,7 @@
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="3" hidden="1" bg_color="#808080" sh_color="#C0C0C0" page_break="" can_break="" pattern="10" sh_angle="270">
   <groupby>CODIMP</groupby>
-  <font face="Arial" size="8" />
+  <font face="Arial" size="7" />
   <prescript description="H3 PRESCRIPT">#GROUP_CODIMP @
 IF
 "H3" SHOW
@@ -105,7 +106,7 @@ THEN
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="4" hidden="1" bg_color="#C0C0C0" sh_color="#FFFFFF" page_break="" can_break="" pattern="10" sh_angle="270">
   <groupby>CODLOC</groupby>
-  <font face="Arial" bold="1" size="8" />
+  <font face="Arial" bold="1" size="7" />
   <prescript description="H4 PRESCRIPT">#GROUP_CODLOC @
 IF
 "H4" SHOW
@@ -184,32 +185,38 @@ MESSAGE ADD,F3.106
 MESSAGE ADD,F4.106</postscript>
   </field>
   <field x="145" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="107" pattern="1" hide_zero="" text="#########,@@">
-   <source>#104+#105-#106</source>
+   <source>#QAMM_FPRIVATO</source>
    <postscript description="B1.107 POSTSCRIPT">MESSAGE ADD,F2.107
 MESSAGE ADD,F3.107
 MESSAGE ADD,F4.107</postscript>
   </field>
   <field x="157" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="108" pattern="1" hide_zero="" text="#########,@@">
-   <source>#RESAMM-#QAMM</source>
+   <source>#104+#105-#106+#107</source>
    <postscript description="B1.108 POSTSCRIPT">MESSAGE ADD,F2.108
 MESSAGE ADD,F3.108
 MESSAGE ADD,F4.108</postscript>
   </field>
+  <field x="169" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="109" pattern="1" hide_zero="" text="#########,@@">
+   <source>#COSTOFIN-#108</source>
+   <postscript description="B1.109 POSTSCRIPT">MESSAGE ADD,F2.109
+MESSAGE ADD,F3.109
+MESSAGE ADD,F4.109</postscript>
+  </field>
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Foot" level="" hidden="" page_break="" can_break="" pattern="1">
-  <field border="1" x="1" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="168" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
+  <field border="1" x="1" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="180" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
-  <field x="140" y="0.25" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="5" codval="" id="" pattern="1" hide_zero="" text="Pag.">
+  <field x="152" y="0.25" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="5" codval="" id="" pattern="1" hide_zero="" text="Pag.">
    <font italic="1" face="Courier New" size="9" />
   </field>
-  <field x="146" y="0.25" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="3" codval="" id="" pattern="1" hide_zero="" text="">
+  <field x="158" y="0.25" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="3" codval="" id="" pattern="1" hide_zero="" text="">
    <font italic="1" face="Courier New" bold="1" size="9" />
    <source>#REPORT.PAGE</source>
   </field>
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Foot" level="1" hidden="" bg_color="#000000" page_break="" can_break="" pattern="2">
-  <font italic="1" face="Arial" bold="1" size="8" />
+  <font italic="1" face="Arial" bold="1" size="7" />
-  <field border="2" x="1" deactivated="" type="Linea" hidden="" link="" fg_color="#FFFFFF" dynamic_height="" shade_offset="" width="168" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
   <field x="1" deactivated="" type="Testo" hidden="" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="25" codval="" id="" pattern="1" hide_zero="" text="Totali generali" />
+  <field border="2" x="1" deactivated="" type="Linea" hidden="" link="" fg_color="#FFFFFF" dynamic_height="" shade_offset="" width="180" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
   <field x="66" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="101" pattern="1" hide_zero="" text="#########,@@" />
   <field x="90" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="102" pattern="1" hide_zero="" text="#########,@@" />
   <field x="78" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="103" pattern="1" hide_zero="" text="#########,@@" />
@@ -218,9 +225,10 @@ MESSAGE ADD,F4.108</postscript>
   <field x="133" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="106" pattern="1" hide_zero="" text="#########,@@" />
   <field x="145" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="107" pattern="1" hide_zero="" text="#########,@@" />
   <field x="157" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="108" pattern="1" hide_zero="" text="#########,@@" />
+  <field x="169" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="109" pattern="1" hide_zero="" text="#########,@@" />
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Foot" level="2" hidden="" bg_color="#000000" height="2" page_break="" can_break="" pattern="10" sh_angle="90">
-  <font face="Arial" bold="1" size="8" />
+  <font face="Arial" bold="1" size="7" />
   <field x="1" deactivated="" type="Testo" hidden="" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Totale Categoria" />
   <field x="17" deactivated="" type="Stringa" hidden="" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="2" codval="" id="97" pattern="1" hide_zero="" text="" />
   <field x="20" deactivated="" type="Stringa" hidden="" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="30" codval="" id="98" pattern="1" hide_zero="" text="">
@@ -250,9 +258,12 @@ MESSAGE ADD,F4.108</postscript>
   <field x="157" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="108" pattern="1" hide_zero="" text="#########,@@">
    <postscript description="F2.108 POSTSCRIPT">MESSAGE ADD,F1.108</postscript>
   </field>
+  <field x="169" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="109" pattern="1" hide_zero="" text="#########,@@">
+   <postscript description="F2.109 POSTSCRIPT">MESSAGE ADD,F1.109</postscript>
+  </field>
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Foot" level="3" hidden="1" bg_color="#808080" sh_color="#C0C0C0" page_break="" can_break="" pattern="10" sh_angle="90">
-  <font italic="1" face="Arial" bold="1" size="8" />
+  <font italic="1" face="Arial" bold="1" size="7" />
   <field x="4" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Totale impianto" />
   <field border="2" x="1" y="1" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="168" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
   <field x="20" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="97" pattern="1" hide_zero="" text="" />
@@ -267,9 +278,10 @@ MESSAGE ADD,F4.108</postscript>
   <field x="133" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="106" pattern="1" hide_zero="" text="#########,@@" />
   <field x="145" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="107" pattern="1" hide_zero="" text="#########,@@" />
   <field x="157" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="108" pattern="1" hide_zero="" text="#########,@@" />
+  <field x="169" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="109" pattern="1" hide_zero="" text="#########,@@" />
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Foot" level="4" hidden="1" bg_color="#C0C0C0" sh_color="#FFFFFF" page_break="" can_break="" pattern="10" sh_angle="90">
-  <font italic="1" face="Arial" bold="1" size="8" />
+  <font italic="1" face="Arial" bold="1" size="7" />
   <field x="7" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Totale localit&#E0;" />
   <field x="23.5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="97" pattern="1" hide_zero="" text="" />
   <field x="36.5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="20" codval="" id="98" pattern="1" hide_zero="" text="">
@@ -283,6 +295,7 @@ MESSAGE ADD,F4.108</postscript>
   <field x="133" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="106" pattern="1" hide_zero="" text="#########,@@" />
   <field x="145" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="107" pattern="1" hide_zero="" text="#########,@@" />
   <field x="157" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="108" pattern="1" hide_zero="" text="#########,@@" />
+  <field x="169" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="109" pattern="1" hide_zero="" text="#########,@@" />
  </section>
  <sql>USE CESPI KEY 2</sql>
 </report>

src/f1/f1lib.cpp

@@ -1,6 +1,6 @@
 #include "f1lib.h"
 #include "config.h"
-#include "cglib.h"
+#include "../cg/cglib.h"
 #include "execp.h"
 #include "cfven.h"
 #include "reputils.h"
@@ -202,10 +202,10 @@ bool TFppro::associa_mov(const int numreg) const
 const char* TFppro::get_tipoprot() const
 {
 	TString query;
-	static TString tipo;
+
 	query << "SELECT PZ_TIPOPROT AS TIPOPROT FROM FPPRO00F\r\n" << where_str();
 	_db->sq_set_exec(query);
-	return tipo.cut(0) = _db->sq_get("TIPOPROT");
+	return _db->sq_get("TIPOPROT");
 }
 
 const char* TFppro::get_numprot() const

src/f9/f9lib.h

@@ -8,7 +8,7 @@
 #include "strings.h"
 #include "date.h"
 #include "real.h"
-#include "cglib.h"
+#include "../cg/cglib.h"
 #include "sheet.h"
 #include "sqlset.h"
 #include "reprint.h"
@@ -156,8 +156,9 @@ private:
   std::shared_ptr<std::set<TString>>                              _name_catdocs;
   int                                                             _mode_sheet;
 
-  std::shared_ptr<classe_doc> find_causcont(const TString& caus);   // OK
+  std::shared_ptr<TCategorie_doc::classe_doc> find_causcont(const TString& caus) const ;   // OK
-  std::shared_ptr<classe_doc> find_tipodoc(const TString& tipodoc); // OK
+  std::shared_ptr<TCategorie_doc::classe_doc> find_tipodoc(const TString& tipodoc) const ; // OK
+  std::shared_ptr<TCategorie_doc::classe_doc> find_tipodocsdi(const TString& tipodocsdi) const ; // OK
 
   std::vector<pair<TString, std::shared_ptr<TArray_sheet>>>::iterator find_sheet_annessi(const TString& catdoc);  // OK
 
@@ -193,6 +194,7 @@ public:
   std::shared_ptr<TArray_sheet> get_sheet_catdocs();
   std::shared_ptr<TArray_sheet> get_sheet_ann(const TString& catdoc);
   std::shared_ptr<classe_doc>   mov2cat(int numreg);
+  const char *                  tipo2caus_cont(const TString & tipodoc) { std::shared_ptr<TCategorie_doc::classe_doc> c = find_tipodocsdi(tipodoc); if (c != nullptr) return c->causcont; else return ""; }
   void                          reload();
   static void                   remove_all();
   static void                   remove_all_ann();

src/f9/f9lib01.cpp

@@ -2,11 +2,11 @@
 
 #include "f9lib.h"
 
-#include "f1lib.h"
+#include "../f1/f1lib.h"
 #include "f901tab.h"
 #include "progind.h"
 #include "clifo.h"
-#include "cglib.h"
+#include "../cg/cglib.h"
 #include "mov.h"
 #include "../fp/fplib.h"
 #include "annessif9.h"
@@ -1269,7 +1269,7 @@ TF9_dberr::TF9_dberr()
 // TCategorie_doc
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-std::shared_ptr<TCategorie_doc::classe_doc> TCategorie_doc::find_causcont(const TString& caus)
+std::shared_ptr<TCategorie_doc::classe_doc> TCategorie_doc::find_causcont(const TString& caus) const
 {
   for (auto it = _rows.begin(); it != _rows.end(); ++it)
   {
@@ -1279,7 +1279,7 @@ std::shared_ptr<TCategorie_doc::classe_doc> TCategorie_doc::find_causcont(const
   return nullptr;
 }
 
-std::shared_ptr<TCategorie_doc::classe_doc> TCategorie_doc::find_tipodoc(const TString& tipodoc)
+std::shared_ptr<TCategorie_doc::classe_doc> TCategorie_doc::find_tipodoc(const TString& tipodoc) const
 {
   for (auto it = _rows.begin(); it != _rows.end(); ++it)
   {
@@ -1290,6 +1290,16 @@ std::shared_ptr<TCategorie_doc::classe_doc> TCategorie_doc::find_tipodoc(const T
   return nullptr;
 }
 
+std::shared_ptr<TCategorie_doc::classe_doc> TCategorie_doc::find_tipodocsdi(const TString& tipodocsdi) const
+{
+  for (auto it = _rows.begin(); it != _rows.end(); ++it)
+  {
+    if ((*it)->caus_sost == tipodocsdi)
+      return *it;
+  }
+  return nullptr;
+}
+
 std::vector<pair<TString, std::shared_ptr<TArray_sheet>>>::iterator TCategorie_doc::find_sheet_annessi(const TString& catdoc)
 {
   for(auto it = _sheets_annessi.begin(); it != _sheets_annessi.end(); ++it)

src/li/lilib01.cpp

@@ -560,14 +560,18 @@ bool TLi_manager::plafond_rewrite(TDocumento& d)
 	TToken_string plafs(d.get(DOC_PLAFOND),  ',');
 	const TString8 tipodoc = d.tipo().codice();
 	const TString4 stato = d.get(DOC_STATO);
-	real diff = (doc_ok(d) && has_valid_plafond() ? d.importo_plafond() : ZERO) - d.importo_plafond_salvato();
 
-// Calcolo le differenze tra il plafond attuale da verificare e quello precedente
+  if (doc_ok(d) && has_valid_plafond())
+  {
+    const real diff = d.importo_plafond(true);
+
+    // Calcolo le differenze tra il plafond attuale da verificare e quello precedente
     if (diff != ZERO)
     {
       ok = utilizza_plafond(d, plafs, diff);
       d.put(DOC_PLAFOND, plafs);
       flush();
+    }
   }
 	return ok;
 }

src/res/resource.ini

@@ -48,6 +48,7 @@
 10236=intervento.ico
 10237=attrezzature.ico
 10238=camporep.ico
+10239=senddoc.ico
 
 [Images]
 101=ok.bmp

src/ve/velib.h

@@ -883,7 +883,7 @@ public:
 	const TRiepilogo_iva * riepilogo_iva(int index) const { return (index >= 0 && index < _cod_iva.items()) ? riepilogo_iva(_cod_iva.row(index)) : NULL; }
 	TCli_for& clifor(bool force_reload = false) const;
 	TLi_manager & plafond(bool force_reload = false);
-	const real importo_plafond() const;
+	const real importo_plafond(bool diff = false) const;
 	const real importo_plafond_salvato() const;
 	TOccasionale& occas() const;
 	const TAgente& agente(bool first = true) const;

src/ve/velib03.cpp

@@ -2801,7 +2801,7 @@ TCli_for& TDocumento::clifor(bool force_reload) const
 	return cf;
 }
 
-const real TDocumento::importo_plafond()  const
+const real TDocumento::importo_plafond(bool diff)  const
 {
 	real importo_plafond;
 
@@ -2816,6 +2816,8 @@ const real TDocumento::importo_plafond()  const
 		}
 	if (is_nota_credito())
 		importo_plafond = -importo_plafond;
+  if (diff)
+    importo_plafond -= importo_plafond_salvato();
 	return importo_plafond;
 }
 

src/ve/velib04b.cpp

@@ -17,6 +17,7 @@
 #include "../m770/scperc.h"
 #include "../m770/rver.h"
 #include "../m770/perc.h"
+#include "../f9/f9lib.h"
 
 
 void TMovimentoPN_VE::destroy_iva_row(int i)
@@ -1037,8 +1038,26 @@ TCausale* TContabilizzazione::get_caus(const TDocumento& doc, const int year) co
 {
 	TString4 codcaus;
 	TToken_string key;
+  static TCategorie_doc __cats;
 
-	if (_fld_cms_cont.full())
+  if (main_app().has_module(F9AUT, CHK_DONGLE))
+  {
+    const TString & tipodoc = doc.get(DOC_TIPODOCSDI);
+
+    if (tipodoc.full())
+    {
+#ifdef NEW_FP
+     TClasse_doc * classe = __cats.tipo2class(tipodoc);
+      
+      if (classe != nullptr)
+
+        codcaus = classe->caus_cont();
+#else
+      codcaus =__cats.tipo2caus_cont(tipodoc);
+#endif
+    }
+  }
+	if (codcaus.blank() && _fld_cms_cont.full())
 	{
 		const TString& cms = doc.commessa_principale();
 		if (cms.full())
@@ -1065,13 +1084,10 @@ TCausale* TContabilizzazione::get_caus(const TDocumento& doc, const int year) co
 			codcaus =	doc.tipo().causale();	// Istanzia la causale del documento corrente...
 	}
 
-  if (_caus != NULL && _caus->codice() == codcaus && _caus->reg().year() == year)
+  if (_caus != nullptr && _caus->codice() == codcaus && _caus->reg().year() == year)
     return _caus;
-  if (_caus != NULL)
+  if (_caus != nullptr)
-  {
+    safe_delete(_caus);
-    delete _caus;
-    _caus = NULL;
-  }
   if (codcaus.full())
     _caus = new TCausale(codcaus, year);
  

src/ve/velib06a.cpp

@@ -3065,7 +3065,7 @@ bool codcms_handler(TMask_field& f, KEY key)
 		} //if (main_app().has_module(CTAUT) && (...
 
     //aggiornamento automatico del campo codice contabilita' separata nel caso di commessa che ce lo abbia
-    if (main_app().has_module(NPAUT, CHK_DONGLE) && f.running_check(key))
+    if (mask.id2pos(F_CONTSEP) >= 0 && main_app().has_module(NPAUT, CHK_DONGLE) && mask.get(F_CONTSEP).full() && f.running_check(key))
 		{
       const TString& contsep = cache().get(LF_COMMESSE, codcms, COMMESSE_CONTSEP);