From 620cfe4a74727443d1e14ee9426d48610e43d044 Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 8 Mar 2010 15:57:09 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2010.?= =?UTF-8?q?0=20Files=20correlati=20=20=20=20=20:=20ve0.exe=20Ricompilazion?= =?UTF-8?q?e=20Demo=20:=20[=20]=20Commento=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20:=200001573:=20F8=20su=20campo=20descrizione=20che=20apre?= =?UTF-8?q?=20la=20videata=20di=20zoom=20Con=20F8=20sul=20campo=20descrizi?= =?UTF-8?q?one=20di=20una=20riga=20di=20un=20documento=20si=20apre=20la=20?= =?UTF-8?q?videata=20di=20"zoom"=20lasciano=20per=C3=B2=20uno=20spazio=20c?= =?UTF-8?q?ome=20primo=20carattere=20(questo=20errore=20era=20stato=20gi?= =?UTF-8?q?=C3=A0=20sistemato=20con=20patches=20precedenti=20e=20si=20?= =?UTF-8?q?=C3=A8=20ripresentato=20con=20le=20ultime)=20-=20segnalazione?= =?UTF-8?q?=20del=20cliente=20Presscolor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.65.10.50/trunk@20208 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ve/velib02.cpp | 26 +++++++++----------------- ve/velib06.cpp | 9 ++------- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/ve/velib02.cpp b/ve/velib02.cpp index 4de2e9db6..454c1ad05 100755 --- a/ve/velib02.cpp +++ b/ve/velib02.cpp @@ -1334,16 +1334,14 @@ void TRiga_documento::autoload(TSheet_field & f) for (short id = FR_JOLLY1; id <= FR_JOLLY10; id++) { const int pos = m.id2pos(id); - if (pos > 0) { const TFieldref* fld = m.fld(pos).field(); if (fld != NULL) { - const int idx = f.cid2index(id); - - row.add(fld->read(*this), idx); + const int idx = f.cid2index(id); + row.add(fld->read(*this), idx); } } } @@ -1351,30 +1349,25 @@ void TRiga_documento::autoload(TSheet_field & f) for (short id = FR_SCAACC; id <= FR_PUNVET; id++) { const int pos = m.id2pos(id); - if (pos > 0) { const TFieldref* fld = m.fld(pos).field(); - if (fld != NULL) { const int idx = f.cid2index(id); - row.add(fld->read(*this), idx); } } } + + row.pack(); } -TArticolo & TRiga_documento::articolo() const -{ - return cached_article(get(RDOC_CODARTMAG)); -} +TArticolo& TRiga_documento::articolo() const +{ return cached_article(get(RDOC_CODARTMAG)); } -TArticolo_giacenza & TRiga_documento::articolo_giacenza() const -{ - return cached_article_balances(get(RDOC_CODARTMAG)); -} +TArticolo_giacenza& TRiga_documento::articolo_giacenza() const +{ return cached_article_balances(get(RDOC_CODARTMAG)); } const TToken_string & TRiga_documento::get_original_rdoc_key() const { @@ -1389,8 +1382,7 @@ const TToken_string & TRiga_documento::get_original_rdoc_key() const const TToken_string & TRiga_documento::get_rdoc_key() const { - TToken_string & key = get_tmp_string(32); - + TToken_string& key = get_tmp_string(32); key.add(get(RDOC_CODNUM)); key.add(get(RDOC_ANNO)); key.add(get(RDOC_PROVV)); diff --git a/ve/velib06.cpp b/ve/velib06.cpp index 0fbd446bd..62eb51966 100755 --- a/ve/velib06.cpp +++ b/ve/velib06.cpp @@ -1635,7 +1635,7 @@ bool TDocumento_mask::ss_notify( TSheet_field& ss, int r, KEY key ) } } if (s.full()) - riga.put("CODMAG", s); + riga.put(RDOC_CODMAG, s); riga.autoload(ss); ss.check_row(r); @@ -1664,13 +1664,8 @@ bool TDocumento_mask::ss_notify( TSheet_field& ss, int r, KEY key ) break; case K_CTRL + K_TAB: // uscita dalla riga { + static const bool checkgiac = ini_get_bool(CONFIG_DITTA, "ve", "LIVPERART"); bool ok = true; - static int checkgiac = 3; - if (checkgiac > 2) - { - TConfig c(CONFIG_DITTA); - checkgiac = c.get_bool("LIVPERART", "ve"); - } if (checkgiac) { TString livello;