From 6c28b4a0ab632b58d09359e1755079af2bd68bf5 Mon Sep 17 00:00:00 2001
From: guy
Date: Fri, 13 Dec 2013 09:24:56 +0000
Subject: [PATCH] Collegamento cg <-> fe
git-svn-id: svn://10.65.10.50/branches/R_10_00@22901 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
cg/cg0100.cpp | 2 +-
cg/cg0100a.uml | 6 +-
cg/cg0200a.uml | 3 +-
cg/cg2100.cpp | 32 +-
cg/cg2100.h | 5 +-
cg/cg2100c.uml | 66 +-
cg/cg2101.cpp | 2 +-
cg/cg3600.cpp | 21 +-
cg/cg4301.cpp | 8341 ++++++++++++++++++++++++-----------------------
cg/cg4400.cpp | 2 +-
cg/cglib03.cpp | 1 -
cg/cgmenu.men | 8 +-
cg/cgsaldac.cpp | 21 +-
cg/f22.dir | 2 +-
cg/f22.trr | 25 +-
cg/f23.dir | 6 +-
cg/f23.trr | 9 +-
17 files changed, 4262 insertions(+), 4290 deletions(-)
diff --git a/cg/cg0100.cpp b/cg/cg0100.cpp
index d172c1917..e790ad5bf 100755
--- a/cg/cg0100.cpp
+++ b/cg/cg0100.cpp
@@ -203,7 +203,7 @@ void TPianoconti_app::init_insert_mode(TMask& m)
m.show(FLD_CM1_IVACOMP, indbil == RICAVI);
m.show(FLD_CM1_DESCIVACOMP, indbil == RICAVI);
}
- m.show(FLD_CM1_RICSER, indbil == PASSIVITA || indbil == RICAVI);
+ // m.show(FLD_CM1_RICSER, indbil == PASSIVITA || indbil == RICAVI); // Sempre visibile per spesometro dal 9-10-2013
if (conto != 0)
{
m.enable(FLD_CM1_SEZIVD, ivd_enable);
diff --git a/cg/cg0100a.uml b/cg/cg0100a.uml
index f590a5e28..34105cd3b 100755
--- a/cg/cg0100a.uml
+++ b/cg/cg0100a.uml
@@ -420,11 +420,11 @@ END
LIST FLD_CM1_RICSER 1 18
BEGIN
- PROMPT 1 12 "Ricavi per servizi "
+ PROMPT 1 12 "Merce / Servizi "
FIELD RICSER
- FLAGS "H"
- ITEM "0|Altre attivita'"
+ ITEM "0|"
ITEM "1|Servizi"
+ ITEM "2|Merce"
END
STRING FLD_CM1_IVACOMP 4
diff --git a/cg/cg0200a.uml b/cg/cg0200a.uml
index 1e70c89e1..cdff54b89 100755
--- a/cg/cg0200a.uml
+++ b/cg/cg0200a.uml
@@ -288,7 +288,7 @@ BEGIN
CHECKTYPE NORMAL
END
-NUMBER F_ALLEG 1
+STRING F_ALLEG 1
BEGIN
PROMPT 2 14 "Tipo cliente/fornitore "
FIELD ALLEG
@@ -305,6 +305,7 @@ BEGIN
ITEM "7|Ente pubblico"
ITEM "8|Fallimento/proc.concorsuale"
ITEM "9|Estero NON CEE"
+ ITEM "C|Scheda carburante"
OUTPUT F_ALLEG
END
diff --git a/cg/cg2100.cpp b/cg/cg2100.cpp
index c50f732e8..ead5d6985 100755
--- a/cg/cg2100.cpp
+++ b/cg/cg2100.cpp
@@ -585,14 +585,14 @@ void TPrimanota_application::init_mask(TMask& m)
m.show(-2, forg);
}
- m.hide(-7); // Nascondi tutti i campi del modulo FE (compreso FE_MODPAG)
+ m.hide(-7); // Nascondi tutti i campi del modulo FE
if (corrisp)
m.hide(F_STATOPAIV);
else
{
if (has_module(FEAUT))
- m.show(FE_MODPAG); // Mostro FE_MODPAG solo se strettamente necessario
+ m.show(FE_NOLEGGIO); // Mostro FE_MODPAG solo se strettamente necessario
}
// Show/Hide campi valuta: F_VALUTAINTRA, F_CAMBIOINTRA, F_CORRISPETTIVO, F_CORRVAL (GROUP 4)
@@ -716,8 +716,8 @@ bool TPrimanota_application::can_I_write(const TRelation* rel) const
<< "La preghiamo di contattare Sirio informatica e sistemi ai seguenti riferimenti:
"
<< ""
+ << "Casella vocale Hotline Campo:
"
+ << "hotlinecampo@sirio-is.it Tel. 0236583540"
<< "