Corretto campo totale documento

Aggiunto flag stampa tutti i movimenti alla stampa solleciti e aggiornato programma programma


git-svn-id: svn://10.65.10.50/trunk@2610 c028cbd2-c16b-5b4b-a496-9718f37d4682

sc/sc2100.cpp

@@ -163,10 +163,15 @@ TEC_row::TEC_row(const TRiga_partite& row, const TDate& data, const TImporto& im
   _num_prot    = row.get_long(PART_PROTIVA);
   _num_reg     = row.get_long(PART_NREG);
   _importo     = imp; _importo.normalize();                  
-  _totale      = row.get_real(PART_IMPTOTDOC);
    _descrizione = row.get(PART_DESCR);
 
   _valuta.get(row);
+
+  const bool valuta = form().in_valuta() && _valuta.in_valuta();
+  const char* const field = valuta ? PART_IMPTOTVAL : PART_IMPTOTDOC;
+
+  _totale   = row.get_real(field);
+
 }
 
 TEC_row::TEC_row(const char* desc, const TImporto& imp, const TValuta& val)
@@ -267,6 +272,9 @@ void TEC_row::print_on(TPrint_section& body)
   TForm_item& datadoc = body.find_field(PEC_DATADOC);
   datadoc.set(_data_doc.string());
   
+  TForm_item& totdoc = body.find_field(PEC_TOTDOC);
+  totdoc.set(_totale.string());
+  
   TForm_item& numdoc = body.find_field(PEC_NUMDOC);
   numdoc.set(_num_doc);
   

sc/sc2400.cpp

