Patch level : 10.0 patch 549

Files correlati     : lvmenu lv0300a.msk(->lv0 lv1 lv2 lv3) lv2500a.msk lv2.exe
Ricompilazione Demo : [ ]
Commento            :
Aggiunta la gestione del parametro per decidere quale fatturazione proporre da eseguire

Aggiunte due voci di menù per la fatturazione

Aggiunte in configurazione le possibili elaborazioni per fatturare


git-svn-id: svn://10.65.10.50/trunk@19791 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca83 2009-12-16 10:10:02 +00:00
parent 3e9f632c7d
commit 63d6508b39
5 changed files with 111 additions and 69 deletions

View File

@ -19,65 +19,67 @@
#define F_TIPODOC_FAT 207 #define F_TIPODOC_FAT 207
#define F_DESTIPODOC_FAT 208 #define F_DESTIPODOC_FAT 208
#define F_RIFTEST 209 #define F_RIFTEST 209
#define F_FELAB_DIF 210
#define F_FELAB_PRO 211
#define F_CODNUM_ORF 210 #define F_CODNUM_ORF 212
#define F_DESNUM_ORF 211 #define F_DESNUM_ORF 213
#define F_TIPODOC_ORF 212 #define F_TIPODOC_ORF 214
#define F_DESTIPODOC_ORF 213 #define F_DESTIPODOC_ORF 215
#define F_CODNUM_ORC 214 #define F_CODNUM_ORC 216
#define F_DESNUM_ORC 215 #define F_DESNUM_ORC 217
#define F_TIPODOC_ORC 216 #define F_TIPODOC_ORC 218
#define F_DESTIPODOC_ORC 217 #define F_DESTIPODOC_ORC 219
#define F_BUONIRIT 218 #define F_BUONIRIT 220
#define F_BUONIANT 219 #define F_BUONIANT 221
#define F_BUONIPREL 220 #define F_BUONIPREL 222
#define F_DOCCONG 221 #define F_DOCCONG 223
#define F_DOCDOT 222 #define F_DOCDOT 224
#define F_CAUSLAV 223 #define F_CAUSLAV 225
#define F_CAUSLAVDESC 224 #define F_CAUSLAVDESC 226
#define F_CAULVRITDT 225 #define F_CAULVRITDT 227
#define F_CAULVRITDTDE 226 #define F_CAULVRITDTDE 228
#define F_CAUCARMAG 227 #define F_CAUCARMAG 229
#define F_CAUCARMAGDE 228 #define F_CAUCARMAGDE 230
#define F_CAUSCARMAG 229 #define F_CAUSCARMAG 231
#define F_CAUSCARMAGDE 230 #define F_CAUSCARMAGDE 232
#define F_CODMAG 231 #define F_CODMAG 233
#define F_DESMAG 232 #define F_DESMAG 234
#define F_CODMAGN 233 #define F_CODMAGN 235
#define F_DESMAGN 234 #define F_DESMAGN 236
#define F_CODMAGC 235 #define F_CODMAGC 237
#define F_DESMAGC 236 #define F_DESMAGC 238
#define F_CODMAGP 237 #define F_CODMAGP 239
#define F_DESMAGP 238 #define F_DESMAGP 240
#define F_UNICONT 239 #define F_UNICONT 241
#define F_QTAMODI 240 #define F_QTAMODI 242
#define F_AUTGIRI 241 #define F_AUTGIRI 243
#define F_ORDGIRI 242 #define F_ORDGIRI 244
#define F_DATAFISSA 243 #define F_DATAFISSA 245
#define F_AGGCONG 244 #define F_AGGCONG 246
#define F_PERARR 245 #define F_PERARR 247
#define F_RIFOR 246 #define F_RIFOR 248
#define F_ARTCANFIS 247 #define F_ARTCANFIS 249
#define F_GESTSACA 248 #define F_GESTSACA 250
#define F_ALMANAC 249 #define F_ALMANAC 251
#define F_USEINDSP 250 #define F_USEINDSP 252
#define F_CODARTFIX 251 #define F_CODARTFIX 253
#define F_DESARTFIX 252 #define F_DESARTFIX 254
#define F_CODARTCAFIX 253 #define F_CODARTCAFIX 255
#define F_DESARTCAFIX 254 #define F_DESARTCAFIX 256
#define F_TIPOPR 255 #define F_TIPOPR 257
#define F_PATH_CON 256 #define F_PATH_CON 258
#define F_SHEET_NAME 257 #define F_SHEET_NAME 259
#define F_PATH_MAN 258 #define F_PATH_MAN 260
#define F_PATH_LAVA 259 #define F_PATH_LAVA 261
#define F_PATH_PUL 260 #define F_PATH_PUL 262
#define F_FILE_PUL 261 #define F_FILE_PUL 263
#define S_CODNUM_RIT 101 #define S_CODNUM_RIT 101
#define S_TIPODOC_RIT 102 #define S_TIPODOC_RIT 102

