Patch level :4.0 830

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :riportate modifiche dalla 3.1 relative ad IBAN e modulo EP


git-svn-id: svn://10.65.10.50/trunk@15824 c028cbd2-c16b-5b4b-a496-9718f37d4682

ef/df900000.frm

@@ -233,14 +233,14 @@ END
 STRING 21 5 
 BEGIN
  KEY "ABI presentazione"
- PROMPT 55 4 "ABI: "
+ PROMPT 20 4 "ABI: "
  FIELD 20->CODABI
 END         
 
 STRING 22 5 
 BEGIN
  KEY "CAB succursale"
- PROMPT 66 4 "CAB: "
+ PROMPT 31 4 "CAB: "
  FIELD 20->CODCAB
 END    
 
@@ -271,14 +271,14 @@ END
 STRING 34 20 
 BEGIN
  KEY "Conto Corrente"
- PROMPT 78 4 "C/C "
+ PROMPT 43 4 "C/C "
  FIELD 20->NUMCC
 END
 
 STRING 133 1
 BEGIN
  KEY "Conto Corrente"
- PROMPT 55 4 ""
+ PROMPT 5 4 ""
  FIELD 20->NUMCC
  MESSAGE EMPTY DISABLE,134
  FLAGS "H"
@@ -287,11 +287,18 @@ END
 STRING 134 35
 BEGIN
  KEY "Conto Corrente"
- PROMPT 55 4 "ACCOUNT NUM. "
+ PROMPT 43 4 "ACCOUNT NUM. "
  FIELD 20->NUMCC
  FLAGS "D"
 END
 
+STRING 135 35
+BEGIN
+ KEY "Conto Corrente"
+ PROMPT 61 4 "IBAN "
+ FIELD 20->IBAN
+END
+
 STRING 35 3
 BEGIN
  KEY "test sulla valuta"
@@ -322,21 +329,21 @@ SECTION RIGHE_EFFETTO 5 1 1 FILE 14 GROUP NPROGTR
     FIELD 14->DATAFATT
   END
 
-  NUMERO 3 21 3
+  VALUTA 3 21 3
   BEGIN
     PROMPT 124 1 ""
     FIELD 14->IMPORTOVAL
-    PICTURE "###.###.###.###,@@#"
+  //  PICTURE "###.###.###.###,@@#"
     GROUP 3
   END
 
-  NUMERO 4 18 
+  VALUTA 4 18 
   BEGIN
     PROMPT 124 1 ""
     FIELD 14->IMPORTO
-    PICTURE "###.###.###,@@#"
+  //  PICTURE "###.###.###.###"
     GROUP 4
-   FLAGS "D"
+    FLAGS "D"
   END
 
 END
@@ -357,17 +364,30 @@ BEGIN
  PROMPT 114 6 "@B"
 END
 
-NUMERO 26 18
+VALUTA 26 18
 BEGIN
  KEY "importo"
  PROMPT 124 6 ""
  MESSAGE _IMPORTO
  MESSAGE ADD,FL->3
- PICTURE "###.###.###,@@#"
+ PICTURE "###.###.###.###"
 END
 
 END
 SECTION FOOTER ODD 5
+
+STRINGA 99
+BEGIN
+ KEY "riga separazione dalle righe del body"
+ PROMPT 2 1 "---------------------------------------------------------------------------------------------------------------------------------------------"
+END
+
+STRINGA 100 12 1
+BEGIN
+ KEY "stampa 'segue' in coda"
+ PROMPT  120 3 "-- SEGUE --"
+END
+
 END
 
 SECTION FOOTER LAST 5
@@ -387,7 +407,7 @@ END
 NUMERO 3 50 
 BEGIN
  KEY "Totale"
- PROMPT 5 3 "Dell' importo complessivo di Eur.@B"
+ PROMPT 5 3 "Dell' importo complessivo di L.@B"
  PICTURE "###.###.###.###,@@#"
 END   
 
@@ -426,7 +446,8 @@ BEGIN
  KEY "data valuta"
  PROMPT 100 3 "@Rcon valuta per noi: @B"
  FIELD 31->DATADIST
-END   
+ FL "D"
+END
 
 END
 

ef/dse.frm

@@ -178,8 +178,15 @@ END
 STRING 22 5 
 BEGIN
  KEY "CAB succursale"
- PROMPT 55 6 "CAB: "
+ PROMPT 67 5 "CAB: "
  FIELD CODCAB
+END
+
+STRING 29 35
+BEGIN
+  KEY "Conto Corrente"
+  PROMPT 55 6 "IBAN "
+  FIELD 20->IBAN
 END    
 
 LISTA 23 8

ef/ef0a00.cpp

@@ -2,13 +2,13 @@
 #include <automask.h>
 #include <defmask.h>
 #include <execp.h>
+#include <modaut.h>
 #include <progind.h>
 #include <relation.h>
 #include <tabutil.h>
 
 #include <clifo.h>
 #include <cfven.h>
-#include <scadenze.h>
 #include "../cg/cgsaldac.h"
 #include "../ef/ef0301.h"
 
@@ -984,10 +984,11 @@ class TPagamento_effetti : public TSkeleton_application
 {
   TPE_mask* _mask;
 
-public:      
+public:
+	virtual bool create();
   virtual void main_loop();
   virtual void print();
-  virtual bool firm_change_enabled() const { return FALSE; }
+  virtual bool firm_change_enabled() const { return false; }
 };
 
 void TPagamento_effetti::main_loop()
@@ -1020,10 +1021,20 @@ void TPagamento_effetti::print()
     _mask->print();
 }
 
+
+bool TPagamento_effetti::create()
+{
+  if (!has_module(EPAUT) && !has_module(EEAUT))
+    return error_box(TR("Modulo non autorizzato"));
+
+	return TSkeleton_application::create();
+}
+
+
 int ef0A00(int argc, char* argv[])
 {
   int n = 0;
   TPagamento_effetti pe;
-  pe.run(argc, argv, "Disposizioni incassi/pagamenti");
+  pe.run(argc, argv, TR("Disposizioni incassi/pagamenti"));
   return 0;
 }