diff --git a/lv/lv2500.cpp b/lv/lv2500.cpp index 4dc7ba129..d87825664 100755 --- a/lv/lv2500.cpp +++ b/lv/lv2500.cpp @@ -687,7 +687,8 @@ void TFatturazione_lavanderie::post_process(TLista_documenti& doc_out, TLista_do const TString80 codart = riga.get(RDOC_CODART); const TRectype & rcont = contr.row(codart); const char tipvalconvcli = rcont.get_char(LVRCONDV_VCARTCLI); - if (tipvalconvcli == 'C') + char lavtype = riga.get_char("LVTYPE"); + if (tipvalconvcli == 'C' && lavtype != 'D') { if (arts.objptr(codart) == NULL) { @@ -737,7 +738,7 @@ void TFatturazione_lavanderie::post_process(TLista_documenti& doc_out, TLista_do const TRectype& rcont = contr.row(codart); const char tipvalconvcli = rcont.get_char(LVRCONDV_VCARTCLI); char lavtype = delrow.get_char("LVTYPE"); - if (tipvalconvcli == 'C' && (lavtype == '\0' || lavtype == 'C')) + if (tipvalconvcli == 'C' && lavtype != 'D') doc.destroy_row(k, true); } } diff --git a/lv/lv2900.cpp b/lv/lv2900.cpp index 3ed4c6d80..297432bec 100755 --- a/lv/lv2900.cpp +++ b/lv/lv2900.cpp @@ -888,14 +888,14 @@ TConta_pulito_msk::TConta_pulito_msk():TAutomask("lv2900a") _auto = _auto.right(1); TString16 tmp = main_app().argv(3); + + _codcf = 0L; if (tmp.left(2) == "-C") { _percli = true; if (tmp.len() > 2) _codcf = atoi(tmp.sub(2)); - else - _codcf = 0; _permag = false; }