@@ -224,7 +224,8 @@ bool TStampaSol_application::menu(MENU_TAG)
   TSol_mask &m= mask();
   while (m.run() != K_QUIT)
   {                         
-    _form= new TSol_form(m, _gesval, F_DATALIMSOL);
+    const bool neverending_game = m.get_bool(F_ALLMOV);
+    _form= new TSol_form(m, _gesval, neverending_game ? 0: F_DATALIMSOL, F_DATALIMSOL);
     print_selected();
     delete _form;
     _form= NULL;

sc/sc2400a.h

@@ -9,5 +9,6 @@
 #define F_STAMPESP   107
 #define F_IMPORMIN   108
 #define F_RIFIMPMIN  109
+#define F_ALLMOV     110
 
 #endif       

sc/sc2400a.uml

@@ -1,7 +1,7 @@
 #include "scselmsk.h"
 #include "sc2400a.h"
 
-PAGE "Stampa solleciti" -1 -1 68 17
+PAGE "Stampa solleciti" -1 -1 68 18
 
 NUMBER F_CODDITTA 5
 BEGIN
@@ -19,7 +19,7 @@ BEGIN
   FLAGS "D"
 END
 
-GROUPBOX DLG_NULL 68 7
+GROUPBOX DLG_NULL 68 8
 BEGIN
    PROMPT 0 2 ""
 END
@@ -85,84 +85,74 @@ BEGIN
   PROMPT 1 6 "Stampa esposizione"
 END
 
+BOOLEAN F_ALLMOV
+BEGIN
+  PROMPT 1 7 "Stampa tutti i movimenti"
+END
+
 STRING F_LUOGOSEND 50 32
 BEGIN
-  PROMPT 1 7 "Luogo d'invio "
+  PROMPT 1 8 "Luogo d'invio "
 END
 
 DATE F_DATASEND
 BEGIN
-  PROMPT 50 7 "Data "
+  PROMPT 50 8 "Data "
   FLAGS "A"
   CHECKTYPE REQUIRED
 END
 
 RADIOBUTTON SC_SORTCF 40
 BEGIN
-  PROMPT 1 9 "Ordinamento" 
+  PROMPT 0 10 "Ordinamento"
   ITEM "1|Per codice"    MESSAGE HIDE,2@|SHOW,1@
   ITEM "2|Per ragione sociale" MESSAGE HIDE,1@|SHOW,2@
 END
 
 BUTTON SC_SELECT 10 1
 BEGIN
-  PROMPT 50 10 "~Selezione"
+  PROMPT 50 11 "~Selezione"
 END
 
 BUTTON SC_RESET 10 1
 BEGIN
-  PROMPT 50 11 "~Azzera"
+  PROMPT 50 12 "~Azzera"
 END
 
 NUMBER SC_CFCODFR 5
 BEGIN
-  PROMPT 1 13 "Da codice               "
+  PROMPT 1 14 "Da codice               "
   GROUP 1
 END
 
 BUTTON SC_CFBUTFR 2 1
 BEGIN
-  PROMPT 31 13 ""
+  PROMPT 31 14 ""
   GROUP 1
   PICTURE 109
 END
 
 NUMBER SC_CFCODTO 5
 BEGIN
-  PROMPT 36 13  "a codice "
+  PROMPT 36 14 "a codice "
   GROUP 1
 END
 
 BUTTON SC_CFBUTTO 2 1
 BEGIN
-  PROMPT 51 13 ""
+  PROMPT 51 14 ""
   PICTURE 109
   GROUP 1
 END
 
 STRING SC_CFDESFR  50 30
 BEGIN
-  PROMPT 1 13 "Da ragione sociale "
+  PROMPT 1 14 "Da ragione sociale "
   GROUP 2
   FLAGS "H"
 END
 
 BUTTON SC_CFDESBUTFR 2 1
-BEGIN  
-  PROMPT 51 13 ""
-  PICTURE 109
-  GROUP 2
-  FLAGS "H"
-END
-
-STRING SC_CFDESTO 50 30
-BEGIN 
-  PROMPT 2 14 "A ragione sociale "
-  GROUP 2
-  FLAGS "H"
-END
- 
-BUTTON SC_CFDESBUTTO 2 1
 BEGIN
   PROMPT 51 14 ""
   PICTURE 109
@@ -170,9 +160,24 @@ BEGIN
   FLAGS "H"
 END
 
+STRING SC_CFDESTO 50 30
+BEGIN
+  PROMPT 2 15 "A ragione sociale "
+  GROUP 2
+  FLAGS "H"
+END
+
+BUTTON SC_CFDESBUTTO 2 1
+BEGIN
+  PROMPT 51 15 ""
+  PICTURE 109
+  GROUP 2
+  FLAGS "H"
+END
+
 NUMBER SC_NSEL 3
 BEGIN
-  PROMPT 59 13 "N. "
+  PROMPT 59 14 "N. "
   FLAGS "D"
 END
 

sc/sc2401.cpp

@@ -69,9 +69,13 @@ TESSL_row::TESSL_row(const TRiga_partite& row, const TDate& data, const TImporto
   _num_prot = row.get_long(PART_PROTIVA);
   _num_reg     = row.get_long(PART_NREG);
   _importo  = imp;   _importo.normalize();                  
-  _totale   = row.get_real(PART_IMPTOTDOC);
-
   _valuta.get(row);
+
+  const bool valuta = form().in_valuta() && _valuta.in_valuta();
+  const char* const field = valuta ? PART_IMPTOTVAL : PART_IMPTOTDOC;
+
+  _totale   = row.get_real(field);
+
 }
 
 TESSL_row::TESSL_row(const char* desc, const TImporto& imp, const TValuta& val)
@@ -175,6 +179,9 @@ void TESSL_row::print_on(TPrint_section& body)
   TForm_item& datadoc = body.find_field(PEC_DATADOC);
   datadoc.set(_data_doc.string());
   
+  TForm_item& totdoc = body.find_field(PEC_TOTDOC);
+  totdoc.set(_totale.string());
+  
   TForm_item& numdoc = body.find_field(PEC_NUMDOC);
   numdoc.set(_num_doc);
   
@@ -990,11 +997,8 @@ TESSL_form::TESSL_form(const TESSL_mask& m, bool gesval, short id_datalim, short
   TCursor_sheet& cs = m.cur_sheet();
   _cursore = cs.cursor();                     
 
-  _dlo = m.get(id_datalim);
+  _dlo = id_datalim > 0 ? TDate(m.get(id_datalim)) : eotime;
-  if (id_datascad > 0)
+  _dls = id_datascad > 0 ? TDate(m.get(id_datascad)) : eotime;
-    _dls = m.get(id_datascad);
-  else
-    _dls = eotime;
   if (id_giorni_rischio > 0)
     _giorni_rischio = m.get_int(id_giorni_rischio); 
     

sc/sc2401.h

@@ -1,6 +1,6 @@
 
-#ifndef __SC2403_H
+#ifndef __SC2401_H
-#define __SC2403_H
+#define __SC2401_H
 
 #include <printer.h>
 #include <form.h>
@@ -167,7 +167,7 @@ public:
   void ultima_pagina();
   virtual bool print_game(const TPartita& game);
 
-  TESSL_form(const TESSL_mask& m, bool gesval, short id_datalim, short id_datascad = 0, short id_giorni_rischio = 0);      
+  TESSL_form(const TESSL_mask& m, bool gesval, short id_datalim = 0 , short id_datascad = 0, short id_giorni_rischio = 0);      
   virtual ~TESSL_form();
 };    
 
@@ -201,4 +201,4 @@ public:
   virtual ~TESSL_array() {}
 };
 
-#endif // __SC2403_H
+#endif // __SC2401_H

sc/sc2402.cpp

@@ -48,8 +48,8 @@ TSol_row::TSol_row(const char* desc, const TImporto& imp, const TValuta& val)
 // TSol_form: form speciale per solleciti
 ///////////////////////////////////////////////////////////
 
-TSol_form::TSol_form(const TSol_mask& m, bool gesval, short id_datalim)
+TSol_form::TSol_form(const TSol_mask& m, bool gesval, short id_datalim, short id_datascad)
-          :TESSL_form(m, gesval, id_datalim)
+          :TESSL_form(m, gesval, id_datalim, id_datascad)
 
 { 
   _sel_tot_saldo = m.get_sel_tot_saldo();

sc/sc2402.h

@@ -61,7 +61,7 @@ protected:
 public:
   bool get_sel_tot_saldo() const { return _sel_tot_saldo;}
   const real & get_sel_importo() const { return _sel_importo; }
-  TSol_form(const TSol_mask& m, bool gesval, short id_datalim);      
+  TSol_form(const TSol_mask& m, bool gesval, short id_datalim, short id_datascad);      
   virtual ~TSol_form() {}
 };