root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0 1062

Browse Source 
Files correlati     : ve0.exe ve6.exe

Commento        :

Modificato calcolo plafond
Contabilizzazione con causale per tipo documenti SDI
This commit is contained in:
Alessandro Bonazzi 2021-06-11 20:38:36 +02:00
parent 9fa391cca1
commit d49f244033
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/f9/f9lib.h
View File

@ -8,7 +8,7 @@
#include "strings.h"
#include "date.h"
#include "real.h"
#include "cglib.h"
#include "../cg/cglib.h"
#include "sheet.h"
#include "sqlset.h"
#include "reprint.h"
@ -156,8 +156,9 @@ private:
std::shared_ptr<std::set<TString>> _name_catdocs;
int _mode_sheet;
std::shared_ptr<classe_doc> find_causcont(const TString& caus); // OK
std::shared_ptr<classe_doc> find_tipodoc(const TString& tipodoc); // OK
std::shared_ptr<TCategorie_doc::classe_doc> find_causcont(const TString& caus) const ; // OK
std::shared_ptr<TCategorie_doc::classe_doc> find_tipodoc(const TString& tipodoc) const ; // OK
std::shared_ptr<TCategorie_doc::classe_doc> find_tipodocsdi(const TString& tipodocsdi) const ; // OK
std::vector<pair<TString, std::shared_ptr<TArray_sheet>>>::iterator find_sheet_annessi(const TString& catdoc); // OK
@ -193,6 +194,7 @@ public:
std::shared_ptr<TArray_sheet> get_sheet_catdocs();
std::shared_ptr<TArray_sheet> get_sheet_ann(const TString& catdoc);
std::shared_ptr<classe_doc> mov2cat(int numreg);
const char * tipo2caus_cont(const TString & tipodoc) { std::shared_ptr<TCategorie_doc::classe_doc> c = find_tipodocsdi(tipodoc); if (c != nullptr) return c->causcont; else return ""; }
void reload();
static void remove_all();
static void remove_all_ann();

18
src/f9/f9lib01.cpp
View File

@ -2,11 +2,11 @@
#include "f9lib.h"
#include "f1lib.h"
#include "../f1/f1lib.h"
#include "f901tab.h"
#include "progind.h"
#include "clifo.h"
#include "cglib.h"
#include "../cg/cglib.h"
#include "mov.h"
#include "../fp/fplib.h"
#include "annessif9.h"
@ -1269,7 +1269,7 @@ TF9_dberr::TF9_dberr()
// TCategorie_doc
///////////////////////////////////////////////////////////////////////////////////////////
std::shared_ptr<TCategorie_doc::classe_doc> TCategorie_doc::find_causcont(const TString& caus)
std::shared_ptr<TCategorie_doc::classe_doc> TCategorie_doc::find_causcont(const TString& caus) const
{
for (auto it = _rows.begin(); it != _rows.end(); ++it)
{
@ -1279,7 +1279,7 @@ std::shared_ptr<TCategorie_doc::classe_doc> TCategorie_doc::find_causcont(const
return nullptr;
}
std::shared_ptr<TCategorie_doc::classe_doc> TCategorie_doc::find_tipodoc(const TString& tipodoc)
std::shared_ptr<TCategorie_doc::classe_doc> TCategorie_doc::find_tipodoc(const TString& tipodoc) const
{
for (auto it = _rows.begin(); it != _rows.end(); ++it)
{
@ -1290,6 +1290,16 @@ std::shared_ptr<TCategorie_doc::classe_doc> TCategorie_doc::find_tipodoc(const T
return nullptr;
}
std::shared_ptr<TCategorie_doc::classe_doc> TCategorie_doc::find_tipodocsdi(const TString& tipodocsdi) const
{
for (auto it = _rows.begin(); it != _rows.end(); ++it)
{
if ((*it)->caus_sost == tipodocsdi)
return *it;
}
return nullptr;
}
std::vector<pair<TString, std::shared_ptr<TArray_sheet>>>::iterator TCategorie_doc::find_sheet_annessi(const TString& catdoc)
{
for(auto it = _sheets_annessi.begin(); it != _sheets_annessi.end(); ++it)