From 7baf8c543329debbca346227e2598ad53fdcda42 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 27 Aug 2008 12:58:13 +0000
Subject: [PATCH] Patch level         : 10.0 109 Files correlati     :
 Ricompilazione Demo : [ ] Commento           :

Riportata la versione 3.2 1208


git-svn-id: svn://10.65.10.50/trunk@17109 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 res/resource.ini |  8 ++++++++
 sc/sc2600.cpp    | 17 ++++++++---------
 sc/sc2600a.uml   | 14 ++++++++++----
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/res/resource.ini b/res/resource.ini
index 406fb2eed..5cebf6d2b 100755
--- a/res/resource.ini
+++ b/res/resource.ini
@@ -279,3 +279,11 @@ Item_00_00=30001,&Colori righe
 [Menu_VE0-0]
 Item_00=5100,&Opzioni
 Item_00_00=30001,&Colori righe
+
+[Menu_MR2-0]
+Item_00=5100,&Opzioni
+Item_00_00=30001,&Colori righe
+
+[Menu_MR2-1]
+Item_00=5100,&Opzioni
+Item_00_00=30001,&Colori righe
diff --git a/sc/sc2600.cpp b/sc/sc2600.cpp
index 5f1e6efa6..a87f7a0c2 100755
--- a/sc/sc2600.cpp
+++ b/sc/sc2600.cpp
@@ -15,16 +15,16 @@
 // Stampa prospetto scadenze
 ///////////////////////////////////////////////////////////
 
-#define NUMERO_FASCE 6
-#define LIMITI {0, 30, 60, 90, 120, 150, 180}
+#define NUMERO_FASCE 9
+#define LIMITI {0, 30, 60, 90, 120, 150, 180, 210, 240, 270}
 
 enum tipo_st {clienti=0, fornitori=1};
 
 class TLineTotal : public TObject  //Oggetto di base per i TAssoc_array dei totali
 {                                     
 public:  
-  real _s[6];// Scaglioni scaduto
-  real _ns[6];// Scaglioni a scadere
+  real _s[NUMERO_FASCE];// Scaglioni scaduto
+  real _ns[NUMERO_FASCE];// Scaglioni a scadere
   real _es; // esposto
   real _sl; // saldo
   
@@ -100,7 +100,7 @@ public:
   void print_totali(int nriga);
   void print_header();
 	int calc_last_column();
-	void update_totals(bool what, real& esp, real s[6], real ns[6]);
+	void update_totals(bool what, real& esp, real s[NUMERO_FASCE], real ns[NUMERO_FASCE]);
   void compute_unassigned(TPartita& p, const TDate & datalim);
   void compute_all(TPartita& p, TBill& bill);
 	void print_real(TString& dest, const real& num);
@@ -139,8 +139,7 @@ bool TProspettoScadenze::fil_function(const TRelation *r)
 }
 
 void TProspettoScadenze::update_totals(bool what, real& esp,
-                         real s[6],
-                         real ns[6]) 
+                         real s[NUMERO_FASCE], real ns[NUMERO_FASCE]) 
 {
   TAssoc_array& a = (TAssoc_array&) _t[what];
   TLineTotal *ll = (TLineTotal *) a.objptr(_codval);
@@ -190,8 +189,8 @@ void TProspettoScadenze::compute_unassigned(TPartita& p, const TDate & datalim)
 void TProspettoScadenze::compute_all(TPartita& p, TBill& bill)
 { 
   real residuo;
-	real s[6];
-	real ns[6];
+	real s[NUMERO_FASCE];
+	real ns[NUMERO_FASCE];
 	real res_pagati;
 	real esposto;
 
diff --git a/sc/sc2600a.uml b/sc/sc2600a.uml
index fa02f06d5..00dbdd2b9 100755
--- a/sc/sc2600a.uml
+++ b/sc/sc2600a.uml
@@ -208,12 +208,15 @@ END
 LISTBOX F_SCADFASCE 3
 BEGIN
 	PROMPT 35 16 "Fino alla fascia "
-        ITEM "0|0"
+  ITEM "0|0"
 	ITEM "1|30"
 	ITEM "2|60"
 	ITEM "3|90"
 	ITEM "4|120"
 	ITEM "5|150"
+	ITEM "6|180"
+	ITEM "7|210"
+	ITEM "8|240"
 END
 
 BOOLEAN F_ASCADINFASCE
@@ -227,14 +230,17 @@ END
 LISTBOX F_ASCADFASCE 3
 BEGIN
 	PROMPT 35 17 "Fino alla fascia "
-        ITEM "0|0"
+  ITEM "0|0"
 	ITEM "1|30"
 	ITEM "2|60"
 	ITEM "3|90"
 	ITEM "4|120"
 	ITEM "5|150"
-	NUM_EXPR {#F_SCADFASCE+#F_ASCADFASCE<7}
-	WARNING "E' possibile selezionare massimo 6 fasce in totale"
+	ITEM "6|180"
+	ITEM "7|210"
+	ITEM "8|240"
+	NUM_EXPR {#F_SCADFASCE+#F_ASCADFASCE < 10}
+	WARNING "E' possibile selezionare massimo 9 fasce in totale"
 END
 
 ENDPAGE