Merge branch 'R_10_00' of http://10.65.20.33/sirio/CAMPO/campo into R_10_00

This commit is contained in:
Sirio Builder 2019-10-08 15:00:32 +02:00
commit 7b75595406

View File

@ -599,25 +599,25 @@ void TFatturazione_lavanderie::post_process(TLista_documenti& doc_out, TLista_do
doc.put(DOC_NOTE, descr);
doc.destroy_row(1, true);
}
if (!pack_rif() && doc.physical_rows() > 0 && doc[1].is_descrizione())
{
TRiga_documento& rout = doc[1];
TString descr = rout.get(RDOC_DESCR);
if (!pack_rif() && doc.physical_rows() > 0 && doc[1].is_descrizione())
{
TRiga_documento& rout = doc[1];
TString descr = rout.get(RDOC_DESCR);
descr << ' ' << rout.get(RDOC_DESCEST);
descr << ' ' << rout.get(RDOC_DESCEST);
const int l = descr.find("n. ");
int pos = descr.find("n. ", l + 1);
while (pos > 0)
{
descr.overwrite(" n. ", pos - l - 1, l + 4);
pos = descr.find("n. ", pos + 1);
}
descr.strip_double_spaces();
rout.put(RDOC_DESCR, descr.left(50));
rout.put(RDOC_DESCLUNGA, descr.len() > 50);
rout.put(RDOC_DESCEST, descr.mid(51));
}
const int l = descr.find("n. ");
int pos = descr.find("n. ", l + 1);
while (pos > 0)
{
descr.overwrite(" n. ", pos - l - 1, l + 4);
pos = descr.find("n. ", pos + 1);
}
descr.strip_double_spaces();
rout.put(RDOC_DESCR, descr.left(50));
rout.put(RDOC_DESCLUNGA, descr.len() > 50);
rout.put(RDOC_DESCEST, descr.mid(51));
}
aggiorna_fattura(doc, contr.get_int(LVCONDV_CODCONT));
if (doc.physical_rows() > 0)
doc.sort_rows(RDOC_CODART "|LVTYPE");