diff --git a/mg/mg1.cpp b/mg/mg1.cpp index 748a78f76..d45711763 100755 --- a/mg/mg1.cpp +++ b/mg/mg1.cpp @@ -1,9 +1,10 @@ #include #include - +// +// Modulo di gestione movimenti #include "mg1.h" -#define usage "Error - usage : %s -{0|1|2|3|4|5|6|7|8|9}" +#define usage "Error - usage : %s -{0|1|2}" int main(int argc, char** argv) { @@ -14,6 +15,10 @@ int main(int argc, char** argv) { case 0: rt = mg1100(argc,argv) ; break; // gestione manuale movimenti + case 1: + //rt = mg1200(argc,argv) ; break; // gestione movimenti DA DOCUMENTI + case 2: + //rt = mg1300(argc,argv) ; break; // gestione aperture/chiusure default: error_box(usage, argv[0]) ; break; } diff --git a/mg/mg1100.h b/mg/mg1100.h index 911ec87b0..230670944 100755 --- a/mg/mg1100.h +++ b/mg/mg1100.h @@ -16,10 +16,11 @@ #define F_CODLIST 116 #define F_CODCONTR 117 #define F_CODOFF 118 -#define F_CONDV 119 +#define F_TIPOCONDV 119 #define F_RIGHE 120 #define F_NUMPROVV 121 #define F_CODCF 122 +#define F_CODCONDV 123 #define G_DEFMOV 1 diff --git a/mg/mg1100.uml b/mg/mg1100.uml new file mode 100755 index 000000000..8e3d9e104 --- /dev/null +++ b/mg/mg1100.uml @@ -0,0 +1,371 @@ +#include "mg1100.h" + +TOOLBAR "" 0 20 60 2 +#include +ENDPAGE + +PAGE "Testata" 11 60 14 + +GROUPBOX DLG_NULL 75 5 +BEGIN + PROMPT 1 1 "" + FLAGS "R" +END + +NUMBER F_NUMREG 7 +BEGIN +// FLAGS "D" + FIELD NUMREG + PROMPT 2 2 "Numero di registrazione " + KEY 1 3 4 + USE LF_MOVMAG + INPUT NUMREG F_NUMREG + DISPLAY "N.reg." NUMREG + DISPLAY "Anno" ANNOES + DISPLAY "Data reg." DATAREG + DISPLAY "Data comp." DATACOMP + OUTPUT F_NUMREG NUMREG + OUTPUT F_DATAREG DATAREG + OUTPUT F_DATACOMP DATACOMP + CHECKTYPE REQUIRED +END + +NUMBER F_ANNOES 4 +BEGIN + FLAGS "D" + PROMPT 2 3 "Esercizio di competenza " + FIELD ANNOES +END + +DATE F_DATAREG +BEGIN + PROMPT 38 2 "Data di registrazione " + FLAGS "A" + FIELD DATAREG + KEY 3 + USE LF_MOVMAG KEY 3 + INPUT NUMREG F_NUMREG + INPUT DATAREG F_DATAREG + DISPLAY "N.reg." NUMREG + DISPLAY "Anno" ANNOES + DISPLAY "Data reg." DATAREG + DISPLAY "Data comp." DATACOMP + OUTPUT F_NUMREG NUMREG + OUTPUT F_DATAREG DATAREG + OUTPUT F_DATACOMP DATACOMP + CHECKTYPE REQUIRED +END + +DATE F_DATACOMP +BEGIN + PROMPT 38 3 "Data di competenza " + FLAGS "A" + FIELD DATACOMP + KEY 4 + USE LF_MOVMAG KEY 4 + INPUT NUMREG F_NUMREG + INPUT DATACOMP F_DATACOMP + COPY DISPLAY F_DATAREG + COPY OUTPUT F_DATAREG + CHECKTYPE REQUIRED +END + +STRING F_DESCR 50 40 +BEGIN + PROMPT 2 4 "Descrizione " + FIELD DESCR +END + +LISTBOX F_RIFADOC 30 +BEGIN + PROMPT 2 5 "Movimento " + FLAG "HG" + ITEM "N|non riferito a documento" + MESSAGE ENABLE,G_DEFMOV@ + ITEM "S|riferito a documento" + MESSAGE DISABLE,G_DEFMOV@ +END + +LISTBOX F_NUMPROVV 1 20 +BEGIN + PROMPT 0 0 "" + FLAGS "HG" + ITEM "D|Definitiva" +END + +STRING F_NUMDOC 3 +BEGIN + FLAGS "D" + PROMPT 2 6 "Documento: numero " + FIELD NUMDOC + USE LF_DOC + INPUT PROVV F_NUMPROVV SELECT + INPUT NDOC F_NUMDOC + INPUT ANNO F_ANNOES + DISPLAY "NDoc" NDOC + DISPLAY "Tipo" TIPODOC + DISPLAY "Anno" ANNO + OUPUT F_NUMDOC NDOC + OUPUT F_ANNODOC ANNO + OUPUT F_TIPOCF TIPOCF + OUPUT F_CODCLI CODCF + OUPUT F_CODFOR CODCF + OUPUT F_CODCAUS CAUSMAG1 + CHECKTYPE NORMAL + + MESSAGE "S",F_RIFADOC + MESSAGE EMPTY "N",F_RIFADOC +END + +NUMBER F_ANNODOC 4 +BEGIN + FLAGS "D" + PROMPT 30 6 "anno " + FIELD ANNODOC + USE LF_DOC SELECT NDOC==F_NUMDOC + INPUT ANNODOC F_ANNODOC + DISPLAY "Anno" ANNODOC + DISPLAY "NDoc" NDOC + DISPLAY "Tipo" TIPODOC + COPY OUTPUT F_NUMDOC +// CHECKTYPE NORMAL +END + +STRING F_CODCAUS 5 +BEGIN + PROMPT 2 8 "Codice causale " + FIELD CODCAUS + USE CAU + FLAGS "U" + INPUT CODTAB F_CODCAUS + DISPLAY "Codice " CODTAB + DISPLAY "Descrizione@50 " S0 + OUTPUT F_CODCAUS CODTAB + OUTPUT F_DESCAU S0 + CHECKTYPE REQUIRED + + GROUP G_DEFMOV +END + +STRING F_DESCAU 50 30 +BEGIN + PROMPT 30 8 "" + USE CAU KEY 2 + INPUT S0 F_DESCAU + DISPLAY "Descrizione@50 " S0 + DISPLAY "Codice " CODTAB + COPY OUTPUT1 F_CODCAUS + + GROUP G_DEFMOV +END + +LISTBOX F_TIPOCF 10 +BEGIN + PROMPT 2 9 "Relativo a " + FIELD TIPOCF + ITEM "C|Cliente" + MESSAGE SHOW,F_CODCLI|HIDE,F_CODFOR//|CHECK,F_CODCF//|RESET,F_CODFOR + ITEM "F|Fornitore" + MESSAGE HIDE,F_CODCLI|SHOW,F_CODFOR//|CHECK,F_CODCF//|RESET,F_CODCLI + + GROUP G_DEFMOV +END + +// campi per READ/WRITE su archivio (e ricerca utente) +NUMBER F_CODCLI 6 +BEGIN + PROMPT 2 10 "Codice cliente " + FIELD CODCF + USE LF_CLIFO + INPUT TIPOCF F_TIPOCF SELECT + INPUT CODCF F_CODCLI + DISPLAY "Codice " CODCF + DISPLAY "Ragione sociale@50" RAGSOC + OUTPUT F_CODCF CODCF + MESSAGE EMPTY RESET,F_CODCF +// OUTPUT F_CODCLI CODCF +// MESSAGE COPY,F_CODCF|CHECK,F_CODCF + CHECKTYPE NORMAL + GROUP G_DEFMOV +END + +// campi per READ/WRITE su archivio (e ricerca utente) +NUMBER F_CODFOR 6 +BEGIN + PROMPT 2 10 "Codice fornitore " + FIELD CODCF + USE LF_CLIFO + INPUT TIPOCF F_TIPOCF SELECT + INPUT CODCF F_CODFOR + DISPLAY "Codice " CODCF + DISPLAY "Ragione sociale@50" RAGSOC + OUTPUT F_CODCF CODCF + MESSAGE EMPTY RESET,F_CODCF +// OUTPUT F_CODFOR CODCF +// MESSAGE COPY,F_CODCF|CHECK,F_CODCF + CHECKTYPE NORMAL + GROUP G_DEFMOV +END + +// esegue i controlli e ricopia i valori del codice sia in CLI che in FOR +// agisce anche quando l'utente non entra in gioco (settaggio da LISTINO...) +NUMBER F_CODCF 6 +BEGIN + FLAGS "HG" + PROMPT 0 1 "" + USE LF_CLIFO + INPUT TIPOCF F_TIPOCF SELECT + INPUT CODCF F_CODCF + OUTPUT F_RAGSOC RAGSOC + OUTPUT F_CODCF CODCF + CHECKTYPE NORMAL + MESSAGE COPY,F_CODCLI|COPY,F_CODFOR +// MESSAGE EMPTY RESET,F_RAGSOC +END + +STRING F_RAGSOC 50 40 +BEGIN + PROMPT 30 10 "" + USE LF_CLIFO KEY 2 + INPUT TIPOCF F_TIPOCF SELECT + INPUT RAGSOC F_RAGSOC + DISPLAY "Ragione sociale@50" RAGSOC + DISPLAY "Codice " CODCF + OUTPUT F_CODCF CODCF + GROUP G_DEFMOV +END + +LISTBOX F_TIPOCONDV 1 12 +BEGIN + PROMPT 2 12 "Condizione di vendita " + ITEM " |Nessuna" + MESSAGE DISABLE,F_CODLIST|DISABLE,F_CODCONTR|DISABLE,F_CODOFF + MESSAGE ENABLE,F_TIPOCF|ENABLE,F_CODCLI|ENABLE,F_CODFOR|ENABLE,F_RAGSOC + ITEM "L|Listino" + MESSAGE ENABLE,F_CODLIST|DISABLE,F_CODCONTR|DISABLE,F_CODOFF + MESSAGE RESET,F_CODCONTR|RESET,F_CODOFF + MESSAGE DISABLE,F_TIPOCF|DISABLE,F_CODCLI|DISABLE,F_CODFOR|DISABLE,F_RAGSOC + ITEM "C|Contratto" + MESSAGE DISABLE,F_CODLIST|ENABLE,F_CODCONTR|DISABLE,F_CODOFF + MESSAGE RESET,F_CODLIST|RESET,F_CODOFF + MESSAGE DISABLE,F_TIPOCF|DISABLE,F_CODCLI|DISABLE,F_CODFOR|DISABLE,F_RAGSOC + ITEM "O|Offerta" + MESSAGE DISABLE,F_CODLIST|DISABLE,F_CODCONTR|ENABLE,F_CODOFF + MESSAGE RESET,F_CODLIST|RESET,F_CODCONTR + MESSAGE DISABLE,F_TIPOCF|DISABLE,F_CODCLI|DISABLE,F_CODFOR|DISABLE,F_RAGSOC + +// GROUP G_DEFMOV +END + + +STRING F_CATVEN 2 +BEGIN + PROMPT 0 0 "" + FLAGS "HG" +END + +STRING F_CODCONDV 3 +BEGIN + PROMPT 1 1 "Codice CONDV " + FLAGS "HG" +END + +STRING F_CODLIST 3 +BEGIN + PROMPT 2 13 "Codice listino " + FIELD CODLIST + USE LF_CONDV + INPUT TIPO "L" + INPUT CATVEN F_CATVEN + INPUT COD F_CODLIST + DISPLAY "Cat.Ven." CATVEN + DISPLAY "C/F" TIPOCF + DISPLAY "Cod Cli/For" CODCF + DISPLAY "Codice" COD + DISPLAY "Descr.@30" DESCR + OUTPUT F_TIPOCONDV TIPO + OUTPUT F_CATVEN CATVEN + OUTPUT F_CODCF CODCF + OUTPUT F_CODLIST COD + OUTPUT F_CODCONDV COD + CHECKTYPE NORMAL +// GROUP G_DEFMOV +END + +STRING F_CODCONTR 3 +BEGIN + PROMPT 26 13 "Codice contratto " + FIELD CODCONT + USE LF_CONDV + INPUT TIPO "C" + INPUT CATVEN F_CATVEN + INPUT TIPOCF F_TIPOCF + INPUT CODCF F_CODCF + INPUT COD F_CODCONTR + DISPLAY "Cat.Ven." CATVEN + DISPLAY "C/F" TIPOCF + DISPLAY "Cod Cli/For" CODCF + DISPLAY "Codice" COD + DISPLAY "Descr.@30" DESCR + OUTPUT F_TIPOCONDV TIPO + OUTPUT F_CATVEN CATVEN + OUTPUT F_TIPOCF TIPOCF + OUTPUT F_CODCF CODCF + OUTPUT F_CODCONTR COD + OUTPUT F_CODCONDV COD + + CHECKTYPE NORMAL +// GROUP G_DEFMOV +END + +STRING F_CODOFF 3 +BEGIN + PROMPT 50 13 "Codice offerta " + FIELD CODCAMP + USE LF_CONDV + INPUT TIPO "O" + INPUT CATVEN F_CATVEN + INPUT COD F_CODOFF + DISPLAY "Codice" COD + DISPLAY "Descr.@30" DESCR + OUTPUT F_TIPOCONDV TIPO + OUTPUT F_CODCF CODCF + OUTPUT F_CATVEN CATVEN + OUTPUT F_CODOFF COD + OUTPUT F_CODCONDV COD + CHECKTYPE NORMAL +// GROUP G_DEFMOV +END + +ENDPAGE + +PAGE "Righe" 11 60 14 + +TEXT DLG_NULL +BEGIN + PROMPT 2 2 "Righe" + GROUP G_DEFMOV +END + +SPREADSHEET F_RIGHE 77 15 +BEGIN + PROMPT 2 3 "RIGHE DI MOVIMENTO" + FLAGS "A" +// USE LF_RMOVMAG KEY NRIG +// INPUT NUMREG F_NUMREG + ITEM "CodArt" + ITEM "CodMag" + ITEM "CodDep" + ITEM "Liv1" + ITEM "Liv2" + ITEM "Liv3" + ITEM "Liv4" + ITEM "UM" + ITEM "Qta" + ITEM "Prezzo" +END + + +ENDPAGE +ENDMASK +#include "mg1100a.uml" diff --git a/mg/mg1100a.uml b/mg/mg1100a.uml index f9ae3585b..62fc0aeec 100755 --- a/mg/mg1100a.uml +++ b/mg/mg1100a.uml @@ -34,7 +34,7 @@ BEGIN CHECKTYPE REQUIRED END -STRING F_DESART 20 +STRING F_DESART 50 BEGIN PROMPT 2 3 "Descrizione " FIELD CODART @@ -184,6 +184,7 @@ END STRING F_UM 2 BEGIN + FLAGS "U" PROMPT 2 11 "Unità di misura " FIELD UM USE LF_UMART KEY 2