From 71bf37a1eaaf4e2115801efc3f0a5a79a0bce152 Mon Sep 17 00:00:00 2001 From: luca Date: Wed, 4 Mar 2009 11:46:25 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:10.0?= =?UTF-8?q?=20250=20Files=20correlati=20=20=20=20=20:=20Ricompilazione=20D?= =?UTF-8?q?emo=20:=20[=20]=20Commento=20=20=20=20=20=20=20=20=20=20=20=20:?= =?UTF-8?q?=200001159:=20movimenti=20di=20contabilit=C3=A0=20analitica=20D?= =?UTF-8?q?escrizione=20=20Scrivo=20importo=20riga,=20poi=20ricerco=20pian?= =?UTF-8?q?o=20dei=20conti,=20imposto=20x=20descrizione=20e=20riporta=20im?= =?UTF-8?q?porto=20nel=20campo=20descrizione?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.65.10.50/trunk@18412 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ca/ca0400a.uml | 38 +++++++++++++++++++++----------------- ca/ca2100.cpp | 2 -- ca/ca2100a.h | 1 + ca/ca2100a.uml | 40 ++++++++++++++++++++++------------------ ca/calib01.cpp | 30 +++++++++++++++--------------- include/msksheet.cpp | 6 +++++- 6 files changed, 64 insertions(+), 53 deletions(-) diff --git a/ca/ca0400a.uml b/ca/ca0400a.uml index 5d998b791..40c93c58f 100755 --- a/ca/ca0400a.uml +++ b/ca/ca0400a.uml @@ -47,7 +47,7 @@ END ENDPAGE -PAGE "Piano dei conti contabile" -1 -1 64 6 +PAGE "Piano dei conti contabile" 0 2 0 0 TEXT DLG_NULL BEGIN @@ -67,7 +67,26 @@ ENDPAGE ENDMASK -PAGE "Sheet" -1 -1 78 8 +TOOLBAR "topbar" 0 0 0 2 + +BUTTON DLG_OK 10 2 +BEGIN + PROMPT -13 -1 "" +END + +BUTTON DLG_DELREC 10 2 +BEGIN + PROMPT -23 -1 "" +END + +BUTTON DLG_CANCEL 10 2 +BEGIN + PROMPT -33 -1 "" +END + +ENDPAGE + +PAGE "Riga" 0 2 0 0 NUMBER FR_GRUPPO 3 BEGIN @@ -150,21 +169,6 @@ BEGIN CHECKTYPE SEARCH END -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -13 -1 "" -END - -BUTTON DLG_DELREC 10 2 -BEGIN - PROMPT -23 -1 "" -END - -BUTTON DLG_CANCEL 10 2 -BEGIN - PROMPT -33 -1 "" -END - ENDPAGE ENDMASK diff --git a/ca/ca2100.cpp b/ca/ca2100.cpp index 25906f03e..b3d133929 100755 --- a/ca/ca2100.cpp +++ b/ca/ca2100.cpp @@ -1,7 +1,5 @@ -#include #include #include -#include #include "ca2.h" #include "ca2100a.h" diff --git a/ca/ca2100a.h b/ca/ca2100a.h index 56c403f08..c9950c445 100755 --- a/ca/ca2100a.h +++ b/ca/ca2100a.h @@ -48,3 +48,4 @@ #define S_CON2 117 #define S_CON3 118 #define S_CON4 119 + diff --git a/ca/ca2100a.uml b/ca/ca2100a.uml index 15096309d..2542c401a 100755 --- a/ca/ca2100a.uml +++ b/ca/ca2100a.uml @@ -128,7 +128,7 @@ BEGIN OUTPUT F_CODCAUS CODCAUS OUTPUT F_DESCAUS DESCR CHECKTYPE REQUIRED - FLAGS "U" + FLAGS "U" FIELD CODCAUS GROUP 5 END @@ -248,7 +248,7 @@ END ENDPAGE -PAGE "Righe" -1 -1 80 20 +PAGE "Righe" 0 2 0 0 GROUPBOX DLG_NULL 78 4 BEGIN @@ -325,7 +325,26 @@ ENDPAGE ENDMASK -PAGE "Riga" -1 -1 78 19 +TOOLBAR "topbar" 0 0 0 2 + +BUTTON DLG_OK 10 2 +BEGIN + PROMPT -13 -1 "" +END + +BUTTON DLG_DELREC 10 2 +BEGIN + PROMPT -23 -1 "" +END + +BUTTON DLG_CANCEL 10 2 +BEGIN + PROMPT -33 -1 "" +END + +ENDPAGE + +PAGE "Riga" 0 2 0 0 CURRENCY S_DARE 15 BEGIN @@ -471,21 +490,6 @@ BEGIN GROUP 1 END -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -13 -1 "" -END - -BUTTON DLG_DELREC 10 2 -BEGIN - PROMPT -23 -1 "" -END - -BUTTON DLG_CANCEL 10 2 -BEGIN - PROMPT -33 -1 "" -END - ENDPAGE ENDMASK diff --git a/ca/calib01.cpp b/ca/calib01.cpp index d8725a098..f348695c3 100755 --- a/ca/calib01.cpp +++ b/ca/calib01.cpp @@ -352,8 +352,8 @@ static void ca_append_select_clause(ostream& out, int level, int logic, bool upp { switch (level) { - case 0: str = "CONTO==\"\""; break; - case 1: str = "SOTTOCONTO==\"\""; break; + case 0: str = "CONTO==\"\""; break; + case 1: str = "SOTTOCONTO==\"\""; break; default: break; } } @@ -372,23 +372,23 @@ static void ca_append_select_clause(ostream& out, int level, int logic, bool upp } str << ')'; } - TString16 fieldname; + const char* fieldname = NULL; switch (logic) { - case LF_COMMESSE: - fieldname = "S0"; - break; - case LF_CDC: - fieldname = "S1"; - break; - case LF_FASI: - fieldname = "S2"; - break; - default: - break; + case LF_COMMESSE: + fieldname = "S0"; + break; + case LF_CDC: + fieldname = "S1"; + break; + case LF_FASI: + fieldname = "S2"; + break; + default: + break; } - if (fieldname.full()) + if (fieldname != NULL) { const TString utente(user()); const TString gruppo(cache().get(LF_USER, utente,"GROUPNAME")); diff --git a/include/msksheet.cpp b/include/msksheet.cpp index 741ecc49e..fc0b20471 100755 --- a/include/msksheet.cpp +++ b/include/msksheet.cpp @@ -1561,7 +1561,11 @@ bool TSpreadsheet::event_handler(XI_OBJ* itf, XI_EVENT *xiev) const bool spork = _edit_field->dirty() != 0; // TBT notify_change(); - copy_cell2field(); + //gestione campi che non appaiono nello sheet ma che possono essere usati nelle ricerche + //es: per evitare di avere il valore della prima colonna in una descrizione che si puo' usere.. + //..per le ricerche, ma che non appare nello sheet (es. ca2100a.uml) + if (_edit_field->dlg() == FIRST_FIELD || _cur_col > 1) + copy_cell2field(); _edit_field->set_dirty(_cell_dirty = spork); // TBT }