From 9122d42b1670a7e89854438d0705a251182111e7 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 1 Mar 1995 15:17:16 +0000
Subject: [PATCH] Corretto uso di new _pag

git-svn-id: svn://10.65.10.50/trunk@1055 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg2100.cpp | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/cg/cg2100.cpp b/cg/cg2100.cpp
index b34814fac..9d5afe9f7 100755
--- a/cg/cg2100.cpp
+++ b/cg/cg2100.cpp
@@ -177,7 +177,7 @@ bool TPrimanota_application::user_destroy()
   for (int m = 3; m >= 0; m--)
     if (_msk[m] != NULL) delete _msk[m];
   
-  if (_pag != NULL) delete _pag;
+  if (_pag) delete _pag;
   if (_pag_rows != NULL) delete _pag_rows;
 
   delete _giornale;  
@@ -229,8 +229,7 @@ bool TPrimanota_application::read_caus(const char* cod, int year)
   
   if (iva != nessuna_iva)
   {
-    if (sal) m->enable_page(2);
-    else     m->disable_page(2);
+    m->enable_page(2, sal);
     
     m->efield(F_CODPAG).check_type(sal ? CHECK_REQUIRED : CHECK_NORMAL);// Cod. pag. obbligatorio
     const bool av = causale().reg().agenzia_viaggi();
@@ -491,17 +490,19 @@ const char* TPrimanota_application::get_next_key()
 
 void TPrimanota_application::init_insert_mode(TMask& m)
 {
-  if (iva() != nessuna_iva)
-    occas_mask().reset();
-
   init_mask(m);             
   if (causale().reg().agenzia_viaggi())
     m.set(F_DATA74TER, m.get(F_DATAREG));              
+  
+  if (iva() != nessuna_iva)
+  {
+    occas_mask().reset();
 
-  TString dt(m.get(F_DATAREG));
-  _pag = new Pagamento(NULL,dt);  
-  set_scadenze(m);
-  _saldi.reset();                        // Inizializza saldi
+    TString dt(m.get(F_DATAREG));
+    set_pagamento(NULL,dt);  
+    set_scadenze(m);
+    _saldi.reset();                        // Inizializza saldi
+  }  
 }
 
 
@@ -651,9 +652,10 @@ int TPrimanota_application::read(TMask& m)
     c.add_to(riga, 4, 0x7);              // Conto 105-110
     
     ivas().row(i) = riga;
-  }
-  TString dt(m.get(F_DATAREG));
-  _pag = new Pagamento(m.get(F_CODPAG),dt);
+  }           
+  
+  TString16 dt(m.get(F_DATAREG));
+  set_pagamento(m.get(F_CODPAG),dt);
   if (!read_scadenze(m))
     set_scadenze(m);
   
@@ -865,7 +867,7 @@ HIDDEN bool incasso_handler(TMask_field& f, KEY k)
 void TPrimanota_application::genera_incasso(const char* causimm)
 {
   TMask m("cg2100i");
-  if (iva() == iva_acquisti) m.set_caption("Movimento di pagamento immediato");
+  if (iva() == iva_acquisti) m.set_caption("Movimento di TPagamento immediato");
   
   m.set_handler(F_DATAREG, datareg_handler);
   m.set_handler(F_DATACOMP, datacomp_handler);