From c60f5f27ce54709aa7ce8fda2065fa6cdc3fcdc2 Mon Sep 17 00:00:00 2001 From: luca Date: Mon, 9 Feb 2009 10:46:20 +0000 Subject: [PATCH] Patch level :10.0 230 Files correlati : Ricompilazione Demo : [ ] Commento : 0001160: schermo bilancio di commessa Descrizione il campo report risulta tagliato, gli si sovrappone il profilo. git-svn-id: svn://10.65.10.50/trunk@18223 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ca/ca3100.uml | 20 ++++++++++---------- ca/ca3200.uml | 20 ++++++++++---------- ca/ca3300.uml | 20 ++++++++++---------- ca/ca3600.uml | 22 +++++++++++----------- ca/ca3700.uml | 24 ++++++++++++------------ ca/camenu.men | 15 +++++++-------- 6 files changed, 60 insertions(+), 61 deletions(-) diff --git a/ca/ca3100.uml b/ca/ca3100.uml index 0e37cf4d2..dedc7de97 100755 --- a/ca/ca3100.uml +++ b/ca/ca3100.uml @@ -5,11 +5,18 @@ TOOLBAR "topbar" 0 0 0 2 #include ENDPAGE -TOOLBAR "" 0 -1 0 1 +TOOLBAR "bottombar" 0 -2 0 1 + +STRING F_REPORT 256 66 +BEGIN + PROMPT 1 -2 "Report " + FLAGS "B" + CHECKTYPE REQUIRED +END STRING DLG_PROFILE 50 BEGIN - PROMPT 9 -11 "Profilo " + PROMPT 1 -1 "Profilo " PSELECT END @@ -112,7 +119,7 @@ END STRING F_CAUSALEINI 3 BEGIN - PROMPT 1 8 "Stampa dalla causale " + PROMPT 1 8 "Stampa dalla causale " USE LF_CAUSALI KEY 1 INPUT CODCAUS F_CAUSALEINI DISPLAY "Codice causale" CODCAUS @@ -144,13 +151,6 @@ BEGIN ITEM "T|Temporaneo" END -STRING F_REPORT 256 62 -BEGIN - PROMPT 1 10 "Report " - FLAGS "B" - CHECKTYPE REQUIRED -END - SPREADSHEET F_RIGHE -1 -1 BEGIN PROMPT 1 12 "Selezione su CdC / Commesse / Fasi" diff --git a/ca/ca3200.uml b/ca/ca3200.uml index 06f798830..462484a98 100755 --- a/ca/ca3200.uml +++ b/ca/ca3200.uml @@ -5,11 +5,18 @@ TOOLBAR "topbar" 0 0 0 2 #include ENDPAGE -TOOLBAR "" 0 -1 0 1 +TOOLBAR "bottombar" 0 -2 0 1 + +STRING F_REPORT 256 66 +BEGIN + PROMPT 1 -2 "Report " + FLAGS "B" + CHECKTYPE REQUIRED +END STRING DLG_PROFILE 50 BEGIN - PROMPT 9 -11 "Profilo " + PROMPT 1 -1 "Profilo " PSELECT END @@ -17,7 +24,7 @@ ENDPAGE PAGE "Selezioni" 0 0 0 2 -SPREADSHEET F_RIGHE -1 -2 +SPREADSHEET F_RIGHE -1 -1 BEGIN PROMPT 0 2 "" ITEM "Cdc1" @@ -129,13 +136,6 @@ BEGIN ITEM "P|Preventivo e variazione" END -STRING F_REPORT 256 64 -BEGIN - PROMPT 2 20 "Report " - FLAGS "B" - CHECKTYPE REQUIRED -END - ENDPAGE ENDMASK diff --git a/ca/ca3300.uml b/ca/ca3300.uml index a38afa24b..e3826b33a 100755 --- a/ca/ca3300.uml +++ b/ca/ca3300.uml @@ -4,11 +4,18 @@ TOOLBAR "topbar" 0 0 0 2 #include ENDPAGE -TOOLBAR "" 0 -1 0 1 +TOOLBAR "bottombar" 0 -2 0 1 + +STRING F_REPORT 256 66 +BEGIN + PROMPT 1 -2 "Report " + FLAGS "B" + CHECKTYPE REQUIRED +END STRING DLG_PROFILE 50 BEGIN - PROMPT 9 -11 "Profilo " + PROMPT 1 -1 "Profilo " PSELECT END @@ -112,14 +119,7 @@ BEGIN GROUP 4 END -STRING F_REPORT 256 66 -BEGIN - PROMPT 2 9 "Report " - FLAGS "B" - CHECKTYPE REQUIRED -END - -SPREADSHEET F_RIGHE +SPREADSHEET F_RIGHE -1 -1 BEGIN PROMPT 0 11 "" ITEM "Cdc 1" diff --git a/ca/ca3600.uml b/ca/ca3600.uml index f70ea5d19..07330bcae 100755 --- a/ca/ca3600.uml +++ b/ca/ca3600.uml @@ -5,11 +5,18 @@ TOOLBAR "topbar" 0 0 0 2 #include ENDPAGE -TOOLBAR "" 0 -1 0 1 +TOOLBAR "bottombar" 0 -2 0 1 + +STRING F_REPORT 256 64 +BEGIN + PROMPT 2 -2 "Report " + FLAGS "B" + CHECKTYPE REQUIRED +END STRING DLG_PROFILE 50 BEGIN - PROMPT 9 -11 "Profilo " + PROMPT 2 -1 "Profilo " PSELECT END @@ -17,7 +24,7 @@ ENDPAGE PAGE "Stampa pagato" 0 0 0 2 -SPREADSHEET F_RIGHE -1 -12 +SPREADSHEET F_RIGHE -1 8 BEGIN PROMPT 1 1 "Centro di Costo / Commessa / Fase" ITEM "Cdc1" @@ -117,13 +124,6 @@ BEGIN CHECKTYPE NORMAL END -STRING F_REPORT 256 64 -BEGIN - PROMPT 2 20 "Report " - FLAGS "B" - CHECKTYPE REQUIRED -END - ENDPAGE //-------------- pagina con configurazione conti --------------------- @@ -174,7 +174,7 @@ END*/ BUTTON DLG_SAVEREC 12 2 BEGIN - PROMPT -11 19 "" + PROMPT -11 -1 "" PICTURE BMP_SAVEREC PICTURE BMP_SAVERECDN END diff --git a/ca/ca3700.uml b/ca/ca3700.uml index 6fddfcc3c..2fa453d7a 100755 --- a/ca/ca3700.uml +++ b/ca/ca3700.uml @@ -5,11 +5,18 @@ TOOLBAR "topbar" 0 0 0 2 #include ENDPAGE -TOOLBAR "" 0 -1 0 1 +TOOLBAR "bottombar" 0 -2 0 1 + +STRING F_REPORT 256 64 +BEGIN + PROMPT 2 -2 "Report " + FLAGS "B" + CHECKTYPE REQUIRED +END STRING DLG_PROFILE 50 BEGIN - PROMPT 9 -11 "Profilo " + PROMPT 2 -1 "Profilo " PSELECT END @@ -66,7 +73,7 @@ BEGIN PROMPT 1 4 "Compatta movimenti ripartiti" END -SPREADSHEET F_RIGHE -1 -4 +SPREADSHEET F_RIGHE -1 -6 BEGIN PROMPT 0 6 "Centro di Costo / Commessa / Fase" ITEM "Cdc1" @@ -85,19 +92,12 @@ END DATE F_DATAINI BEGIN - PROMPT 2 18 "Dalla data " + PROMPT 2 -4 "Dalla data " END DATE F_DATAFIN BEGIN - PROMPT 40 18 "Alla data " -END - -STRING F_REPORT 256 64 -BEGIN - PROMPT 2 19 "Report " - FLAGS "B" - CHECKTYPE REQUIRED + PROMPT 40 -4 "Alla data " END ENDPAGE diff --git a/ca/camenu.men b/ca/camenu.men index 688822504..5793e65ad 100755 --- a/ca/camenu.men +++ b/ca/camenu.men @@ -63,14 +63,13 @@ Caption = "Stampe" Picture = Module = 22 Flags = "" -Item_01 = "Tabelle", "", "F" -Item_02 = "Movimenti", "ca3 -0", "F" -Item_03 = "Mastrini", "ca3 -1", "F" -Item_04 = "Bilancio", "ca3 -2", "F" -Item_05 = "Pagato", "ca3 -5", "F" -Item_06 = "Rendiconto", "ca3 -6", "F" -Item_07 = "Bilancio di commessa", "ca3 -7", "F" -Item_08 = "Stima ricavi di competenza", "ca3 -8", "F" +Item_01 = "Movimenti", "ca3 -0", "F" +Item_02 = "Mastrini", "ca3 -1", "F" +Item_03 = "Bilancio", "ca3 -2", "F" +Item_04 = "Pagato", "ca3 -5", "F" +Item_05 = "Rendiconto", "ca3 -6", "F" +Item_06 = "Bilancio di commessa", "ca3 -7", "F" +Item_07 = "Stima ricavi di competenza", "ca3 -8", "F" [CAMENU_050] Caption = "Servizi"