From 3c1425f34bd59f2487aa090e883bc96011805c62 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Thu, 6 Feb 2025 23:48:43 +0100 Subject: [PATCH] Patch level : 12.00 1370 Files correlati : cg0.exe cg0800a.msk cg0900a.msk cg0800a.rep cg0900a.rep cg4.exe cg4b00a.msk cg4c00a.msk cg4b00a.rep cg4c00a.rep cgmenu.men Bug : MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commento: Progressivi IVA per attività (registrazione e competenza) --- src/cg/cg0.cpp | 3 +- src/cg/cg0.h | 2 +- src/cg/cg0800.cpp | 6 +- src/cg/cg0800a.h | 3 - src/cg/cg0800a.rep | 35 +++--- src/cg/cg0800a.uml | 55 ++------- src/cg/cg0900.cpp | 126 ++++++++++++++++++++ src/cg/cg0900a.h | 7 ++ src/cg/cg0900a.rep | 214 ++++++++++++++++++++++++++++++++++ src/cg/cg0900a.uml | 93 +++++++++++++++ src/cg/cg4.cpp | 1 + src/cg/cg4.h | 1 + src/cg/cg4b00.cpp | 6 +- src/cg/cg4b00a.h | 4 - src/cg/cg4b00a.rep | 39 +++---- src/cg/cg4b00a.uml | 64 ++-------- src/cg/cg4c00.cpp | 152 ++++++++++++++++++++++++ src/cg/cg4c00a.h | 9 ++ src/cg/cg4c00a.rep | 228 ++++++++++++++++++++++++++++++++++++ src/cg/cg4c00a.uml | 106 +++++++++++++++++ src/cg/cglib.h | 70 +++++++---- src/cg/cglib05.cpp | 283 +++++++++++++++++++++++++-------------------- src/cg/cgmenu.men | 4 +- 23 files changed, 1197 insertions(+), 314 deletions(-) create mode 100644 src/cg/cg0900.cpp create mode 100644 src/cg/cg0900a.h create mode 100644 src/cg/cg0900a.rep create mode 100644 src/cg/cg0900a.uml create mode 100644 src/cg/cg4c00.cpp create mode 100644 src/cg/cg4c00a.h create mode 100644 src/cg/cg4c00a.rep create mode 100644 src/cg/cg4c00a.uml diff --git a/src/cg/cg0.cpp b/src/cg/cg0.cpp index 2d6cc8f33..97836b9ff 100755 --- a/src/cg/cg0.cpp +++ b/src/cg/cg0.cpp @@ -13,7 +13,8 @@ int main(int argc, char** argv) case 4: cg0500(argc,argv); break; // Causali contabili case 5: cg0600(argc,argv); break; // Tabelle contabili case 6: cg0700(argc, argv); break; // Clienti/Fornitori occasionali - case 7: cg0800(argc, argv); break; // Stampa progressivi IVA avanzata + case 7: cg0800(argc, argv); break; // Stampa progressivi IVA avanzata + case 8: cg0900(argc, argv); break; // Stampa progressivi IVA avanzata per attività default: cg0100(argc,argv); break; // Piano dei conti } return 0; diff --git a/src/cg/cg0.h b/src/cg/cg0.h index 79ba4ce5d..0bf8cd291 100755 --- a/src/cg/cg0.h +++ b/src/cg/cg0.h @@ -9,6 +9,7 @@ int cg0500(int argc, char* argv[]); int cg0600(int argc, char* argv[]); int cg0700(int argc, char* argv[]); int cg0800(int argc, char* argv[]); +int cg0900(int argc, char* argv[]); #endif // __CG0_H @@ -24,4 +25,3 @@ int cg0800(int argc, char* argv[]); - diff --git a/src/cg/cg0800.cpp b/src/cg/cg0800.cpp index a84d5f5ca..c2a009faa 100644 --- a/src/cg/cg0800.cpp +++ b/src/cg/cg0800.cpp @@ -62,7 +62,7 @@ void TRiepilogoIVA_app::main_loop() while (m.run() != K_QUIT) { TRiepilogoIVA_report rep; - TFilename repname = m.get(F_REPORT); + TFilename repname = m.get(DLG_REPORT); TRiepilogoIVA_recordset * recset = new TRiepilogoIVA_recordset; if (repname.blank()) @@ -95,10 +95,6 @@ void TRiepilogoIVA_app::main_loop() a.set_end_month(); recset->set_from(da); recset->set_to(a); - - const TString & codatt = m.get(F_CODATT); - - recset->set_codatt(codatt); rep.set_recordset(recset); rep.print_or_preview(); } diff --git a/src/cg/cg0800a.h b/src/cg/cg0800a.h index c2579d8e2..e1c932f3c 100644 --- a/src/cg/cg0800a.h +++ b/src/cg/cg0800a.h @@ -3,6 +3,3 @@ #define F_ANNO 103 #define F_DAMESE 104 #define F_AMESE 105 -#define F_CODATT 106 - -#define F_REPORT 200 diff --git a/src/cg/cg0800a.rep b/src/cg/cg0800a.rep index d42492a3b..f340bba25 100644 --- a/src/cg/cg0800a.rep +++ b/src/cg/cg0800a.rep @@ -1,5 +1,5 @@ - + Riepilogo progressivi IVA