diff --git a/ca/ca3.cpp b/ca/ca3.cpp index 49f823da3..6e0ff1105 100755 --- a/ca/ca3.cpp +++ b/ca/ca3.cpp @@ -10,7 +10,7 @@ int main(int argc, char** argv) case 1: ca3200(argc, argv); break; // stampa mastrini case 2: ca3300(argc, argv); break; // stampa bilancio case 3: ca3400(argc, argv); break; // generazione movimenti perfetti ma casuali - //case 4: ca3500(argc, argv); break; + case 4: ca3500(argc, argv); break; // stampatore generico di report di CA case 5: ca3600(argc, argv); break; // stampa pagato per CdC/Commessa/Fase case 6: ca3700(argc, argv); break; //stampa rendiconto case 7: ca3800(argc, argv); break; //stampa bilancio di commessa per esercizio diff --git a/ca/ca3.h b/ca/ca3.h index f31f5317f..fc243217b 100755 --- a/ca/ca3.h +++ b/ca/ca3.h @@ -5,7 +5,7 @@ int ca3100(int argc, char* argv[]); int ca3200(int argc, char* argv[]); int ca3300(int argc, char* argv[]); int ca3400(int argc, char* argv[]); -//int ca3500(int argc, char* argv[]); +int ca3500(int argc, char* argv[]); int ca3600(int argc, char* argv[]); int ca3700(int argc, char* argv[]); int ca3800(int argc, char* argv[]); diff --git a/ca/ca3500.cpp b/ca/ca3500.cpp new file mode 100755 index 000000000..6853672d4 --- /dev/null +++ b/ca/ca3500.cpp @@ -0,0 +1,35 @@ +#include + +#include "calib02.h" +#include "../ba/ba8500.h" + + +class TGeneric_anal_report : public TAnal_report +{ +protected: + virtual bool use_mask() { return true; } +}; + +/////////////////////////////////////////////////////////// +// TBruce_wayne_app +/////////////////////////////////////////////////////////// + +class TBruce_wayne_app : public TKlarkKent_app +{ +protected: + virtual TReport* create_report(const char* name) const; +}; + +TReport* TBruce_wayne_app::create_report(const char* name) const +{ + TGeneric_anal_report* rep = new TGeneric_anal_report; + rep->load(name); + return rep; +} + +int ca3500(int argc, char* argv[]) +{ + TBruce_wayne_app app; + app.run(argc, argv, TR("Stampa Report Analitica")); + return 0; +} \ No newline at end of file diff --git a/ca/ca9300a.h b/ca/ca9300a.h new file mode 100755 index 000000000..e90ab6013 --- /dev/null +++ b/ca/ca9300a.h @@ -0,0 +1,14 @@ +#define F_TIPO 101 +#define F_DACODICE 102 +#define F_DADESCR 103 +#define F_ACODICE 104 +#define F_ADESCR 105 + +#define F_CODCMS 106 +#define F_DESCRCMS 107 +#define F_CODCOSTO 108 +#define F_DESCRCOSTO 109 +#define F_CODCONTO 110 +#define F_DESCRCONTO 111 + +#define F_REPORT 120 \ No newline at end of file diff --git a/ca/ca9300a.rep b/ca/ca9300a.rep new file mode 100755 index 000000000..ab799c62d --- /dev/null +++ b/ca/ca9300a.rep @@ -0,0 +1,238 @@ + + + Stampa tabelle ripartizione analitica + +
+ + + + + + + 2 + + + + 1 + + + + 1 + + + + 1 + + + + + + + + + + + + + + + + + + + + +
+
+ + #CODCMS @ +EMPTY= IF + 101 HIDE + 102 HIDE +THEN +#CODCOSTO @ +EMPTY= IF + 103 HIDE + 104 HIDE +THEN + + + + + + + + + #TIPO + +
  • +
  • +
  • + + + + + + + + #CODCMS + + + MESSAGE ISAMREAD,COMMESSE,CODCMS=#102,DESCRIZ + + + + + + #CODCOSTO + + + MESSAGE ISAMREAD,CDC,CODCOSTO=#104,DESCRIZ + +
    • +
    + CODICE + + + + CODICE + + + + RIP.DESCRIZ + + + 1 + RIP.CODCMS + + + + 1 + MESSAGE ISAMREAD,COMMESSE,CODCMS=#101,DESCRIZ + + + 1 + RIP.CODCOSTO + + + + 1 + MESSAGE ISAMREAD,CDC,CODCOSTO=#103,DESCRIZ + + + 1 + RIP.CODFASE + + + RIP.TIPORIP + +
  • +
  • +
  • + + + + RIP.ANNOES + + + RIP.INDBIL + + + RIP.CLASSEMOV + +
  • +
  • +
  • + + + + 2 + RIP.GRUPPO + + + 2 + RIP.CONTO + + + 2 + RIP.SOTTOCONTO + + + 2 + MESSAGE ISAMREAD,PCON,GRUPPO=#201!CONTO=#202!SOTTOCONTO=#203,DESCR + +
    • +
    +
    + + NRIGA + + + + MESSAGE ISAMREAD,COMMESSE,CODCMS=#101,DESCRIZ + + + + MESSAGE ISAMREAD,CDC,CODCOSTO=#103,DESCRIZ + + + + CODCONTO + CA_FORMAT_CONTO_DESCR + + + RIPARTO + + + CODCMS + + + CODCOSTO + + + CODFASE + + + CODCONTO + CA_FORMAT_CONTO + +
    +
    + + + + #SYSTEM.DATE + + + + #REPORT.PAGE + +
    +
    +
    + USE RRIP +SELECT (BETWEEN(CODCMS,#CODCMS,#CODCMS))(BETWEEN(CODCOSTO,#CODCOSTO,#CODCOSTO)) +JOIN RIP INTO TIPO==TIPO CODICE==CODICE +FROM TIPO=#TIPO CODICE=#DACODICE +TO TIPO=#TIPO CODICE=#ACODICE + \ No newline at end of file diff --git a/ca/ca9300a.uml b/ca/ca9300a.uml new file mode 100755 index 000000000..69e4dbbad --- /dev/null +++ b/ca/ca9300a.uml @@ -0,0 +1,136 @@ +#include "ca9300a.h" + +TOOLBAR "topbar" 0 0 0 2 +#include +ENDPAGE + +PAGE "Stampa tabelle ripartizione analitica" 0 2 0 0 + +GROUPBOX DLG_NULL 78 5 +BEGIN + PROMPT 0 1 "@bParametri ripartizione" +END + +LIST F_TIPO 16 +BEGIN + PROMPT 1 2 "Tipo " + ITEM "I|Interattiva" + ITEM "B|Batch" + ITEM "P|Pareggio" + FIELD #TIPO +END + +STRING F_DACODICE 8 +BEGIN + PROMPT 1 3 "Da rip. " + USE LF_RIP + INPUT TIPO F_TIPO SELECT + INPUT CODICE F_DACODICE + DISPLAY "Tipo" TIPO + DISPLAY "Codice@8" CODICE + DISPLAY "Descrizione@50" DESCRIZ + OUTPUT F_DACODICE CODICE + OUTPUT F_DADESCR DESCRIZ + FIELD #DACODICE +END + +STRING F_DADESCR 50 +BEGIN + PROMPT 21 3 "" + USE LF_RIP KEY 2 + INPUT TIPO F_TIPO SELECT + INPUT DESCRIZ F_DADESCR + DISPLAY "Descrizione@50" DESCRIZ + DISPLAY "Codice@8" CODICE + DISPLAY "Tipo" TIPO + COPY OUTPUT F_DACODICE +END + +STRING F_ACODICE 8 +BEGIN + PROMPT 1 4 "A rip. " + USE LF_RIP + INPUT TIPO F_TIPO SELECT + INPUT CODICE F_ACODICE + DISPLAY "Tipo" TIPO + DISPLAY "Codice@8" CODICE + DISPLAY "Descrizione@50" DESCRIZ + OUTPUT F_ACODICE CODICE + OUTPUT F_ADESCR DESCRIZ + FIELD #ACODICE +END + +STRING F_ADESCR 50 +BEGIN + PROMPT 21 4 "" + USE LF_RIP KEY 2 + INPUT TIPO F_TIPO SELECT + INPUT DESCRIZ F_ADESCR + DISPLAY "Descrizione@50" DESCRIZ + DISPLAY "Codice@8" CODICE + DISPLAY "Tipo" TIPO + COPY OUTPUT F_ACODICE +END + +GROUPBOX DLG_NULL 78 8 +BEGIN + PROMPT 0 6 "@bParametri di selezione" +END + +TEXT DLG_NULL +BEGIN + PROMPT 1 7 "Commessa" +END + +STRING F_CODCMS 20 +BEGIN + PROMPT 1 8 "" + USE COMMESSE + INPUT CODCMS F_CODCMS + DISPLAY "Codice@20" CODCMS + DISPLAY "Descrizione@50" DESCRIZ + OUTPUT F_CODCMS CODCMS + OUTPUT F_DESCRCMS DESCRIZ + FIELD #CODCMS +END + +STRING F_DESCRCMS 50 +BEGIN + PROMPT 25 8 "" + USE COMMESSE KEY 2 + INPUT DESCRIZ F_DESCRCMS + DISPLAY "Descrizione@50" DESCRIZ + DISPLAY "Codice@20" CODCMS + COPY OUTPUT F_CODCMS +END + +TEXT DLG_NULL +BEGIN + PROMPT 1 9 "Centro di costo" +END + +STRING F_CODCOSTO 20 +BEGIN + PROMPT 1 10 "" + USE CDC + INPUT CODCOSTO F_CODCOSTO + DISPLAY "Codice@20" CODCOSTO + DISPLAY "Descrizione@50" DESCRIZ + OUTPUT F_CODCOSTO CODCOSTO + OUTPUT F_DESCRCOSTO DESCRIZ + FIELD #CODCOSTO +END + +STRING F_DESCRCOSTO 50 +BEGIN + PROMPT 25 10 "" + USE CDC KEY 2 + INPUT DESCRIZ F_DESCRCOSTO + DISPLAY "Descrizione@50" DESCRIZ + DISPLAY "Codice@20" CODCOSTO + COPY OUTPUT F_CODCOSTO +END + +ENDPAGE + +ENDMASK diff --git a/ca/cacmmenu.men b/ca/cacmmenu.men index b350a1bbf..63b29ad01 100755 --- a/ca/cacmmenu.men +++ b/ca/cacmmenu.men @@ -19,6 +19,7 @@ Item_03 = "Fasi", "ca0 -6", "SF" Item_04 = "Stampa Commesse", "ca1 -5", "F" Item_05 = "Stampa Fasi", "ca1 -6", "F" Item_06 = "Tabelle di ripartizione", "ca0 -7", "F" +Item_07 = "Stampa Tabelle ripartizione", "ca3 -4 ca9300a", "F" [CMMENU_040] Caption = "Stampe" diff --git a/ca/calib02.h b/ca/calib02.h index f3656fa4b..f533ee582 100755 --- a/ca/calib02.h +++ b/ca/calib02.h @@ -1,6 +1,10 @@ #ifndef __CALIB02_H #define __CALIB02_H +#ifndef __AUTOMASK_H +#include +#endif + #ifndef __REPORT_H #include #endif diff --git a/ca/camenu.men b/ca/camenu.men index 8ee2b9a3c..318f775ad 100755 --- a/ca/camenu.men +++ b/ca/camenu.men @@ -44,11 +44,12 @@ Picture = Module = 22 Flags = "" Item_01 = "Piano dei conti", "ca1 -3", "F" -Item_02 = "Riclassificazione conti A/C", "ba8 -4 ca9400k1", "F" -Item_03 = "Riclassificazione conti C/A", "ba8 -4 ca9400k2", "F" -Item_04 = "Centri di costo", "ca1 -4", "F" -Item_05 = "Commesse", "ca1 -5", "F" -Item_06 = "Fasi", "ca1 -6", "F" +Item_02 = "Riclassificazione conti A/C", "ca3 -4 ca9400k1", "F" +Item_03 = "Riclassificazione conti C/A", "ca3 -4 ca9400k2", "F" +Item_04 = "Tabelle ripartizione", "ca3 -4 ca9300a", "F" +Item_05 = "Centri di costo", "ca1 -4", "F" +Item_06 = "Commesse", "ca1 -5", "F" +Item_07 = "Fasi", "ca1 -6", "F" [CAMENU_030] Caption = "Movimenti"