Patch level :10.0 472

Files correlati : Ricompilazione Demo : [ ] Commento : 0001451: Scheda percipiante Descrizione entrando nella gestione dei percipienti, poi scheda dei percipienti (ho impostato solo il sostituto d'imposta per l'anno 2009), clicco sul bottone percipiente e mi viene segnalato l'errore dell'allegato, Dopodichè anche remendo fine mi rimane appeso il pgm 776.exe e a volte 770.exe. git-svn-id: svn://10.65.10.50/trunk@19447 c028cbd2-c16b-5b4b-a496-9718f37d4682
2009-10-14 15:04:50 +00:00 · 2009-10-14 15:04:50 +00:00 · 1574ef3191
commit 1574ef3191
parent 2640e17bdd
9 changed files with 64 additions and 120 deletions
--- a/m770/771100a.uml
+++ b/m770/771100a.uml
@ -1,44 +1,32 @@
 #include "771100.h"
-//
-// Lista modifiche
-//
-// 1.4.96 Aggiunti campi prefisso/telefono
-//
-TOOLBAR "" 0 20 0 2
+
+TOOLBAR "" 0 0 0 2

 BUTTON F_FISICA 10 2
 BEGIN
-  PROMPT -15 -1 "F~isiche" 
+  PROMPT -15 -1 "F~isiche"
+  PICTURE TOOL_USERS
 END

 BUTTON F_ATTIVITA 10 2
 BEGIN
-  PROMPT -25 -1 "~Attivita'" 
+  PROMPT -25 -1 "~Attivita'"
+  PICTURE TOOL_EDIT
 END

 BUTTON DLG_SAVEREC 10 2
 BEGIN
 PROMPT -35 -1 "~Registra"
 MESSAGE EXIT,K_SAVE  
-PICTURE BMP_SAVEREC
-PICTURE BMP_SAVERECDN
+PICTURE TOOL_SAVEREC
+
 END

-BUTTON DLG_CANCEL 10 2
-BEGIN
-PROMPT -45 -1 ""
-MESSAGE EXIT,K_ESC
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-PROMPT -55 -1 ""
-MESSAGE EXIT,K_QUIT
-END
+#include "cancelbar.h"

 ENDPAGE

-PAGE "Dichiarante" -1 -1 78 18
+PAGE "Dichiarante" 0 2 0 0

 GROUPBOX DLG_NULL 78 4
 BEGIN
--- a/m770/771100b.uml
+++ b/m770/771100b.uml
@ -1,41 +1,32 @@
 #include "771100.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "" 0 0 0 2

-BUTTON F_GIURIDICA 10 2
+BUTTON F_GIURIDICA 2 2
 BEGIN
-  PROMPT -15 -1 "~Giuridiche" 
+  PROMPT 1 1 "~Giuridiche"
+  PICTURE TOOL_USERS
 END

-BUTTON F_ATTIVITA 10 2
+BUTTON F_ATTIVITA 2 2
 BEGIN
-  PROMPT -25 -1 "~Attività" 
+  PROMPT 2 1 "~Attività" 
  MESSAGE K_TAB,F_ATTIV
+  PICTURE TOOL_EDIT
 END

-BUTTON DLG_SAVEREC 10 2
+BUTTON DLG_SAVEREC 2 2
 BEGIN
-PROMPT -35 -1 "~Registra"
+PROMPT 3 1 "~Registra"
 MESSAGE EXIT,K_SAVE   
-PICTURE BMP_SAVEREC
-PICTURE BMP_SAVERECDN
+PICTURE TOOL_SAVEREC
 END

-BUTTON DLG_CANCEL 10 2
-BEGIN
-PROMPT -45 -1 ""
-MESSAGE EXIT,K_ESC
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-PROMPT -55 -1 ""
-MESSAGE EXIT,K_QUIT
-END
+#include "cancelbar.h"

 ENDPAGE

-PAGE "Dichiarante" -1 -1 78 18
+PAGE "Dichiarante" 0 2 0 0

 GROUPBOX DLG_NULL 78 4
 BEGIN
