From 9807eaca25b7d4ef85965e1aed913ee2b4e25fde Mon Sep 17 00:00:00 2001 From: Simone Palacino Date: Fri, 28 Feb 2020 09:33:32 +0100 Subject: [PATCH] Patch level : 12.0 no-patch Files correlati : ps6215.exe Commento : Comari partite aperte --- src/ps/ps6215100.cpp | 29 ++++++++++++++++++++++++----- src/ps/ps6215partite.h | 6 ++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/ps/ps6215100.cpp b/src/ps/ps6215100.cpp index 7a863f829..02f8116f6 100644 --- a/src/ps/ps6215100.cpp +++ b/src/ps/ps6215100.cpp @@ -16,6 +16,7 @@ #include "ps6215partite.h" #include #include "scadenze.h" +#include "clifo.h" #define CLIFO_RECLEN 730 @@ -564,14 +565,18 @@ void TComariExport_app::add_chiusa(const TISAM_recordset& part_rec) void TComariExport_app::export_parti(ofstream& fout) { const char* fields[] = { - PART_ANNO, PART_NUMPART, PART_NRIGA, PART_TIPOCF, PART_SOTTOCONTO, PART_TIPOMOV, PART_TIPOPAG, PART_NREG, PART_NUMRIG, PART_DATAREG, PART_DATADOC, + PART_ANNO, PART_NUMPART, PART_NRIGA, PART_TIPOCF, PART_SOTTOCONTO, + PART_TIPOMOV, PART_TIPOPAG, PART_NREG, PART_NUMRIG, PART_DATAREG, PART_DATADOC, PART_DATAPAG, PART_NUMDOC, PART_REG, PART_PROTIVA, PART_CODCAUS, PART_SEZ, PART_IMPORTO, PART_IMPOSTA, PART_SPESE, PART_IMPTOTDOC, PART_RITENUTE, - PART_RITSOC, PART_SEZABB, PART_ABBUONI, PART_SEZDIFCAM, PART_DIFFCAM, PART_GRUPPOCL, PART_CONTOCL, PART_CHIUSA + PART_RITSOC, PART_SEZABB, PART_ABBUONI, PART_SEZDIFCAM, PART_DIFFCAM, PART_GRUPPOCL, PART_CONTOCL, + CLI_COFI, CLI_STATOPAIV, CLI_PAIV }; const int dim_fields[] = { - D_ANNO, D_NUMPART, D_NRIGA, D_TIPOC, D_SOTTOCONTO, D_TIPOMOV, D_TIPOPAG, D_NREG, D_NUMRIG, D_DATAREG, D_DATADOC, + D_ANNO, D_NUMPART, D_NRIGA, D_TIPOC, D_SOTTOCONTO, + D_TIPOMOV, D_TIPOPAG, D_NREG, D_NUMRIG, D_DATAREG, D_DATADOC, D_DATAPAG, D_NUMDOC, D_REG, D_PROTIVA, D_CODCAUS, D_SEZ, D_IMPORTO, D_IMPOSTA, D_SPESE, D_IMPTOTDOC, D_RITENUTE, - D_RITSOC, D_SEZABB, D_ABBUONI, D_SEZDIFCAM, D_DIFFCAM, D_GRUPPOCL, D_CONTOCL + D_RITSOC, D_SEZABB, D_ABBUONI, D_SEZDIFCAM, D_DIFFCAM, D_GRUPPOCL, D_CONTOCL, + D_COFI, D_STATOPAIV, D_PAIV }; TString4 last_game = ini_get_string(CONFIG_DITTA, "ps6215", "last_year_open_game", "2019"); @@ -612,8 +617,22 @@ void TComariExport_app::export_parti(ofstream& fout) } else if (idx >= I_IMPORTO && idx <= I_RITSOC || idx == I_ABBUONI || idx == I_DIFFCAM) rec->set_str(idx, part_rec.get(part_rec.find_column(fields[idx])).as_real().string()); - else + else if(idx <= I_CONTOCL) rec->set_str(idx, part_rec.get(part_rec.find_column(fields[idx])).as_string()); + else + { + TLocalisamfile clifo(LF_CLIFO); + TString c = part_rec.get(part_rec.find_column(PART_TIPOCF)).as_string(); + TString s = part_rec.get(part_rec.find_column(PART_SOTTOCONTO)).as_string(); + clifo.put(CLI_TIPOCF, part_rec.get(part_rec.find_column(PART_TIPOCF)).as_string()); + clifo.put(CLI_CODCF, part_rec.get(part_rec.find_column(PART_SOTTOCONTO)).as_string()); + clifo.read(); + + rec->set_str(idx, clifo.get(CLI_COFI)); + rec->set_str(idx, clifo.get(CLI_STATOPAIV)); + rec->set_str(idx, clifo.get(CLI_PAIV)); + break; // Setto ed esco tanto sono gli ultimi + } } if(!part_rec.get(part_rec.find_column(PART_CHIUSA)).as_bool()) diff --git a/src/ps/ps6215partite.h b/src/ps/ps6215partite.h index 8bc1d76ac..96bd5d123 100644 --- a/src/ps/ps6215partite.h +++ b/src/ps/ps6215partite.h @@ -30,6 +30,9 @@ #define D_DIFFCAM 18 // 18 con 3 decimali, segno, e virgola #define D_GRUPPOCL 3 #define D_CONTOCL 3 +#define D_COFI 28 +#define D_STATOPAIV 2 +#define D_PAIV 12 #define I_ANNO 0 #define I_NUMPART 1 @@ -60,6 +63,9 @@ #define I_DIFFCAM 26 #define I_GRUPPOCL 27 #define I_CONTOCL 28 +#define I_COFI 29 +#define I_STATOPAIV 30 +#define I_PAIV 31 #define DS_ANNO 4 #define DS_NUMPART 7