root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminati conflitti

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@785 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
nik 1994-12-20 17:13:57 +00:00
parent 8fdd38d5b3
commit d4dfe35c11
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cg/cg3100a.uml
View File

@ -95,35 +95,22 @@ END
DATE F_DATAINI
BEGIN
<<<<<<< cg3100a.uml
PROMPT 19 11 "Stampa mov. dalla data "
HELP "Data da cui iniziare la stampa"
=======
PROMPT 16 11 "Stampa mov. dalla data "
//HELP "Se non indicato nessun valore viene effettuata una stampa completa in ordine di data"
>>>>>>> 1.12
GROUP 3
END
DATE F_DATAFIN
BEGIN
<<<<<<< cg3100a.uml
PROMPT 55 11 "alla data "
HELP "Data fino a cui stampare i movimenti"
=======
PROMPT 52 11 "alla data "
>>>>>>> 1.12
GROUP 3
END
NUMBER F_NUMEROINI 7
BEGIN
<<<<<<< cg3100a.uml
PROMPT 19 12 "Stampa mov. dal numero "
HELP "Numero del movimento da cui iniziare la stampa"
=======
PROMPT 16 12 "Stampa mov. dal numero "
>>>>>>> 1.12
USE LF_MOV KEY 1
INPUT NUMREG F_NUMEROINI
DISPLAY "Numero@6" NUMREG
@ -139,12 +126,8 @@ END
NUMBER F_NUMEROFIN 7
BEGIN
<<<<<<< cg3100a.uml
PROMPT 55 12 "al numero "
HELP "Numero del movimenti fino cui fare la stampa"
=======
PROMPT 52 12 "al numero "
>>>>>>> 1.12
COPY USE F_NUMEROINI
INPUT NUMREG F_NUMEROFIN
COPY DISPLAY F_NUMEROINI