root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0 patch ???

Browse Source 
Files correlati     : lv2 lv3
Ricompilazione Demo : [ ]
Commento            :
modificato il controllo per riportare su tutti i tipi documento la descrizione estesa degli articoli, ove questa è prevista


git-svn-id: svn://10.65.10.50/branches/R_10_00@20857 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca83 2010-09-14 10:47:54 +00:00
parent 5462140c04
commit 68c7955e27
5 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lv/lv2400.cpp
View File

@ -391,7 +391,8 @@ void TGenera_documenti_app::crea_riga(TToken_string& chiave, const char modpas,
const TRectype& anamag = cache().get(LF_ANAMAG,codart);
//recupero i dati di interesse dall'anagrafica di magazzino, ma devo evitare divisioni per 0
const real ppconf = anamag.get_real(ANAMAG_PPCONF) != 0 ? anamag.get_real(ANAMAG_PPCONF) : 1;
const TString80 descrart = anamag.get(ANAMAG_DESCR);
TString descrart;
descrart << anamag.get(ANAMAG_DESCR) << anamag.get(ANAMAG_DESCRAGG);
//recupero i valori delle dotazione temporanea dal magazzino del cliente
TLocalisamfile magcli(LF_CLIFOGIAC);

13
lv/lv2600.cpp
View File

@ -908,11 +908,20 @@ void TAcquisizione_lavanderie_app::genera_documenti(TLog_report& rep, TAssoc_arr
}
else
{
const TRectype& anamag = cache().get(LF_ANAMAG, codart);
const TRectype& anamag = cache().get(LF_ANAMAG, codart);
TString descrart;
descrart << anamag.get(ANAMAG_DESCR) << anamag.get(ANAMAG_DESCRAGG);
TRiga_documento& rdoc = doc.new_row("22");
rdoc.put(RDOC_CODART, codart);
rdoc.put(RDOC_DESCR, anamag.get(ANAMAG_DESCR));
if (descrart.len() > 50)
{
rdoc.put(RDOC_DESCR, descrart.left(50));
rdoc.put(RDOC_DESCLUNGA, true);
rdoc.put(RDOC_DESCEST, descrart.sub(50));
}
else
rdoc.put(RDOC_DESCR, descrart);
rdoc.put(RDOC_CODARTMAG, codart);
rdoc.put(RDOC_CHECKED, 'X');
rdoc.put(RDOC_CODAGG1, causale);

3
lv/lv2900.cpp
View File

@ -600,7 +600,8 @@ bool TConta_pulito_msk::genera_documenti(const TFilename& file, TAssoc_array& do
//instanzio una cache sulla tabella del magazzino
const TRectype& anamag = cache().get(LF_ANAMAG,codart);
//recupero i dati di interesse dall'anagrafica di magazzino
const TString80 descr = anamag.get(ANAMAG_DESCR);
TString descr;
descr << anamag.get(ANAMAG_DESCR) << anamag.get(ANAMAG_DESCRAGG);
//recupero i valori delle dotazione temporanea dal magazzino del cliente
TLocalisamfile magcli(LF_CLIFOGIAC);

12
lv/lv3100.cpp
View File

@ -453,11 +453,21 @@ bool TGestione_bolle_msk::lv_bolla_handler(TMask_field& f, KEY k)
key.add(codart);
key.add(1);
const TRectype& umart = cache().get(LF_UMART, key);
TString descrart;
descrart << anamag.get(ANAMAG_DESCR) << anamag.get(ANAMAG_DESCRAGG);
rdoc.put(RDOC_CODART,codart);
rdoc.put(RDOC_CODARTMAG,codart);
rdoc.put(RDOC_CHECKED,'X');
rdoc.put(RDOC_DESCR, anamag.get(ANAMAG_DESCR));
if (descrart.len() > 50)
{
rdoc.put(RDOC_DESCR, descrart.left(50));
rdoc.put(RDOC_DESCLUNGA, true);
rdoc.put(RDOC_DESCEST, descrart.sub(50));
}
else
rdoc.put(RDOC_DESCR, descrart);
rdoc.put(RDOC_UMQTA, umart.get(UMART_UM));
rdoc.put(RDOC_CODAGG1,causale);
rdoc.put(RDOC_CODIVA,anamag.get(ANAMAG_CODIVA));

11
lv/lv3300.cpp
View File

@ -447,11 +447,20 @@ bool TGestione_buoni_msk::set_righe_buono_handler(TMask_field& f, KEY k)
key.add(codart);
key.add(1);
const TRectype& umart = cache().get(LF_UMART, key);
TString descr;
descr << anamag.get(ANAMAG_DESCR) << anamag.get(ANAMAG_DESCRAGG);
rdoc.put(RDOC_CODART,codart);
rdoc.put(RDOC_CODARTMAG,codart);
rdoc.put(RDOC_CHECKED,'X');
rdoc.put(RDOC_DESCR, anamag.get(ANAMAG_DESCR));
if(descr.len() <= 50)
rdoc.put(RDOC_DESCR, descr);
else
{
rdoc.put(RDOC_DESCR, descr.left(50));
rdoc.put(RDOC_DESCEST, descr.sub(50));
rdoc.put(RDOC_DESCLUNGA, true);
}
rdoc.put(RDOC_UMQTA, umart.get(UMART_UM));
rdoc.put(RDOC_CODAGG1,causale);
rdoc.put(RDOC_CODIVA,anamag.get(ANAMAG_CODIVA));