From 935f8e8f915de433b577934278079f4830687361 Mon Sep 17 00:00:00 2001 From: luca83 Date: Fri, 19 Mar 2010 11:41:19 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2010.?= =?UTF-8?q?0=20patch=20781=20Files=20correlati=20=20=20=20=20:=20lv0300a.m?= =?UTF-8?q?sk=20lv2=20Ricompilazione=20Demo=20:=20[=20]=20Commento=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20:=20Paolo=20mi=20ha=20girato=20te?= =?UTF-8?q?lefonicamente=20una=20richiesta=20di=20Diana,=20e=20cio=C3=A8?= =?UTF-8?q?=20avere=20una=20data=20di=20prevista=20consegna=20sui=20buoni?= =?UTF-8?q?=20di=20consegna=20generati=20da=20pulito=20diversa=20da=20quel?= =?UTF-8?q?la=20prevista;=20in=20particolare=20per=20i=20clienti=20che=20p?= =?UTF-8?q?revedono=20una=20consegna=20tutti=20i=20giorni,=20la=20data=20d?= =?UTF-8?q?i=20prevista=20consegna=20deve=20essere=20quella=20del=20giorno?= =?UTF-8?q?=20successivo,=20o,=20nel=20caso=20che=20questo=20sia=20domenic?= =?UTF-8?q?a,=20quella=20del=20luned=C3=AC=20successivo.=20La=20proposta?= =?UTF-8?q?=20=C3=A8=20aggiungere=20un=20flag=20in=20configurazione=20(anc?= =?UTF-8?q?he=20se=20=C3=A8=20un=20parametro=20pi=C3=B9=20del=20cliente=20?= =?UTF-8?q?che=20generale)=20che=20verrebbe=20utilizzato=20solo=20nella=20?= =?UTF-8?q?generazione=20dei=20buoni=20da=20pulito.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.65.10.50/trunk@20244 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/lv0300a.h | 31 ++++++++++++++++--------------- lv/lv0300a.uml | 26 ++++++++++++++++---------- lv/lv2900.cpp | 9 ++++++++- 3 files changed, 40 insertions(+), 26 deletions(-) diff --git a/lv/lv0300a.h b/lv/lv0300a.h index 69af4b086..d422da137 100755 --- a/lv/lv0300a.h +++ b/lv/lv0300a.h @@ -70,23 +70,24 @@ #define F_GESTSACA 252 #define F_ALMANAC 253 #define F_USEINDSP 254 -#define F_CODARTFIX 255 -#define F_DESARTFIX 256 -#define F_CODARTCAFIX 257 -#define F_DESARTCAFIX 258 -#define F_TIPOPR 259 -#define F_UMPESO 260 -#define F_DATABCON 261 +#define F_DATABCON 255 +#define F_CONDOM 256 +#define F_CODARTFIX 257 +#define F_DESARTFIX 258 +#define F_CODARTCAFIX 259 +#define F_DESARTCAFIX 260 +#define F_TIPOPR 261 +#define F_UMPESO 262 -#define F_PATH_CON 262 -#define F_SHEET_NAME 263 -#define F_PATH_MAN 264 -#define F_PATH_LAVA 265 -#define F_PATH_PUL 266 -#define F_FILE_PUL 267 +#define F_PATH_CON 263 +#define F_SHEET_NAME 264 +#define F_PATH_MAN 265 +#define F_PATH_LAVA 266 +#define F_PATH_PUL 267 +#define F_FILE_PUL 268 -#define F_CODARTCOFIX 268 -#define F_DESARTCOFIX 269 +#define F_CODARTCOFIX 269 +#define F_DESARTCOFIX 270 #define F_BACKUP 300 diff --git a/lv/lv0300a.uml b/lv/lv0300a.uml index 21ccccab9..907106d56 100755 --- a/lv/lv0300a.uml +++ b/lv/lv0300a.uml @@ -647,27 +647,39 @@ END TEXT -1 BEGIN - PROMPT 0 8 "@bOpzioni contratti" + PROMPT 0 7 "@bOpzioni contratti" END BOOLEAN F_UNICONT BEGIN - PROMPT 1 9 "Numera contr. per ditta" + PROMPT 1 8 "Numera contr. per ditta" FIELD UniCont END BOOLEAN F_QTAMODI BEGIN - PROMPT 28 9 "Dot. modificabili" + PROMPT 28 8 "Dot. modificabili" FIELD Qtamodi END BOOLEAN F_USEINDSP BEGIN - PROMPT 50 9 "Utilizza ind. sped. su contratto" + PROMPT 50 8 "Utilizza ind. sped. su contratto" FIELD Useindsp END +BOOLEAN F_DATABCON +BEGIN + PROMPT 1 9 "Data buono di consegna uguale alla data evasione buono di ritiro" + FIELD DataBcon +END + +BOOLEAN F_CONDOM +BEGIN + PROMPT 1 10 "Consegna giorno successivo per i clienti che lavorano a pulito" + FIELD ConDom +END + TEXT -1 BEGIN PROMPT 0 11 "@bOpzioni Giri" @@ -795,12 +807,6 @@ BEGIN CHECKTYPE REQUIRED END -BOOLEAN F_DATABCON -BEGIN - PROMPT 1 10 "Data buono di consegna uguale alla data evasione buono di ritiro" - FIELD DataBcon -END - TEXT -1 BEGIN PROMPT 0 22 "@bOpzioni articoli" diff --git a/lv/lv2900.cpp b/lv/lv2900.cpp index f6344205b..9b2cad6d0 100755 --- a/lv/lv2900.cpp +++ b/lv/lv2900.cpp @@ -193,7 +193,14 @@ TObject* TBuoni_cache::key2obj(const char* key) if(ini_get_bool(CONFIG_DITTA, "lv", "DataBcon")) { doc->put(DOC_DATADOC, datagen); - doc->put(DOC_DATAPART, datadoc); + //modifica 18/03/2010 richiesta da Diana2000 per i clienti che consegnano tutti i giorni + if(ini_get_bool(CONFIG_DITTA, "lv", "ConDom")) + { + TDate datacon(TODAY); datacon++; + if(datacon.wday() == 7) + datacon++; + doc->put(DOC_DATAPART, datacon); + } } else doc->put(DOC_DATADOC, datadoc);