From e6cae1810f43bff8030e7ec42e0db0d1265cbd7d Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 10 Jun 2011 11:03:48 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            :

git-svn-id: svn://10.65.10.50/branches/R_10_00@22256 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ps/ps1002100.cpp  | 32 +++++++++++++++++++-------------
 ps/ps1002100a.h   |  5 +++--
 ps/ps1002100a.uml | 15 +++++++++++----
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/ps/ps1002100.cpp b/ps/ps1002100.cpp
index 032790959..4a6cea8ad 100755
--- a/ps/ps1002100.cpp
+++ b/ps/ps1002100.cpp
@@ -400,7 +400,7 @@ void TEdit_rdocs_mask::fill_sheet()
   query << "USE DOC KEY 2";
   query << "\nSELECT (CODNUM=#CODNUM)";
   if (includi_evasi)
-    query << "&&(BETWEEN(DATADOC,#DADATA,#ADATA))";
+    query << "&&(ANNO>=#DAANNO)";
   else
     query << "&&(DOCEVASO!=\"X\")";
 
@@ -412,10 +412,7 @@ void TEdit_rdocs_mask::fill_sheet()
   recset.set_var("#CODCF", get_long(F_CODCF));
   recset.set_var("#CODNUM", get(F_CODNUM));
   if (includi_evasi)
-  {
-    recset.set_var("#DADATA", get_date(F_DADATA_EV));
-    recset.set_var("#ADATA", get_date(F_ADATA_EV));
-  }
+    recset.set_var("#DAANNO", get_long(F_DA_ANNO));
 
   const TString& lav = get(F_LAV);
   const TString& col = get(F_COLORE);
@@ -437,18 +434,27 @@ void TEdit_rdocs_mask::fill_sheet()
 
     //per ogni documento prende le sole righe non evase e le carica sullo sheet
     TDocumento doc(rec);
+    bool rdoc_da_considerare = false;
     FOR_EACH_PHYSICAL_RDOC(doc, r, rdoc)
     {
-      if (!rdoc->is_evasa() && rdoc->is_evadibile())
+      const real qta = rdoc->get_real(RDOC_QTA);
+      if (qta > ZERO)
       {
-        if (lav.full() && rdoc->get(RDOC_CODCMS) != lav)
-          continue;
-        if (col.full() && rdoc->get(RDOC_FASCMS) != col)
-          continue;
-        if (codart.full() && rdoc->get(RDOC_CODART) != codart)
-          continue;
+        if (includi_evasi)
+          rdoc_da_considerare = rdoc->is_evadibile();
+        else
+          rdoc_da_considerare = !rdoc->is_evasa() && rdoc->is_evadibile();
+        if (rdoc_da_considerare)
+        {
+          if (lav.full() && rdoc->get(RDOC_CODCMS) != lav)
+            continue;
+          if (col.full() && rdoc->get(RDOC_FASCMS) != col)
+            continue;
+          if (codart.full() && rdoc->get(RDOC_CODART) != codart)
+            continue;
 
-        sf_righe.autoload_line(++k, *rdoc);  //aggiunge una riga nuova riempiendola con tutti i campi che hanno FIELD nella maschera
+          sf_righe.autoload_line(++k, *rdoc);  //aggiunge una riga nuova riempiendola con tutti i campi che hanno FIELD nella maschera
+        }
       }
     }
   }
diff --git a/ps/ps1002100a.h b/ps/ps1002100a.h
index 3c56e4942..ae79cf674 100755
--- a/ps/ps1002100a.h
+++ b/ps/ps1002100a.h
@@ -14,8 +14,9 @@
 #define F_CODART    314
 #define F_DESCR     315
 #define F_INCL_EVASI 316
-#define F_DADATA_EV  317
-#define F_ADATA_EV   318
+#define F_DA_ANNO   317
+//#define F_DADATA_EV  317
+//#define F_ADATA_EV   318
 
 #define F_RIGHE     320
 
diff --git a/ps/ps1002100a.uml b/ps/ps1002100a.uml
index b7aaffd34..1ea46f841 100755
--- a/ps/ps1002100a.uml
+++ b/ps/ps1002100a.uml
@@ -207,11 +207,18 @@ END
 BOOLEAN F_INCL_EVASI
 BEGIN
   PROMPT 2 8 "Includi evasi"
-  MESSAGE FALSE HIDE,F_DADATA_EV|HIDE,F_ADATA_EV
-  MESSAGE TRUE SHOW,F_DADATA_EV|SHOW,F_ADATA_EV
+  MESSAGE FALSE HIDE,F_DA_ANNO
+  MESSAGE TRUE SHOW,F_DA_ANNO
 END
 
-DATA F_DADATA_EV
+NUMBER F_DA_ANNO 4
+BEGIN
+  PROMPT 20 8 "Dall' anno "
+  CHECKTYPE REQUIRED
+  FLAGS "A"
+END
+
+/*DATA F_DADATA_EV
 BEGIN
   PROMPT 20 8 "Dalla data "
   CHECKTYPE REQUIRED
@@ -221,7 +228,7 @@ DATA F_ADATA_EV
 BEGIN
   PROMPT 45 8 "Alla data "
   CHECKTYPE REQUIRED
-END
+END*/
 
 SPREADSHEET F_RIGHE
 BEGIN