From c6cf7d094a720c4d6a62c33ce192066d8ead1c76 Mon Sep 17 00:00:00 2001
From: mtollari <mtollari@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 8 May 2017 15:00:53 +0000
Subject: [PATCH] Patch level         : 12.0 386 Files correlati     : tf
 Commento            : Aggiunto bottone "Solo invio" su tf0500, sistemati
 controlli su tf0200

git-svn-id: svn://10.65.10.50/branches/R_10_00@23793 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 src/tf/tf0200.cpp  |  6 ++----
 src/tf/tf0500.cpp  | 51 +++++++++++++++++++++++++---------------------
 src/tf/tf0500a.uml |  6 ++++++
 3 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/tf/tf0200.cpp b/src/tf/tf0200.cpp
index 949f1e7e5..559dcc665 100644
--- a/src/tf/tf0200.cpp
+++ b/src/tf/tf0200.cpp
@@ -439,9 +439,8 @@ void ComLiqPerIva_mask::extractinator() // Per gli amici GTFO
 		const TRectype rowLim = getLIM(anno, start);
 
 		// Controllo che la liquidazione è stata effettuata
-		if(rowLim.empty())
+		if(rowLim.empty() || rowLim.get_bool("B0"))
 		{
-			message_box("Errore LIM");
 			error_box("Attenzione non è stata calcolata la liquidazione del periodo corrente"); 
 			return;
 		}
@@ -554,7 +553,6 @@ void ComLiqPerIva_mask::extractinator() // Per gli amici GTFO
 	TRectype rowVer = getVER(anno, start);
 	if(rowVer.empty() || rowVer.get_real("R5") == ZERO)
 	{
-		message_box("Errore VER");
 		error_box("Non è stata valorizzato correttamente il campo \"Periodico\" in \"Versamenti ed interessi IVA\"");
 		return;
 	}
@@ -777,7 +775,7 @@ public:
 };
 
 bool ComLiqPerIva_app::user_create()
-{    
+{
   _rel = new TRelation(LF_IVALIQ);
   _mask = new ComLiqPerIva_mask;
 	set_search_field(F_ANNO);
diff --git a/src/tf/tf0500.cpp b/src/tf/tf0500.cpp
index c95ff17ee..66788c9e4 100644
--- a/src/tf/tf0500.cpp
+++ b/src/tf/tf0500.cpp
@@ -10,10 +10,33 @@
 #include <utility.h>	// get_iva_sirio()
 
 #define TIPO_FILE "DF"
-#define TFBASE "ModuliSirio"
+#define TFBASE "ModuliSirio\\Invio Liquidazione IVA"
 
 #define CODICE_FORNITURA "IVP17"
 
+class TIvaSend_msk : public TAutomask
+{
+	bool mese;
+	virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
+public:
+	bool checkVariables();
+	bool isMese() { return mese; }
+	TIvaSend_msk() : TAutomask("tf0500a"){}
+};
+
+// Definizione per chiamare metodo send dalla maschera
+class TIvaSend_app : public TSkeleton_application
+{
+	void generateNSend(TIvaSend_msk& msk) { generate(msk) && send(); }
+	bool generate(TIvaSend_msk& msk);
+	TToken_string getTestata(TIvaSend_msk& msk);
+public:
+	bool send();
+	virtual void main_loop();
+};
+
+TIvaSend_app& app() { return (TIvaSend_app&)main_app(); }
+
 const TRectype getAnagDitta()
 {
 	TString codanagr = cache().get(LF_NDITTE, prefix().firm().codice(), "TIPOA");
@@ -58,16 +81,6 @@ TString formatCurrency(TString value)
 		return TCurrency(app).string();
 }
 
-class TIvaSend_msk : public TAutomask
-{
-	bool mese;
-	virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
-public:
-	bool checkVariables();
-	bool isMese() { return mese; }
-	TIvaSend_msk() : TAutomask("tf0500a"){}
-};
- 
 bool TIvaSend_msk::on_field_event(TOperable_field& o, TField_event e, long jolly)
 {
 	switch(o.dlg())
@@ -139,6 +152,10 @@ bool TIvaSend_msk::on_field_event(TOperable_field& o, TField_event e, long jolly
 		if(e == fe_modify)
 			set(F_ATRIMESTRE, get_int(F_DATRIMESTRE));
 		break;
+	case DLG_EMAIL:
+		if(e == fe_button)
+			app().send();
+		break;
 	}
 	return true;
 }
@@ -163,18 +180,6 @@ bool TIvaSend_msk::checkVariables()
 	return true;
 }
 
-class TIvaSend_app : public TSkeleton_application
-{
-	void generateNSend(TIvaSend_msk& msk) { generate(msk) && send(); }
-	bool generate(TIvaSend_msk& msk);
-	TToken_string getTestata(TIvaSend_msk& msk);
-	bool send();
-public:
-	virtual void main_loop();
-};
-
-
-
 bool TIvaSend_app::generate(TIvaSend_msk& msk)
 {
 	if(!msk.checkVariables())
diff --git a/src/tf/tf0500a.uml b/src/tf/tf0500a.uml
index 9f5ef6691..3af3dd493 100644
--- a/src/tf/tf0500a.uml
+++ b/src/tf/tf0500a.uml
@@ -2,6 +2,12 @@
 
 TOOLBAR "topbar" 0 0 0 2
 
+BUTTON DLG_EMAIL 2 2
+BEGIN
+  PROMPT 1 1 "Solo Invia"
+  PICTURE TOOL_EMAIL 
+END
+
 #include <elabar.h>
 ENDPAGE