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

Patch level : 10.0 patch ???

Browse Source 
Files correlati     : lv0400.msk lv0 lvlib->lv3 tracciati record
Ricompilazione Demo : [ ]
Commento            :
Allineati i campi maschera
Aggiunto campi sulle righe contratto
Aggiunto salvataggio data di inserimento dell'articolo


git-svn-id: svn://10.65.10.50/branches/R_10_00@21706 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca83 2011-02-23 14:28:38 +00:00
parent f4b4cb1513
commit c6533eeb32
7 changed files with 154 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lv/f169.dir
View File

@ -1,3 +1,3 @@
169
0
$lvrcondv|0|0|219|0|Righe del contratto|||
$lvrcondv|0|0|228|0|Righe del contratto|||

4
lv/f169.trr
View File

@ -1,5 +1,5 @@
169
25
27
CODCF|3|6|0|Codice cliente
CODCONT|3|6|0|Codice contratto
CODART|1|20|0|Codice articolo
@ -25,5 +25,7 @@ MINCIC|4|4|2|Minimo ciclaggio
PREZNOL|4|18|3|Prezzo nolo
NOLCIC|1|1|0|Scelta per dotazione odierna o iniziale
VCARTCLI|1|1|0|Scelta per la % sul val.conv su articolo <A> o cliente <C>
DATAINS|5|8|0|Data inserimento articolo
CONTPUL|8|1|0|Flag di conteggio pulito
1
CODCF+CODCONT+CODART|

2
lv/lv0400.cpp
View File

@ -344,7 +344,7 @@ void TContratti_msk::on_idle()
{
set(F_CODCONT, _post_contr);
_post_contr = 0;
efield(F_CODCONT);
efield(F_CODCONT).set_focus();
}
}

94
lv/lv0400.h
View File

@ -1,54 +1,58 @@
//Definizione campi per maschera lv0400a - Inserimento e gestione contratti
//Toolbar
#define DLG_PLANNING 801
#define DLG_RESET 802
//Testata contratto
#define F_CODCF 201
#define F_RAGSOC 202
#define F_CODCONT 203
#define F_DATAIN 204
#define F_DATASC 205
#define F_RIGHE 206 //sheet righe contratto
#define F_PERFAT 207
#define F_TIPOCAN 208
#define F_INPERFAT 209
#define F_DTLASTFAT 210
#define F_ATTFATNODT 211
#define F_FORFNOCONS 212
#define F_TIPOSTPRZ 213
#define F_TIPOLIS 214
#define F_TIPOIMB 215
#define F_CONTSPOR 216
#define F_SSCONS 217
#define F_RIFBOL 218
#define F_RIPCONS 219
#define F_ELCONS 220
#define F_ADDCAPROT 221
#define F_PROFORME 222
#define F_FATTSOSP 223
#define F_CICLAGGIO 224
#define F_STPRZBOL 225
#define F_STETIMATI 226
#define F_STETITS 227
#define F_STDDTPTS 228
#define F_IMPMINFAT 229
#define F_PERCNOCONT 230
#define F_PERCTOLPES 231
#define F_RITAUDTTMP 232
#define DLG_PLANNING 233
#define F_INDSPED 234
#define F_RICALT 202
#define F_CODCONT 203
#define F_INDSPED 204
#define F_RAGSOC 205
#define F_DATAIN 206
#define F_DATASC 207
#define F_RIGHE 208 //sheet righe contratto
#define F_PERFAT 209
#define F_TIPOCAN 210
#define F_INPERFAT 211
#define F_DTLASTFAT 212
#define F_ATTFATNODT 213
#define F_FORFNOCONS 214
#define F_TIPOSTPRZ 215
#define F_TIPOLIS 216
#define F_TIPOIMB 217
#define F_CONTSPOR 218
#define F_SSCONS 219
#define F_RIFBOL 220
#define F_RIPCONS 221
#define F_ELCONS 222
#define F_ADDCAPROT 223
#define F_PROFORME 224
#define F_FATTSOSP 225
#define F_CICLAGGIO 226
#define F_STPRZBOL 227
#define F_STETIMATI 228
#define F_STETITS 229
#define F_STDDTPTS 230
#define F_IMPMINFAT 231
#define F_PERCNOCONT 232
#define F_PERCTOLPES 233
#define F_RITAUDTTMP 234
#define F_PROPOSTA 235
#define F_TIPOLOGIA 236
#define F_COLORE 237
#define F_BARCODE 238
#define F_RICALT 239
#define F_IMPFIX 240
#define F_CANFIX 241
#define F_RAGART 242
#define F_RIFTEST 243
#define F_NOLCICTE 246
#define F_CODNUM 247
#define F_TPDOC 248
#define F_DESCR 249
#define F_REDDI 250
#define DLG_RESET 251
#define F_IMPFIX 239
#define F_CANFIX 240
#define F_RAGART 241
#define F_RIFTEST 242
#define F_NOLCICTE 243
#define F_CODNUM 244
#define F_TPDOC 245
#define F_DESCR 246
#define F_REDDI 247
#define F_RAGGCGRUP 252
// Campi del dettalio sotto lo spreadsheet
@ -105,6 +109,8 @@
#define S_FATTKG 128
#define S_UM 129
#define S_PPCONF 130
#define S_DATAINS 131
#define S_CONTPUL 132
#define S_CODCF 301
#define S_RAGSOC 302

