From 03ab4572587c19628f7b8ef18cb88a148a796128 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 10 Dec 1997 12:12:46 +0000
Subject: [PATCH] Aggiunta apertura del File LF_RCONDV

git-svn-id: svn://10.65.10.50/trunk@5719 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ve/ve1100.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ve/ve1100.cpp b/ve/ve1100.cpp
index 17d9e1ab6..7d1bdedfb 100755
--- a/ve/ve1100.cpp
+++ b/ve/ve1100.cpp
@@ -324,7 +324,8 @@ void TDocumento_form::edit_picture(TForm_item & fi, const int dec)
 {
   TString old_picture(20);
   old_picture = fi.picture();
-  TString new_picture(20);
+  TString new_picture(20);    
+  char migliaia_char = old_picture.find(',') > 0 ? ',' : '.';
   
   if (old_picture.empty())  // picture di default
   {
@@ -338,7 +339,7 @@ void TDocumento_form::edit_picture(TForm_item & fi, const int dec)
     TString16 dec_to_add;
     for (int i = 0; i < dec; i++) dec_to_add << "@"; // aggiunge tanti "@" quanti sono i decimali voluti
     new_picture = old_picture;
-    if (old_picture.find(',') > 0)
+    if (migliaia_char == ',')
       new_picture << "."; // se ha trovato la virgola come separatore di migliaia significa che deve aggiungere il punto decimale
     else
       new_picture << ","; // altrimenti aggiunge la solita virgola
@@ -350,6 +351,8 @@ void TDocumento_form::edit_picture(TForm_item & fi, const int dec)
   {
     exceed=::abs(exceed);
     new_picture = new_picture.mid(exceed,new_picture.len()-exceed);
+    if (new_picture[0] == migliaia_char)
+      new_picture.ltrim(1);
   }
   fi.set_picture(new_picture); // setta la nuova picture
 }
@@ -1049,7 +1052,7 @@ bool TStampaDoc_application::create()
   _firmrel->add(LF_UNLOC,"CODDITTA=CODDITTA"); // si posiziona sulla prima unita' locale della ditta
   _firmrel->add(LF_COMUNI, "COM=STATORES+COMRES", 1, LF_ANAG, 100+LF_COMUNI);
   _firmrel->add(LF_COMUNI, "COM=STATORES+COMRF", 1, LF_ANAG, 200+LF_COMUNI);
-  open_files(LF_TABCOM, LF_TAB, LF_OCCAS, LF_CLIFO, LF_CFVEN, LF_MOVMAG, LF_RMOVMAG, 0);
+  open_files(LF_TABCOM, LF_TAB, LF_OCCAS, LF_CLIFO, LF_CFVEN, LF_MOVMAG, LF_RMOVMAG, LF_CONDV, 0);
   const int argc = TApplication::argc();
   
   _is_lista = argc == 3 && argv(2)[0] == 'L';