From 775faea657f46b2db15695a1a56b51a5d3768312 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 29 Apr 2015 09:01:25 +0000
Subject: [PATCH] Aggiunto supporto per CFVEN a modifica valori

git-svn-id: svn://10.65.10.50/branches/R_10_00@23070 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ve/ve4100.cpp   |  9 +++++----
 ve/ve4100.uml   |  3 ++-
 ve/velib04d.cpp | 10 +++++++---
 ve/vetbrpd.h    | 21 +++++++++++++++++++++
 ve/vetbstg.h    | 21 +++++++++++++++++++++
 5 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 ve/vetbrpd.h
 create mode 100644 ve/vetbstg.h

diff --git a/ve/ve4100.cpp b/ve/ve4100.cpp
index 49446316e..3c9b52519 100755
--- a/ve/ve4100.cpp
+++ b/ve/ve4100.cpp
@@ -313,7 +313,7 @@ public:
 TRicalcolo_mask::TRicalcolo_mask()
                : TMask("ve4100"), _cur_file(0), _relation(NULL), _cursor(NULL)
 {
-  const int lf[] = { LF_ANAMAG, LF_UMART, LF_DESLIN, LF_CONDV, LF_RCONDV, LF_CLIFO, LF_CFBAN, 0 };
+  const int lf[] = { LF_ANAMAG, LF_UMART, LF_DESLIN, LF_CONDV, LF_RCONDV, LF_CLIFO, LF_CFBAN, LF_CFVEN, 0 };
   for (int i = 0; lf[i]; i++)                   
   {                                   
     TRelation* rel = new TRelation(lf[i]);
@@ -517,9 +517,7 @@ TRelation& TRicalcolo_mask::create_relation()
     }
     break;
   case LF_CLIFO:
-    {
-      _relation->add(LF_CFVEN, "TIPOCF==TIPOCF|CODCF==CODCF");
-    }
+    _relation->add(LF_CFVEN, "TIPOCF==TIPOCF|CODCF==CODCF");
     break;
   case LF_CFBAN:
     {
@@ -527,6 +525,9 @@ TRelation& TRicalcolo_mask::create_relation()
       _relation->add(LF_CFVEN, "TIPOCF==TIPOCF|CODCF==CODCF");
     }
     break;
+  case LF_CFVEN:
+    _relation->add(LF_CLIFO, "TIPOCF==TIPOCF|CODCF==CODCF");
+    break;
   default:
     break;
   }
diff --git a/ve/ve4100.uml b/ve/ve4100.uml
index c484681ad..f0e2fcf2a 100755
--- a/ve/ve4100.uml
+++ b/ve/ve4100.uml
@@ -20,7 +20,8 @@ BEGIN
   ITEM "3|Condizioni di vendita"
   ITEM "4|Righe condizioni di vendita"
   ITEM "5|Clienti/Fornitori"
-  ITEM "6|Banche per Clienti/Fornitori"
+  ITEM "6|Clienti/Fornitori Banche"
+  ITEM "7|Clienti/Fornitori Vendite"
 END
 
 LIST F_KEY 10
diff --git a/ve/velib04d.cpp b/ve/velib04d.cpp
index 46a60768d..fec52ebce 100755
--- a/ve/velib04d.cpp
+++ b/ve/velib04d.cpp
@@ -11,6 +11,7 @@ class TConsegna_mask : public TAutomask
 {
   bool _ordina_per_codice;
   bool _ignora_descrizioni;
+  bool _check_giac;
   const TDocumento* _indoc;
   const TDocumento* _outdoc;
 
@@ -98,7 +99,7 @@ bool TConsegna_mask::on_field_event(class TOperable_field& f, TField_event e, lo
     if (e == fe_close)
     {
       const TString& codcausmag = _outdoc->get(DOC_CAUSMAG);
-      if (codcausmag.full())
+      if (codcausmag.full() && _check_giac)
       {
         const TCausale_magazzino& causmag = ::cached_causale_magazzino(codcausmag);
         const int segno = causmag.sgn(s_giac);
@@ -148,7 +149,9 @@ bool TConsegna_mask::on_field_event(class TOperable_field& f, TField_event e, lo
         }
       }
     }
-  default:break;
+    break;
+  default:
+    break;
   }
   
   if (update_row)
@@ -290,7 +293,7 @@ void TConsegna_mask::doc2mask(const TDocumento& indoc, const TDocumento& outdoc,
 
 TConsegna_mask::TConsegna_mask(int header_code, bool per_codice, bool ignora_descrizioni)
               : TAutomask("velib04d"), _ordina_per_codice(per_codice), _indoc(NULL), _outdoc(NULL),
-                _ignora_descrizioni(ignora_descrizioni)
+                _ignora_descrizioni(ignora_descrizioni), _check_giac(false)
 { 
   TCodgiac_livelli cl;
   TSheet_field& s = sfield(F_ROWS);
@@ -326,6 +329,7 @@ TConsegna_mask::TConsegna_mask(int header_code, bool per_codice, bool ignora_des
       agg.set_prompt(codagg);
     }
   }
+  _check_giac = c.get_bool("CHECK_GIAC", "mg");
 }
 
 ///////////////////////////////////////////////////////////
diff --git a/ve/vetbrpd.h b/ve/vetbrpd.h
new file mode 100644
index 000000000..7ba1ea198
--- /dev/null
+++ b/ve/vetbrpd.h
@@ -0,0 +1,21 @@
+
+
+//      campi maschera batbrpd.msk
+
+#define F_CODICE                            101
+#define F_DESCR                             102
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ve/vetbstg.h b/ve/vetbstg.h
new file mode 100644
index 000000000..22cfbbdd6
--- /dev/null
+++ b/ve/vetbstg.h
@@ -0,0 +1,21 @@
+
+
+//      campi maschera batbstg.msk
+
+#define F_CODICE                            101
+#define F_DESCR                             102
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+