@ -137,7 +128,6 @@ END
 BOOLEAN F_SEDELEG
 BEGIN
  PROMPT 1 9 "Sede legale"
-  //FLAGS "D"
 END
          
 STRING F_COMRES 50
@ -178,7 +168,6 @@ END
 BOOLEAN F_DOMFISC
 BEGIN
  PROMPT 1 14 "Domicilio fiscale"
-  //FLAGS "D" 
 END

 STRING F_PTELRF 10
--- a/m770/771100g.uml
+++ b/m770/771100g.uml
@ -1,38 +1,30 @@
 #include "771100.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "" 0 0 0 2

 /* questi button vengono abilitati alternativamente
   dal listbox ghost F_TIPOA2BTN */
+   
 BUTTON F_BTN_GIURIDICA 10 2
 BEGIN
 PROMPT -14 -1 "~Giuridiche"
+PICTURE TOOL_USERS
 END

 BUTTON F_BTN_FISICA 10 2
 BEGIN
 PROMPT -14 -1 "F~isiche"
+PICTURE TOOL_USERS
 END

 BUTTON DLG_SAVEREC 10 2
 BEGIN
 PROMPT -24 -1 "~Registra"
 MESSAGE EXIT,K_SAVE  
-PICTURE BMP_SAVEREC
-PICTURE BMP_SAVERECDN
+PICTURE TOOL_SAVEREC
 END

-BUTTON DLG_CANCEL 10 2
-BEGIN
-PROMPT -34 -1 ""
-MESSAGE EXIT,K_ESC
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-PROMPT -44 -1 ""
-MESSAGE EXIT,K_QUIT
-END
+#include "cancelbar.h" 

 ENDPAGE

--- a/m770/771230e.uml
+++ b/m770/771230e.uml
@ -88,9 +88,14 @@ BEGIN
  MESSAGE COPY,F_CODANAGR
 END

-SPREADSHEET F_RIGHE 0 14
+BUTTON F_GENERA 24 1
 BEGIN
-  PROMPT 0 6 ""
+  PROMPT 1 6 "~Generazione da schede"
+END
+
+SPREADSHEET F_RIGHE
+BEGIN
+  PROMPT 0 7 ""
  ITEM "Cod.\ncau.@4"
  ITEM "Cau."
  ITEM "Imponibile\ncorrisposto@15"
@ -99,16 +104,6 @@ BEGIN
  ITEM "Somme al netto\nritenute@15"
  ITEM "Somme non\nsogg. riten.@15"
  ITEM "Generata\nda schede"
-//  FLAGS "A"
-//  USE LF_QUAE KEY NPROG
-//  INPUT CODDITTA F_CODDITTA
-//  INPUT TIPOA    F_TIPOA
-//  INPUT CODANAGR F_CODANAGR
-END       
-
-BUTTON F_GENERA 24 1
-BEGIN
-  PROMPT 2 18 "~Generazione da schede"
 END

 ENDPAGE
--- a/m770/771230e1.uml
+++ b/m770/771230e1.uml
@ -88,9 +88,19 @@ BEGIN
  KEY 1
 END

-SPREADSHEET F_RIGHE 0 12
+BUTTON F_GENERA 24 1
 BEGIN
-  PROMPT 0 6 ""
+  PROMPT 1 6 "~Generazione da schede"
+END
+
+BUTTON F_PROSPBTN 24 1
+BEGIN
+  PROMPT 30 6 "~Prospetto"
+END
+
+SPREADSHEET F_RIGHE
+BEGIN
+  PROMPT 0 7 ""
  ITEM "Cod.\ncau.@4"
  ITEM "Descrizione@35"
  ITEM "Cau."
@ -100,21 +110,6 @@ BEGIN
  ITEM "Ritenute\noperate@15"
  ITEM "Netto\ncorrisposto@15"
  ITEM "Generata\nda schede@8"
