From 2a7d0abdc489779f5a043e50817482461fc6171b Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Sat, 12 Feb 2011 00:48:12 +0000
Subject: [PATCH] Patch level         : 10.0 918 Files correlati     : mg3.exe
 Ricompilazione Demo : [ ] Commento            :
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug 0001770: 003343 - Diana 2000

Il cliente richiede che nella stampa disponibilità e giacenze venga inserito un filtro per magazzino e deposito.


git-svn-id: svn://10.65.10.50/branches/R_10_00@21635 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 mg/mg3100.cpp   | 44 ++++++++++++++++++++++++++++++++++++++------
 mg/mg3100.h     |  2 ++
 mg/mg3100.uml   | 24 ++++++++++++++++++++++++
 mg/mg3100a.frm  |  2 +-
 mg/mg3100aa.frm |  2 +-
 mg/mg3100b.frm  |  2 +-
 mg/mg3200.cpp   | 26 ++++++++++++++++++++++++--
 mg/mg3200.h     |  2 ++
 mg/mg3200.uml   | 24 ++++++++++++++++++++++++
 9 files changed, 117 insertions(+), 11 deletions(-)

diff --git a/mg/mg3100.cpp b/mg/mg3100.cpp
index 4f50cc39c..6b5158cb7 100755
--- a/mg/mg3100.cpp
+++ b/mg/mg3100.cpp
@@ -352,13 +352,25 @@ void TStampa_datistorici::setprint_permagazzini()
   if (_mask->get(F_DAMAG).full())
   {
     darec.put("CODMAG",_mask->get(F_DAMAG));
-    srangem << "da \"" << _mask->get(F_DAMAG) << "\" ";
+    srangem << "da " << _mask->get(F_DAMAG) << " ";
   }
   if (_mask->get(F_AMAG).full())
   {
     arec.put("CODMAG",_mask->get(F_AMAG));
-    srangem << "fino a \"" <<  _mask->get(F_AMAG) << "\" ";
+    srangem << "a " <<  _mask->get(F_AMAG) << " ";
   }
+  if (_mask->get(F_DADEP).full())
+  {
+    cfilter << "(" << LF_MAG<< "->CODMAG[4,5]>=" <<'"' << _mask->get(F_DADEP)<< "\")&&" ;
+    srangem << TR("deposito da ") <<  _mask->get(F_DADEP) << " ";
+  }
+  if (_mask->get(F_ADEP).full())
+  {
+    cfilter << "(" << LF_MAG<< "->CODMAG[4,5]<=" <<'"' << _mask->get(F_ADEP)<< "\")&&" ;
+    srangem << TR("a ") <<  _mask->get(F_ADEP) << " ";
+  }
+	if (cfilter.full())
+		cfilter.rtrim(2);
   rangem.set(srangem.empty() ? TR("Tutti i magazzini") : format(FR("Magazzini %s"), (const char *)srangem));
   darec.put("ANNOES",_mask->get(F_ANNOES));
   arec.put("ANNOES",_mask->get(F_ANNOES));
@@ -383,9 +395,19 @@ void TStampa_datistorici::setprint_perarticoli()
   _cur = _form->cursor();
   
   if (_mask->get(F_DAMAG).full())
-    srangem << "da \"" << _mask->get(F_DAMAG) << "\" ";
+    srangem << "da " << _mask->get(F_DAMAG) << " ";
   if (_mask->get(F_AMAG).full())
-    srangem << "fino a \"" << _mask->get(F_AMAG) << "\"";
+    srangem << " a " << _mask->get(F_AMAG) << " ";
+  if (_mask->get(F_DADEP).full())
+  {
+    filter << "(" << LF_MAG<< "->CODMAG[4,5]>=" <<'"' << _mask->get(F_DADEP)<< "\")&&" ;
+    srangem << TR("deposito ") <<  _mask->get(F_DADEP) << " ";
+  }
+  if (_mask->get(F_ADEP).full())
+  {
+    filter << "(" << LF_MAG<< "->CODMAG[4,5]<=" <<'"' << _mask->get(F_ADEP)<< "\")&&" ;
+    srangem << TR("a ") <<  _mask->get(F_ADEP) << " ";
+  }
 
   rangem.set(srangem.blank()? TR("Tutti i magazzini") : format(FR("Magazzini %s"),(const char *)srangem));
 
