From 02dd834c595edeec0946763dda7496d5fd137fd0 Mon Sep 17 00:00:00 2001
From: luca83 <luca83@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 17 Dec 2009 12:21:45 +0000
Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2010.?=
 =?UTF-8?q?0=20patch=20552=20Files=20correlati=20=20=20=20=20:=20lv0300a.m?=
 =?UTF-8?q?sk=20lv3=20Ricompilazione=20Demo=20:=20[=20]=20Commento=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20:=20Aggiunto=20in=20configurazion?=
 =?UTF-8?q?e=20l'unit=C3=A0=20di=20misura=20del=20peso=20e=20un=20parametr?=
 =?UTF-8?q?o=20per=20sapere=20la=20data=20dei=20buoni=20di=20consegna=20qu?=
 =?UTF-8?q?ando=20generati=20da=20una=20evasione?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implementata la gestione del secondo parametro nei programmi di evasione


git-svn-id: svn://10.65.10.50/trunk@19807 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 lv/lv0300a.h   | 14 ++++++++------
 lv/lv0300a.uml | 23 +++++++++++++++++++++--
 lv/lv3200.cpp  |  7 ++++++-
 lv/lv3400.cpp  |  7 ++++++-
 4 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/lv/lv0300a.h b/lv/lv0300a.h
index 0f36c7a83..7a21dda64 100755
--- a/lv/lv0300a.h
+++ b/lv/lv0300a.h
@@ -73,13 +73,15 @@
 #define F_CODARTCAFIX 		 255
 #define F_DESARTCAFIX 		 256
 #define F_TIPOPR           257
+#define F_UMPESO           258
+#define F_DATABCON         259
 
-#define F_PATH_CON         258
-#define F_SHEET_NAME       259
-#define F_PATH_MAN         260
-#define F_PATH_LAVA        261
-#define F_PATH_PUL         262
-#define F_FILE_PUL         263
+#define F_PATH_CON         260
+#define F_SHEET_NAME       261
+#define F_PATH_MAN         262
+#define F_PATH_LAVA        263
+#define F_PATH_PUL         264
+#define F_FILE_PUL         265
 
 #define S_CODNUM_RIT       101
 #define S_TIPODOC_RIT      102
diff --git a/lv/lv0300a.uml b/lv/lv0300a.uml
index 775585e43..8dd7bf83f 100755
--- a/lv/lv0300a.uml
+++ b/lv/lv0300a.uml
@@ -733,14 +733,33 @@ BEGIN
   FIELD Tipopr
 END
 
+STRING F_UMPESO 3
+BEGIN
+  PROMPT 40 17 "U.M. "
+  USE %UMS
+  INPUT CODTAB F_UMPESO
+  DISPLAY "Codice@6" CODTAB
+  DISPLAY "Descrizione@50" S0
+  OUTPUT  F_UMPESO CODTAB
+  FIELD UmKg
+  FLAG "U"
+  CHECKTYPE REQUIRED
+END
+
+BOOLEAN F_DATABCON
+BEGIN
+  PROMPT 1 18 "Data buono di consegna uguale alla data evasione buono di ritiro"
+  FIELD DataBcon
+END
+
 TEXT -1
 BEGIN
-	PROMPT 0 19 "@bOpzioni articoli"
+	PROMPT 0 20 "@bOpzioni articoli"
 END
 
 BOOLEAN F_GESTSACA
 BEGIN
-  PROMPT 1 20 "Gestione sacchi/carrello"
+  PROMPT 1 21 "Gestione sacchi/carrello"
   FIELD Gestsaca
 END
 
diff --git a/lv/lv3200.cpp b/lv/lv3200.cpp
index b869d7ab7..2884c7108 100755
--- a/lv/lv3200.cpp
+++ b/lv/lv3200.cpp
@@ -455,7 +455,12 @@ void TEvasione_msk::genera_documento()
   TDocumento doc('D', kdoc.anno(), codnum, ++_ndoc);
   doc.put(DOC_TIPODOC, tipodoc);
   doc.put(DOC_STATO, stato);
-  doc.put(DOC_DATADOC, databolla);
+
+  if(ini_get_bool(CONFIG_DITTA, "lv", "DataBcon"))
+    doc.put(DOC_DATADOC, datagen);
+  else
+    doc.put(DOC_DATADOC, databolla);
+
   doc.put(DOC_TIPOCF, 'C');
   doc.put(DOC_CODCF, codcf);
   doc.put(DOC_CODCONT, codcont);
diff --git a/lv/lv3400.cpp b/lv/lv3400.cpp
index a1e8e7c80..9aad84ea5 100755
--- a/lv/lv3400.cpp
+++ b/lv/lv3400.cpp
@@ -420,7 +420,12 @@ void TEvasione_ter_msk::genera_buono()
   TDocumento doc('D', kdoc.anno(), codnum, ++_ndoc);
   doc.put(DOC_TIPODOC, tipodoc);
   doc.put(DOC_STATO, stato);
-  doc.put(DOC_DATADOC, databolla);
+
+  if(ini_get_bool(CONFIG_DITTA, "lv", "DataBcon"))
+    doc.put(DOC_DATADOC, datagen);
+  else
+    doc.put(DOC_DATADOC, databolla);
+
   doc.put(DOC_TIPOCF, 'C');
   doc.put(DOC_CODCF, codcf);
   doc.put(DOC_CODCONT, codcont);