-//  FLAGS "A"
-//  USE LF_QUAE1 KEY NPROG
-//  INPUT CODDITTA F_CODDITTA
-//  INPUT TIPOA    F_TIPOA
-//  INPUT CODANAGR F_CODANAGR
-END       
-
-BUTTON F_GENERA 24 1
-BEGIN
-  PROMPT 2 18 "~Generazione da schede"
-END
-
-BUTTON F_PROSPBTN 24 1
-BEGIN
-  PROMPT 30 18 "~Prospetto"
 END

 ENDPAGE
--- a/m770/771230la.uml
+++ b/m770/771230la.uml
@ -4,8 +4,6 @@ TOOLBAR "" 0 0 0 2
 #include <relapbar.h>
 ENDPAGE

-ENDPAGE
-
 PAGE "Riepilogo LA" -1 -1 78 18

 GROUPBOX DLG_NULL 78 5
@ -90,9 +88,14 @@ BEGIN
  WARNING "Anagrafica assente"
 END

+BUTTON F_GENERA 24 1
+BEGIN
+  PROMPT 2 6 "~Generazione da schede"
+END
+
 SPREADSHEET F_RIGHE
 BEGIN
-  PROMPT 0 6 ""
+  PROMPT 0 7 ""
  ITEM "Cod.\ncau.@4"
  ITEM "Aliq."
  ITEM "Cau."       
@ -111,11 +114,6 @@ BEGIN
  ITEM "Generata\nda schede@9"
 END       

-BUTTON F_GENERA 24 1
-BEGIN
-  PROMPT 2 18 "~Generazione da schede"
-END
-
 ENDPAGE

 ENDMASK
--- a/m770/771310a.uml
+++ b/m770/771310a.uml
@ -4,8 +4,6 @@ TOOLBAR "" 0 0 0 2
 #include <relapbar.h>
 ENDPAGE

-ENDPAGE
-
 PAGE "Riepilogo ST" -1 -1 78 18

 GROUPBOX DLG_NULL 78 3
@ -222,7 +220,7 @@ END

 LIST F_QUADRO 2
 BEGIN
-  PROMPT 2 9 "Codice quadro  "
+  PROMPT 2 9 "Codice quadro    "
  HELP "Inserire il codice quadro"
  ITEM "| "
  ITEM "LA|LA"                     
@ -240,7 +238,7 @@ END

 CURRENCY F_QLRITVEREC 15
 BEGIN
-  PROMPT 42 10 "Rit. Vers. Ecc.  "
+  PROMPT 42 10 "Rit. Vers. Ecc.    "
  FIELD LF_QUAL->QLRITVEREC
 END

@ -261,7 +259,7 @@ END

 CURRENCY F_QLDIFF 15
 BEGIN        
-  PROMPT 42 11 "Differenza       "
+  PROMPT 42 11 "Differenza         "
  FLAGS "D"
 END

@ -286,7 +284,7 @@ END

 NUMBER F_REGIONE 2
 BEGIN
-  PROMPT 42 13 "Regione "
+  PROMPT 42 13 "Regione            "
  FLAGS "Z"
  USE %RGI
  INPUT CODTAB F_REGIONE
--- a/m770/777100a.uml
+++ b/m770/777100a.uml
@ -73,15 +73,11 @@ BEGIN
  PROMPT 1 8 "Genera record di testata (tipo A, B, Z)"
 END

-BUTTON DLG_OK 10 2
-BEGIN
-  PROMPT -12 -1 ""
-END
+ENDPAGE

-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -22 -1 ""
-END
+TOOLBAR "" 0 0 0 2
+
+#include "stdbar.h"

 ENDPAGE

--- a/m770/77sr.uml
+++ b/m770/77sr.uml
@ -20,17 +20,10 @@ BEGIN
  FLAGS "D"
 END

-BUTTON DLG_PRINT 10 2 
-BEGIN
-  PROMPT -12 -1 "~Stampa"
-  MESSAGE EXIT,K_ENTER
-END
-
-BUTTON DLG_QUIT 10 2 
-BEGIN 
-  PROMPT -22 -1 "Fine"
-END
+ENDPAGE

+TOOLBAR "" 0 0 0 2
+#include "printbar.h"
 ENDPAGE

 ENDMASK