@@ -555,12 +577,22 @@ void TStampa_datistorici::setprint_perarticoli_all()
   if (_mask->get(F_DAMAG).full())
   {
     filter << "(" << LF_MAG <<"->CODMAG[1,3]>=" <<'"' << _mask->get(F_DAMAG)<< "\")&&" ;
-    srangem << "da \"" << _mask->get(F_DAMAG) << "\" ";
+    srangem << "da " << _mask->get(F_DAMAG) << " ";
   }
   if (_mask->get(F_AMAG).full())
   {
     filter << "(" << LF_MAG <<"->CODMAG[1,3]<=" <<'"' << _mask->get(F_AMAG)<< "\")&&" ;
-    srangem << "fino a \"" << _mask->get(F_AMAG) << "\"";
+    srangem << "a " << _mask->get(F_AMAG) << " ";
+  }
+  if (_mask->get(F_DADEP).full())
+  {
+    filter << "(" << LF_MAG<< "->CODMAG[4,5]>=" <<'"' << _mask->get(F_DADEP)<< "\")&&" ;
+    srangem << TR("deposito da ") <<  _mask->get(F_DADEP) << " ";
+  }
+  if (_mask->get(F_ADEP).full())
+  {
+    filter << "(" << LF_MAG<< "->CODMAG[4,5]<=" <<'"' << _mask->get(F_ADEP)<< "\")&&" ;
+    srangem << TR("a ") <<  _mask->get(F_ADEP) << " ";
   }
   rangem.set(srangem.blank()? TR("Tutti i magazzini") : format(FR("Magazzini %s"),(const char *)srangem));
 
diff --git a/mg/mg3100.h b/mg/mg3100.h
index d3f63de8d..365c3dd36 100755
--- a/mg/mg3100.h
+++ b/mg/mg3100.h
@@ -28,6 +28,8 @@
 #define F_CATVENLISTINO 129
 #define F_DAUSR 130
 #define F_AUSR 131
+#define F_DADEP 132
+#define F_ADEP 133
 
 #define G_CATMER 1 
 #define G_CODART 2
diff --git a/mg/mg3100.uml b/mg/mg3100.uml
index 23652098f..6f16f2959 100755
--- a/mg/mg3100.uml
+++ b/mg/mg3100.uml
@@ -203,6 +203,19 @@ BEGIN
   OUTPUT F_DAMAG CODTAB
 END
 
+STRING F_DADEP 2 
+BEGIN
+  PROMPT 30 10 "Deposito "
+  FLAGS "U"
+  USE MAG SELECT CODTAB[4,5]!="" 
+  INPUT CODTAB[1,3] F_DAMAG SELECT
+  INPUT CODTAB[4,5] F_DADEP
+  DISPLAY "Codice magazzino" CODTAB[1,3]
+  DISPLAY "Deposito" CODTAB[4,5]
+  DISPLAY "Descr@50" S0
+  OUTPUT F_DADEP CODTAB[4,5]
+END
+
 STRING F_AMAG 3
 BEGIN
   PROMPT 2 11 "Al magazzino  "
@@ -213,6 +226,17 @@ BEGIN
   OUTPUT F_AMAG CODTAB
 END
 
+STRING F_ADEP 2
+BEGIN
+  PROMPT 30 11 "Deposito "
+  FLAGS "U"
+  COPY USE F_DADEP
+  INPUT CODTAB[1,3] F_AMAG SELECT
+  INPUT CODTAB F_ADEP
+  COPY DISPLAY F_DADEP
+  OUTPUT F_ADEP CODTAB
+END
+
 STRING F_DACATMER 3 
 BEGIN
   PROMPT 2 12 "Dal gruppo    "
diff --git a/mg/mg3100a.frm b/mg/mg3100a.frm
index 4bcefa2cd..bb0450cef 100755
--- a/mg/mg3100a.frm
+++ b/mg/mg3100a.frm
@@ -68,7 +68,7 @@ BEGIN
   PROMPT 1 3 ""
 END
 
-STRINGA FF_RANGEMAGAZ 40
+STRINGA FF_RANGEMAGAZ 60
 BEGIN
   KEY "RANGE"
   PROMPT 1 4 ""
diff --git a/mg/mg3100aa.frm b/mg/mg3100aa.frm
index 05e3bd522..bf578a6e3 100755
--- a/mg/mg3100aa.frm
+++ b/mg/mg3100aa.frm
@@ -68,7 +68,7 @@ BEGIN
   PROMPT 1 3 ""
 END
 
-STRINGA FF_RANGEMAGAZ 40
+STRINGA FF_RANGEMAGAZ 60
 BEGIN
   KEY "RANGE"
   PROMPT 1 4 ""
diff --git a/mg/mg3100b.frm b/mg/mg3100b.frm
index 5ad911502..56754acdc 100755
--- a/mg/mg3100b.frm
+++ b/mg/mg3100b.frm
@@ -67,7 +67,7 @@ BEGIN
   PROMPT 1 4 ""
 END
 
-STRINGA FF_RANGEMAGAZ 40
+STRINGA FF_RANGEMAGAZ 60
 BEGIN
   KEY "RANGE"
   PROMPT 1 3 ""
diff --git a/mg/mg3200.cpp b/mg/mg3200.cpp
index 28efb3330..15c36cb62 100755
--- a/mg/mg3200.cpp
+++ b/mg/mg3200.cpp
@@ -284,6 +284,18 @@ void TStampa_disp::setprint_permagazzini()
     srangem << TR("da \"") <<  _mask->get(F_DAMAG) << "\" ";
   if (_mask->get(F_AMAG).full())
     srangem << TR("fino a \"") <<  _mask->get(F_AMAG) << "\" ";
