From 4cede5839b4d665ba0bdc816832bb52e92d55672 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 14 May 2014 08:26:49 +0000
Subject: [PATCH] git-svn-id: svn://10.65.10.50/branches/R_10_00@22937
c028cbd2-c16b-5b4b-a496-9718f37d4682
---
lv/lv0400.cpp | 9 ++++++++-
lv/lv2900.cpp | 2 +-
lv/lv3800.cpp | 10 +++++-----
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/lv/lv0400.cpp b/lv/lv0400.cpp
index 8ef619f69..e94c51a7d 100755
--- a/lv/lv0400.cpp
+++ b/lv/lv0400.cpp
@@ -1316,13 +1316,20 @@ bool TContratti_app::remove()
void TContratti_app::init_query_mode(TMask& m)
{
//abilita il campo F_RAGSOC se il campo F_CODCF � abilitato
- m.field(F_RAGSOC).enable(m.field(F_CODCF).enabled());
+ const bool yes = m.efield(F_CODCF).enabled();
+ m.field(F_RAGSOC).enable(yes);
+ m.field(F_RICALT).enable(yes);
m.reset();
}
//INIT_MODIFY_MODE: ridefinizione del metodo init_modify_mode() standard
void TContratti_app::init_modify_mode(TMask& m)
{
+ //disabilita il campo F_RAGSOC se il campo F_CODCF � disabilitato
+ const bool yes = m.efield(F_CODCF).enabled();
+ m.field(F_RAGSOC).enable(yes);
+ m.field(F_RICALT).enable(yes);
+
//setto alcune variabili di interesse
const TDate oggi(TODAY);
const int year = oggi.year();
diff --git a/lv/lv2900.cpp b/lv/lv2900.cpp
index a93a4885e..8b008e88e 100755
--- a/lv/lv2900.cpp
+++ b/lv/lv2900.cpp
@@ -942,7 +942,7 @@ TConta_pulito_msk::TConta_pulito_msk():TAutomask("lv2900a")
TConfig configlv(CONFIG_DITTA, "lv");
const TString& path = configlv.get("PathPulito");
- TFilename& file = (TFilename)configlv.get("FilePulito");
+ TFilename file = configlv.get("FilePulito");
//se ho pi� di un parametro, allora lo sto lanciando da linea di comando, e ne devo tenere conto
if (main_app().argc() > 2)
diff --git a/lv/lv3800.cpp b/lv/lv3800.cpp
index b4ebd8c2c..9d1c02e11 100755
--- a/lv/lv3800.cpp
+++ b/lv/lv3800.cpp
@@ -110,7 +110,7 @@ void TInvia_articoli_skema::aggiungi_riga(const TString& codart)
if (ump != _umkg)
{
peso = anamag.convert_to_um(peso, _umkg, ump, false); // Converto in Kg
- peso.round(3); // Arrotondo al grammo
+ peso.round(3); // Arrotondo al grammo
}
}
else
@@ -221,9 +221,9 @@ Codice Articolo Alfanumerico 21-40
*/
- create_field("CODCF", -1, 20, _alfafld, true); //codice cliente
- create_field("CODART", -1, 20, _alfafld, true); //codice cliente
- create_field("ACAPO", -1, 2, _alfafld, true, TVariant("\r\n")); //caratteri di a capo
+ create_field("CODCF", -1, 20, _alfafld, true); //codice cliente
+ create_field("CODART", -1, 20, _alfafld, true); //codice cliente
+ create_field("ACAPO", -1, 2, _alfafld, true, TVariant("\r\n")); //caratteri di a capo
}
@@ -344,6 +344,6 @@ void TInvcon_skema_app::main_loop()
int lv3800(int argc, char *argv[])
{
TInvcon_skema_app a;
- a.run (argc, argv, TR("Invio a contapezzi"));
+ a.run (argc, argv, TR("Invio a contapezzi Skema"));
return TRUE;
}