From 036bd58ee3617959beb83995289ba486c1a2ad99 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 9 Dec 2009 11:21:50 +0000
Subject: [PATCH] Patch level : 10.0 Files correlati : ef0
Ricompilazione Demo : [ ] Commento : Ritocchi per maggiore
efficienza
git-svn-id: svn://10.65.10.50/trunk@19738 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
cg/cglib03.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cg/cglib03.cpp b/cg/cglib03.cpp
index 64d3893e9..b389b886e 100755
--- a/cg/cglib03.cpp
+++ b/cg/cglib03.cpp
@@ -68,7 +68,7 @@ int analizza_IVA(const real& imptot, const real& ivatot, const real perc_ind,
flag = 1;
imp_det = imptot;
iva_det = ivatot;
- if (iva_det.is_zero() && corrispettivo)
+ if (corrispettivo && iva_det.is_zero())
{
const TCodiceIVA iva(codiva);
iva_det = iva.scorpora(imp_det);
@@ -95,7 +95,7 @@ int analizza_IVA(const real& imptot, const real& ivatot, const real perc_ind,
iva_ind = iva.imposta(imp_ind, decimali);
iva_det = ivatot - iva_ind;
}
- if (!iva_ind.is_zero() && iva_ind_al_costo)
+ if (iva_ind_al_costo && !iva_ind.is_zero())
{
imp_ind += iva_ind;
iva_ind = ZERO;
@@ -136,7 +136,7 @@ TInteressi_IVA_table::~TInteressi_IVA_table()
int TInteressi_IVA_table::read(int anno, int mese)
{
TString8 k; k.format("%04d%02d",anno,mese);
- zero();put("CODTAB",k);
+ zero(); put("CODTAB",k);
if (TTable::read(_isgteq) == NOERR)
{
const TString& cod = TTable::get("CODTAB");