From a8d4d9d9527cf10c10d471682d295b831aa44eb0 Mon Sep 17 00:00:00 2001 From: angelo Date: Wed, 2 Apr 1997 11:02:16 +0000 Subject: [PATCH] Correzione MI4354, relativo alla stampa localita' Cli/Fo git-svn-id: svn://10.65.10.50/trunk@4249 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg4400.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cg/cg4400.cpp b/cg/cg4400.cpp index 1c8a78419..efc923747 100755 --- a/cg/cg4400.cpp +++ b/cg/cg4400.cpp @@ -2141,7 +2141,10 @@ bool CG4400_application::preprocess_page(int file, int counter) ragsoc = descrcau; else { - if (ocfpi.trim().empty()) + ocfpi.trim(); + comune = ""; + prov = ""; + if (ocfpi.empty()) { TRectype dep = ricerca_cf(tipocf, codcf); ragsoc = dep.get (CLI_RAGSOC); @@ -2149,6 +2152,7 @@ bool CG4400_application::preprocess_page(int file, int counter) civcf = dep.get (CLI_CIVCF); capcf = dep.get (CLI_CAPCF); comcf = dep.get (CLI_COMCF); + comune = dep.get (CLI_LOCCF); char tipoa = dep.get_char(CLI_TIPOAPER); if (tipoa == 'F') { @@ -2170,8 +2174,11 @@ bool CG4400_application::preprocess_page(int file, int counter) comcf = dep.get (OCC_COM); } TRectype com = look_comuni(comcf); - comune = com.get(COM_DENCOM); - prov = com.get(COM_PROVCOM); + if (!com.empty()) + { + comune = com.get(COM_DENCOM); + prov = com.get(COM_PROVCOM); + } } _tipodoc = mov.get(MOV_TIPODOC);