From 939216119712fa8cb89fce1a1e360ef074864e9d Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 24 Sep 2003 10:27:20 +0000
Subject: [PATCH] Patch level : 2003 580 Files correlati : ve2.exe
ve2400.msk Ricompilazione Demo : [ ] Commento :
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
GF20085
STESSO ERRORE già risolto rif. GF20027
Nello spreadsheet delle giacenze disabilitare la voce depositi
se il magazzino specificato sulla riga non ne prevede la gestione.
git-svn-id: svn://10.65.10.50/trunk@11435 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
ve/ve2400.cpp | 11 +++++++----
ve/ve2400d.h | 1 +
ve/ve2400d.uml | 16 ++++++++++++----
3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/ve/ve2400.cpp b/ve/ve2400.cpp
index 2662ce831..c15ba2c98 100755
--- a/ve/ve2400.cpp
+++ b/ve/ve2400.cpp
@@ -564,9 +564,12 @@ bool TMask_anamag::handle_anno(TMask_field &fld, KEY k)
mask.set(F_ANNORIF, mask.esercizi_contabili().last()) ;
mask.set(F_ANNO, mask.get(F_ANNORIF));
}
- if (mask.last_annogiac>0 && mask.last_annogiac!=fld.mask().get_int(F_ANNO)) {
- if (fld_giac.dirty() && handle_sheetgiac(fld_giac,K_ENTER)) {
- if (fld.yesno_box("Salvare le righe di giacenza per l'anno %d",mask.last_annogiac )) {
+ if (mask.last_annogiac>0 && mask.last_annogiac!=fld.mask().get_int(F_ANNO))
+ {
+ if (fld_giac.dirty() && handle_sheetgiac(fld_giac,K_ENTER))
+ {
+ if (fld.yesno_box("Salvare le righe di giacenza per l'anno %d",mask.last_annogiac ))
+ {
fld_giac.autosave(*mask._rel);
fld_giac.record()->rewrite();
}
@@ -1504,7 +1507,7 @@ void TAnagrafica_magazzino::load_um(TMask& m)
// *****************************
// LETTURA SHEET UNITA' DI MISURA
TSheet_field &fld_um= m.sfield(F_SHEETUM); // prende lo sheet delle unit� di misura
- get_relation()->lfile().put(ANAMAG_CODART,m.get(F_CODART));
+ get_relation()->curr().put(ANAMAG_CODART,m.get(F_CODART));
fld_um.record()->read(*fld_um.putkey(*get_relation()));
fld_um.autoload(*get_relation());
// else
diff --git a/ve/ve2400d.h b/ve/ve2400d.h
index 1322f17b2..f20e3b2d2 100755
--- a/ve/ve2400d.h
+++ b/ve/ve2400d.h
@@ -40,6 +40,7 @@
#define F_DESMAG 150
#define F_DESDEP 151
#define H_DESMAG 152
+#define H_CODDEP 153
#define F_UBICAZD 154
#define F_DESL1 155
diff --git a/ve/ve2400d.uml b/ve/ve2400d.uml
index 22238b963..4a5bb411c 100755
--- a/ve/ve2400d.uml
+++ b/ve/ve2400d.uml
@@ -27,14 +27,23 @@ BEGIN
FIELD CODMAG[1,3]
USE MAG SELECT CODTAB[4,5]==""
INPUT CODTAB F_CODMAG
- DISPLAY "Codice " CODTAB[1,3]
- DISPLAY "Denominazione mag.@50" S0
+ DISPLAY "Codice" CODTAB[1,3]
+ DISPLAY "Denominazione magazzino@50" S0
OUTPUT F_CODMAG CODTAB[1,3]
OUTPUT F_DESMAG S0
OUTPUT H_DESMAG S0
+ OUTPUT H_CODDEP B0
CHECKTYPE REQUIRED
END
+BOOLEAN H_CODDEP
+BEGIN
+ PROMPT 2 1 "Gestione depositi "
+ MESSAGE FALSE DISABLE,F_CODDEP
+ MESSAGE TRUE ENABLE,F_CODDEP
+ FLAGS "HG"
+END
+
STRING F_CODDEP 2
BEGIN
PROMPT 2 1 "Deposito "
@@ -49,7 +58,6 @@ BEGIN
OUTPUT F_CODDEP CODTAB[4,5]
OUTPUT F_DESDEP S0
CHECKTYPE REQUIRED
-// WARNING "Indicare il deposito"
END
STRING H_DESMAG 50
@@ -63,7 +71,7 @@ BEGIN
PROMPT 22 0 ""
USE MAG KEY 2 SELECT CODTAB[4,5]==""
INPUT S0 F_DESMAG
- DISPLAY "Denominazione mag.@50" S0
+ DISPLAY "Denominazione magazzino@50" S0
DISPLAY "Cod. magazzino" CODTAB[1,3]
DISPLAY "Cod. deposito" CODTAB[4,5]
OUTPUT F_CODMAG CODTAB[1,3]