From 83b3db30806ec77cf876a7576bec2b4ef0e9ec78 Mon Sep 17 00:00:00 2001 From: luca Date: Wed, 28 Jul 2010 14:41:20 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:10.0?= =?UTF-8?q?=20Files=20correlati=20=20=20=20=20:=20Ricompilazione=20Demo=20?= =?UTF-8?q?:=20[=20]=20Commento=20=20=20=20=20=20=20=20=20=20=20=20:=20fat?= =?UTF-8?q?to=20diventare=20ca2400.cpp=20ps0713700.cpp;=20visto=20che=20il?= =?UTF-8?q?=20programma=20serve=20solo=20all'ATS,=20che=20=C3=A8=20pericol?= =?UTF-8?q?oso=20da=20usare=20visto=20i=20danni=20che=20pu=C3=B2=20causare?= =?UTF-8?q?,=20visto=20che=20se=20a=20qualcun'altro=20in=20futuro=20servis?= =?UTF-8?q?se=20(eventualit=C3=A0=20quotata=201.000.000.000:1=20dai=20book?= =?UTF-8?q?makers=20a=20Londra)=20lo=20pagherebbe=20qualche=20simpatico=20?= =?UTF-8?q?euro....?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.65.10.50/branches/R_10_00@20713 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ca/ca2.cpp | 1 - ca/ca2.h | 1 - ca/ca2400.cpp | 92 ------------------------------------------------- ca/cacmmenu.men | 1 - ca/camenu.men | 1 - 5 files changed, 96 deletions(-) delete mode 100755 ca/ca2400.cpp diff --git a/ca/ca2.cpp b/ca/ca2.cpp index 493291723..22c0b4263 100755 --- a/ca/ca2.cpp +++ b/ca/ca2.cpp @@ -9,7 +9,6 @@ int main(int argc, char** argv) { case 1: ca2200(argc, argv); break; // ripartizione movimenti analitica case 2: ca2300(argc, argv); break; // ricalcolo saldi - case 3: ca2400(argc, argv); break; // eliminazione conti non analitci default: ca2100(argc, argv); break; // gestione movimenti } return 0; diff --git a/ca/ca2.h b/ca/ca2.h index cfd24a5df..6e8488cf0 100755 --- a/ca/ca2.h +++ b/ca/ca2.h @@ -4,6 +4,5 @@ int ca2100(int argc, char* argv[]); int ca2200(int argc, char* argv[]); int ca2300(int argc, char* argv[]); -int ca2400(int argc, char* argv[]); #endif // __CA2_H diff --git a/ca/ca2400.cpp b/ca/ca2400.cpp deleted file mode 100755 index 92c297115..000000000 --- a/ca/ca2400.cpp +++ /dev/null @@ -1,92 +0,0 @@ -#include -#include -#include - -#include "calib01.h" -#include "ca2.h" -#include "ca2300a.h" - -#include "../cg/cglib01.h" - -#include "movana.h" -#include "rmovana.h" -#include "saldana.h" - -//-------------------------------------------------------------------- -// APPLICAZIONE -//-------------------------------------------------------------------- - -class TPulisci_app : public TSkeleton_application -{ - -protected: - virtual const char * extra_modules() const {return "cm";} //deve funzionare anche per le commesse - virtual void main_loop(); - static bool elabora_movimento(const TRelation& rel, void* pJolly); - -public: - TPulisci_app() {} - virtual ~TPulisci_app() {} -}; - -bool TPulisci_app::elabora_movimento(const TRelation& rel, void* pJolly) -{ - TAnal_mov & mov = (TAnal_mov &) rel.curr(); - bool updated = false; - TImporto totdoc(mov.get_char(MOVANA_SEZIONE), mov.get_real(MOVANA_TOTDOC)); - - for (int i = mov.rows(); i >= 1; i--) - { - const TRectype & row = mov.body()[i]; - const TString code = row.get(RMOVANA_CODCONTO); - const int gr = atoi(code.left(3)); - const int co = atoi(code.mid(3, 3)); - const long sc = atol(code.right(6)); - const TBill zio(gr, co, sc); - - if (!zio.is_analitico()) - { - TImporto importo(row.get_char(RMOVANA_SEZIONE), row.get_real(RMOVANA_IMPORTO)); - - updated = true; - totdoc -= importo; - mov.body().destroy_row(i, true); - } - } - if (updated) - { - totdoc.normalize(); - mov.put(MOVANA_SEZIONE, totdoc.sezione()); - mov.put(MOVANA_TOTDOC, totdoc.valore()); - if (mov.rows() > 0) - mov.rewrite(rel.lfile()); - else - mov.remove(rel.lfile()); - } - return true; -} - -void TPulisci_app::main_loop() -{ - if (ca_config().get_bool("UsePdcc") && - yesno_box("Si desidera eliminare i conti non analitici") && - yesno_box("Si desidera veramente eliminare i conti non analitici")) - { - TRelation rel_movana(LF_MOVANA); - TCursor cur_movana(&rel_movana, "", 1); - const long items = cur_movana.items(); - - if (items > 0) - { - rel_movana.lfile().set_curr(new TAnal_mov); //il record principale della rel e' un TMov_anal!! - cur_movana.scan(elabora_movimento, this, "Eliminazione conti non analitici..."); - } - } -} - -int ca2400(int argc, char* argv[]) -{ - TPulisci_app app; - app.run(argc, argv, "Eliminazione conti non analitici..."); - return 0; -} diff --git a/ca/cacmmenu.men b/ca/cacmmenu.men index decd15a85..f3f34ec4b 100755 --- a/ca/cacmmenu.men +++ b/ca/cacmmenu.men @@ -39,5 +39,4 @@ Module = 15 Flags = "" Item_01 = "Trasferimento dati da Contabilità Generale", "cacnv -0", "F" Item_02 = "Ricalcolo saldi", "ca2 -2", "F" -Item_03 = "Eliminazione conti non analitici dai movimenti", "ca2 -3", "F" diff --git a/ca/camenu.men b/ca/camenu.men index 532e022a4..8e552a7e9 100755 --- a/ca/camenu.men +++ b/ca/camenu.men @@ -82,4 +82,3 @@ Module = 22 Flags = "" Item_01 = "Trasferimento dati da Contabilità Generale", "cacnv -0", "F" Item_02 = "Ricalcolo saldi", "ca2 -2", "F" -Item_03 = "Eliminazione conti non analitici dai movimenti", "ca2 -3", "F"