From 0b522db6e5dfa6ebe4d10c5ac13f2e7d1885c8c3 Mon Sep 17 00:00:00 2001 From: mtollari Date: Fri, 23 Sep 2016 15:40:14 +0000 Subject: [PATCH] Patch level : 12.0 no-patch Files correlati : Commento : Aggiunto report occasionali da terminale git-svn-id: svn://10.65.10.50/branches/R_10_00@23317 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- src/cg/cg5500.cpp | 5 +- src/cg/cg5800.cpp | 21 +++++++- src/cg/cg5800.h | 3 +- src/cg/{cg5800ra.rep => cg5800a.rep} | 0 src/cg/cg5800b.rep | 74 ++++++++++++++++++++++++++++ src/cg/cg5800b.uml | 6 +++ src/cg/cgmenu.men | 10 +++- 7 files changed, 113 insertions(+), 6 deletions(-) rename src/cg/{cg5800ra.rep => cg5800a.rep} (100%) create mode 100644 src/cg/cg5800b.rep diff --git a/src/cg/cg5500.cpp b/src/cg/cg5500.cpp index 5f8cb4520..e9882a92e 100755 --- a/src/cg/cg5500.cpp +++ b/src/cg/cg5500.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include "cglib03.h" #include "cg5500.h" @@ -1205,7 +1206,7 @@ void Visliq_app::recalc_liq_data(TViswin* vsw, real& rimb, real& rett, real& ver else replace_number(vsw, lcrs, credspec, 58); - const bool print_intr = _freqviva == "T" && intr != 0.0; + const bool print_intr = _freqviva == "T" && intr != ZERO; const char* desc_inter = TR("Interessi dovuti per liquidazioni trimestrali"); lintr = vsw->search(desc_inter, x, line, true); @@ -1271,7 +1272,7 @@ void Visliq_app::recalc_liq_data(TViswin* vsw, real& rimb, real& rett, real& ver } else if (risul.sign() >= 0) // ... altrimenti siamo a debito, in tal caso si hanno gli interessi (solo trimestrali of course) { - const bool print_intr = _freqviva == "T" && intr != 0.0; + const bool print_intr = _freqviva == "T" && intr != ZERO; if (print_intr) { if (lintr == -1) diff --git a/src/cg/cg5800.cpp b/src/cg/cg5800.cpp index f8b1a0195..c2aa125b4 100755 --- a/src/cg/cg5800.cpp +++ b/src/cg/cg5800.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include @@ -270,8 +271,24 @@ bool TQuadro_VT_iva_mask::on_field_event(TOperable_field& o, TField_event e, lon case DLG_PRELPR: if (e == fe_button) { - TReport rep; - if (rep.load("cg5800ra.rep")) + TProgram_report rep; + if (rep.load("cg5800a.rep")) + { + TRecordset* r = rep.recordset(); + if (r != NULL) + { + const TVariant var = get(F_YEAR); + r->set_var("#ANNO", var); + } + rep.print_or_preview(); + } + } + break; + case DLG_PRELOC: + if (e == fe_button) + { + TProgram_report rep; + if (rep.load("cg5800b.rep")) { TRecordset* r = rep.recordset(); if (r != NULL) diff --git a/src/cg/cg5800.h b/src/cg/cg5800.h index eeefafab6..c92057c8b 100755 --- a/src/cg/cg5800.h +++ b/src/cg/cg5800.h @@ -31,4 +31,5 @@ #define FFR_REGIMP(reg) 2 ## reg #define FFR_REGIVA(reg) 3 ## reg -#define DLG_PRELPR 151 \ No newline at end of file +#define DLG_PRELPR 151 +#define DLG_PRELOC 152 \ No newline at end of file diff --git a/src/cg/cg5800ra.rep b/src/cg/cg5800a.rep similarity index 100% rename from src/cg/cg5800ra.rep rename to src/cg/cg5800a.rep diff --git a/src/cg/cg5800b.rep b/src/cg/cg5800b.rep new file mode 100644 index 000000000..3f31f4997 --- /dev/null +++ b/src/cg/cg5800b.rep @@ -0,0 +1,74 @@ + + + Lista occasionali per quadro VT + +
+ + + "Lista clienti occasionali per quadro IVA VT anno " + #ANNO + + +
+
+
+ 23.OCFPI + 0 "F3.101" ! +0 "F3.102" ! + + + + + + 23.CODCF + + + + 18.RAGSOC + + + + + + +
+
+
+ + RMOVIVA.NUMREG + + + RMOVIVA.IMPONIBILE + MESSAGE ADD,F3.101 + + + RMOVIVA.CODIVA + + + RMOVIVA.IMPOSTA + MESSAGE ADD,F3.102 + +
+
+
+ + + + + +
+
+ + + MESSAGE ADD,F1.201 + + + MESSAGE ADD,F1.202 + +
+ USE RMOVIVA SE (23.TIPO=="C")(23.ANNOIVA=#ANNO)(20.OCCAS=="X")(202@.S1=="") +BY 23.ANNOIVA 23.OCFPI NUMREG +JOIN MOV INTO NUMREG==NUMREG +JOIN OCCAS TO MOV INTO CFPI==OCFPI +JOIN CLIFO TO MOV INTO TIPOCF==TIPO CODCF==CODCF +JOIN %IVA TO RMOVIVA ALIAS 202 INTO CODTAB==CODIVA + \ No newline at end of file diff --git a/src/cg/cg5800b.uml b/src/cg/cg5800b.uml index 253b20cf0..f4b7e3726 100755 --- a/src/cg/cg5800b.uml +++ b/src/cg/cg5800b.uml @@ -14,6 +14,12 @@ BEGIN PICTURE TOOL_PRINTELENCO END +BUTTON DLG_PRELOC 15 2 +BEGIN + PROMPT -33 -11 "Elenco Occasionali" + PICTURE TOOL_PRINTELENCO +END + #include ENDPAGE diff --git a/src/cg/cgmenu.men b/src/cg/cgmenu.men index 3c83d3534..73ab8f0df 100755 --- a/src/cg/cgmenu.men +++ b/src/cg/cgmenu.men @@ -275,6 +275,14 @@ Picture = Module = 7 Flags = "" Item_01 = "Comunicazione annuale dati IVA", "cg5 -7", "F" -Item_02 = "Quadro VT", "cg5 -8", "F" +Item_02 = "Dichiarazione IVA" [CGMENU_030] Item_03 = "Elenco clienti/fornitori", "cg3 -8", "F" Item_04 = "Comunicazione Polivalente", "fe0 -0", "F" + +[CGMENU_030] +Caption = "Dichiarazione IVA" +Picture = +Module = 7 +Flags = "" +Item_01 = "Quadro VE", "cg7 -4", "F" +Item_02 = "Quadro VT", "cg5 -8", "F" \ No newline at end of file