Patch level : 12.0 1208

Files correlati     : bagn011.uml

Commento:
Aggiunta classe annesso ai file cartacei
This commit is contained in:
Alessandro Bonazzi 2022-10-23 22:53:15 +02:00
parent 2be84dd6ea
commit 55ca893ee0
3 changed files with 96 additions and 67 deletions

View File

@ -219,8 +219,6 @@ class TCategorie_doc
TString_array * _name_catdocs;
int _mode_sheet;
TClasse_doc * find_causcont(const TString& caus); // OK
TClasse_doc * find_tipodoc(const TString& tipodoc); // OK
TClasse_doc * find_tipodocsdi(const TString& tipodocsdi, const char * tipocaus); // OK
TArray_sheet * find_sheet_annessi(const TString& catdoc) { return (TArray_sheet *) _sheets_annessi.objptr(catdoc); }
@ -239,6 +237,9 @@ protected:
TCategorie_doc::TAnnesso * find_annesso(const TString& catdoc_padre, const char* catdoc_ann);
public:
TClasse_doc * find_causcont(const TString& caus); // OK
TClasse_doc * find_tipodoc(const TString& tipodoc); // OK
void add_annesso(const TString& catdoc_padre, const TString& catdoc_ann, const TString& descr,
const TString& class_ann, bool obblig = false);
void edit_annesso(const TString& catdoc_padre, const TString& catdoc_ann, const TString& descr,
@ -267,6 +268,8 @@ public:
TCategorie_doc();
};
TCategorie_doc& categorie_doc(bool reload = false);
class TRecord_categorie : public TCategorie_doc
{
public:
@ -307,8 +310,6 @@ enum err_mov
class TMovimento_estr : public TObject // aggiungere metodi per TArray
{
bool _err;
long _numreg;
TDate _datareg;
@ -436,10 +437,8 @@ private:
static bool pura_iva(const TRectype& mov);
void write_errorsql_log(const TString& query) const;
static TCategorie_doc& categorie_doc(bool reload = false);
public:
void add_mov(TMovimento_estr * movimento) { _movs.add(movimento); }
/** DIAGNOSTICA GESTIONALE.
* Controllo lo stato delle fatture:

View File

@ -176,6 +176,36 @@ TMovimento_estr::TMovimento_estr(TISAM_recordset & mov, TipoIVA tipo, bool escl)
// TEstrazione
///////////////////////////////////////////////////////////////////////////////
long find_movcoll(long numreg) // ma serve ?
{
TLocalisamfile mov(LF_MOV);
mov.put(MOV_NUMREG, numreg);
mov.read();
const TCausale& cau = cached_causale(mov.get(MOV_CODCAUS), mov.get_int(MOV_ANNOES));
const TString4 cau_reg = cau.causale_reg_iva();
const TString numdoc = mov.get(MOV_NUMDOC);
TString query("USE ");
query << LF_MOV << " KEY 1 SELECT " << MOV_CODCAUS << "==\"" << cau_reg << "\"\nFROM " << MOV_NUMREG << "==" << numreg;
TISAM_recordset mov_rs(query);
long movcoll = 0L;
for (bool ok = mov_rs.move_first(); ok; ok = mov_rs.move_next())
{
TRectype& curr = (TRectype&)mov_rs.cursor()->curr();
const long movcoll_found = curr.get_long(MOV_MOVCOLL);
if (curr.get(MOV_NUMDOC) == numdoc && (movcoll_found == 0L || movcoll_found == numreg))
{
movcoll = mov_rs.get_long(MOV_NUMREG);
curr.put(MOV_MOVCOLL, numreg);
break;
}
}
return movcoll;
}
const char* TEstrazione::caus_sos(const TLocalisamfile& mov, const TipoIVA iva)
{
if (iva == iva_acquisti)
@ -753,16 +783,6 @@ void TEstrazione::write_errorsql_log(const TString& query) const
#endif
}
TCategorie_doc& TEstrazione::categorie_doc(const bool reload)
{
static TCategorie_doc* _doc_cats = nullptr;
if (_doc_cats == nullptr)
_doc_cats = new TCategorie_doc();
else if (reload)
_doc_cats->reload();
return *_doc_cats;
}
// Public methods /////////////////////////////////////////////////////////////////////////////////////////////
bool TEstrazione::update_drd_stato_estr() const
@ -1965,6 +1985,16 @@ TCategorie_doc::TCategorie_doc() : _mode_sheet(MODE_SHEETS)
TCategorie_doc& categorie_doc(const bool reload)
{
static TCategorie_doc* _doc_cats = nullptr;
if (_doc_cats == nullptr)
_doc_cats = new TCategorie_doc();
else if (reload)
_doc_cats->reload();
return *_doc_cats;
}
///////////////////////////////////////////////////////////////////////////////
// TRecord_categorie