From a31c61d1840cb3267edd767955ac2195fe414472 Mon Sep 17 00:00:00 2001 From: luca Date: Wed, 25 Feb 2009 11:01:31 +0000 Subject: [PATCH] Patch level :10.0 Files correlati : Ricompilazione Demo : [ ] Commento :eliminato quell'aborto di ve7; trasformato in ps0077 tanto per non perdere i programmi git-svn-id: svn://10.65.10.50/trunk@18345 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- projects/frm32.bat | 2 +- projects/ps.sln | 9 + projects/{ve7.rc => ps0077.rc} | 0 projects/{ve7.vcproj => ps0077.vcproj} | 192 +++++----------------- ps/indice_programmi.txt | 2 + ps/ps0077.cpp | 27 +++ ps/ps0077.h | 6 + ve/ve7100.cpp => ps/ps0077100.cpp | 15 +- ve/ve7100a.h => ps/ps0077100a.h | 2 +- ve/ve7100a.uml => ps/ps0077100a.uml | 2 +- ve/ve7200.cpp => ps/ps0077200.cpp | 18 +- ve/ve7200.h => ps/ps0077200.h | 0 ve/ve7200a.frm => ps/ps0077200a.frm | 2 +- ve/ve7200a.h => ps/ps0077200a.h | 0 ve/ve7200a.uml => ps/ps0077200a.uml | 24 +-- ve/ve7300.cpp => ps/ps0077300.cpp | 18 +- ve/ve7300.h => ps/ps0077300.h | 0 ve/ve7300a.frm => ps/ps0077300a.frm | 2 +- ve/ve7300a.h => ps/ps0077300a.h | 4 +- ve/ve7300a.uml => ps/ps0077300a.uml | 24 +-- ve/ve7400.cpp => ps/ps0077400.cpp | 24 +-- ve/ve7400a.h => ps/ps0077400a.h | 0 ve/ve7400a.ini => ps/ps0077400a.ini | 0 ve/ve7400a.uml => ps/ps0077400a.uml | 24 +-- ve/ve7400conf.ini => ps/ps0077400conf.ini | 2 +- ve/ve7600.cpp => ps/ps0077600.cpp | 27 +-- ve/ve7600a.h => ps/ps0077600a.h | 0 ve/ve7600a.uml => ps/ps0077600a.uml | 15 +- ve/ve7700.cpp => ps/ps0077700.cpp | 13 +- ve/ve7700.h => ps/ps0077700.h | 0 ve/ve7700a.h => ps/ps0077700a.h | 4 - ve/ve7700a.uml => ps/ps0077700a.uml | 25 +-- ve/ve7701.cpp => ps/ps0077701.cpp | 13 +- ve/ve7701a.ini => ps/ps0077701a.ini | 0 ve/ve7.cpp | 26 --- ve/ve7.h | 11 -- 36 files changed, 156 insertions(+), 377 deletions(-) rename projects/{ve7.rc => ps0077.rc} (100%) rename projects/{ve7.vcproj => ps0077.vcproj} (78%) create mode 100755 ps/ps0077.cpp create mode 100755 ps/ps0077.h rename ve/ve7100.cpp => ps/ps0077100.cpp (98%) rename ve/ve7100a.h => ps/ps0077100a.h (90%) rename ve/ve7100a.uml => ps/ps0077100a.uml (98%) rename ve/ve7200.cpp => ps/ps0077200.cpp (98%) rename ve/ve7200.h => ps/ps0077200.h (100%) rename ve/ve7200a.frm => ps/ps0077200a.frm (98%) rename ve/ve7200a.h => ps/ps0077200a.h (100%) rename ve/ve7200a.uml => ps/ps0077200a.uml (92%) rename ve/ve7300.cpp => ps/ps0077300.cpp (96%) rename ve/ve7300.h => ps/ps0077300.h (100%) rename ve/ve7300a.frm => ps/ps0077300a.frm (99%) rename ve/ve7300a.h => ps/ps0077300a.h (91%) rename ve/ve7300a.uml => ps/ps0077300a.uml (92%) rename ve/ve7400.cpp => ps/ps0077400.cpp (95%) rename ve/ve7400a.h => ps/ps0077400a.h (100%) rename ve/ve7400a.ini => ps/ps0077400a.ini (100%) rename ve/ve7400a.uml => ps/ps0077400a.uml (86%) rename ve/ve7400conf.ini => ps/ps0077400conf.ini (69%) rename ve/ve7600.cpp => ps/ps0077600.cpp (95%) rename ve/ve7600a.h => ps/ps0077600a.h (100%) rename ve/ve7600a.uml => ps/ps0077600a.uml (66%) rename ve/ve7700.cpp => ps/ps0077700.cpp (98%) rename ve/ve7700.h => ps/ps0077700.h (100%) rename ve/ve7700a.h => ps/ps0077700a.h (90%) rename ve/ve7700a.uml => ps/ps0077700a.uml (84%) rename ve/ve7701.cpp => ps/ps0077701.cpp (98%) rename ve/ve7701a.ini => ps/ps0077701a.ini (100%) delete mode 100755 ve/ve7.cpp delete mode 100755 ve/ve7.h diff --git a/projects/frm32.bat b/projects/frm32.bat index 1190316b8..f2a1f29ca 100755 --- a/projects/frm32.bat +++ b/projects/frm32.bat @@ -3,7 +3,7 @@ echo Compiling %1 into %2 copy ..\include\lffiles.h+%1 %TMP%\tmp.tmp set oldinc=%include -set include=..\include;..\at;..\ba;..\ce;..\cg;..\cm;..\db;..\dl;..\m770;..\mg;..\mr;..\or;..\pr;..\sv;..\ve +set include=..\include;..\at;..\ba;..\ce;..\cg;..\cm;..\db;..\dl;..\m770;..\mg;..\mr;..\or;..\pr;..\ps;..\sv;..\ve cl /nologo /EP %TMP%\tmp.tmp >%TMP%\tmp.frm set include=%oldinc set oldinc= diff --git a/projects/ps.sln b/projects/ps.sln index eed5fd312..a1244386e 100755 --- a/projects/ps.sln +++ b/projects/ps.sln @@ -69,6 +69,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pd0001", "pd0001.vcproj", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ps1100", "ps1100.vcproj", "{2CC07FDE-D15A-420B-9DDB-1FDF32B73BC2}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ps0077", "ps0077.vcproj", "{F3E85440-C87A-43C5-9EE8-680D704B8C8F}" + ProjectSection(ProjectDependencies) = postProject + {A1CE9743-A597-4F92-B55A-345A366C9E55} = {A1CE9743-A597-4F92-B55A-345A366C9E55} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -175,6 +180,10 @@ Global {2CC07FDE-D15A-420B-9DDB-1FDF32B73BC2}.Debug|Win32.Build.0 = Debug|Win32 {2CC07FDE-D15A-420B-9DDB-1FDF32B73BC2}.Release|Win32.ActiveCfg = Release|Win32 {2CC07FDE-D15A-420B-9DDB-1FDF32B73BC2}.Release|Win32.Build.0 = Release|Win32 + {F3E85440-C87A-43C5-9EE8-680D704B8C8F}.Debug|Win32.ActiveCfg = Debug|Win32 + {F3E85440-C87A-43C5-9EE8-680D704B8C8F}.Debug|Win32.Build.0 = Debug|Win32 + {F3E85440-C87A-43C5-9EE8-680D704B8C8F}.Release|Win32.ActiveCfg = Release|Win32 + {F3E85440-C87A-43C5-9EE8-680D704B8C8F}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/projects/ve7.rc b/projects/ps0077.rc similarity index 100% rename from projects/ve7.rc rename to projects/ps0077.rc diff --git a/projects/ve7.vcproj b/projects/ps0077.vcproj similarity index 78% rename from projects/ve7.vcproj rename to projects/ps0077.vcproj index 935a06b05..4945fd23c 100755 --- a/projects/ve7.vcproj +++ b/projects/ps0077.vcproj @@ -2,9 +2,9 @@ @@ -96,7 +96,7 @@ MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" - TypeLibraryName=".\..\debug/ve7.tlb" + TypeLibraryName=".\..\debug/ps0077.tlb" HeaderFileName="" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -818,43 +710,43 @@ Filter="h" > @@ -863,11 +755,11 @@ Filter="frm" > @@ -875,15 +767,15 @@ Name="Ini" > @@ -912,7 +804,7 @@ + +#include "ps0077.h" + +int main(int argc, char** argv) +{ + int n = argc > 1 ? atoi(argv[1]+1) : 0; + switch(n) + { + case 1: + ps0077200(argc, argv); break; // Stampa flussi di cassa per WhiteSun (ex ve7200, Whitesun) + case 2: + ps0077300(argc, argv); break; // Stampa riepilogo entrate fornitori (ex ve7300) + case 3: + ps0077400(argc, argv); break; // Esportazione bolle Conad per Marpesca (ex ve7400, Marpesca) + case 5: + ps0077600(argc, argv); break; // trasferimento JBI (ex ve7600) + case 6: + ps0077700(argc, argv); break; // importazione da Galileo Cantieri (ex ve7700) + case 0: + default: + ps0077100(argc, argv); //Trasferimento documenti Teamsystem (ex ve7100, Pedretti) + break; + } + exit(0); + return 0; +} \ No newline at end of file diff --git a/ps/ps0077.h b/ps/ps0077.h new file mode 100755 index 000000000..95c3739a6 --- /dev/null +++ b/ps/ps0077.h @@ -0,0 +1,6 @@ +int ps0077100(int argc, char* argv[]); +int ps0077200(int argc, char* argv[]); +int ps0077300(int argc, char* argv[]); +int ps0077400(int argc, char* argv[]); +int ps0077600(int argc, char* argv[]); +int ps0077700(int argc, char* argv[]); \ No newline at end of file diff --git a/ve/ve7100.cpp b/ps/ps0077100.cpp similarity index 98% rename from ve/ve7100.cpp rename to ps/ps0077100.cpp index 0d4524bff..1217a503b 100755 --- a/ve/ve7100.cpp +++ b/ps/ps0077100.cpp @@ -1,18 +1,11 @@ -#include -#include #include -#include #include -#include #include -#include -#include -#include -#include "velib04.h" +#include "../ve/velib04.h" #include "../cg/cgsaldac.h" -#include "ve7100a.h" +#include "ps0077100a.h" static char rata_types[] = {'3', '3', '1', '2', '4', '3', '1', '2', '2'}; @@ -595,7 +588,7 @@ bool TContabil_tsys_app::create() open_files(LF_TABCOM, LF_TAB, LF_CLIFO, LF_OCCAS, LF_INDSP, LF_CFVEN, LF_DOC, LF_RIGHEDOC, LF_ANAMAG, LF_MOVMAG, LF_RMOVMAG, LF_PROVV, LF_PCON, LF_CONDV, LF_SVRIEP, LF_AGENTI, LF_PERCPROV, LF_ATTIV, LF_CAUSALI, 0); - _msk = new TMask("ve7100a"); + _msk = new TMask("ps007100a"); _msk->set_handler(F_CODICE_ELAB,handle_cod_eld); _msk->set_handler(F_DATA_INI,handle_data_range); _msk->set_handler(F_DATA_FIN,handle_data_range); @@ -739,7 +732,7 @@ void TContabil_tsys_app::contabilize(TConfig &c) xvtil_statbar_set(""); } -int ve7100 (int argc, char **argv) +int ps0077100 (int argc, char* argv[]) { TContabil_tsys_app a; a.run(argc,argv,TR("Trasferimento documenti a Team System")); diff --git a/ve/ve7100a.h b/ps/ps0077100a.h similarity index 90% rename from ve/ve7100a.h rename to ps/ps0077100a.h index 4879fc4f9..f7ce9a582 100755 --- a/ve/ve7100a.h +++ b/ps/ps0077100a.h @@ -1,4 +1,4 @@ -// Include file per ve7100a.uml +// Include file per ps0077100a.uml #define F_CODICE_ELAB 101 #define F_DESC_ELAB 102 diff --git a/ve/ve7100a.uml b/ps/ps0077100a.uml similarity index 98% rename from ve/ve7100a.uml rename to ps/ps0077100a.uml index 5544cc7d0..94ffca0e4 100755 --- a/ve/ve7100a.uml +++ b/ps/ps0077100a.uml @@ -1,4 +1,4 @@ -#include "ve7100a.h" +#include "ps0077100a.h" PAGE "Contabilizzazione documenti" -1 -1 78 14 diff --git a/ve/ve7200.cpp b/ps/ps0077200.cpp similarity index 98% rename from ve/ve7200.cpp rename to ps/ps0077200.cpp index 3b6534768..1a05edde2 100755 --- a/ve/ve7200.cpp +++ b/ps/ps0077200.cpp @@ -3,16 +3,14 @@ #include #include #include -#include "ve7.h" -#include "ve7200.h" -#include "ve7200a.h" -#include "velib05.h" +#include "ps0077.h" +#include "ps0077200.h" +#include "ps0077200a.h" + +#include "../ve/velib05.h" #include "../cg/cgsaldac.h" -#include -#include - class TDocumentoOrdine : public TDocumento { TString_array _scadenze_array;// Array che contiene le scadenze ("|") @@ -165,7 +163,7 @@ public: virtual ~TFlussi_form(); }; -TFlussi_form::TFlussi_form() :TForm ("ve7200a") +TFlussi_form::TFlussi_form() :TForm ("ps0077200a") { } @@ -192,7 +190,7 @@ public: virtual ~TFlussi_mask(){}; }; -TFlussi_mask::TFlussi_mask() :TAutomask ("ve7200a") +TFlussi_mask::TFlussi_mask() :TAutomask ("ps0077200a") { } @@ -553,7 +551,7 @@ void TStampaFlussiCassa::print_line(struct_scadenza* riga) } } -int ve7200(int argc, char **argv) +int ps0077200(int argc, char **argv) { TStampaFlussiCassa a; a.run(argc, argv, TR("Stampa flussi di cassa")); diff --git a/ve/ve7200.h b/ps/ps0077200.h similarity index 100% rename from ve/ve7200.h rename to ps/ps0077200.h diff --git a/ve/ve7200a.frm b/ps/ps0077200a.frm similarity index 98% rename from ve/ve7200a.frm rename to ps/ps0077200a.frm index ad05f3695..9b6fe5b8a 100755 --- a/ve/ve7200a.frm +++ b/ps/ps0077200a.frm @@ -1,4 +1,4 @@ -#include "ve7200.h" +#include "ps0077200.h" GENERAL BEGIN diff --git a/ve/ve7200a.h b/ps/ps0077200a.h similarity index 100% rename from ve/ve7200a.h rename to ps/ps0077200a.h diff --git a/ve/ve7200a.uml b/ps/ps0077200a.uml similarity index 92% rename from ve/ve7200a.uml rename to ps/ps0077200a.uml index 2674b7cd4..d2293c49f 100755 --- a/ve/ve7200a.uml +++ b/ps/ps0077200a.uml @@ -1,26 +1,8 @@ -#include "ve7200a.h" +#include "ps0077200a.h" TOOLBAR "" 0 0 0 2 -BUTTON DLG_PRINT 10 2 -BEGIN - PROMPT -14 -1 "" -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -24 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -34 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -44 -1 "" -END +#include ENDPAGE @@ -35,7 +17,7 @@ END ENDPAGE -PAGE "Stampa Flussi di cassa" 0 0 0 0 +PAGE "Stampa Flussi di cassa" 0 2 0 0 GROUPBOX DLG_NULL 78 3 BEGIN diff --git a/ve/ve7300.cpp b/ps/ps0077300.cpp similarity index 96% rename from ve/ve7300.cpp rename to ps/ps0077300.cpp index c7908e216..60e083b62 100755 --- a/ve/ve7300.cpp +++ b/ps/ps0077300.cpp @@ -1,19 +1,15 @@ -#include -#include #include -#include -#include #include -#include "ve7.h" -#include "ve7300.h" -#include "ve7300a.h" +#include "ps0077.h" +#include "ps0077300.h" +#include "ps0077300a.h" -//la dichiarazione delle classi è nel ve7300.h (come si dovrebbe sempre fare...) +//la dichiarazione delle classi è nel ps0077300.h (come si dovrebbe sempre fare...) //-----FORM--------------------------------------------------------------------------------------// -TEntrFor_form::TEntrFor_form() :TForm ("ve7300a") +TEntrFor_form::TEntrFor_form() :TForm ("ps0077300a") { // Usiamo esattamente la relazione e la chiave del from, // ma ne cambiamo l'ordinamento @@ -192,7 +188,7 @@ bool TEntrFor_form::validate(TForm_item& cf, TToken_string& s) //-----AUTOMASK---------------------------------------------------------------------------------// -TEntrFor_mask::TEntrFor_mask() :TAutomask ("ve7300a") +TEntrFor_mask::TEntrFor_mask() :TAutomask ("ps0077300a") { } @@ -356,7 +352,7 @@ void TEntrFor::main_loop() } } -int ve7300(int argc, char **argv) +int ps0077300(int argc, char **argv) { TEntrFor a ; a.run(argc, argv, TR("Stampa di riepilogo entrate fornitori")); diff --git a/ve/ve7300.h b/ps/ps0077300.h similarity index 100% rename from ve/ve7300.h rename to ps/ps0077300.h diff --git a/ve/ve7300a.frm b/ps/ps0077300a.frm similarity index 99% rename from ve/ve7300a.frm rename to ps/ps0077300a.frm index 197144d6b..7c54154c7 100755 --- a/ve/ve7300a.frm +++ b/ps/ps0077300a.frm @@ -1,4 +1,4 @@ -#include "ve7300a.h" +#include "ps0077300a.h" //____________________RELAZIONE_____________________________// USE LF_RIGHEDOC KEY 3 //BY CODARTMAG CODCF DATADOC JOIN LF_DOC INTO PROVV==PROVV ANNO==ANNO CODNUM==CODNUM NDOC==NDOC diff --git a/ve/ve7300a.h b/ps/ps0077300a.h similarity index 91% rename from ve/ve7300a.h rename to ps/ps0077300a.h index e2ed25a34..96c896690 100755 --- a/ve/ve7300a.h +++ b/ps/ps0077300a.h @@ -1,4 +1,4 @@ -//definizioni campi maschera ve7300a +//definizioni campi maschera ps0077300a //campi dello spreadsheet #define F_S_CODNUM 101 #define F_S_DESCRNUM 102 @@ -21,7 +21,7 @@ -// campi form Riepilogo entrate fornitori ve7300a.frm +// campi form Riepilogo entrate fornitori ps0077300a.frm #define FF_CODART 1 #define FF_DESCRART 2 #define FF_CODFORN 3 diff --git a/ve/ve7300a.uml b/ps/ps0077300a.uml similarity index 92% rename from ve/ve7300a.uml rename to ps/ps0077300a.uml index b0419df36..a64e0cda0 100755 --- a/ve/ve7300a.uml +++ b/ps/ps0077300a.uml @@ -1,26 +1,8 @@ -#include "ve7300a.h" +#include "ps0077300a.h" TOOLBAR "" 0 0 0 2 -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -14 -1 "" -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -24 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -34 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -44 -1 "" -END +#include ENDPAGE @@ -35,7 +17,7 @@ END ENDPAGE -PAGE "Riepilogo entrate fornitori " 0 0 0 0 +PAGE "Riepilogo entrate fornitori " 0 2 0 0 STRING F_DACODART 20 BEGIN diff --git a/ve/ve7400.cpp b/ps/ps0077400.cpp similarity index 95% rename from ve/ve7400.cpp rename to ps/ps0077400.cpp index 8be236eca..f9042f3a5 100755 --- a/ve/ve7400.cpp +++ b/ps/ps0077400.cpp @@ -1,18 +1,10 @@ -#include -#include #include -#include #include -#include -#include -#include -#include -#include + +#include "../ve/velib.h" -#include "velib.h" - -#include "ve7.h" -#include "ve7400a.h" +#include "ps0077.h" +#include "ps0077400a.h" class TFilConad: public TFile_text { @@ -40,7 +32,7 @@ public: virtual ~TBolle2Conad_mask(){}; }; -TBolle2Conad_mask::TBolle2Conad_mask() :TAutomask ("ve7400a") +TBolle2Conad_mask::TBolle2Conad_mask() :TAutomask ("ps0077400a") { } @@ -212,7 +204,7 @@ bool TBolle2Conad::destroy() void TBolle2Conad::main_loop() { - TConfig config("ve7400conf.ini", "TRASFERIMENTO"); + TConfig config("ps0077400conf.ini", "TRASFERIMENTO"); TFilename tracciatoname = config.get("TRACCIATO"); _modalita = config.get_int("MODALITA"); _codconad = config.get_long("CONAD"); @@ -252,7 +244,7 @@ void TBolle2Conad::elabora_documenti() bool ok = TRUE; TString16 codnum; TString filt_expr; - if (_modalita == 0) // MARPESCA, seleziono in base al codice cliente indicato in ve7400conf.ini + if (_modalita == 0) // MARPESCA, seleziono in base al codice cliente indicato in ps0077400conf.ini { da.put("TIPOCF", "C"); da.put("CODCF", _codconad); @@ -376,7 +368,7 @@ void TBolle2Conad::elabora_doc_originale(const TDocumento& documento) } } -int ve7400(int argc, char **argv) +int ps0077400(int argc, char **argv) { TBolle2Conad a; a.run(argc, argv, TR("Trasferimento bolle CONAD")); diff --git a/ve/ve7400a.h b/ps/ps0077400a.h similarity index 100% rename from ve/ve7400a.h rename to ps/ps0077400a.h diff --git a/ve/ve7400a.ini b/ps/ps0077400a.ini similarity index 100% rename from ve/ve7400a.ini rename to ps/ps0077400a.ini diff --git a/ve/ve7400a.uml b/ps/ps0077400a.uml similarity index 86% rename from ve/ve7400a.uml rename to ps/ps0077400a.uml index ce83d686f..23a972715 100755 --- a/ve/ve7400a.uml +++ b/ps/ps0077400a.uml @@ -1,26 +1,8 @@ -#include "ve7400a.h" +#include "ps0077400a.h" TOOLBAR "" 0 0 0 2 -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -14 -1 "" -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -24 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -34 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -44 -1 "" -END +#include ENDPAGE @@ -35,7 +17,7 @@ END ENDPAGE -PAGE "Trasferimento bolle CONAD" 0 0 0 0 +PAGE "Trasferimento bolle CONAD" 0 2 0 0 GROUPBOX DLG_NULL 78 3 BEGIN diff --git a/ve/ve7400conf.ini b/ps/ps0077400conf.ini similarity index 69% rename from ve/ve7400conf.ini rename to ps/ps0077400conf.ini index 3cdb5c83e..844508e56 100755 --- a/ve/ve7400conf.ini +++ b/ps/ps0077400conf.ini @@ -1,5 +1,5 @@ [TRASFERIMENTO] -TRACCIATO = ve7400a.ini +TRACCIATO = ps0077400a.ini MODALITA = CONAD = FORNITORE = diff --git a/ve/ve7600.cpp b/ps/ps0077600.cpp similarity index 95% rename from ve/ve7600.cpp rename to ps/ps0077600.cpp index 23eebe651..02ae89de7 100755 --- a/ve/ve7600.cpp +++ b/ps/ps0077600.cpp @@ -1,24 +1,13 @@ #include -#include -#include -#include -#include #include -#include -#include -#include "velib.h" +#include "../ve/velib.h" +#include "../pr/agenti.h" -#include "ve7.h" -#include "ve7600a.h" - -#include <..\pr\agenti.h> -#include <..\mg\anamag.h> -#include -#include #include -#include -#include + +#include "ps0077.h" +#include "ps0077600a.h" #define ALIAS_TIP 201 @@ -32,7 +21,7 @@ public: virtual ~TRDoc2JBI_mask(){}; }; -TRDoc2JBI_mask::TRDoc2JBI_mask() :TAutomask ("ve7600a") +TRDoc2JBI_mask::TRDoc2JBI_mask() :TAutomask ("ps0077600a") { } @@ -64,7 +53,7 @@ bool TRDoc2JBI::create() { open_files(LF_DOC, LF_RIGHEDOC, LF_ANAMAG, LF_CLIFO, LF_CFVEN, LF_COMUNI, LF_NDITTE, 0); _msk = new TRDoc2JBI_mask(); - _config = new TConfig("ve7600.ini"); + _config = new TConfig("ps0077600.ini"); return TSkeleton_application::create(); } @@ -288,7 +277,7 @@ void TRDoc2JBI::update_tab(TExternisamfile& filetab, const TRectype rectab) insert_tab(filetab, "DEP", rectab.get("CODDEP"), descr); } -int ve7600(int argc, char** argv) +int ps0077600(int argc, char** argv) { TRDoc2JBI app; app.run(argc, argv, "Trasferimento JBI"); diff --git a/ve/ve7600a.h b/ps/ps0077600a.h similarity index 100% rename from ve/ve7600a.h rename to ps/ps0077600a.h diff --git a/ve/ve7600a.uml b/ps/ps0077600a.uml similarity index 66% rename from ve/ve7600a.uml rename to ps/ps0077600a.uml index e9470a6c4..e1ae313cc 100755 --- a/ve/ve7600a.uml +++ b/ps/ps0077600a.uml @@ -1,18 +1,11 @@ -#include "ve7600a.h" +#include "ps0077600a.h" +TOOLBAR "topbar" 0 2 0 0 +#include +ENDPAGE PAGE "trasferimento JBI" -1 -1 78 5 -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -12 -1 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -22 -1 "" -END - NUMBER F_ANNO 4 BEGIN PROMPT 1 1 "Anno da trasferire " diff --git a/ve/ve7700.cpp b/ps/ps0077700.cpp similarity index 98% rename from ve/ve7700.cpp rename to ps/ps0077700.cpp index 2ad6f6d57..40dcd6e4f 100755 --- a/ve/ve7700.cpp +++ b/ps/ps0077700.cpp @@ -1,12 +1,11 @@ -#include "ve7700.h" -#include "ve7700a.h" - #include #include #include #include #include +#include "ps0077700.h" +#include "ps0077700a.h" /////////////////////////////////////////////////////////// // TGalileo_log @@ -429,7 +428,7 @@ const TString& TGalileo_transfer::build_insert_query(const char* table, const ch } TGalileo_transfer::TGalileo_transfer() - : _log(NULL), _config("ve7701a.ini"), _recset(NULL), _outset(NULL), _tab(NULL) + : _log(NULL), _config("ps0077701a.ini"), _recset(NULL), _outset(NULL), _tab(NULL) {} TGalileo_transfer::~TGalileo_transfer() @@ -486,7 +485,7 @@ void TTrasferimentoGalileo_mask::serialize(bool bSave) void TTrasferimentoGalileo_mask::trasferisci() { TReport_book book; - TReport rep; rep.load("ve7700a"); + TReport rep; rep.load("ps0077700a"); TGalileo_log* log = new TGalileo_log; rep.set_recordset(log); @@ -590,7 +589,7 @@ bool TTrasferimentoGalileo_mask::on_field_event(TOperable_field& o, TField_event return true; } -TTrasferimentoGalileo_mask::TTrasferimentoGalileo_mask() : TAutomask("ve7700a") +TTrasferimentoGalileo_mask::TTrasferimentoGalileo_mask() : TAutomask("ps0077700a") { serialize(false); } @@ -615,7 +614,7 @@ void TTrasferimentoGalileo::main_loop() mask.trasferisci(); } -int ve7700(int argc, char** argv) +int ps0077700(int argc, char* argv[]) { TTrasferimentoGalileo tg; tg.run(argc, argv, TR("Trasferimento Galileo")); diff --git a/ve/ve7700.h b/ps/ps0077700.h similarity index 100% rename from ve/ve7700.h rename to ps/ps0077700.h diff --git a/ve/ve7700a.h b/ps/ps0077700a.h similarity index 90% rename from ve/ve7700a.h rename to ps/ps0077700a.h index 7e428fb49..4c748bcfd 100755 --- a/ve/ve7700a.h +++ b/ps/ps0077700a.h @@ -1,6 +1,3 @@ -#ifndef __VE7700A_H -#define __VE7700A_H - #define F_FIRM 101 #define F_RAGSOC 102 @@ -23,4 +20,3 @@ #define F_CMS 212 #define F_CANT 213 -#endif diff --git a/ve/ve7700a.uml b/ps/ps0077700a.uml similarity index 84% rename from ve/ve7700a.uml rename to ps/ps0077700a.uml index 52e8d2b60..55b8cd30e 100755 --- a/ve/ve7700a.uml +++ b/ps/ps0077700a.uml @@ -1,31 +1,12 @@ -#include "ve7700a.h" +#include "ps0077700a.h" TOOLBAR "" 0 0 0 2 -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -14 -11 "~Elabora" - PICTURE BMP_ELABORA -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -24 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -34 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -44 -1 "" -END +#include ENDPAGE -PAGE "Trasferimento da Galileo Cantieri" 0 0 0 0 +PAGE "Trasferimento da Galileo Cantieri" 0 2 0 0 GROUPBOX DLG_NULL 78 3 BEGIN diff --git a/ve/ve7701.cpp b/ps/ps0077701.cpp similarity index 98% rename from ve/ve7701.cpp rename to ps/ps0077701.cpp index c56bbe121..5965ff6c7 100755 --- a/ve/ve7701.cpp +++ b/ps/ps0077701.cpp @@ -1,15 +1,12 @@ -#include "ve7700.h" - #include -#include -#include -#include <..\mg\anamag.h> -#include <..\mg\umart.h> +#include <../mg/anamag.h> +#include <../mg/umart.h> + #include #include -#include -#include + +#include "ps0077700.h" /////////////////////////////////////////////////////////// // TGalileo_clifo diff --git a/ve/ve7701a.ini b/ps/ps0077701a.ini similarity index 100% rename from ve/ve7701a.ini rename to ps/ps0077701a.ini diff --git a/ve/ve7.cpp b/ve/ve7.cpp deleted file mode 100755 index dcf157787..000000000 --- a/ve/ve7.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include - -#include "ve7.h" // dichiarazioni delle procedure - -int main( int argc, char** argv ) -{ - const int r = (argc > 1) ? argv[1][1]-'0' : -1; - - switch (r) - { - case 6: - ve7700(argc, argv); break; // importazione da Galileo Cantieri - case 5: - ve7600(argc, argv); break; // trasferimento JBI - case 3: - ve7400(argc, argv); break; // esportazione bolle CONAD per marpesca - case 2: - ve7300(argc, argv); break; // stampa riepilogo entrate fornitori - case 1: - ve7200(argc, argv); break; // stampa flussi di cassa per white sun - default: - ve7100(argc, argv); break; // trasferimento documenti Team System - } - exit(0); - return 0; -} diff --git a/ve/ve7.h b/ve/ve7.h deleted file mode 100755 index 6953063f0..000000000 --- a/ve/ve7.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef __VE7_H -#define __VE7_H - -int ve7100 (int, char**); -int ve7200 (int, char**); -int ve7300 (int, char**); -int ve7400 (int, char**); -int ve7600 (int, char**); -int ve7700 (int, char**); - -#endif