+  if (_mask->get(F_DADEP).full())
+  {
+    cfilter << "(" << LF_MAG<< "->CODMAG[4,5]>=" <<'"' << _mask->get(F_DADEP)<< "\")&&" ;
+    srangem << TR("deposito da ") <<  _mask->get(F_DADEP) << " ";
+  }
+  if (_mask->get(F_ADEP).full())
+  {
+    cfilter << "(" << LF_MAG<< "->CODMAG[4,5]<=" <<'"' << _mask->get(F_ADEP)<< "\")&&" ;
+    srangem << TR("a ") <<  _mask->get(F_ADEP) << " ";
+  }
+	if (cfilter.full())
+		cfilter.rtrim(2);
   rangem.set(srangem.empty() ? TR("Tutti i magazzini") : format(FR("Magazzini %s"),(const char *)srangem));
 
   cur.setfilter(cfilter);
@@ -308,12 +320,22 @@ void TStampa_disp::setprint_perarticoli()
   if (_mask->get(F_DAMAG).full())
   {
     filter << "(" << LF_MAG<< "->CODMAG[1,3]>=" <<'"' << _mask->get(F_DAMAG)<< "\")&&" ;
-    srangem << TR("da \"") <<  _mask->get(F_DAMAG) << "\" ";
+    srangem << TR("da ") <<  _mask->get(F_DAMAG) << " ";
   }
   if (_mask->get(F_AMAG).full())
   {
     filter << "(" << LF_MAG<< "->CODMAG[1,3]<=" <<'"' << _mask->get(F_AMAG)<< "\")&&" ;
-    srangem << TR("fino a \"") <<  _mask->get(F_AMAG) << "\" ";
+    srangem << TR("a ") <<  _mask->get(F_AMAG) << " ";
+  }
+  if (_mask->get(F_DADEP).full())
+  {
+    filter << "(" << LF_MAG<< "->CODMAG[4,5]>=" <<'"' << _mask->get(F_DADEP)<< "\")&&" ;
+    srangem << TR("deposito da") <<  _mask->get(F_DADEP) << " ";
+  }
+  if (_mask->get(F_ADEP).full())
+  {
+    filter << "(" << LF_MAG<< "->CODMAG[4,5]<=" <<'"' << _mask->get(F_ADEP)<< "\")&&" ;
+    srangem << TR("a ") <<  _mask->get(F_ADEP) << " ";
   }
   rangem.set(srangem.empty() ? TR("Tutti i magazzini") : format(FR("Magazzini %s"),(const char *)srangem));
   if (filter.not_empty())
diff --git a/mg/mg3200.h b/mg/mg3200.h
index 489bc89c0..73dc3f2c2 100755
--- a/mg/mg3200.h
+++ b/mg/mg3200.h
@@ -10,6 +10,8 @@
 #define F_ACATMER 110
 #define F_DADES 111
 #define F_ADES 112
+#define F_DADEP 113
+#define F_ADEP 114
 #define F_TOTALIMAGAZZINI 119
 #define F_TOTALIDEPOSITI 120
 
diff --git a/mg/mg3200.uml b/mg/mg3200.uml
index d4dc94099..0ba90d361 100755
--- a/mg/mg3200.uml
+++ b/mg/mg3200.uml
@@ -133,6 +133,19 @@ BEGIN
   OUTPUT F_DAMAG CODTAB
 END
 
+STRING F_DADEP 2 
+BEGIN
+  PROMPT 30 10 "Deposito "
+  FLAGS "U"
+  USE MAG SELECT CODTAB[4,5]!="" 
+  INPUT CODTAB[1,3] F_DAMAG SELECT
+  INPUT CODTAB[4,5] F_DADEP
+  DISPLAY "Codice magazzino" CODTAB[1,3]
+  DISPLAY "Deposito" CODTAB[4,5]
+  DISPLAY "Descr@50" S0
+  OUTPUT F_DADEP CODTAB[4,5]
+END
+
 STRING F_AMAG 3
 BEGIN
   PROMPT 2 11 "Al magazzino  "
@@ -143,6 +156,17 @@ BEGIN
   OUTPUT F_AMAG CODTAB
 END
 
+STRING F_ADEP 2
+BEGIN
+  PROMPT 30 11 "Deposito "
+  FLAGS "U"
+  COPY USE F_DADEP
+  INPUT CODTAB[1,3] F_AMAG SELECT
+  INPUT CODTAB F_ADEP
+  COPY DISPLAY F_DADEP
+  OUTPUT F_ADEP CODTAB
+END
+
 STRING F_DACATMER 3 
 BEGIN
   PROMPT 2 12 "Dal gruppo    "