From 96074eca0fd5cd5208cf9e40687013cadf0c5fe5 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 14 Dec 2006 16:45:14 +0000
Subject: [PATCH] Patch level :4.0 567 Files correlati :
Ricompilazione Demo : [ ] Commento :corretti errori di riporto
git-svn-id: svn://10.65.10.50/trunk@14637 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
cg/cg2102.cpp | 12 ++++++------
cg/cg2103.cpp | 4 ++--
cg/cg2103.h | 2 +-
cg/cg2107.cpp | 2 +-
cg/cg3200.h | 1 +
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/cg/cg2102.cpp b/cg/cg2102.cpp
index 46b8baf97..1b5039b17 100755
--- a/cg/cg2102.cpp
+++ b/cg/cg2102.cpp
@@ -1478,7 +1478,7 @@ bool TPrimanota_application::iva_notify(TSheet_field& iva, int r, KEY k)
if (oldpos[d] < 0)
{
const TString desc(cau.desc_agg(2));
- oldpos[d] = a.set_cgs_row(-1, a.real2imp(ZERO, 'I'), oldconto, desc, 'I', oldconto.commessa(), oldconto.fase());
+ oldpos[d] = a.set_cgs_row(-1, a.real2imp(ZERO, 'I'), oldconto, desc, 'I');
}
}
else
@@ -1544,7 +1544,7 @@ bool TPrimanota_application::iva_notify(TSheet_field& iva, int r, KEY k)
{ // crea una nuova riga contabile
if (saved_descr.blank())
saved_descr = cau.desc_agg(2);
- newpos = a.set_cgs_row(-1, newimp, conto, saved_descr, 'I', conto.commessa(), conto.fase());
+ newpos = a.set_cgs_row(-1, newimp, conto, saved_descr, 'I');
}
}
else
@@ -1960,7 +1960,7 @@ bool TPrimanota_application::caus_modify_handler(TMask_field& f, KEY key)
return false;
- const TMask& m = f.mask();
+ TMask& m = f.mask();
const int ann = m.get_int(F_ANNOIVA);
const TString& cau = f.get();
@@ -1969,7 +1969,7 @@ bool TPrimanota_application::caus_modify_handler(TMask_field& f, KEY key)
if (!c.ok())
return false;
- const TCausale& k = app().causale();
+ const TCausale& k = app().causale();
const TString& msg = c.compatible(k);
if (msg.not_empty()) // La causale non e' compatibile
{
@@ -1981,9 +1981,9 @@ bool TPrimanota_application::caus_modify_handler(TMask_field& f, KEY key)
TString4 provv;
provv << c.provvisorio();
- f.mask().set(F_PROVVISORIO, provv);
+ m.set(F_PROVVISORIO, provv);
if (c.iva() != nessuna_iva)
- f.mask().set(F_SOLAIVA, c.soloiva() ? "X" : " ");
+ m.set(F_SOLAIVA, c.soloiva() ? "X" : " ");
return true;
}
}
diff --git a/cg/cg2103.cpp b/cg/cg2103.cpp
index ff5e048cf..67ff41df8 100755
--- a/cg/cg2103.cpp
+++ b/cg/cg2103.cpp
@@ -14,11 +14,11 @@
TCausale::TCausale(const char* cod, int year)
: TArray(12), _rec(LF_CAUSALI),
_iva(iva_errata), _corrisp(false),
- _sezione_clifo(' '), _sezione_ritsoc(' '), _sezione_ritfis(' ')
+ _sezione_clifo(' '), _sezione_ritsoc(' '), _sezione_ritfis(' '),
_provvisorio(' ')
{
- if (*cod)
+ if (cod && *cod)
read(cod, year);
}
diff --git a/cg/cg2103.h b/cg/cg2103.h
index 88163efce..2609e0f20 100755
--- a/cg/cg2103.h
+++ b/cg/cg2103.h
@@ -13,7 +13,7 @@ class TCausale : public TArray
TipoIVA _iva;
bool _corrisp;
- char _sezione_clifo, _sezione_ritsoc, _provvisorio;
+ char _sezione_clifo, _sezione_ritsoc, _sezione_ritfis, _provvisorio;
protected:
const TRectype* row(int num) const { return (const TRectype*)objptr(num); }
diff --git a/cg/cg2107.cpp b/cg/cg2107.cpp
index e2ea3e23f..a5562e2ec 100755
--- a/cg/cg2107.cpp
+++ b/cg/cg2107.cpp
@@ -325,7 +325,7 @@ bool TSolder_tree::get_description(TString& desc) const
if (level == 0) // Il prossimo clifo non esiste mai per progetto
{
desc = _cache.bill().descrizione();
- desc.strip_d_spaces();
+ desc.strip_double_spaces();
return true;
}
diff --git a/cg/cg3200.h b/cg/cg3200.h
index 16fa2ed83..8e9c9d32e 100755
--- a/cg/cg3200.h
+++ b/cg/cg3200.h
@@ -36,6 +36,7 @@
#define F_STAMPATOTIVA 114
#define F_SELEZ_STAMPA 115
#define F_STAMPAMOVPROV 116
+#define F_NOT_STAMPA_CONT 117
#define F_SEPARATOR 150
#define F_SORTDESC 151