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

Patch level : 4.0 676

Browse Source 
Files correlati     :   ve0.exe tutti i profili
Ricompilazione Demo : [ ]
Commento            :

Supporto per 10 campi personalizzati sulle righe da 155 /FR_JOLLY1) a 164 (FR_JOLLY10)


git-svn-id: svn://10.65.10.50/trunk@15160 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2007-04-02 16:32:20 +00:00
parent 630200e7bb
commit 2043539627
23 changed files with 172 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
ve/jolly.uml Executable file
View File

@ -0,0 +1,91 @@
PAGE "Pag.4" -1 -1 MASK_WIDTH MASK_HEIGHT
STRING FR_JOLLY1 20
BEGIN
PROMPT 2 1 "1 "
FLAGS "B"
END
STRING FR_JOLLY2 20
BEGIN
PROMPT 2 2 "2 "
FLAGS "B"
END
STRING FR_JOLLY3 20
BEGIN
PROMPT 2 3 "3 "
FLAGS "B"
END
STRING FR_JOLLY4 20
BEGIN
PROMPT 2 4 "4 "
FLAGS "B"
END
STRING FR_JOLLY5 20
BEGIN
PROMPT 2 5 "5 "
FLAGS "B"
END
STRING FR_JOLLY6 20
BEGIN
PROMPT 2 6 "6 "
FLAGS "B"
END
STRING FR_JOLLY7 20
BEGIN
PROMPT 2 7 "7 "
FLAGS "B"
END
STRING FR_JOLLY8 20
BEGIN
PROMPT 2 8 "8 "
FLAGS "B"
END
STRING FR_JOLLY9 20
BEGIN
PROMPT 2 9 "9 "
FLAGS "B"
END
STRING FR_JOLLY10 20
BEGIN
PROMPT 2 10 "10 "
FLAGS "B"
END
#ifndef FULL_SCREEN
BUTTON DLG_OK 10 2
BEGIN
PROMPT -14 -1 ""
END
BUTTON DLG_CANCEL 10 2
BEGIN
PROMPT -24 -1 ""
END
#ifndef PAGE_1
BUTTON DLG_DELREC 10 2
BEGIN
PROMPT -34 -1 "Elimina"
MESSAGE EXIT,K_DEL
END
BUTTON DLG_USER 10 2
BEGIN
PROMPT -44 -1 "~Collega"
PICTURE BMP_LINK
END
#endif
#endif
ENDPAGE

25
ve/ve0300b.dat
View File

@ -37,5 +37,26 @@ QTAGG4|3|1305|Quantita'\nagg. 4|13
QTAGG5|3|1305|Quantita'\nagg. 5|13
IMPIANTO|2|5|Impianto|8
LINEA|2|5|Linea|5
CODCMS|2|20|Codice\ncommessa|20
FASCMS|2|10|Fase\ncommessa|10
CDC1|2|20|CDC 1|20
CDC2|2|20|CDC 1|20
CDC3|2|20|CDC 1|20
CDC4|2|20|CDC 1|20
CDC5|2|20|CDC 1|20
CDC6|2|20|CDC 1|20
CDC8|2|20|CDC 1|20
CDC9|2|20|CDC 1|20
CDC10|2|20|CDC 1|20
CDC11|2|20|CDC 1|20
CDC12|2|20|CDC 1|20
CODAGG1|2|20|Codice agg 1|20
CODAGG1|2|20|Codice agg 1|20
DETR|2|1|Detraibilità|12
JOLLY1|2|20|JOLLY 1|20
JOLLY2|2|20|JOLLY 1|20
JOLLY3|2|20|JOLLY 1|20
JOLLY4|2|20|JOLLY 1|20
JOLLY5|2|20|JOLLY 1|20
JOLLY6|2|20|JOLLY 1|20
JOLLY8|2|20|JOLLY 1|20
JOLLY9|2|20|JOLLY 1|20
JOLLY10|2|20|JOLLY 1|20

4
ve/velib.h
View File

@ -425,8 +425,6 @@ public:
const int decr_perc_prezzo() const { return _decrp;}
bool formfeed() const { return get_bool("B0"); }
int detraibilita() const { return get_int("I0"); }
real perc_indetraibilita() const { return get_real("R0"); }
TFormula_documento* first_formula() { return succ_formula(true); }
TFormula_documento* succ_formula(bool restart = FALSE);
@ -888,4 +886,4 @@ public:
virtual ~TDocumento_mask();
};
#endif
#endif

