diff --git a/lv/lv0700a.rep b/lv/lv0700a.rep index 1f797c5f2..13f4c042a 100755 --- a/lv/lv0700a.rep +++ b/lv/lv0700a.rep @@ -219,8 +219,8 @@ MESSAGE RESET,F3.2000 - USE 34 KEY 5 -SELECT (BETWEEN(33.TIPODOC,#F_TIPODOC,#F_TIPODOC)(34.CODART!='')(BETWEEN(33.CODCF,#F_CODCF,#F_CODCF))(BETWEEN(34.CODNUM,#F_CODNUM,#F_CODNUM))(BETWEEN(33.DATADOC,#F_DATADOC_DA,#F_DATADOC_A))(BETWEEN(34.CODART,#F_CODART,#F_CODART))(BETWEEN(34.CODAGG1,#F_CODAGG1,#F_CODAGG1))) + USE 34 KEY 2 +SELECT (BETWEEN(33.TIPODOC,#F_TIPODOC,#F_TIPODOC)(BETWEEN(33.CODCF,#F_CODCF,#F_CODCF))(BETWEEN(33.DATADOC,#F_DATADOC_DA,#F_DATADOC_A))(BETWEEN(34.CODAGG1,#F_CODAGG1,#F_CODAGG1))) JOIN 33 INTO CODNUM==CODNUM ANNO==ANNO PROVV==PROVV NDOC==NDOC JOIN 20 TO 33 INTO TIPOCF==TIPOCF CODCF==CODCF JOIN 47 TO 34 INTO CODART==CODART @@ -229,6 +229,6 @@ JOIN 169 TO 34 INTO CODCF==#F_CODCF CODART==CODART CODCONT='1' JOIN CAU TO 34 INTO CODTAB==CODAGG1 JOIN %CAU TO CAU ALIAS 104 INTO COD==COD CODTAB==S1 JOIN %CAU TO CAU ALIAS 204 INTO COD==COD CODTAB==S2 - - - \ No newline at end of file +FROM CODNUM=#F_CODNUM ANNO=#F_ANNO PROVV='D' CODART=#FROM +TO CODNUM=#F_CODNUM ANNO=#F_ANNO PROVV='D' CODART=#TO + diff --git a/lv/lv0700a.uml b/lv/lv0700a.uml index b57843ddc..bfa291e5f 100755 --- a/lv/lv0700a.uml +++ b/lv/lv0700a.uml @@ -51,6 +51,9 @@ STRING 203 20 OUTPUT 203 CODART OUTPUT 204 DESCR FIELD #F_CODART + MESSAGE EMPTY "",215|"ZZZZZZZZZZZZZZZZZZZ",216 + MESSAGE COPY,215|COPY,216 + CHECKTYPE NORMAL END STRING 204 50 @@ -65,6 +68,20 @@ BE FIELD #F_DESART END +STRING 215 20 + BEGIN + PROMPT 2 5 "Articolo " + FLAG "UDH" + FIELD #FROM +END + +STRING 216 20 + BEGIN + PROMPT 40 5 "Articolo " + FLAG "UDH" + FIELD #TO +END + STRING 205 3 BEGIN PROMPT 2 6 "Causale Lav." @@ -76,6 +93,7 @@ BEGIN OUTPUT 205 CODTAB OUTPUT 206 S0 FIELD #F_CODAGG1 + CHECKTYPE NORMAL END STRING 206 50 @@ -85,7 +103,6 @@ BEGIN FIELD #F_DESCODAGG1 END - STRING 207 4 BEGIN PROMPT 2 8 "Numerazione " @@ -115,8 +132,6 @@ BEGIN FIELD #F_DESCODNUM END - - STRING 209 4 BEGIN PROMPT 2 9 "Tipo " @@ -129,6 +144,7 @@ BEGIN OUTPUT 210 S0 FLAGS "UP" FIELD #F_TIPODOC + CHECKTYPE NORMAL END STRING 210 50 @@ -145,28 +161,37 @@ END DATE 211 BEGIN - PROMP 2 11 "Da Data " + PROMPT 2 11 "Da Data " FIELD #F_DATADOC_DA + STR_EXPR (#211=="")||(#212=="")||(MID(#212,7,4)==MID(#211,7,4)) + WARNING "Le date devono appartenere allo stesso anno" CHECKTYPE REQUIRED END DATE 212 BEGIN - PROMP 40 11 "Da Data " + PROMPT 40 11 "Da Data " FIELD #F_DATADOC_A VALIDATE DATE_CMP_FUNC >= 211 WARNING "La data finale non deve essere successiva a quella finale" CHECKTYPE REQUIRED - FLAGS "A" +END + +NUMBER 214 4 +BEGIN + PROMPT 2 13 "Anno " + FLAGS "DG" + STR_CALC MID(#211,7,4) + DRIVENBY 211 + FIELD #F_ANNO END BOOLEAN 213 BEGIN FIELD #F_TOT - PROMPT 2 13 "Solo Totali" + PROMPT 2 15 "Solo Totali" END - ENDPAGE ENDMASK