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

Patch level : 12.0 1066

Browse Source 
Files correlati     : ce3.exe ce3900.msk rimosso ce3900b.rep
Commento        :

corretta la ricerca della causale quando è impostato il tipo documento SDI.

Interno :

Controllare un pò di contabilizzazioni
This commit is contained in:
Alessandro Bonazzi 2021-07-01 08:54:25 +02:00
parent a1288069f8
commit a898b955ca
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/f9/f9lib.h
View File

@ -158,7 +158,7 @@ private:
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::shared_ptr<TCategorie_doc::classe_doc> find_tipodocsdi(const TString& tipodocsdi, const char * tipocaus) const ; // OK
std::vector<pair<TString, std::shared_ptr<TArray_sheet>>>::iterator find_sheet_annessi(const TString& catdoc); // OK
@ -194,7 +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 ""; }
const char * tipo2caus_cont(const TString & tipodoc, const char * tipocaus) { std::shared_ptr<TCategorie_doc::classe_doc> c = find_tipodocsdi(tipodoc, tipocaus); if (c != nullptr) return c->causcont; else return ""; }
void reload();
static void remove_all();
static void remove_all_ann();

4
src/f9/f9lib01.cpp
View File

@ -1290,11 +1290,11 @@ 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
std::shared_ptr<TCategorie_doc::classe_doc> TCategorie_doc::find_tipodocsdi(const TString& tipodocsdi, const char * tipocaus) const
{
for (auto it = _rows.begin(); it != _rows.end(); ++it)
{
if ((*it)->caus_sost == tipodocsdi)
if (((*it)->caus_sost == tipodocsdi) && ((*it)->tipocaus == tipocaus))
return *it;
}
return nullptr;