From 9f536d34a9d48d1f78cbca5fe922fc0c4ec32bae Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 25 Jun 2009 09:10:49 +0000 Subject: [PATCH] Patch level : 10.0 332 Files correlati : pe0.exe Ricompilazione Demo : [ ] Commento Preventivazione gestione k git-svn-id: svn://10.65.10.50/trunk@19077 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- pe/pe0400.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pe/pe0400.cpp b/pe/pe0400.cpp index 09a77a705..de9ca65dc 100755 --- a/pe/pe0400.cpp +++ b/pe/pe0400.cpp @@ -994,8 +994,9 @@ int TGestione_preventivo_app::write( const TMask& m ) { TRiga_documento & row = (TRiga_documento &)doc[i]; const int level = row.get_int(RDOC_LEVEL); + const TString & row_k = row.get(RDOC_K); - if (i == rows || level >= doc[i + 1].get_int(RDOC_LEVEL)) + if ((row_k.blank()) && (i == rows || level >= doc[i + 1].get_int(RDOC_LEVEL))) row.put(RDOC_K, k); } mask.update_costi_ricavi(); @@ -1014,8 +1015,9 @@ int TGestione_preventivo_app::rewrite( const TMask& m ) { TRiga_documento & row = (TRiga_documento &)doc[i]; const int level = row.get_int(RDOC_LEVEL); + const TString & row_k = row.get(RDOC_K); - if (i == rows || level >= doc[i + 1].get_int(RDOC_LEVEL)) + if ((row_k.blank()) && (i == rows || level >= doc[i + 1].get_int(RDOC_LEVEL))) row.put(RDOC_K, k); } mask.update_costi_ricavi();