From 7697e5bb52590b9010242ca1e439a8b5c2c65669 Mon Sep 17 00:00:00 2001 From: smen Date: Mon, 9 May 2022 11:30:24 +0200 Subject: [PATCH] Patch level : 12.0 nopatch Files correlati : fp0700 Commento: Corretto bug nella griglia di visualizzaziobne dei documenti da inviare che scriveva il codice destinatario del cliente e non quello della ditta incluso vector in fp0400.cpp --- src/fp/fp0400.cpp | 1 + src/fp/fp0700.cpp | 11 ++++++++--- src/fp/fp0700a.h | 9 ++++++--- src/fp/fp0700a.uml | 26 ++++++++++++-------------- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/src/fp/fp0400.cpp b/src/fp/fp0400.cpp index f418a2f2a..7445fe42e 100644 --- a/src/fp/fp0400.cpp +++ b/src/fp/fp0400.cpp @@ -11,6 +11,7 @@ #include "mov.h" #include "comuni.h" #include "urldefid.h" +#include #define FILTER_NOASS "" #define FILTER_ASS "E" diff --git a/src/fp/fp0700.cpp b/src/fp/fp0700.cpp index edfb2f488..b1d584615 100644 --- a/src/fp/fp0700.cpp +++ b/src/fp/fp0700.cpp @@ -151,6 +151,8 @@ void TPAR_mask::fill() enable(DLG_SAVEREC, (is_f8() && (filter_selected == "X") || filter_selected == "D")); enable(DLG_ALL, true); + //TAnagrafica ditta = + /* VECCHIA QUERY @@ -189,6 +191,9 @@ void TPAR_mask::fill() regs.enable_column(cid2index(S_RIFAMM), false); regs.reset(); + TAnagrafica ditta; + ditta.init(LF_NDITTE, prefix().get_codditta()); + for (bool okc = rec.move_first(); okc; okc = rec.move_next()) { if (!pi.add_status()) @@ -222,11 +227,12 @@ void TPAR_mask::fill() regs.set_row_cell(S_DATADOC, rec.get_date(MOV_DATADOC), r); regs.set_row_cell(S_CLIENTE, rec.get_long(MOV_CODCF), r); regs.set_row_cell(S_RAGSOC, cli.get(CLI_RAGSOC), r); + regs.set_row_cell(S_PIVA, cli.get(CLI_PAIV), r); // non c'è ? TString cod_ind_sped = rec.get(DOC_CODINDSP).as_string(); TString rif = get_dest_sdi(rec.get_string(MOV_TIPO)[0], rec.get_long(MOV_CODCF), EMPTY_STRING); - // Se è ancora vuoto potrebbe essere estero + // Se è ancora vuoto potrebbe essere estero || SERVE QUESTO IF? if (rif.empty()) { // Segno la riga errata @@ -239,8 +245,7 @@ void TPAR_mask::fill() regs.set_back_and_fore_color(COLOR_RED, COLOR_WHITE, rec.current_row(), regs.cid2index(S_UFFICIO)); fat_no_cod++; } - regs.set_row_cell(S_UFFICIO, rif, r); - //regs.set_row_cell(S_RIFAMM, cli.vendite().get(CFV_PARIFAMM), r); + regs.set_row_cell(S_UFFICIO, ditta.coddest(), r); regs.set_row_cell(S_COFI, cli.get(CLI_COFI), r); bool split = cli.get_bool("20." CLI_SPLITPAY); diff --git a/src/fp/fp0700a.h b/src/fp/fp0700a.h index d60b10382..5b5273f23 100644 --- a/src/fp/fp0700a.h +++ b/src/fp/fp0700a.h @@ -26,6 +26,9 @@ #define S_DATADOC 107 #define S_CLIENTE 108 #define S_RAGSOC 109 -#define S_UFFICIO 110 -#define S_RIFAMM 111 -#define S_COFI 112 +#define S_PIVA 110 +#define S_COFI 111 +#define S_UFFICIO 112 +#define S_RIFAMM 113 + + diff --git a/src/fp/fp0700a.uml b/src/fp/fp0700a.uml index 7829aefd3..859a09a46 100644 --- a/src/fp/fp0700a.uml +++ b/src/fp/fp0700a.uml @@ -111,16 +111,16 @@ BEGIN PROMPT 0 2 "" ITEM "@1" ITEM "Anno" - ITEM "Num.\nReg.@7" + ITEM "Num.\nReg." ITEM "Data\nReg.@10" ITEM "Tipo SDI@4" ITEM "Num.\nDoc.@7" ITEM "Data\nDoc.@10" ITEM "Cliente" ITEM "Ragione Sociale@50" - ITEM "Codice destinatario@20" - ITEM "Riferimento\nAmministrazione@20" + ITEM "P. IVA@10" ITEM "Codice Fiscale@16" + ITEM "Codice destinatario@20" END ENDPAGE @@ -186,7 +186,7 @@ PAGE "Documento" -1 -1 78 9 BOOLEAN S_SELECTED BEGIN - PROMPT 1 1 "Da elaborare" + PROMPT 1 10 "Da elaborare" END NUMBER S_ANNO 4 @@ -197,7 +197,7 @@ END NUMBER S_NUMREG 7 BEGIN - PROMPT 21 2 "Numero Reg." + PROMPT 21 2 "Numer Reg." FLAGS "D" END @@ -242,15 +242,9 @@ BEGIN FLAGS "D" END -STRING S_UFFICIO 50 20 +STRING S_PIVA 11 BEGIN - PROMPT 1 6 "" - FLAGS "D" -END - -STRING S_RIFAMM 20 -BEGIN - PROMPT 21 6 "" + PROMPT 21 5 "P IVA " FLAGS "D" END @@ -260,7 +254,11 @@ BEGIN FLAGS "D" END - +STRING S_UFFICIO 50 20 +BEGIN + PROMPT 1 6 "" + FLAGS "D" +END ENDPAGE TOOLBAR "Documento" 0 0 0 2