View File

@ -63,12 +63,12 @@ PAGE "Documenti" 0 0 0 0
GROUPBOX DLG_NULL 78 4 GROUPBOX DLG_NULL 78 4
BEGIN BEGIN
PROMPT 1 1 "@bDocumenti da generare" PROMPT 1 0 "@bDocumenti da generare"
END END
STRING F_CODNUM_GEN 4 STRING F_CODNUM_GEN 4
BEGIN BEGIN
PROMPT 2 2 "Numerazione " PROMPT 2 1 "Numerazione "
FIELD NUM_GEN FIELD NUM_GEN
HELP "Codice numerazione" HELP "Codice numerazione"
USE %NUM USE %NUM
@ -84,7 +84,7 @@ END
STRING F_DESNUM_GEN 50 STRING F_DESNUM_GEN 50
BEGIN BEGIN
PROMPT 24 2 "" PROMPT 24 1 ""
HELP "Descrizione Numerazione" HELP "Descrizione Numerazione"
USE %NUM KEY 2 USE %NUM KEY 2
INPUT S0 F_DESNUM_GEN INPUT S0 F_DESNUM_GEN
@ -95,7 +95,7 @@ END
STRING F_TIPODOC_GEN 4 STRING F_TIPODOC_GEN 4
BEGIN BEGIN
PROMPT 2 3 "Tipo " PROMPT 2 2 "Tipo "
FIELD TIPODOC_GEN FIELD TIPODOC_GEN
HELP "Codice tipo documento" HELP "Codice tipo documento"
USE %TIP USE %TIP
@ -110,7 +110,7 @@ END
STRING F_DESTIPODOC_GEN 50 STRING F_DESTIPODOC_GEN 50
BEGIN BEGIN
PROMPT 24 3 "" PROMPT 24 2 ""
HELP "Descrizione tipo documento" HELP "Descrizione tipo documento"
USE %TIP KEY 2 USE %TIP KEY 2
INPUT S0 F_DESTIPODOC_GEN INPUT S0 F_DESTIPODOC_GEN
@ -119,14 +119,14 @@ BEGIN
COPY OUTPUT F_TIPODOC_GEN COPY OUTPUT F_TIPODOC_GEN
END END
GROUPBOX DLG_NULL 78 5 GROUPBOX DLG_NULL 78 6
BEGIN BEGIN
PROMPT 1 5 "@bFatture" PROMPT 1 4 "@bFatture"
END END
STRING F_CODNUM_FAT 4 STRING F_CODNUM_FAT 4
BEGIN BEGIN
PROMPT 2 6 "Numerazione " PROMPT 2 5 "Numerazione "
FIELD NUM_FAT FIELD NUM_FAT
HELP "Codice numerazione" HELP "Codice numerazione"
USE %NUM USE %NUM
@ -142,7 +142,7 @@ END
STRING F_DESNUM_FAT 50 STRING F_DESNUM_FAT 50
BEGIN BEGIN
PROMPT 24 6 "" PROMPT 24 5 ""
HELP "Descrizione Numerazione" HELP "Descrizione Numerazione"
USE %NUM KEY 2 USE %NUM KEY 2
INPUT S0 F_DESNUM_FAT INPUT S0 F_DESNUM_FAT
@ -153,7 +153,7 @@ END
STRING F_TIPODOC_FAT 4 STRING F_TIPODOC_FAT 4
BEGIN BEGIN
PROMPT 2 7 "Tipo " PROMPT 2 6 "Tipo "
FIELD TIPODOC_FAT FIELD TIPODOC_FAT
HELP "Codice tipo documento" HELP "Codice tipo documento"
USE %TIP USE %TIP
@ -168,7 +168,7 @@ END
STRING F_DESTIPODOC_FAT 50 STRING F_DESTIPODOC_FAT 50
BEGIN BEGIN
PROMPT 24 7 "" PROMPT 24 6 ""
HELP "Descrizione tipo documento" HELP "Descrizione tipo documento"
USE %TIP KEY 2 USE %TIP KEY 2
INPUT S0 F_DESTIPODOC_FAT INPUT S0 F_DESTIPODOC_FAT
@ -179,10 +179,38 @@ END
BOOLEAN F_RIFTEST BOOLEAN F_RIFTEST
BEGIN BEGIN
PROMPT 2 8 "Scrivi riferimenti in testata documento" PROMPT 2 7 "Scrivi riferimenti in testata documento"
FIELD RifTest FIELD RifTest
END END
STRING F_FELAB_DIF 8
BEGIN
PROMPT 2 8 "Tipo fatt. definitiva"
FLAG "U"
USE %ELD SELECT I0==2
INPUT CODTAB F_FELAB_DIF
DISPLAY "Codice@8" CODTAB
DISPLAY "Descrizione@50" S0
DISPLAY "Numerazione" S5
OUTPUT F_FELAB_DIF CODTAB
CHECKTYPE REQUIRED
FIELD FatDif
END
STRING F_FELAB_PRO 8
BEGIN
PROMPT 45 8 "Tipo fatt. di prova "
FLAG "U"
USE %ELD SELECT I0==2
INPUT CODTAB F_FELAB_PRO
DISPLAY "Codice@8" CODTAB
DISPLAY "Descrizione@50" S0
DISPLAY "Numerazione" S5
OUTPUT F_FELAB_PRO CODTAB
CHECKTYPE REQUIRED
FIELD FatPro
END
GROUPBOX DLG_NULL 78 4 GROUPBOX DLG_NULL 78 4
BEGIN BEGIN
PROMPT 1 10 "@bOrdini fornitori" PROMPT 1 10 "@bOrdini fornitori"