26
ve/velib02.cpp
View File

@ -993,7 +993,18 @@ void TRiga_documento::autosave(TSheet_field& f)
}
put( RDOC_CODAGG1, row.get( f.cid2index(FR_CODAGG1)) );
put( RDOC_CODAGG2, row.get( f.cid2index(FR_CODAGG2)) );
put( RDOC_TIPODET, row.get( f.cid2index(FR_TIPODET)) );
for (short jid = FR_JOLLY1; jid <= FR_JOLLY10; jid++)
{
const int pos = m.id2pos(jid);
if (pos < 0)
break;
const TMask_field& fld = m.fld(pos);
const TFieldref* fldref = fld.field();
if (fldref == NULL)
break;
fldref->write(fld.get(), *this);
}
}
}
@ -1079,7 +1090,20 @@ void TRiga_documento::autoload(TSheet_field & f)
}
row.add( get( RDOC_CODAGG1) , f.cid2index(FR_CODAGG1));
row.add( get( RDOC_CODAGG2) , f.cid2index(FR_CODAGG2));
row.add( get( RDOC_TIPODET) , f.cid2index(FR_TIPODET));
for (short jid = FR_JOLLY1; jid <= FR_JOLLY10; jid++)
{
const int pos = m.id2pos(jid);
if (pos < 0)
break;
TMask_field& fld = m.fld(pos);
const TFieldref* fldref = fld.field();
if (fldref == NULL)
break;
const TString& val = fldref->read(*this);
row.add(val, f.cid2index(jid));
}
}
TArticolo_giacenza* TRiga_documento::articolo() const

23
ve/verig.h
View File

@ -88,17 +88,18 @@
#define FR_CDC12 151
#define FR_CODAGG1 152
#define FR_CODAGG2 153
#define FR_JOLLY1 154
#define FR_JOLLY2 155
#define FR_JOLLY3 156
#define FR_JOLLY4 157
#define FR_JOLLY5 158
#define FR_JOLLY6 159
#define FR_JOLLY7 160
#define FR_JOLLY8 161
#define FR_JOLLY9 161
#define FR_JOLLY10 162
#define FR_END 163
#define FR_TIPODET 154
#define FR_JOLLY1 155
#define FR_JOLLY2 156
#define FR_JOLLY3 157
#define FR_JOLLY4 158
#define FR_JOLLY5 159
#define FR_JOLLY6 160
#define FR_JOLLY7 161
#define FR_JOLLY8 162
#define FR_JOLLY9 163
#define FR_JOLLY10 164
#define FR_END 165
#define MAX_COLUMNS FR_END-FR_LORDO

50
ve/verig.uml
View File

@ -1300,6 +1300,20 @@ IFDEF(MS_DESIVA)
ENDIF
END
ENDIF
STRING FR_TIPODET 1
BEGIN
PROMPT 55 15 "Indetraibilita' "
USE %DET
INPUT CODTAB FR_TIPODET
DISPLAY "Codice" CODTAB
DISPLAY "Tipo" I0
DISPLAY "Descrizione@50" S0
OUTPUT FR_TIPODET CODTAB
CHECTYPE NORMAL
FLAGS "U"
END
ENDIF
IFDEF(FLD_ADDIVA)
@ -1711,10 +1725,6 @@ ENDIF
#endif
IFDEF(JOLLY)
INCLDEF(JOLLY)
ENDIF
#ifndef FULL_SCREEN
BUTTON DLG_OK 10 2
BEGIN
@ -1902,36 +1912,8 @@ END
ENDPAGE
IFDEF(JOLLYP)
INCLDEF(JOLLYP)
#ifndef FULL_SCREEN
BUTTON DLG_OK 10 2
BEGIN
PROMPT -14 -1 ""
END
BUTTON DLG_CANCEL 10 2
BEGIN
PROMPT -24 -1 ""
END
#ifndef PAGE_1
BUTTON DLG_DELREC 10 2
BEGIN
PROMPT -34 -1 "Elimina"
MESSAGE EXIT,K_DEL
END
BUTTON DLG_USER 10 2
BEGIN
PROMPT -44 -1 "~Collega"
PICTURE BMP_LINK
END
#ifdef JOLLY
#include "jolly.uml"
#endif
#endif
ENDIF
ENDMASK

2
ve/verig00.uml
View File

