diff --git a/src/ve/ve0600.cpp b/src/ve/ve0600.cpp index ff1c848b1..08170a7e9 100755 --- a/src/ve/ve0600.cpp +++ b/src/ve/ve0600.cpp @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -229,6 +230,74 @@ bool TCVM_tab_app::user_destroy() return true; } +/////////////////////////////////////////////////////////// +// Maschera di gestione tabella CSC: +// Connversione conai +/////////////////////////////////////////////////////////// + +#include "vetbcsc.h" + +class TCSC_mask : public TAutomask +{ +protected: + virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly); + +public: + TCSC_mask() : TAutomask("vetbcsc") {} +}; + + +bool TCSC_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) +{ + switch (o.dlg()) + { + case DLG_CONV: + switch (e) + { + case fe_button: + { + TExternal_app app("bacnv -26"); + + app.run(); + } + break; + default: break; + } + default: break; + } + return true; +} + +class TCSC_tab_app : public TRelation_application +{ + TCSC_mask * _msk; + TRelation * _rel; + +protected: + +public: + virtual TMask* get_mask(int) { return _msk; } + virtual TRelation* get_relation() const { return _rel; } + + virtual bool user_create(); + virtual bool user_destroy(); + +}; + +bool TCSC_tab_app::user_create() +{ + _rel = new TRelation("&CSC"); + _msk = new TCSC_mask; + return true; +} + +bool TCSC_tab_app::user_destroy() +{ + delete _msk; + delete _rel; + return true; +} + /////////////////////////////////////////////////////////// // Selettore applicazione per gestione maschere di modulo /////////////////////////////////////////////////////////// @@ -243,11 +312,17 @@ int ve0600(int argc, char* argv[]) TCVM_tab_app a; a.run(argc, argv, TR("Conti per categoria e gruppo")); } - else - { - TVE_tab_mod_app a; - a.run(argc, argv, TR("Tabelle modulo vendite")); - } + else + if (tab == "CSC") + { + TCSC_tab_app a; + a.run(argc, argv, TR("Conversione CONAI")); + } + else + { + TVE_tab_mod_app a; + a.run(argc, argv, TR("Tabelle modulo vendite")); + } return 0; } diff --git a/src/ve/vearea.men b/src/ve/vearea.men index 3e7415594..a8a809101 100755 --- a/src/ve/vearea.men +++ b/src/ve/vearea.men @@ -60,8 +60,9 @@ Item_14 = "Zone", "ba3 -0 ZON", "F" Item_15 = "Fatture da emettere/ricevere", "ve0 -6 &MRE", "F" Item_16 = "Conti ricavo dei materiali", "ve0 -6 &CMT", "F" Item_17 = "Sottocategorie CONAI", "ve0 -6 &SCC", "F" -Item_18 = "Note articolo", "ve0 -4 NAR", "F" -Item_19 = "Operatori", "ve0 -4 DIP", "F" +Item_18 = "Conversione sottocategorie CONAI", "ve0 -6 &CSC", "F" +Item_19 = "Note articolo", "ve0 -4 NAR", "F" +Item_20 = "Operatori", "ve0 -4 DIP", "F" [ACQVEN_005] Caption = "Tabelle contabili" diff --git a/src/ve/vetbcsc.h b/src/ve/vetbcsc.h new file mode 100644 index 000000000..1eeb1f29e --- /dev/null +++ b/src/ve/vetbcsc.h @@ -0,0 +1,6 @@ +#define DLG_CONV 99 +#define SCC_VCATEGORIA 101 +#define SCC_VCODICE 102 +#define SCC_CATEGORIA 103 +#define SCC_CODICE 104 +#define SCC_DESCR 105 diff --git a/src/ve/vetbcsc.uml b/src/ve/vetbcsc.uml new file mode 100644 index 000000000..5da3b0a06 --- /dev/null +++ b/src/ve/vetbcsc.uml @@ -0,0 +1,101 @@ +#include "vetbcsc.h" + +TOOLBAR "Toolbar" 0 0 0 2 + +BUTTON DLG_CONV 2 2 +BEGIN + PROMPT 1 1 "~Applica" + PICTURE TOOL_ELABORA +END + +#include + +ENDPAGE + +PAGE "Conversione Sottocategorie CONAI" 0 0 0 0 + +GROUPBOX DLG_NULL 78 3 +BEGIN + PROMPT 1 0 "Vecchia categoria" + FLAGS "R" +END + +LIST SCC_VCATEGORIA 2 10 +BEGIN + PROMPT 2 1 "Categoria " + FIELD CODTAB[1,2] + KEY 1 + ITEM "AC|Acciaio" + ITEM "AL|Alluminio" + ITEM "CA|Carta" + ITEM "PL|Plastica" + ITEM "LE|Legno" + ITEM "VE|Vetro" +END + +NUMBER SCC_VCODICE 2 +BEGIN + PROMPT 30 1 "Codice " + FIELD CODTAB[3,4] + KEY 1 + USE &CSC + FLAGS "Z" + INPUT CODTAB[1,2] SCC_VCATEGORIA + INPUT CODTAB[3,4] SCC_VCODICE + DISPLAY "Vecchia categoria" CODTAB[1,2] + DISPLAY "Codice@8" CODTAB[3,4] + OUTPUT SCC_VCATEGORIA CODTAB[1,2] + OUTPUT SCC_VCODICE CODTAB[3,4] + CHECKTYPE REQUIRED +END + +TEXT DLG_NULL +BEGIN + PROMPT 1 4 "Nuova categoria" +END + +LIST SCC_CATEGORIA 2 10 +BEGIN + PROMPT 2 5 "Categoria " + FIELD S1[1,2] + ITEM "AC|Acciaio" + ITEM "AL|Alluminio" + ITEM "CA|Carta" + ITEM "PL|Plastica" + ITEM "LE|Legno" + ITEM "VE|Vetro" +END + +NUMBER SCC_CODICE 2 +BEGIN + PROMPT 30 5 "Codice " + FIELD S1[3,4] + USE &SCC + FLAGS "Z" + INPUT CODTAB[1,2] SCC_CATEGORIA + INPUT CODTAB[3,4] SCC_CODICE + DISPLAY "Categoria" CODTAB[1,2] + DISPLAY "Codice@8" CODTAB[3,4] + DISPLAY "Descrizione@50" S0 + DISPLAY "Spesa@8" S1 + OUTPUT SCC_CATEGORIA CODTAB[1,2] + OUTPUT SCC_CODICE CODTAB[3,4] + OUTPUT SCC_DESCR S0 + CHECKTYPE REQUIRED +END + +STRING SCC_DESCR 50 +BEGIN + PROMPT 2 7 "Descrizione " + USE &SCC KEY 2 + INPUT S0 SCC_DESCR + DISPLAY "Descrizione@50 " S0 + DISPLAY "Categoria" CODTAB[1,2] + DISPLAY "Codice@8" CODTAB[3,4] + COPY OUTPUT SCC_CODICE + CHECKTYPE SEARCH +END + +ENDPAGE +ENDMASK + diff --git a/src/ve/vetbscc.uml b/src/ve/vetbscc.uml index 0b606d075..63559df1e 100755 --- a/src/ve/vetbscc.uml +++ b/src/ve/vetbscc.uml @@ -8,7 +8,7 @@ ENDPAGE PAGE "Sottocategorie CONAI" 0 0 0 0 -GROUPBOX DLG_NULL 78 5 +GROUPBOX DLG_NULL 78 7 BEGIN PROMPT 1 0 "" FLAGS "R" @@ -40,24 +40,11 @@ BEGIN DISPLAY "Codice@8" CODTAB[3,4] DISPLAY "Descrizione@50" S0 DISPLAY "Spesa@8" S1 + OUTPUT SCC_CATEGORIA CODTAB[1,2] OUTPUT SCC_CODICE CODTAB[3,4] CHECKTYPE REQUIRED END -STRING SCC_CODSPESA 8 -BEGIN - PROMPT 20 3 "Codice spesa " - FIELD S1 - USE SPP - FLAGS "U" - INPUT CODTAB SCC_CODSPESA - DISPLAY "Codice Spesa " CODTAB - DISPLAY "Descrizione@50" S0 - OUTPUT SCC_CODSPESA CODTAB - CHECKTYPE REQUIRED - HELP "Codice spesa collegato alla sottocategoria" -END - STRING SCC_DESCR 50 BEGIN PROMPT 2 5 "Descrizione " @@ -72,6 +59,20 @@ BEGIN CHECKTYPE REQUIRED END +STRING SCC_CODSPESA 8 +BEGIN + PROMPT 2 8 "Codice spesa" + FIELD S1 + USE SPP + FLAGS "U" + INPUT CODTAB SCC_CODSPESA + DISPLAY "Codice Spesa " CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT SCC_CODSPESA CODTAB + CHECKTYPE REQUIRED + HELP "Codice spesa collegato alla sottocategoria" +END + ENDPAGE ENDMASK