173
lv/lv0400a.uml
View File

@ -40,7 +40,7 @@ PAGE "Articoli" 0 2 0 0
NUMBER F_CODCF 6
BEGIN
PROMPT 2 0 "Cliente "
PROMPT 1 0 "Cliente "
FIELD CODCF
FLAGS "U"
KEY 1
@ -56,18 +56,18 @@ BEGIN
ADD RUN cg0 -1
END
STRING F_RAGSOC 50 30
STRING F_RICALT 30 15
BEGIN
PROMPT 2 1 "Ragione sociale"
KEY 1
USE LF_CLIFO KEY 2
PROMPT 20 0 "Ricerca Alt."
USE LF_CLIFO KEY 6
INPUT TIPOCF "C"
INPUT RAGSOC F_RAGSOC
DISPLAY "Ragione Sociale@50" RAGSOC
DISPLAY "Codice" CODCF
INPUT RICALT F_RICALT
DISPLAY "Ricerca alternativa@30" RICALT
DISPLAY "Sospeso" SOSPESO
DISPLAY "Ragione sociale@50" RAGSOC
COPY OUTPUT F_CODCF
CHECKTYPE REQUIRED
ADD RUN cg0 -1
HELP "Chiave di ricerca alternativa"
CHECKTYPE NORMAL
END
NUMBER F_CODCONT 6
@ -107,18 +107,18 @@ BEGIN
CHECKTYPE NORMAL
END
STRING F_RICALT 30 15
STRING F_RAGSOC 50 41
BEGIN
PROMPT 20 0 "Ricerca Alt."
USE LF_CLIFO KEY 6
PROMPT 1 1 "Ragione sociale "
KEY 1
USE LF_CLIFO KEY 2
INPUT TIPOCF "C"
INPUT RICALT F_RICALT
DISPLAY "Ricerca alternativa@30" RICALT
DISPLAY "Sospeso" SOSPESO
DISPLAY "Ragione sociale@50" RAGSOC
INPUT RAGSOC F_RAGSOC
DISPLAY "Ragione Sociale@50" RAGSOC
DISPLAY "Codice" CODCF
COPY OUTPUT F_CODCF
HELP "Chiave di ricerca alternativa"
CHECKTYPE NORMAL
CHECKTYPE REQUIRED
ADD RUN cg0 -1
END
SPREADSHEET F_RIGHE -1 -10
@ -154,6 +154,8 @@ BEGIN
ITEM "Fatturazione\na kg"
ITEM "UM@3"
ITEM "Pezzi per\nPacco"
ITEM "Data\nIns."
ITEM "Conta\npul."
END
STRING F_CODART 20
@ -164,7 +166,7 @@ END
STRING F_DESART 40
BEGIN
PROMPT 32 -9 ""
PROMPT 39 -9 ""
FLAGS "D"
END
@ -177,9 +179,9 @@ BEGIN
ITEM "3|Contratto in rinnovo"
END
LISTBOX F_CALCCONS 1 28
LISTBOX F_CALCCONS 1 29
BEGIN
PROMPT 40 -8 "Consegnato"
PROMPT 39 -8 "Consegnato"
ITEM "0|Uguale al ritirato"
ITEM "1|Conguaglio alla confezione"
END
@ -203,7 +205,7 @@ END
LISTBOX F_NOLCIC 1 20
BEGIN
PROMPT 40 -7 "In base a "
PROMPT 39 -7 "In base a "
ITEM "I|Dot. iniziale"
ITEM "O|Dot. odierna"
GROUP 1
@ -220,20 +222,20 @@ END
CURRENCY F_IMPFISART 15
BEGIN
PROMPT 1 -6 "Imp.fisso "
PROMPT 1 -6 "Imp.fisso"
CHECTYPE REQUIRED
END
CURRENCY F_PREZNOL 15
BEGIN
PROMPT 1 -6 "Prz. Nolo "
PROMPT 1 -6 "Prz. Nolo"
FLAGS "U"
CHECKTYPE REQUIRED
END
CURRENCY F_VALCONV 15
BEGIN
PROMPT 30 -6 "Val.Conven. "
PROMPT 29 -6 "Val.Conv. "
FLAGS "U"
END
@ -244,13 +246,13 @@ END
CURRENCY F_PREZDAN 15
BEGIN
PROMPT 1 -5 "Danneggiati "
PROMPT 1 -5 "Dannegg. "
FLAGS "U"
END
STRING F_CAUSLAVRIG 3
BEGIN
PROMPT 30 -5 "Cau. default "
PROMPT 29 -5 "Cau. Def. "
USE &CAU
INPUT CODTAB F_CAUSLAVRIG
DISPLAY "Codice" CODTAB
@ -267,12 +269,12 @@ END
NUMBER F_DOTTMP 9
BEGIN
PROMPT 1 -4 "Dot. temp. "
PROMPT 1 -4 "Dot.temp."
END
CURRENCY F_PRZDTTMP 15
BEGIN
PROMPT 24 -4 "Prezzo "
PROMPT 23 -4 "Prezzo "
FLAGS "U"
END
@ -290,36 +292,36 @@ END
NUMBER F_PPCONF 15 4
BEGIN
PROMPT 1 -3 "Pz per Pacco "
PROMPT 1 -3 "Pz X pac."
FLAGS "DG"
END
STRING F_BARCODE 21
STRING F_BARCODE 20
BEGIN
PROMPT 34 -3 "BarCode "
PROMPT 39 -3 "BarCode "
FLAGS "D"
END
STRING F_TIPOLOGIA 20
BEGIN
PROMPT 1 -2 "Tipologia "
PROMPT 1 -2 "Tipologia"
FLAGS "D"
END
STRING F_COLORE 21
STRING F_COLORE 18
BEGIN
PROMPT 34 -2 "Colore "
PROMPT 39 -2 "Colore "
FLAGS "D"
END
BOOLEAN F_RITAUDTTMPRIG
BEGIN
PROMPT 1 -1 "Ritiro automatico dot. temp. "
PROMPT 1 -1 "Ritiro automatico dot. temp."
END
BOOLEAN F_FATTKG
BEGIN
PROMPT 35 -1 "Fatturazione a Kg."
PROMPT 39 -1 "Fatturazione a Kg."
END
ENDPAGE
@ -345,13 +347,13 @@ END
CURRENCY F_IMPMINFAT 10
BEGIN
PROMPT 2 2 "Importo minimo fatturabile "
PROMPT 2 2 "Importo minimo fatturabile "
FIELD IMPMINFAT
END
CURRENCY F_IMPFIX 10
BEGIN
PROMPT 49 2 "Importo fisso "
PROMPT 49 2 "Importo fisso "
FIELD IMPFIX
CHECKTYPE REQUIRED
END
@ -431,7 +433,7 @@ END
LISTBOX F_CANFIX 1 22
BEGIN
PROMPT 48 7 "Con "
PROMPT 49 7 "Con "
ITEM "0|Nessun elenco"
ITEM "1|Elenco art. con qtà."
ITEM "2|Elenco art. senza qtà."
@ -457,7 +459,7 @@ END
LISTBOX F_TIPOLIS 1 20
BEGIN
PROMPT 43 9 "Tipo Listino "
PROMPT 49 9 "Tp. Lis."
ITEM "0|Prezzo nel contratto"
ITEM "1|Prezzo su articoli"
FIELD TIPOLIS
@ -471,7 +473,7 @@ END
BOOLEAN F_RAGGCGRUP
BEGIN
PROMPT 43 10 "Raggruppa sul capogruppo"
PROMPT 49 10 "Raggruppa sul capogruppo"
FIELD RAGGCGRUP
END
@ -531,7 +533,7 @@ END
STRING F_DESCR 50 40
BEGIN
PROMPT 36 14 ""
PROMPT 37 14 ""
USE %TIP
INPUT CODTAB F_TPDOC
DISPLAY "Descrizione@50" S0
@ -541,7 +543,7 @@ END
LISTBOX F_TIPOIMB 1 8
BEGIN
PROMPT 2 15 "Tipo imballo "
PROMPT 2 15 "Tipo imballo "
ITEM "0|Sacco"
ITEM "1|Carrello"
ITEM "2|Misto"
@ -550,7 +552,7 @@ END
LISTBOX F_CONTSPOR 1 12
BEGIN
PROMPT 45 15 "Conta dello sporco "
PROMPT 45 15 "Conta dello sporco "
ITEM "0|Nessuno"
ITEM "1|Sporco"
ITEM "2|Solo pulito"
@ -653,28 +655,28 @@ PAGE "Riga Contratto" -1 -1 80 20
NUMBER S_CODCF 6
BEGIN
PROMPT 2 1 "Cliente "
PROMPT 1 1 "Cliente "
FLAGS "DG"
NUM_CALC #-F_CODCF
END
STRING S_RAGSOC 50 28
STRING S_RAGSOC 50
BEGIN
PROMPT 25 1 ""
PROMPT 16 1 ""
FLAGS "DG"
STR_CALC #-F_RAGSOC
END
NUMBER S_CODCONT 6
BEGIN
PROMPT 59 1 "Contratto N. "
PROMPT 68 1 "Cont. "
FLAGS "DG"
NUM_CALC #-F_CODCONT
END
GROUPBOX DLG_NULL 78 4
GROUPBOX DLG_NULL 80 4
BEGIN
PROMPT 1 2 "@b Articolo"
PROMPT 1 2 "@bArticolo"
END
STRING S_CODART 20
@ -694,15 +696,9 @@ BEGIN
ADD RUN ve2 -3
END
STRING S_UM 2
STRING S_DESCR 52
BEGIN
PROMPT 25 3 "U.M."
FLAGS "D"
END
STRING S_DESCR 50 40
BEGIN
PROMPT 35 3 ""
PROMPT 25 3 ""
USE LF_ANAMAG KEY 2
INPUT DESCR S_DESCR
DISPLAY "Descrizone@50" DESCR
@ -711,9 +707,15 @@ BEGIN
CHECKTYPE REQUIRED
END
STRING S_UM 2
BEGIN
PROMPT 2 4 "U.M."
FLAGS "D"
END
LISTBOX S_ARTBLOC 1 25
BEGIN
PROMPT 2 4 "Bloccato "
PROMPT 15 4 "Bloccato "
ITEM "0|No"
ITEM "1|Articolo in sostituzione"
ITEM "2|Cliente in chiusura"
@ -723,13 +725,13 @@ END
NUMBER S_CONG 9
BEGIN
PROMPT 58 4 "Conguaglio"
PROMPT 58 4 "Conguaglio "
FIELD QTACONG
END
GROUPBOX DLG_NULL 78 7
GROUPBOX DLG_NULL 80 7
BEGIN
PROMPT 1 6 "@b Forfait/Prezzi"
PROMPT 1 6 "@bForfait/Prezzi"
END
LISTBOX S_TIPOFORF 1 25
@ -752,7 +754,7 @@ END
LISTBOX S_NOLCIC 1 20
BEGIN
PROMPT 45 7 "In base a "
PROMPT 47 7 "In base a "
ITEM "I|Dot. iniziale"
ITEM "O|Dot. odierna"
FIELD NOLCIC
@ -768,7 +770,7 @@ END
LISTBOX S_VCARTCLI 1 20
BEGIN
PROMPT 45 8 "Per "
PROMPT 47 8 "Per "
ITEM "A|Articolo"
ITEM "C|Cliente"
FIELD VCARTCLI
@ -785,7 +787,7 @@ END
CURRENCY S_PREZZORN 15
BEGIN
PROMPT 30 9 "Di rinnovo "
PROMPT 32 9 "Di rinnovo "
FIELD PREZRIN
FLAGS "U"
GROUP 2
@ -793,7 +795,7 @@ END
STRING S_SCONTO 6
BEGIN
PROMPT 60 9 "Sconto %"
PROMPT 63 9 "Sconto % "
FIELD SCONTPERC
END
@ -804,30 +806,30 @@ BEGIN
FIELD PREZDAN
END
BOOLEAN S_FATTKG
BEGIN
PROMPT 30 10 "Fatturazione a Kg."
FIELD FATTKG
END
CURRENCY S_PREZNOL 15
BEGIN
PROMPT 50 10 "Prezzo nolo"
PROMPT 32 10 "Prezzo nolo "
FLAGS "U"
FIELD PREZNOL
CHECKTYPE REQUIRED
END
BOOLEAN S_FATTKG
BEGIN
PROMPT 63 10 "Fatturaz. a Kg."
FIELD FATTKG
END
CURRENCY S_IMPFISART 15
BEGIN
PROMPT 2 11 "Imp.fisso "
PROMPT 2 11 "Imp. fisso "
FIELD IMPFISART
CHECKTYPE REQUIRED
END
CURRENCY S_VALCONV 15
BEGIN
PROMPT 30 11 "Val.Conven."
PROMPT 32 11 "Val. Conven."
FLAGS "U"
FIELD VALCONV
END
@ -936,6 +938,23 @@ BEGIN
CHECKTYPE NORMAL
END
GROUPBOX DLG_NULL 78 3
BEGIN
PROMPT 1 22 "@bParametri"
END
DATE S_DATAINS
BEGIN
PROMPT 2 23 "Data inserimento "
FIELD DATAINS
END
BOOLEAN S_CONTPUL
BEGIN
PROMPT 35 23 "Conta Pulito"
FIELD CONTPUL
END
ENDPAGE
PAGE "Dati carrello" -1 -1 80 20

1
lv/lvlib.cpp
View File

@ -177,6 +177,7 @@ int TLaundry_contract::add_row(const char* codart)
rcondv.put(LVRCONDV_CODCF, codcf);
rcondv.put(LVRCONDV_CODCONT, codcont);
rcondv.put(LVRCONDV_CODART, codart);
rcondv.put(LVRCONDV_DATAINS, TDate(TODAY));
return rcondv.rewrite_write();
}

2
lv/lvrcondv.h
View File

@ -31,5 +31,7 @@
#define LVRCONDV_VCARTCLI "VCARTCLI"
#define LVRCONDV_CAUSLAV "CAUSLAV"
#define LVRCONDV_PREZNOL "PREZNOL"
#define LVRCONDV_DATAINS "DATAINS"
#define LVRCONDV_CONTPUL "CONTPUL"
#endif