From 3bdacad8ae3fa9d1bb23117c106ff08b3911ffac Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 28 Oct 1996 13:02:24 +0000
Subject: [PATCH] Corrette date di inizio scadenza e cambio

git-svn-id: svn://10.65.10.50/trunk@3837 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ve/ve0100.cpp  | 6 ++++--
 ve/ve0300a.src | 2 +-
 ve/velib01.cpp | 9 ++++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ve/ve0100.cpp b/ve/ve0100.cpp
index 8c2cfb03a..bbe8e8a2d 100755
--- a/ve/ve0100.cpp
+++ b/ve/ve0100.cpp
@@ -44,8 +44,10 @@ void TMotore_application::init_insert_mode( TMask& m )
   m.set(F_STATO, _doc->head().get("STATO"));
   const TString16 data_doc(m.get( F_DATADOC));
     
-  m.set(F_DATAINSC,data_doc);
-  m.set( F_DATACAMBIO, data_doc);
+  const int pos = m.id2pos( F_DATACAMBIO1);
+  
+  if (pos >= 0 && m.fld(pos).active())
+    m.fld(pos).set(data_doc);
   clifo( ).occas_mask( ).reset( );
   const int ndefaults = pro( ).get_int( "NDEFAULTS", "DEFAULT" );          // prof
   TMask & emask = edit_mask();
diff --git a/ve/ve0300a.src b/ve/ve0300a.src
index 5f5b23a95..f734c1a79 100755
--- a/ve/ve0300a.src
+++ b/ve/ve0300a.src
@@ -447,7 +447,7 @@ FIELDNAME=DATAINSC
 MSKID=F_DATAINSC
 TYPE=T_DATA
 PROMPT="Data inizio scadenze  "
-FLAG=A
+// FLAG=A
 WARNING=E' richiesta una data valido
 HELP=Inserisci la data di inizio scadenza
 
diff --git a/ve/velib01.cpp b/ve/velib01.cpp
index 6f63d452d..7790ce517 100755
--- a/ve/velib01.cpp
+++ b/ve/velib01.cpp
@@ -143,9 +143,12 @@ bool condpag_hndl( TMask_field& field, KEY key )
   if ( field.to_check(key))
   {
     TDocumento_mask& m = (TDocumento_mask &) field.mask( );
-    TString16 condpag( m.get( F_CODPAG ) );
-    TString16 data( m.get( F_DATAINSC ) );
-    if ( condpag.not_empty() && data.not_empty())
+    const TString16 condpag(m.get(F_CODPAG));
+    TString16 data(m.get(F_DATAINSC));      
+    
+    if (data.empty())     
+      data = m.get(F_DATADOC);      
+    if ( condpag.not_empty())
     {
       TPagamento pag(condpag, data);