From b9f6a0082155430d8790605fc8051410c2d8e8c2 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 7 Mar 2007 16:51:50 +0000
Subject: [PATCH] Patch level :4.0 649 Files correlati :
Ricompilazione Demo : [ ] Commento :errori di compilazione nel
riporto
git-svn-id: svn://10.65.10.50/trunk@15023 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
ve/velib06.cpp | 3 ---
ve/velib06a.cpp | 20 +++++---------------
2 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/ve/velib06.cpp b/ve/velib06.cpp
index 38f9a16ff..165c4bc6a 100755
--- a/ve/velib06.cpp
+++ b/ve/velib06.cpp
@@ -1464,9 +1464,6 @@ bool TDocumento_mask::clifo_handler( TMask_field& f, KEY key )
if ( cli_for.get_bool(CLI_SOSPESO) )
return f.error_box( "Il codice '%ld' e' sospeso e non puo' essere utilizzato", atol(f.get()));
-
- if (f.focusdirty())
- d.spese_updated() = false;
m.cli2mask();
diff --git a/ve/velib06a.cpp b/ve/velib06a.cpp
index ea9a79fb6..049b79d5a 100755
--- a/ve/velib06a.cpp
+++ b/ve/velib06a.cpp
@@ -1569,9 +1569,9 @@ bool qtaart_handler( TMask_field& f, KEY key )
TSheet_field& sh = *row_mask.get_sheet();
TDocumento_mask& mask = (TDocumento_mask&) sh.mask();
const int current_doc_row = sh.selected() + 1;
-
TCond_vendita & condv = mask.condv();
- condv.set_riga(&row_mask);
+
+ condv.set_riga(&row_mask);
condv.ricerca(false, true);
if (mask.doc().tipo().calcolo_lordo())
mask.doc()[current_doc_row].put(RDOC_PREZZOL, row_mask.get(FR_PREZZO));
@@ -1586,7 +1586,7 @@ bool qtaart_handler( TMask_field& f, KEY key )
upd_colli_peso_tara(row_mask, anamag);
}
- }
+ } //if(key==K_TAB
else
if (key == K_ENTER && f.dirty())
{
@@ -1600,7 +1600,6 @@ bool qtaart_handler( TMask_field& f, KEY key )
TToken_string& row = sf.row(sf.selected());
const TString codart = row.get(sf.cid2index(FR_CODARTMAG));
-
if (codart.not_empty())
{
TString16 codmag = row.get(sf.cid2index(FR_CODMAG));
@@ -1621,16 +1620,7 @@ bool qtaart_handler( TMask_field& f, KEY key )
real qta(row.get(sf.cid2index(FR_QTA)));
const TString16 caus(mask.get(F_CAUSMAG));
TCausale_magazzino c(caus);
- const long nmovmag = doc.get_long(DOC_MOVMAG);
-
- const TString& codart = row_mask.get(FR_CODARTMAG);
-
- if (codart.not_empty())
- {
- const TRectype& anamag = cache().get(LF_ANAMAG, codart);
- if (!anamag.empty())
- upd_colli_peso_tara(row_mask, anamag);
- }
+ const long nmovmag = doc.get_long(DOC_MOVMAG);
if (nmovmag != 0)
{
@@ -1816,7 +1806,7 @@ bool sppr_handler( TMask_field& f, KEY key )
}
if (!perc_fl)
{
- const TMask& mask = row_mask.get_sheet()->mask();
+ const TDocumento_mask& mask = (const TDocumento_mask&)row_mask.get_sheet()->mask();
const real cambio = mask.get_real(F_CAMBIO);
real prezzo = sp.prezzo();
const TString& doc_valuta = mask.get(F_CODVAL);