diff --git a/include/rdoc.h b/include/rdoc.h index 9fd2ab22a..65ed39a90 100755 --- a/include/rdoc.h +++ b/include/rdoc.h @@ -41,7 +41,7 @@ #define RDOC_CODIVA "CODIVA" #define RDOC_ADDIVA "ADDIVA" #define RDOC_ASPBENI "ASPBENI" -#define RDOC_G1 "G1" +#define RDOC_RG1 "RG1" #define RDOC_CAUSMAG "CAUSMAG" #define RDOC_MOVMAG "MOVMAG" #define RDOC_CODMAGC "CODMAGC" diff --git a/include/urldefid.h b/include/urldefid.h index 58f52d213..bad444f14 100755 --- a/include/urldefid.h +++ b/include/urldefid.h @@ -97,6 +97,7 @@ #define BMP_PREVIEW 176 #define BMP_FONT 179 #define BMP_COPY 180 +#define BMP_PASTE 181 //immagini bottoni barre strumenti principali //------------------------------------------- diff --git a/ve/ve0100.cpp b/ve/ve0100.cpp index 497952b78..d90cc0f8f 100755 --- a/ve/ve0100.cpp +++ b/ve/ve0100.cpp @@ -579,7 +579,7 @@ bool TMotore_application::user_create( ) } } - TConfig utente(CONFIG_GUI, "ve"); + TConfig utente(CONFIG_GUI, app().name().left(2)); if (_codnum.blank()) _codnum = utente.get("CODNUM"); if (_tipodoc.blank()) @@ -594,7 +594,7 @@ bool TMotore_application::user_create( ) bool TMotore_application::user_destroy( ) { // Registro l'ultimo tipo documento e l'ultima numerazione - TConfig utente( CONFIG_GUI, "ve" ); + TConfig utente( CONFIG_GUI, app().name().left(2) ); utente.set( "CODNUM", _codnum ); utente.set( "TIPODOC", _tipodoc ); diff --git a/ve/velib03.cpp b/ve/velib03.cpp index 922f4432b..c30934787 100755 --- a/ve/velib03.cpp +++ b/ve/velib03.cpp @@ -706,6 +706,8 @@ void TDocumento::copy_data(TRectype& dst, const TRectype& src) dst.zero(RDOC_MOVMAG); const TString memo = src.get(RDOC_DESCEST); dst.put(RDOC_DESCEST, memo); + const TString g1 = src.get(RDOC_RG1); + dst.put(RDOC_RG1, g1); } else {