From 9d33ec53285e07c6ab7289d6697a9cc6c26405fb Mon Sep 17 00:00:00 2001 From: Simoe Date: Thu, 22 Dec 2022 13:12:58 +0100 Subject: [PATCH] Messaggio interno: patch con log errore esteso pt2 --- src/cg/cg2102.cpp | 8 +++++--- src/fp/fplib01.cpp | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/cg/cg2102.cpp b/src/cg/cg2102.cpp index d61439f8b..cabf76af3 100755 --- a/src/cg/cg2102.cpp +++ b/src/cg/cg2102.cpp @@ -2645,6 +2645,7 @@ bool TPrimanota_application::numdoc_handler(TMask_field& f, KEY key) { TMask& m = f.mask(); const int annodoc = m.get_date(F_DATADOC).year(); + const TString8 cod_reg = m.get(F_CODREG); const long fornitore = m.get_long(F_CODCLIFOR); if (annodoc > 0 && fornitore > 0) @@ -2656,8 +2657,8 @@ bool TPrimanota_application::numdoc_handler(TMask_field& f, KEY key) TString filter; filter << '(' << MOV_NUMDOC << "=\"" << f.get() << "\")&&(" << MOV_REG << "!=\"\")"; - if (m.edit_mode()) - filter << "&&(" << MOV_NUMREG << "!=\"" << m.get(F_NUMREG) << "\")"; + if (m.edit_mode()) + filter << "&&(" << MOV_NUMREG << "!=\"" << m.get(F_NUMREG) << "\")"; TRelation rel(LF_MOV); TRectype& rec = rel.curr(); @@ -2678,8 +2679,9 @@ bool TPrimanota_application::numdoc_handler(TMask_field& f, KEY key) for (cur = 0; cur.pos() < items; ++cur) { const int ad = rec.get_date(MOV_DATADOC).year(); + const TString8 cr = rec.get(MOV_REG); - if (ad == annodoc) + if (ad == annodoc && cod_reg == cr) return yesno_box("Il documento %d / %s è già stato inserito con la registrazione %ld\nSi desidera continuare ugualmente?", annodoc, (const char*)f.get(), rec.get_long(MOV_NUMREG)); } diff --git a/src/fp/fplib01.cpp b/src/fp/fplib01.cpp index eddcd535f..e208f740b 100644 --- a/src/fp/fplib01.cpp +++ b/src/fp/fplib01.cpp @@ -1861,7 +1861,7 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc) paf0200f.set("P2_CONTATTIMAIL", mail); TDate data_iscriz_albo = get_firm().get_date(NDT_DATAISCRAA); - if(!data_iscriz_albo.empty()) + if(data_iscriz_albo.ok()) paf0200f.set("P2_DTISCRIZEALBO", data_iscriz_albo); TString rifamm = cco(doc).get("S4");