From a2af48e4a3e35aa592e8e2e981a42c2999d78d8c Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 24 Feb 2011 11:13:15 +0000
Subject: [PATCH] Patch level         : 10.0 Files correlati     : mg4.exe
 mg4200a.frm mg4200b.frm Ricompilazione Demo : [ ] Commento            :
 Corretta stampa inventario per magazzini con totali per livello di giacenza
 (cliente Hardy)

git-svn-id: svn://10.65.10.50/branches/R_10_00@21709 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 mg/mg4200.cpp  | 30 +++++++++++++++++++++---------
 mg/mg4200a.frm |  8 ++++++++
 mg/mg4200b.frm |  5 +++++
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/mg/mg4200.cpp b/mg/mg4200.cpp
index 64140bee6..d9e1bd932 100755
--- a/mg/mg4200.cpp
+++ b/mg/mg4200.cpp
@@ -635,8 +635,12 @@ void TStampa_inventario::setprint_permagazzini(const char subordine, const bool
       espr1 = "ANNOES|CODMAG[1,3]|CODART|LIVELLO|CODMAG[4,5]";
     else
       espr1 = "ANNOES|CODMAG|CODART|LIVELLO";
-    _form->find_field('B',odd_page,"GRUPPI_SCATMER").setcondition("CODART",_strexpr);
-    _form->set_ordering(mg_normale);
+    
+    //_form->find_field('B',odd_page,"GRUPPI_SCATMER").setcondition("CODART",_strexpr);
+    //_form->set_ordering(mg_normale);
+    _form->find_field('B',odd_page,"GRUPPI_SCATMER").setcondition("CODMAG+CODART",_strexpr);
+    _form->find_field('B',odd_page,"GRUPPI_CATMER").setcondition("CODMAG+CODART",_strexpr);
+
     break;
   case 'D':
     _form->find_field('B',odd_page,"H_CATMER").hide();
@@ -647,8 +651,12 @@ void TStampa_inventario::setprint_permagazzini(const char subordine, const bool
       espr1 = "ANNOES|CODMAG[1,3]|UPPER(47->DESCR)|LIVELLO|CODMAG[4,5]";
     else
       espr1 = "ANNOES|CODMAG|UPPER(47->DESCR)|LIVELLO";
-    _form->find_field('B',odd_page,"GRUPPI_SCATMER").setcondition("CODART",_strexpr);
-    _form->set_ordering(mg_normale);
+    
+    //_form->find_field('B',odd_page,"GRUPPI_SCATMER").setcondition("CODART",_strexpr);
+    //_form->set_ordering(mg_normale);
+    _form->find_field('B',odd_page,"GRUPPI_SCATMER").setcondition("CODMAG+CODART",_strexpr);
+    _form->find_field('B',odd_page,"GRUPPI_CATMER").setcondition("CODMAG+CODART",_strexpr);
+ 
     if (m.get(F_DADES).full())
       cfilter << and_connect(cfilter) << "(UPPER(47->DESCR)>=\"" << m.get(F_DADES) << "\")";
     if (m.get(F_ADES).full())
@@ -793,8 +801,10 @@ void TStampa_inventario::setprint_perarticoli(const char subordine, const bool a
     _form->find_field('B',odd_page,"H_SCATMER").hide();
     _form->find_field('B',odd_page,"TOT_SCATMER").hide();
      espr1 = "ANNOES|CODART|LIVELLO|CODMAG";
-    _form->find_field('B',odd_page,"GRUPPI_SCATMER").setcondition("CODART",_strexpr);
+    
+     _form->find_field('B',odd_page,"GRUPPI_SCATMER").setcondition("CODART",_strexpr);
     _form->set_ordering(mg_normale);
+    
     if (m.get(F_DAART).full())
 			cfilter << and_connect(cfilter) << "(CODART>=\"" << m.get(F_DAART) << "\")";
     if (m.get(F_AART).full())
@@ -964,8 +974,9 @@ void TStampa_inventario::setprint_perarticoli_all(const char subordine, bool all
     _form->find_field('B',odd_page,"TOT_CATMER").hide();
     _form->find_field('B',odd_page,"H_SCATMER").hide();
     _form->find_field('B',odd_page,"TOT_SCATMER").hide();
-    _form->find_field('B',odd_page,"GRUPPI_SCATMER").setcondition("CODART",_strexpr);
-    _form->set_ordering(mg_normale);
+
+    _form->find_field('B',odd_page,"GRUPPI_SCATMER").setcondition("CODART",_strexpr);   
+    _form->set_ordering(mg_normale); 
     break;
   case 'D':
     _form->cursor()->setkey(2); sortexp = ANAMAG_DESCR;
@@ -975,8 +986,9 @@ void TStampa_inventario::setprint_perarticoli_all(const char subordine, bool all
     _form->find_field('B',odd_page,"TOT_CATMER").hide();
     _form->find_field('B',odd_page,"H_SCATMER").hide();
     _form->find_field('B',odd_page,"TOT_SCATMER").hide();
-    _form->find_field('B',odd_page,"GRUPPI_SCATMER").setcondition("CODART",_strexpr);
-    _form->set_ordering(mg_normale);
+    
+    _form->find_field('B',odd_page,"GRUPPI_SCATMER").setcondition("CODART",_strexpr);   
+    _form->set_ordering(mg_normale); 
     break;
   case 'S':
   case 'M':
diff --git a/mg/mg4200a.frm b/mg/mg4200a.frm
index e5cd81cd0..448129262 100755
--- a/mg/mg4200a.frm
+++ b/mg/mg4200a.frm
@@ -1311,11 +1311,19 @@ SECTION BODY ODD 0 COLUMNWISE
                           KEY "" 
                           PROMPT 3 1 ""
                         END
+
                         STRINGA 551 20
                         BEGIN
                           KEY "" 
                           PROMPT 2 1 ""
                         END
+
+                        STRINGA -1 19
+                        BEGIN
+                          KEY "Spaziatura" 
+                          PROMPT 4 1 ""
+                        END
+
                         STRINGA 553 3
                         BEGIN
                           KEY "UM"
diff --git a/mg/mg4200b.frm b/mg/mg4200b.frm
index 9bd470232..01a429399 100755
--- a/mg/mg4200b.frm
+++ b/mg/mg4200b.frm
@@ -1052,6 +1052,11 @@ SECTION BODY ODD 1 COLUMNWISE
                             KEY "" 
                             PROMPT 2 1 ""
                           END
+                          STRINGA -1 19
+                          BEGIN
+                            KEY "Spacer"
+                            PROMPT 4 1 ""
+                          END
                           STRINGA 553 3
                           BEGIN
                             KEY "UM"