From c4de2fc47b2ef81e8c073457eb5e2dbb85c21080 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 17 Jul 2006 13:50:22 +0000
Subject: [PATCH] Patch level         :  4.0 451 Files correlati     :
 Ricompilazione Demo : [ ] Commento            :

Corrretto il meccanismo di proposta delle spese automatiche per cliente


git-svn-id: svn://10.65.10.50/trunk@14189 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ve/velib.h      |  3 +++
 ve/velib03.cpp  | 14 ++++++++------
 ve/velib03a.cpp |  4 +---
 ve/velib06.cpp  |  4 ++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ve/velib.h b/ve/velib.h
index b25351280..9caa80761 100755
--- a/ve/velib.h
+++ b/ve/velib.h
@@ -606,6 +606,7 @@ class TDocumento : public TMultiple_rectype	// velib03
 	TRiga_documento * _esenzione; // Riga per l' esenzione iva
 	
 	bool _dirty_deny;
+	bool _spese_updated;
 
 	static TAssoc_array _tipi; 
 	static TAssoc_array _numerazioni;	
@@ -650,6 +651,8 @@ public:
 	TCodgiac_livelli & livelli() const ;
 	void dirty_fields();
 
+	bool & spese_updated() { return _spese_updated;}
+
 	TAssoc_array & tabella_iva() { update_tabella_iva(); return _tabella_iva; }
 	TCli_for & clifor() const;
 	TOccasionale & occas() const;
diff --git a/ve/velib03.cpp b/ve/velib03.cpp
index 9ea236720..ba2ad9530 100755
--- a/ve/velib03.cpp
+++ b/ve/velib03.cpp
@@ -167,7 +167,8 @@ void TDocumento::init()
   
   _sconto = _esenzione = NULL;
   _stato_originale = ' ';
-  _dirty_deny = FALSE;
+  _dirty_deny = false;
+	_spese_updated = false;
   
   check_modules();
 
@@ -673,6 +674,7 @@ int TDocumento::read(TBaseisamfile& f, word op, word lockop)
   if (is_fattura())
     set_riga_esenzione();
   _stato_originale = stato();
+	_spese_updated = get_bool(DOC_SPESEUPD);
   
   if (err == NOERR && tipo_valido() && tipo().statistiche() && _has_stat_ven)
   {       
@@ -864,7 +866,8 @@ int TDocumento::write_rewrite(TBaseisamfile & f, bool re) const
 
   if (!doc_bloccato)
   {
-    if(tipo().spese_aut() && !get_bool(DOC_SPESEUPD))
+		myself.put(DOC_SPESEUPD, _spese_updated);
+    if(tipo().spese_aut() && !_spese_updated)
     {
       TString16 name("CODSP0");
       TString_array spese;        
@@ -879,7 +882,6 @@ int TDocumento::write_rewrite(TBaseisamfile & f, bool re) const
       }               
       myself.update_spese_aut(spese);
     }
-  
     myself.update_conai();
     myself.set_row_ids();
 //	  const int rows = physical_rows();
@@ -2166,6 +2168,7 @@ TDocumento & TDocumento::copy(const TDocumento & d)
   reset_fields(*this);
   set_fields(*this);
 	put(DOC_SPESEUPD, d.get(DOC_SPESEUPD));
+	_spese_updated =  d._spese_updated;
   for (int i = physical_rows(); i > 0; i--)
   {
     TRiga_documento & r = row(i);
@@ -2229,8 +2232,7 @@ TRecord_array& TDocumento::body(int logicnum) const
 
 void TDocumento::update_spese_aut(TString_array & spese_aut, bool preserve_old, TSheet_field * sh)
 {
-  const bool updated = get_bool(DOC_SPESEUPD);
-  if (updated)
+  if (_spese_updated)
     return;
 
   const bool interactive = sh != NULL;
@@ -2324,7 +2326,7 @@ void TDocumento::update_spese_aut(TString_array & spese_aut, bool preserve_old,
       }
     }                                                   
   }
-  put(DOC_SPESEUPD, true);
+  _spese_updated = true;
 }
                                    
 real TDocumento::calc_conai_qta(int type)
diff --git a/ve/velib03a.cpp b/ve/velib03a.cpp
index 3f74a1ae0..6a48f92e5 100755
--- a/ve/velib03a.cpp
+++ b/ve/velib03a.cpp
@@ -196,9 +196,7 @@ const TString_array& TTipo_documento::sheet_columns() const
   {
     TFilename pn; profile_name(pn);
     TConfig prof(pn, "SHEET");
-    TString8 col;
-    const int ncols = prof.get_int("NCOLS");
-    for (int i = 1; i <= ncols; i++)
+    for (int i = 0; i < MAX_COLUMNS; i++)
     {
 	  const TString& id = prof.get("Col", NULL, i);
       if (atoi(id) <= 0)
diff --git a/ve/velib06.cpp b/ve/velib06.cpp
index 28a0b2a13..d6f0108df 100755
--- a/ve/velib06.cpp
+++ b/ve/velib06.cpp
@@ -925,7 +925,7 @@ void TDocumento_mask::spese2mask()
 			spese.add(s);
 	}							 
 
-    doc().put("SPESEUPD", false);
+  doc().put(DOC_SPESEUPD, false);
 	doc().put(DOC_CODVAL, get(F_CODVAL));
 	doc().put(DOC_CAMBIO, get(F_CAMBIO));
 	doc().put(DOC_CONTROEURO, get(F_CONTROEURO));
@@ -1446,7 +1446,7 @@ bool TDocumento_mask::clifo_handler( TMask_field& f, KEY key )
 			return f.error_box( "Il codice '%ld' e' sospeso e non puo' essere utilizzato", atol(f.get()));
 		
 		if (f.focusdirty())
-			d.put(DOC_SPESEUPD, false);
+			d.spese_updated() = false;
 
 		m.cli2mask();