diff --git a/mg/batbcau.uml b/mg/batbcau.uml index 35872dd7b..aeb3a5835 100755 --- a/mg/batbcau.uml +++ b/mg/batbcau.uml @@ -128,6 +128,8 @@ BEGIN OUTPUT F_CAUCOLL CODTAB OUTPUT F_DCAUCOLL S0 CHECKTYPE NORMAL + ADD NONE //RUN MG0 -0 %CAU + WARNING "La causale collegata deve essere una causale senza ulteriori collegamenti" END STRING F_DCAUCOLL 50 40 @@ -141,6 +143,8 @@ BEGIN OUTPUT F_DCAUCOLL S0 OUTPUT F_CAUCOLL CODTAB CHECKTYPE NORMAL + ADD NONE //RUN MG0 -0 %CAU + WARNING "La causale collegata deve essere una causale senza ulteriori collegamenti" END ENDPAGE diff --git a/mg/batbgca.uml b/mg/batbgca.uml index c45080dd8..19ad65781 100755 --- a/mg/batbgca.uml +++ b/mg/batbgca.uml @@ -12,14 +12,13 @@ PAGE "Gruppi Codice Articoli" 11 60 14 // FLAGS "R" //END - // codice parte del formato codice NUMBER F_CODLIV 1 BEGIN PROMPT 2 2 "Numero parte " FIELD CODTAB[1,1] KEY 1 - FLAG "U" + FLAG "UP" USE FCA INPUT CODTAB[1,1] F_CODLIV DISPLAY "Codice Parte" CODTAB[1,1] @@ -43,8 +42,10 @@ BEGIN DISPLAY "N.Parte" CODTAB[1,1] COPY OUTPUT F_CODLIV CHECKTYPE FORCED + ADD NONE END + // STRINGA DEL FORMATO CODICE STRING F_FORMLIV 23 BEGIN @@ -74,12 +75,13 @@ BEGIN CHECKTYPE REQUIRED END + STRING F_DESGROUP 50 BEGIN PROMPT 2 7 "Descrizione del gruppo " FIELD S0 KEY 2 - USE GCA KEY 2 + USE GCA KEY 2 SELECT CODTAB[1,1]==#F_CODLIV JOIN FCA ALIAS 500 INTO CODTAB==CODTAB[1,1] INPUT S0 F_DESGROUP DISPLAY "Descrizione@50 " S0 diff --git a/mg/batbgcg.uml b/mg/batbgcg.uml index 839cb1ec6..8c60aab0e 100755 --- a/mg/batbgcg.uml +++ b/mg/batbgcg.uml @@ -11,7 +11,7 @@ NUMBER F_CODLIV 1 BEGIN PROMPT 2 2 "Numero livello " FIELD CODTAB[1,1] - KEY 1 + KEY 1 FLAG "UP" USE FCG INPUT CODTAB[1,1] F_CODLIV @@ -20,8 +20,8 @@ BEGIN OUTPUT F_CODLIV CODTAB OUTPUT F_DESLIV S0 OUTPUT F_FORMLIV S1 - CHECKTYPE FORCED - ADD NONE + CHECKTYPE FORCED + ADD NONE END // descrizione parte del formato codice @@ -29,29 +29,29 @@ STRING F_DESLIV 50 BEGIN PROMPT 2 3 "Descrizione " USE FCG KEY 2 - INPUT S0 F_DESLIV + INPUT S0 F_DESLIV DISPLAY "Descrizione@50 " S0 DISPLAY "N.Liv." CODTAB[1,1] - COPY OUTPUT F_CODLIV - CHECKTYPE FORCED - ADD NONE + COPY OUTPUT F_CODLIV + CHECKTYPE FORCED + ADD NONE END // STRINGA DEL FORMATO CODICE STRING F_FORMLIV 23 BEGIN PROMPT 2 5 "Formato previsto per il codice gruppo " - FLAGS "D" + FLAGS "D" END STRING F_CODGROUP 23 BEGIN - FLAGS "U" + FLAGS "U" PROMPT 22 6 "Codice del gruppo " - FIELD CODTAB[2,25] - KEY 1 + FIELD CODTAB[2,25] + KEY 1 USE GCG - JOIN FCG ALIAS 500 INTO CODTAB==CODTAB[1,1] + JOIN FCG ALIAS 500 INTO CODTAB==CODTAB[1,1] INPUT CODTAB[1,1] F_CODLIV SELECT INPUT CODTAB[2,25] F_CODGROUP DISPLAY "N.Liv." CODTAB[1,1] @@ -61,18 +61,18 @@ BEGIN OUTPUT F_CODLIV CODTAB[1,1] OUTPUT F_CODGROUP CODTAB[2,25] OUTPUT F_DESGROUP S0 - MESSAGE DISABLE,F_DESLIV - MESSAGE EMPTY ENABLE,F_DESLIV - CHECKTYPE REQUIRED + MESSAGE DISABLE,F_DESLIV + MESSAGE EMPTY ENABLE,F_DESLIV + CHECKTYPE REQUIRED END STRING F_DESGROUP 50 BEGIN PROMPT 2 7 "Descr. gruppo " - FIELD S0 - KEY 2 - USE GCG KEY 2 - JOIN FCG ALIAS 500 INTO CODTAB==CODTAB[1,1] + FIELD S0 + KEY 2 + USE GCG KEY 2 SELECT CODTAB[1,1]==F_CODLIV + JOIN FCG ALIAS 500 INTO CODTAB==CODTAB[1,1] INPUT S0 F_DESGROUP DISPLAY "Descrizione@50 " GCG->S0 DISPLAY "N.Liv." CODTAB[1,1] diff --git a/mg/f110.dir b/mg/f110.dir index 9bcb03a59..89455315a 100755 --- a/mg/f110.dir +++ b/mg/f110.dir @@ -1,3 +1,3 @@ 110 0 -$movmag|0|0|120|32|Movimenti di magazzino (?)||| +$movmag|0|0|128|32|Movimenti di magazzino (?)||| diff --git a/mg/f110.trr b/mg/f110.trr index 6dbb8d648..ad72f879f 100755 --- a/mg/f110.trr +++ b/mg/f110.trr @@ -1,13 +1,15 @@ 110 -16 +18 NUMREG|3|7|0|Numero di registrazione ANNOES|1|4|0|Codice esercizio DATAREG|5|8|0|Data registrazione DATACOMP|5|8|0|Data competenza -DOCPROVV|1|1|0|Flag numeraz. provvisiora sul documento -ANNODOC|1|4|0|Anno documento -CODNUM|1|4|0|Codice numerazione documento -NUMDOC|1|7|0|Numero documento +DOCPROVV|1|1|0|Doc. interno: Flag numeraz. provvisoria +ANNODOC|1|4|0|______________Anno documento +CODNUM|1|4|0|______________Codice numerazione documento +NUMDOC|1|7|0|______________Numero documento +EX_DATADOC|5|8|0|Documento esterno:Data doc +EX_NUMDOC|1|7|0|__________________Num.doc CATVEN|1|2|0|categoria di vendita (listini) TIPOCV|1|1|0|Tipo condizione di vendita (Listino/contrato/offerta) CODCONDV|1|3|0|Codice listino/contratto/offerta diff --git a/mg/mg1100.h b/mg/mg1100.h index 52dfaaf93..a89cab5dd 100755 --- a/mg/mg1100.h +++ b/mg/mg1100.h @@ -23,6 +23,8 @@ #define F_CODCF 123 #define F_CODCONDV 124 #define F_DESCONDV 125 +#define F_EXNUMDOC 126 +#define F_EXANNODOC 127 #define H_NUMREG 131 #define H_DATAREG 132 diff --git a/mg/mg1100.uml b/mg/mg1100.uml index e04c6532a..84cb18b12 100755 --- a/mg/mg1100.uml +++ b/mg/mg1100.uml @@ -93,58 +93,18 @@ BEGIN MESSAGE DISABLE,G_DEFMOV@ END -LISTBOX F_NUMPROVV 1 20 -BEGIN - PROMPT 0 0 "" - FLAGS "HG" - ITEM "D|Definitiva" +STRING F_EXNUMDOC 7 +BEGIN + FLAGS "U" + PROMPT 2 6 "Documento numero " + FIELD EX_NUMDOC END -STRING F_CODNUM 4 -BEGIN - FLAGS "D" - PROMPT 2 6 "Documento: numero " - FIELD CODNUM -END -STRING F_NUMDOC 7 +DATE F_EXANNODOC BEGIN - FLAGS "D" - PROMPT 28 6 "/ " - FIELD NUMDOC - USE LF_DOC - INPUT PROVV F_NUMPROVV SELECT - INPUT ANNO F_ANNOES - INPUT CODNUM F_CODNUM - INPUT NDOC F_NUMDOC - DISPLAY "Num" CODNUM - DISPLAY "Doc" NDOC - DISPLAY "Tipo" TIPODOC - DISPLAY "Anno" ANNO - OUPUT F_CODNUM CODNUM - OUPUT F_NUMDOC NDOC - OUPUT F_ANNODOC ANNO -// OUPUT F_TIPOCF TIPOCF -// OUPUT F_CODCF 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 40 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 + PROMPT 30 6 " del " + FIELD EX_DATADOC END diff --git a/mg/mg4100.frm b/mg/mg4100.frm index a3ff3f5dc..bae0d785d 100755 --- a/mg/mg4100.frm +++ b/mg/mg4100.frm @@ -183,6 +183,7 @@ SECTION BODY ODD 1 FIELD %CAU->S0 END +/* SECTION INFO_DOC 3 0 1 NUM_EXPR LF_MOVMAG->NUMDOC!=0 STRINGA 6 20 BEGIN @@ -197,6 +198,23 @@ SECTION BODY ODD 1 FIELD 33->DATADOC END END +*/ + + SECTION INFO_EXDOC 3 0 1 NUM_EXPR LF_MOVMAG->EX_NUMDOC!=0 + STRINGA 6 20 + BEGIN + KEY " NUMDOC" + PROMPT 10 1 "Documento " + FIELD LF_MOVMAG->EX_NUMDOC + END + STRINGA 7 20 + BEGIN + KEY " datadoc" + PROMPT 30 1 "del " + FIELD EX_DATADOC + END + END + SECTION RIGHE_MOV 3 1 1 FILE LF_RMOVMAG GROUP NUMREG SECTION CAUS_RIGA 1 1 1 STREXPR LF_RMOVMAG->CAUS!="" diff --git a/mg/mg4300.cpp b/mg/mg4300.cpp index d4a75c5e0..4572106f6 100755 --- a/mg/mg4300.cpp +++ b/mg/mg4300.cpp @@ -30,8 +30,12 @@ public: bool ragg_grpfis() const { return get_int("B5"); } bool ragg_caus() const { return get_int("B6"); } - void set_last_numreg(long n) { put("I4",n); } int last_numreg() const { return get_int("I4"); } + void set_last_numreg(long n) { put("I4",n); } + // data ultima stampa esercizio precedente + TDate last_print_prec() const { return get_date("D4"); } + // pagina ultima stampa esercizio precedente + int pag_stampate_prec() const{ return get_int("I6"); } TRegistro_giornalemag(const char* code = "", int year = 0); virtual ~TRegistro_giornalemag() {} diff --git a/mg/mg4300.frm b/mg/mg4300.frm index f64b8397a..101089124 100755 --- a/mg/mg4300.frm +++ b/mg/mg4300.frm @@ -171,7 +171,19 @@ SECTION BODY ODD 2 PROMPT 31 1 "" FIELD ALIAS_CAUSALI@->S0 END - SECTION HEADER_DOC 2 1 1 NUMEXPR LF_MOVMAG->NUMDOC!=0 + SECTION HEADER_EXDOC 2 1 1 NUMEXPR LF_MOVMAG->EX_NUMDOC!=0 + STRINGA 101 25 + BEGIN + PROMPT 10 1 "Documento " + FIELD LF_MOVMAG->EX_NUMDOC + END + STRINGA 101 10 + BEGIN + PROMPT 30 1 "del " + FIELD LF_MOVMAG->EX_DATADOC + END + END // end section header doc + SECTION HEADER_DOC 2 1 1 NUMEXPR (LF_MOVMAG->EX_NUMDOC==0) && (LF_MOVMAG->NUMDOC!=0) STRINGA 101 25 BEGIN PROMPT 10 1 "Documento " @@ -182,7 +194,7 @@ SECTION BODY ODD 2 PROMPT 30 1 "del " FIELD LF_MOVMAG->ANNODOC END - END + END // end section header doc END END // header_ragg_crono diff --git a/mg/mg_ana.doc b/mg/mg_ana.doc index b5100af13..6c592761f 100755 Binary files a/mg/mg_ana.doc and b/mg/mg_ana.doc differ diff --git a/mg/mgarea.men b/mg/mgarea.men index 00704aa45..1c8ec5fc1 100755 --- a/mg/mgarea.men +++ b/mg/mgarea.men @@ -62,7 +62,7 @@ Item_08 = "Nazioni", "ba3 -0 %STA", "" Item_09 = "Lingue", "ba3 -0 %LNG", "" Item_10 = "Divise", "ba3 -0 %VAL", "" Item_11 = "Cambi giornalieri", "ba3 -0 CAM", "" -Item_12 = "Esercizi", "ba3 -0 esc", "" +Item_12 = "Esercizi", "cg0 -5 esc", "" [MGAREA_006] Caption = "Tabelle magazzino" @@ -182,7 +182,7 @@ Item_09 = "Modifica valori", "ve4 -0", "" [MGAREA_020] Caption = "Configurazione" -Picture = +Picture = Module = 0 Flags = "" Item_01 = "Magazzino", [MGAREA_022]