root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :10.0 300

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
sistemato problema della perdita dei campi ori sulle rmovana in caso di registrazione di movimento ripartito


git-svn-id: svn://10.65.10.50/trunk@18854 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2009-05-12 08:37:57 +00:00
parent ae6f813700
commit 224b55a941
3 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ca/ca2100.cpp
View File

@ -622,19 +622,16 @@ bool TMovanal_msk::row2rec(int r, TRectype& rec) const
}
TMask& sm = sheet.sheet_mask();
for (int i = sm.fields()-1; i >= 2; i--)
for (int i = sm.fields()-1; i >= 0; i--)
{
const TMask_field& mf = sm.fld(i);
const TFieldref* fr = mf.field();
if (fr != NULL)
{
const int idx = sheet.cid2index(mf.dlg());
if (idx < 17)
{
const char* s = row.get(idx);
if (s != NULL)
fr->write(s, rec);
}
const char* s = row.get(idx);
if (s != NULL)
fr->write(s, rec);
}
}
@ -666,8 +663,7 @@ TToken_string& TMovanal_msk::rec2row(const TRectype& rec, int r) const
if (fr != NULL)
{
const int idx = sheet.cid2index(mf.dlg());
if (idx < 17)
row.add(fr->read(rec), idx);
row.add(fr->read(rec), idx);
}
}

5
ca/ca2100a.h
View File

@ -47,4 +47,7 @@
#define S_CON2 117
#define S_CON3 118
#define S_CON4 119
#define S_CDC_ORI 120
#define S_CMS_ORI 121
#define S_FAS_ORI 122
#define S_CON_ORI 123

32
ca/ca2100a.uml
View File

@ -281,6 +281,10 @@ BEGIN
ITEM "Con 2"
ITEM "Con 3"
ITEM "Con 4"
ITEM "Cdc.Orig."
ITEM "Cms.Orig."
ITEM "Fase Orig."
ITEM "Conto Orig."
END
BUTTON F_RESET 78 2
@ -458,6 +462,34 @@ BEGIN
GROUP 1
END
STRING S_CDC_ORI 20
BEGIN
PROMPT 1 20 "Cdc.Ori"
FLAGS "D"
FIELD CODCCORI
END
STRING S_CMS_ORI 20
BEGIN
PROMPT 21 20 "Cms.Ori"
FLAGS "D"
FIELD CODCMSORI
END
STRING S_FAS_ORI 20
BEGIN
PROMPT 41 20 "Fase Ori"
FLAGS "D"
FIELD CODFASEORI
END
STRING S_CON_ORI 20
BEGIN
PROMPT 61 20 "Conto Ori."
FLAGS "D"
FIELD CODCONTORI
END
ENDPAGE
ENDMASK