@ -1,6 +1,7 @@
#include "verigdef.h"
#define PAGE_2
#define JOLLY
DEFINE_FIELD(CODMAG)
DEFINE_FIELD(DESMAG)
@ -43,6 +44,5 @@ DEFINE_FIELD(LINEA)
DEFINE_FIELD(CDC1)
DEFINE_FIELD(CODAGG1)
DEFINE_FIELD(CODAGG2)
//DEFINE(JOLLYP, "jolly.uml")
#include "verig.uml"

2
ve/verig01.uml
View File

@ -29,9 +29,7 @@ F_POS(SCONTO, 2, 11,"Sconto " )
DEFINE_FIELD(PERCPROV)
F_POS(PERCPROV, 42, 11,"Provvigione" )
DEFINE_FIELD(CODIVA)
F_POS(CODIVA, 2, 13,"Cod. IVA " )
DEFINE_FIELD(DESIVA)
F_POS(DESIVA, 22, 13,"" )
DEFINE_FIELD(CAUS)
DEFINE_FIELD(NCOLLI)
DEFINE_FIELD(PNETTO)

2
ve/verig02.uml
View File

@ -14,9 +14,7 @@ DEFINE_FIELD(QTA)
DEFINE_FIELD(SCONTO)
F_POS(SCONTO, 2, 11,"Sconto " )
DEFINE_FIELD(CODIVA)
F_POS(CODIVA, 2, 13,"Cod. IVA " )
DEFINE_FIELD(DESIVA)
F_POS(DESIVA, 22, 13,"" )
#include "verig.uml"

2
ve/verig03.uml
View File

@ -13,9 +13,7 @@ DEFINE_FIELD(PREZZO)
DEFINE_FIELD(SCONTO)
F_POS(SCONTO, 2, 11,"Sconto " )
DEFINE_FIELD(CODIVA)
F_POS(CODIVA, 2, 13,"Cod. IVA " )
DEFINE_FIELD(DESIVA)
F_POS(DESIVA, 22, 13,"" )
#include "verig.uml"

2
ve/verig04.uml
View File

@ -8,9 +8,7 @@ DEFINE_FIELD(CODSPP)
DEFINE_FIELD(DESCRSPP)
DEFINE_FIELD(PERCSP)
DEFINE_FIELD(CODIVA)
F_POS(CODIVA, 2, 11,"Cod. IVA " )
DEFINE_FIELD(DESIVA)
F_POS(DESIVA, 22, 11,"" )
#define PAGE_2
#include "verig.uml"

2
ve/verig06.uml
View File

@ -16,9 +16,7 @@ DEFINE_FIELD(DATACONS)
DEFINE_FIELD(SCONTO)
F_POS(SCONTO, 2, 11,"Sconto " )
DEFINE_FIELD(CODIVA)
F_POS(CODIVA, 2, 13,"Cod. IVA " )
DEFINE_FIELD(DESIVA)
F_POS(DESIVA, 22, 13,"" )
#include "verig.uml"

16
ve/verig07.uml
View File

@ -1,31 +1,15 @@
#include "verigdef.h"
#define FULL_SCREEN
#define MASK_TITLE1 "Sconto ad importo"
DEFINE_FIELD(DESCR)
DEFINE_FIELD(VALORE)
F_POS(VALORE, 2, 9,"Importo " )
// DEFINE_FIELD(CODIVA)
// F_POS(CODIVA, 2, 11,"Cod. IVA " )
// DEFINE_FIELD(DESIVA)
// F_POS(DESIVA, 22, 11,"" )
#include "verig.uml"

17
ve/verig08.uml
View File

@ -1,31 +1,14 @@
#include "verigdef.h"
#define FULL_SCREEN
#define MASK_TITLE1 "Sconto percentuale"
DEFINE_FIELD(DESCR)
DEFINE_FIELD(SCONTO)
F_POS(SCONTO, 2, 9,"Sconto " )
// DEFINE_FIELD(CODIVA)
// F_POS(CODIVA, 2, 11,"Cod. IVA " )
// DEFINE_FIELD(DESIVA)
// F_POS(DESIVA, 22, 11,"" )
#include "verig.uml"

2
ve/verig09.uml
View File

@ -24,9 +24,7 @@ DEFINE_FIELD(QTAEVASA)
DEFINE_FIELD(RIGAEVASA)
DEFINE_FIELD(DATACONS)
DEFINE_FIELD(CODIVA)
F_POS(CODIVA, 2, 11,"Cod. IVA " )
DEFINE_FIELD(DESIVA)
F_POS(DESIVA, 22, 11,"" )
DEFINE_FIELD(ADDIVA)
DEFINE_FIELD(NCOLLI)
DEFINE_FIELD(PNETTO)

