diff --git a/mg/mg3200.cpp b/mg/mg3200.cpp index b7e4f068d..d4650a76d 100755 --- a/mg/mg3200.cpp +++ b/mg/mg3200.cpp @@ -172,9 +172,13 @@ void TStampa_disp::setprint_permagazzini() cfilter.cut(cfilter.len()-2); // abilita/disabilita le sezioni dei totali - bool showdett; - showdett=_mask->get_bool(F_DETTAGLIODEP); - _form->setdett_permag(_mask->get_int(F_FROMLIVELLOART),_mask->get_int(F_TOLIVELLOART),_mask->get_int(F_FROMLIVELLOGIAC),_mask->get_int(F_TOLIVELLOGIAC),_mask->get_bool(F_TOTALIMAGAZZINI),_mask->get_bool(F_TOTALIDEPOSITI),showdett); + _form->setdett_permag(_mask->get_int(F_FROMLIVELLOART), + _mask->get_int(F_TOLIVELLOART), + _mask->get_int(F_FROMLIVELLOGIAC), + _mask->get_int(F_TOLIVELLOGIAC), + TRUE, + _mask->get_bool(F_TOTALIDEPOSITI), + _mask->get_bool(F_DETTAGLIODEP)); darec.put("ANNOES",_mask->get(F_ANNOES)); darec.put("CODMAG",_mask->get(F_DAMAG)); diff --git a/mg/mg3200.uml b/mg/mg3200.uml index 26013ddc0..75ac849a8 100755 --- a/mg/mg3200.uml +++ b/mg/mg3200.uml @@ -5,9 +5,12 @@ LISTBOX F_ORDINE 10 BEGIN PROMPT 2 1 "Ordinamento " ITEM "A|articoli" - MESSAGE ENABLE,F_ORDINEART + MESSAGE ENABLE,F_ORDINEART|HIDE,F_TOTALIDEPOSITI|HIDE,F_DETTAGLIODEP + MESSAGE SHOW,F_TOTALIMAGAZZINI|SHOW,F_DETTAGLIOMAG ITEM "M|magazzini" MESSAGE "C",F_ORDINEART|K_SPACE,F_ORDINEART|DISABLE,F_ORDINEART|SHOW,G_CODART@|HIDE,G_DESART@ + MESSAGE SHOW,F_TOTALIDEPOSITI|SHOW,F_DETTAGLIODEP + MESSAGE HIDE,F_TOTALIMAGAZZINI|HIDE,F_DETTAGLIOMAG END @@ -119,9 +122,24 @@ BEGIN GROUP G_CATMER END +BOOL F_TOTALIDEPOSITI +BEGIN + PROMPT 2 12 "Stampo i totali depositi" + MESSAGE TRUE ENABLE,F_DETTAGLIODEP + MESSAGE FALSE CLEAR,F_DETTAGLIODEP|K_SPACE,F_DETTAGLIODEP +END + +BOOL F_DETTAGLIODEP +BEGIN + PROMPT 42 12 "Stampa il dettaglio depositi" + MESSAGE TRUE ENABLE,F_RAGGLIVGIAC|ENABLE,F_RAGGCODICE + MESSAGE FALSE CLEAR,F_RAGGLIVGIAC|K_SPACE,F_RAGGLIVGIAC|CLEAR,F_RAGGCODICE|K_SPACE,F_RAGGCODICE +END + + BOOLEAN F_RAGGCODICE BEGIN - PROMPT 2 14 "Raggruppo gli articoli" + PROMPT 2 13 "Raggruppo gli articoli" MESSAGE FALSE CLEAR,F_FROMLIVELLOART|CLEAR,F_TOLIVELLOART|CHECK,F_TOLIVELLOART MESSAGE TRUE ENABLE,F_FROMLIVELLOART|ENABLE,F_TOLIVELLOART|CHECK,F_TOLIVELLOART END @@ -129,7 +147,7 @@ END NUMBER F_FROMLIVELLOART 1 BEGIN FLAGS "G" - PROMPT 42 14 "da " + PROMPT 42 13 "da " USE FCA INPUT CODTAB F_FROMLIVELLOART DISPLAY "Num." CODTAB @@ -142,7 +160,7 @@ END NUMBER F_TOLIVELLOART 1 BEGIN - PROMPT 52 14 "a " + PROMPT 52 13 "a " USE FCA INPUT CODTAB F_TOLIVELLOART DISPLAY "Num." CODTAB @@ -155,7 +173,7 @@ END BOOL F_RAGGLIVGIAC BEGIN - PROMPT 2 15 "Raggruppo le giacenze" + PROMPT 2 14 "Raggruppo le giacenze" MESSAGE FALSE CLEAR,F_FROMLIVELLOGIAC|CLEAR,F_TOLIVELLOGIAC|CHECK,F_TOLIVELLOGIAC MESSAGE TRUE ENABLE,F_FROMLIVELLOGIAC|ENABLE,F_TOLIVELLOGIAC END @@ -163,7 +181,7 @@ END NUMBER F_FROMLIVELLOGIAC 1 BEGIN FLAG "D" - PROMPT 42 15 "da " + PROMPT 42 14 "da " USE FCG INPUT CODTAB F_FROMLIVELLOGIAC DISPLAY "Num." CODTAB @@ -178,7 +196,7 @@ END NUMBER F_TOLIVELLOGIAC 1 BEGIN FLAG "D" - PROMPT 52 15 "a " + PROMPT 52 14 "a " USE FCG INPUT CODTAB F_TOLIVELLOGIAC DISPLAY "Num." CODTAB @@ -189,31 +207,16 @@ BEGIN CHECKTYPE NORMAL END - BOOL F_TOTALIMAGAZZINI BEGIN - PROMPT 2 16 "Stampo i totali di magazzino" + PROMPT 2 15 "Stampo i totali di magazzino" MESSAGE TRUE ENABLE,F_DETTAGLIOMAG MESSAGE FALSE CLEAR,F_DETTAGLIOMAG|K_SPACE,F_DETTAGLIOMAG END BOOL F_DETTAGLIOMAG BEGIN - PROMPT 42 16 "Stampa il dettaglio magazzini" - MESSAGE TRUE ENABLE,F_TOTALIDEPOSITI - MESSAGE FALSE CLEAR,F_TOTALIDEPOSITI|K_SPACE,F_TOTALIDEPOSITI -END - -BOOL F_TOTALIDEPOSITI -BEGIN - PROMPT 2 17 "Stampo i totali di deposito" - MESSAGE TRUE ENABLE,F_DETTAGLIODEP - MESSAGE FALSE CLEAR,F_DETTAGLIODEP|K_SPACE,F_DETTAGLIODEP -END - -BOOL F_DETTAGLIODEP -BEGIN - PROMPT 42 17 "Stampa il dettaglio depositi" + PROMPT 42 15 "Stampa il dettaglio magazzini" END diff --git a/mg/mg3300.uml b/mg/mg3300.uml index 65e9fbe09..e67bb3009 100755 --- a/mg/mg3300.uml +++ b/mg/mg3300.uml @@ -17,9 +17,12 @@ LISTBOX F_ORDINE 12 BEGIN PROMPT 2 2 "Ordinamento " ITEM "A|articoli" - MESSAGE ENABLE,F_ORDINEART + MESSAGE ENABLE,F_ORDINEART|HIDE,F_TOTALIDEPOSITI|HIDE,F_DETTAGLIODEP + MESSAGE SHOW,F_TOTALIMAGAZZINI|SHOW,F_DETTAGLIOMAG ITEM "M|magazzini" MESSAGE "C",F_ORDINEART|K_SPACE,F_ORDINEART|DISABLE,F_ORDINEART|SHOW,G_CODART@|HIDE,G_DESART@ + MESSAGE SHOW,F_TOTALIDEPOSITI|SHOW,F_DETTAGLIODEP + MESSAGE HIDE,F_TOTALIMAGAZZINI|HIDE,F_DETTAGLIOMAG END @@ -210,14 +213,14 @@ END BOOL F_SUDDIV_MAGAZZINI BEGIN - PROMPT 2 16 "Suddivido i magazzini" + PROMPT 2 16 "Suddivido per depositi" MESSAGE TRUE ENABLE,F_SUDDIV_DEPOSITI MESSAGE FALSE CLEAR,F_SUDDIV_DEPOSITI|K_SPACE,F_SUDDIV_DEPOSITI END BOOL F_SUDDIV_DEPOSITI BEGIN - PROMPT 2 17 "Suddivido i depositi" + PROMPT 2 17 "Dettaglio i depositi" MESSAGE TRUE ENABLE,F_DETTAGLIODEP MESSAGE FALSE CLEAR,F_DETTAGLIODEP END diff --git a/mg/mg3300a.frm b/mg/mg3300a.frm index 08f8f5791..63c351955 100755 --- a/mg/mg3300a.frm +++ b/mg/mg3300a.frm @@ -102,6 +102,7 @@ SECTION BODY ODD 2 END SECTION HEADER_ARTICOLO 1 2 2 GROUP + FLAGS "N" SECTION HEADER_CATMER 1 2 1 GROUP STRINGA 10 20 1 BEGIN @@ -139,6 +140,7 @@ SECTION BODY ODD 2 SECTION GRUPPI_ARTICOLO 1 0 0 FILE LF_ANAMAG BY CODART SECTION FILE_RMOVMAG 1 1 0 FILE LF_RMOVMAG SECTION HEADER_LIVGIAC 1 3 3 GROUP + FLAGS "N" SECTION HEADER_LIVGIACCATMER 1 1 1 GROUP STRINGA 10 20 1 BEGIN @@ -249,7 +251,7 @@ SECTION BODY ODD 2 END END - SECTION MOVS_INTERESSATI 1 0 1 STREXPR LF_MOVMAG->DATAREG>="" + SECTION MOVS_INTERESSATI 1 0 0 STREXPR LF_MOVMAG->DATAREG>="" SECTION STAMPASALDOPREC 1 1 1 NUMEXPR (#FF_STAMPASALDOPREC==0)&&(#FF_QUANTRIGA!=0) NUMBER 100 18 BEGIN diff --git a/mg/mg3300b.frm b/mg/mg3300b.frm index a5c4b03b6..4fb6fe8e7 100755 --- a/mg/mg3300b.frm +++ b/mg/mg3300b.frm @@ -117,6 +117,7 @@ SECTION BODY ODD 2 END //HEADER catmer SECTION HEADER_MAG 1 2 2 GROUP + FLAGS "N" STRINGA 22 50 1 BEGIN KEY "mag" @@ -217,7 +218,7 @@ SECTION BODY ODD 2 END END - SECTION MOVS_INTERESSATI 1 0 1 STREXPR LF_MOVMAG->DATAREG>="" + SECTION MOVS_INTERESSATI 1 0 0 STREXPR LF_MOVMAG->DATAREG>="" SECTION STAMPASALDOPREC 1 1 1 NUMEXPR (#FF_STAMPASALDOPREC==0)&&(#FF_QUANTRIGA!=0) NUMBER 100 18 BEGIN