View File

@ -754,6 +754,15 @@ TFatturazione_msk::TFatturazione_msk():TAutomask("lv2500a")
data.set_day(1); data.set_day(1);
set(F_DADATA, data); set(F_DADATA, data);
} }
if (main_app().argc() > 2)
{
TString16 tpela = main_app().argv(2);
tpela = tpela.mid(4);
TString8 codela = ini_get_string(CONFIG_DITTA, "lv", tpela);
set(F_COD_ELAB, codela);
field(F_COD_ELAB).check();
}
} }
///////////////////////////////////// /////////////////////////////////////

View File

@ -92,6 +92,7 @@ BEGIN
OUTPUT F_COD_ELAB CODTAB OUTPUT F_COD_ELAB CODTAB
OUTPUT F_DESC_ELAB S0 OUTPUT F_DESC_ELAB S0
CHECKTYPE REQUIRED CHECKTYPE REQUIRED
FLAGS "D"
END END
STRING F_DESC_ELAB 50 30 STRING F_DESC_ELAB 50 30
@ -104,6 +105,7 @@ BEGIN
DISPLAY "Numerazione" S5 DISPLAY "Numerazione" S5
COPY OUTPUT F_COD_ELAB COPY OUTPUT F_COD_ELAB
CHECKTYPE REQUIRED CHECKTYPE REQUIRED
FLAGS "D"
END END
STRING F_CODCATC 2 STRING F_CODCATC 2

View File

@ -108,11 +108,12 @@ Item_07 = "Buoni di Consegna", "lv3 -0 -filtI1=1 -defNUM_GEN,TIPODOC_GEN,lv", "F
Item_08 = "Fatture", "ve0 -1 -filtI1=2 -defNUM_FAT,TIPODOC_FAT,lv", "F" Item_08 = "Fatture", "ve0 -1 -filtI1=2 -defNUM_FAT,TIPODOC_FAT,lv", "F"
Item_09 = "Ordini Fornitori", "ve0 -1 -filtI1=3 -defNUM_ORF,TIPODOC_ORF,lv", "F" Item_09 = "Ordini Fornitori", "ve0 -1 -filtI1=3 -defNUM_ORF,TIPODOC_ORF,lv", "F"
Item_10 = "Ordini Clienti", "ve0 -1 -filtI1=3 -defNUM_ORC,TIPODOC_ORC,lv", "F" Item_10 = "Ordini Clienti", "ve0 -1 -filtI1=3 -defNUM_ORC,TIPODOC_ORC,lv", "F"
Item_11 = "Fatturazione", "lv2 -4", "F" Item_11 = "Fatturazione definitva", "lv2 -4 -defFatDif", "F"
Item_12 = "Evasione Buoni di Prelievo manuale", "lv3 -1 M", "F" Item_12 = "Fatturazione di prova", "lv2 -4 -defFatPro", "F"
Item_13 = "Evasione Buoni di Prelievo barcode", "lv3 -1 B", "F" Item_13 = "Evasione Buoni di Prelievo manuale", "lv3 -1 M", "F"
Item_14 = "Evasione Buoni di Prelievo terminale", "lv3 -3 T", "F" Item_14 = "Evasione Buoni di Prelievo barcode", "lv3 -1 B", "F"
Item_15 = "Stampe", [LVMENU_050] Item_15 = "Evasione Buoni di Prelievo terminale", "lv3 -3 T", "F"
Item_16 = "Stampe", [LVMENU_050]
[LVMENU_050] [LVMENU_050]
Caption = "Stampe" Caption = "Stampe"