From 19ceac1981b8e50317c86ba9f6954f72ab8152fc Mon Sep 17 00:00:00 2001
From: luca83 <luca83@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 11 May 2011 13:57:55 +0000
Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2010.?=
 =?UTF-8?q?0=20patch=20=3F=3F=3F=20Files=20correlati=20=20=20=20=20:=20lv2?=
 =?UTF-8?q?=20lv3=20lv3200a.msk=20Ricompilazione=20Demo=20:=20[=20]=20Comm?=
 =?UTF-8?q?ento=20=20=20=20=20=20=20=20=20=20=20=20:=20Autista:=20l'autist?=
 =?UTF-8?q?a=20deve=20essere=20quello=20della=20data=20do=20trasporto=20e?=
 =?UTF-8?q?=20non=20la=20data=20bolla=20Stampa=20contratti:=20non=20stampa?=
 =?UTF-8?q?=20il=20codice=20cliente=20Bolla=20da=20pulito:=20ci=20mette=20?=
 =?UTF-8?q?sette=20minuti=20->=20limitata=20la=20query=20sui=20pacchi=20a?=
 =?UTF-8?q?=20un=20mese=20anzich=C3=A8=20un=20anno=20Evasione=20buoni=20di?=
 =?UTF-8?q?=20prelievo=20manuale:=20a=20cavallo=20d'anno=20non=20ti=20fa?=
 =?UTF-8?q?=20cambiare=20l'anno=20di=20esercizio?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.65.10.50/branches/R_10_00@22091 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 lv/lv2900.cpp  | 12 ++++++------
 lv/lv3200.cpp  |  2 +-
 lv/lv3200a.uml |  1 -
 lv/lv3400.cpp  |  2 ++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lv/lv2900.cpp b/lv/lv2900.cpp
index 8c5e9abb1..acd8f8bc7 100755
--- a/lv/lv2900.cpp
+++ b/lv/lv2900.cpp
@@ -520,8 +520,8 @@ bool TConta_pulito_msk::genera_documenti(const TFilename& file, TAssoc_array& do
   TBuoni_cache ca;
 
   //inizializzo le variabili di interesse
-  TDate dadata(TODAY); dadata.addyear(-1);
-  TDate adata(TODAY);  adata.addyear();
+  TDate dadata(TODAY); dadata.addmonth(-1);  dadata.set_day(1);
+  TDate adata(TODAY);  adata.addmonth();
   long codcf = _codcf;
 
   //se non l'ho lanciato da linea di comando, inizializzo le variabili
@@ -758,8 +758,8 @@ void TConta_pulito_msk::prepara_movimenti(const TFilename& file, TAssoc_array& m
   }
 
   //inizializzo le variabili di interesse  
-  TDate dadata(TODAY);  dadata.addyear(-1);
-  TDate adata(TODAY);   adata.addyear();
+  TDate dadata(TODAY); dadata.addmonth(-1);  dadata.set_day(1);
+  TDate adata(TODAY);  adata.addmonth();
   long codcf = _codcf;
   
   //se non ho lanciato il programma da linea di comando, leggo i paramtri dalla maschera
@@ -852,8 +852,8 @@ bool TConta_pulito_msk::genera_movmag(TAssoc_array& movimenti)
   TLocalisamfile movi(LF_MOVMAG);
 
   //inizializzo le variabili di interesse
-  TDate dadata(TODAY);  dadata.addyear(-1);
-  TDate adata(TODAY);   adata.addyear();
+  TDate dadata(TODAY); dadata.addmonth(-1);  dadata.set_day(1);
+  TDate adata(TODAY);  adata.addmonth();
   long codcf = _codcf;
   
   //se non ho lanciato il programma da linea di comando, leggo i paramtri dalla maschera
diff --git a/lv/lv3200.cpp b/lv/lv3200.cpp
index 8003e0c57..c765c3f35 100755
--- a/lv/lv3200.cpp
+++ b/lv/lv3200.cpp
@@ -462,7 +462,7 @@ void TEvasione_msk::genera_documento()
   }
   
   //preparo la testata del documento  
-  TDocumento doc('D', kdoc.anno(), codnum, 0);
+  TDocumento doc('D', databolla.year(), codnum, 0);
   doc.put(DOC_TIPODOC, tipodoc);
   doc.put(DOC_STATO, stato);  
   doc.put(DOC_DATADOC, databolla);
diff --git a/lv/lv3200a.uml b/lv/lv3200a.uml
index 09e3fd7be..81df0a101 100755
--- a/lv/lv3200a.uml
+++ b/lv/lv3200a.uml
@@ -98,7 +98,6 @@ END
 NUMBER F_ANNO 4
 BEGIN
   PROMPT 2 3 "Esercizio "
-  FLAGS "D"
 END
 
 DATE F_DATADOC
diff --git a/lv/lv3400.cpp b/lv/lv3400.cpp
index f78fe8656..177ebe309 100755
--- a/lv/lv3400.cpp
+++ b/lv/lv3400.cpp
@@ -323,6 +323,8 @@ void TEvasione_ter_msk::genera_buono()
   const TDate datagen(TODAY);
   TDate dadata = databpre;
   TDate adata = datagen;
+  if(ini_get_bool(CONFIG_DITTA, "lv", "DataBcon"))
+    dadata = databolla;
   adata.addmonth();  
 
   //recupero i dati di interesse dal planning