Patch level :10.0 250

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
0001159: movimenti di contabilità analitica
Descrizione  Scrivo importo riga, poi ricerco piano dei conti, imposto x descrizione e riporta importo nel campo descrizione


git-svn-id: svn://10.65.10.50/trunk@18412 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2009-03-04 11:46:25 +00:00
parent 143df3149d
commit 71bf37a1ea
6 changed files with 64 additions and 53 deletions

View File

@ -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

View File

@ -1,7 +1,5 @@
#include <automask.h>
#include <defmask.h>
#include <recset.h>
#include <relapp.h>
#include "ca2.h"
#include "ca2100a.h"

View File

@ -48,3 +48,4 @@
#define S_CON2 117
#define S_CON3 118
#define S_CON4 119

View File

@ -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

View File

@ -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"));

View File

@ -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
}