2
ve/verig10.uml
View File

@ -16,9 +16,7 @@ DEFINE_FIELD(DATACONS)
DEFINE_FIELD(SCONTO)
F_POS(SCONTO, 2, 11,"Sconto " )
DEFINE_FIELD(CODIVA)
F_POS(CODIVA, 2, 13,"Cod. IVA " )
DEFINE_FIELD(DESIVA)
F_POS(DESIVA, 22, 13,"" )
#include "verig.uml"

2
ve/verig11.uml
View File

@ -16,9 +16,7 @@ DEFINE_FIELD(DATACONS)
DEFINE_FIELD(SCONTO)
F_POS(SCONTO, 2, 11,"Sconto " )
DEFINE_FIELD(CODIVA)
F_POS(CODIVA, 2, 13,"Cod. IVA " )
DEFINE_FIELD(DESIVA)
F_POS(DESIVA, 22, 13,"" )
#include "verig.uml"

2
ve/verig13.uml
View File

@ -29,9 +29,7 @@ F_POS(SCONTO, 2, 11,"Sconto " )
DEFINE_FIELD(IMPFISUN)
DEFINE_FIELD(IMPFISSO)
DEFINE_FIELD(CODIVA)
F_POS(CODIVA, 2, 13,"Cod. IVA " )
DEFINE_FIELD(DESIVA)
F_POS(DESIVA, 22, 13,"" )
DEFINE_FIELD(CAUS)
DEFINE_FIELD(NCOLLI)
DEFINE_FIELD(PNETTO)

2
ve/verig14.uml
View File

@ -29,9 +29,7 @@ F_POS(SCONTO, 2, 11,"Sconto " )
DEFINE_FIELD(PERCPROV)
F_POS(PERCPROV, 42, 11,"Provvigione" )
DEFINE_FIELD(CODIVA)
F_POS(CODIVA, 2, 13,"Cod. IVA " )
DEFINE_FIELD(DESIVA)
F_POS(DESIVA, 22, 13,"" )
DEFINE_FIELD(CAUS)
DEFINE_FIELD(NCOLLI)
DEFINE_FIELD(PNETTO)

2
ve/verig15.uml
View File

@ -8,9 +8,7 @@
DEFINE_FIELD(DESCR)
DEFINE_FIELD(VALORE)
DEFINE_FIELD(CODIVA)
F_POS(CODIVA, 2, 13,"Cod. IVA " )
DEFINE_FIELD(DESIVA)
F_POS(DESIVA, 22, 13,"" )
DEFINE_FIELD(CODCMS)
#include "verig.uml"

4
ve/vesirio1.cpp
View File

@ -212,7 +212,9 @@ int TToas400::separa_sconti(const TString& sconto, TToken_string& sconti4) const
sconto_orig.insert("+");
//assegna agli elementi della token_string i valori numerici ed i segni
int numsconti = 0;
for (int i=0; sconto_orig[i]; i++)
int i;
for (i=0; sconto_orig[i]; i++)
{
//se il carattere é un segno -> devo cambiare elemento della token string (mettendo '|' ma non nel caso del primo segno)

3
ve/vetbtri.h
View File

@ -2,6 +2,3 @@
#define F_DESCR 102
#define F_TPR 103
#define F_FORMFEED 104
#define F_IND 105
#define F_DESIND 106
#define F_PERIND 107

27
ve/vetbtri.uml
View File

@ -60,32 +60,5 @@ BEGIN
FIELD B0
END
NUMBER F_IND 1
BEGIN
PROMPT 2 12 "Detraibilita' "
SHEET "Codice|Tipo detraibilita'@75"
INPUT F_IND
ITEM " |Regime normale"
ITEM "1|IVA indetraibile su acquisti riferiti a ricavi esenti"
ITEM "3|IVA indicata per passaggi interni al solo fine del calcolo di ventilazione"
ITEM "9|IVA non detraibile per l'articolo 19"
OUTPUT F_IND
OUTPUT F_DESIND
FIELD I0
END
STRING F_DESIND 75 50
BEGIN
PROMPT 20 12 ""
FLAGS "D"
END
NUMBER F_PERIND 6 2
BEGIN
PROMPT 2 14 "% Indetraib. "
FIELD R0
END
ENDPAGE
ENDMASK