Patch level :10.0

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
Personalizzazione cigno: rivista maschera principale


git-svn-id: svn://10.65.10.50/branches/R_10_00@22327 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2011-06-27 13:49:16 +00:00
parent 7d07472a31
commit 8ac3c65b2d
3 changed files with 773 additions and 686 deletions

View File

@ -358,7 +358,7 @@ void TGenera_ordini_mask::update_orders()
TMask& m = sh.sheet_mask();
TRelation& rel = *orders.cursor()->relation();
const int status_pos = sh.cid2index(S_STATODOC);
const int status_pos = sh.cid2index(SD_STATODOC);
for (bool ok = orders.move_first(); ok; ok = orders.move_next())
{
TToken_string& row = sh.row(-1);
@ -886,9 +886,9 @@ void TCreazione_ordini::aggiorna_stato_doc_orig(const TRectype& rdoc)
void TCreazione_ordini::generate_caric_row(const TSheet_field& sf, TToken_string* row,
const real qta, TDocumento* d, TRiga_documento& rdoc, TLocalisamfile& righedoc)
{
const TDate dataord = row->get(sf.cid2index(S_DATADOC));
const long ndoc = row->get_long(sf.cid2index(S_NUMDOC));
const int nriga = row->get_int(sf.cid2index(S_NUMRIGA));
const TDate dataord = row->get(sf.cid2index(SD_DATADOC));
const long ndoc = row->get_long(sf.cid2index(SD_NUMDOC));
const int nriga = row->get_int(sf.cid2index(SD_NUMRIGA));
TRectype& rigcar = righedoc.curr();
rigcar.put(RDOC_PROVV, 'D');
rigcar.put(RDOC_ANNO, dataord.year());
@ -971,8 +971,8 @@ void TCreazione_ordini::generate_order_row(const TSheet_field& sf, TToken_string
else
rdoc.put(RDOC_CODIVA, articolo.get(ANAMAG_CODIVA));
const TString commessa = row->get(sf.cid2index(S_CDC));
const TString fase = row->get(sf.cid2index(S_FSC));
const TString commessa = row->get(sf.cid2index(SO_CDC));
const TString fase = row->get(sf.cid2index(SO_FSC));
rdoc.put(RDOC_CODCMS, commessa);
rdoc.put(RDOC_FASCMS, fase);
@ -1035,7 +1035,7 @@ void TCreazione_ordini::generate_docs_head(const char type, const TSheet_field&
{
if (!pi.setstatus(n))
break;
if (row->get_char(sf.cid2index(S_DAEVADERE) == 'X'))
if (row->get_char(sf.cid2index(SD_DAEVADERE) == 'X'))
{
real qta;
TString8 codforn;
@ -1043,9 +1043,9 @@ void TCreazione_ordini::generate_docs_head(const char type, const TSheet_field&
if (type == 'C')
{
qta = row->get(sf.cid2index(S_QTADAEVADERE));
codforn = row->get(sf.cid2index(S_FORNITORE));
datacons = row->get(sf.cid2index(S_DATACONS));
qta = row->get(sf.cid2index(SD_QTADAEVADERE));
codforn = row->get(sf.cid2index(SD_FORNITORE));
datacons = row->get(sf.cid2index(SD_DATACONS));
}
else
{

View File

@ -27,8 +27,10 @@
#define F_DESMAGC 175
#define F_DEPC 176
#define F_DESDEPC 177
#define DLG_PRINTDOC 178
#define DLG_DELDOC 179
#define F_CAZ_CODART 180
#define F_DATADOC 181
@ -38,7 +40,7 @@
#define F_DATADOCCAR 204
#define F_ORDERS 210
//campi 'S'heet deglio 'O'rdini (SO_)
//campi 'S'heet degli 'O'rdini (SO_)
#define SO_CODART 101
#define SO_DESCR 102
#define SO_UM 103
@ -67,25 +69,26 @@
#define SO_USER9 126
#define SO_USER10 127
#define S_DATADOC 101
#define S_NUMDOC 102
#define S_NUMRIGA 103
#define S_STATODOC 104
#define S_CODART 105
#define S_DESCART 106
#define S_UM 107
#define S_QTA 108
#define S_QTAEVASA 109
#define S_RESIDUO 110
#define S_DAEVADERE 111
#define S_QTADAEVADERE 112
#define S_DATACONS 113
#define S_FORNITORE 114
#define S_RAGSOC 115
#define S_CDC 116
#define S_FSC 117
#define S_DESCRAGG 118
#define S_PPCONF 119
#define S_TAGLIE 120
//campi 'S'heet dei 'D'ocumenti (SD_)
#define SD_DATADOC 101
#define SD_NUMDOC 102
#define SD_NUMRIGA 103
#define SD_STATODOC 104
#define SD_CODART 105
#define SD_DESCART 106
#define SD_UM 107
#define SD_QTA 108
#define SD_QTAEVASA 109
#define SD_RESIDUO 110
#define SD_DAEVADERE 111
#define SD_QTADAEVADERE 112
#define SD_DATACONS 113
#define SD_FORNITORE 114
#define SD_RAGSOC 115
#define SD_CDC 116
#define SD_FSC 117
#define SD_DESCRAGG 118
#define SD_PPCONF 119
#define SD_TAGLIE 120

File diff suppressed because it is too large Load Diff