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

Patch level :10.0 706

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
perfezionata contabilizzazione analitica (adesso assegna correttamente anche datareg e non solo le datecomp)


git-svn-id: svn://10.65.10.50/trunk@20353 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2010-04-19 09:06:04 +00:00
parent ed77a4482c
commit 0a51ef4488
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ve/velib04.h
View File

@ -620,7 +620,7 @@ protected:
const TCausale& rdoc2caus(const TRiga_documento& rdoc); const TCausale& rdoc2caus(const TRiga_documento& rdoc);
void init_distrib(TString_array& conti, TGeneric_distrib& distrib, bool pareggio); void init_distrib(TString_array& conti, TGeneric_distrib& distrib, bool pareggio);
void calcola_date_comp(const TDocumento& doc, TDate& datareg, TDate& datacomp, TDate& datafcomp, int annoes); void calcola_date_comp(const TDocumento& doc, TDate& datacomp, TDate& datafcomp, int annoes);
public: public:
bool search_costo_ricavo(const TRiga_documento& riga, TBill& conto, bool riclassifica_fdr_fde); bool search_costo_ricavo(const TRiga_documento& riga, TBill& conto, bool riclassifica_fdr_fde);

15
ve/velib04f.cpp
View File

@ -479,23 +479,23 @@ void TContabilizzazione_analitica::init_distrib(TString_array& conti, TGeneric_d
} }
} }
void TContabilizzazione_analitica::calcola_date_comp(const TDocumento& doc, TDate& datareg, TDate& datacomp, TDate& datafcomp, int annoes) void TContabilizzazione_analitica::calcola_date_comp(const TDocumento& doc, TDate& datacomp, TDate& datafcomp, int annoes)
{ {
const TDate& datadoc = doc.get_date(DOC_DATADOC); const TDate datadoc = doc.get_date(DOC_DATADOC);
datacomp = doc.get_date(DOC_DATACOMP); datacomp = doc.get_date(DOC_DATACOMP);
if (!datacomp.ok()) if (!datacomp.ok())
datacomp = datadoc; datacomp = datadoc;
datafcomp = doc.get_date(DOC_DATAFCOMP); datafcomp = doc.get_date(DOC_DATAFCOMP);
if (!datafcomp.ok()) if (!datafcomp.ok())
datafcomp = datacomp; datafcomp = datacomp;
datareg = datadoc;
annoes = esercizi().date2esc(datareg); //ci potrebbe andare datacomp? All'analisi l'ardua sentenza annoes = esercizi().date2esc(datacomp); //ci potrebbe andare datacomp? All'analisi l'ardua sentenza
} }
bool TContabilizzazione_analitica::elabora(TDocumento& doc, long numreg_cg, TViswin* viswin, bool can_write, TAnal_mov& mov, bool riclassifica_fdr_fde) bool TContabilizzazione_analitica::elabora(TDocumento& doc, long numreg_cg, TViswin* viswin, bool can_write, TAnal_mov& mov, bool riclassifica_fdr_fde)
{ {
TDate datareg, datacomp, datafcomp, datadoc; TDate datareg, datacomp, datafcomp;
const TDate datadoc = doc.get_date(DOC_DATADOC);
int annoes = 0; int annoes = 0;
TString descr, msg, codcaus; TString descr, msg, codcaus;
bool dare = false; bool dare = false;
@ -512,7 +512,8 @@ bool TContabilizzazione_analitica::elabora(TDocumento& doc, long numreg_cg, TVis
} }
else else
{ {
calcola_date_comp(doc, datareg, datacomp, datafcomp, annoes); calcola_date_comp(doc, datacomp, datafcomp, annoes);
datareg = datadoc;
doc.riferimento(descr); doc.riferimento(descr);
if (descr.empty()) if (descr.empty())
@ -558,7 +559,7 @@ bool TContabilizzazione_analitica::elabora(TDocumento& doc, long numreg_cg, TVis
mov.put(MOVANA_NUMREG, numreg_ca = 0); mov.put(MOVANA_NUMREG, numreg_ca = 0);
} }
calcola_date_comp(doc, datareg, datacomp, datafcomp, annoes); calcola_date_comp(doc, datacomp, datafcomp, annoes);
mov.put(MOVANA_DATAREG, datareg); mov.put(MOVANA_DATAREG, datareg);
mov.put(MOVANA_DATACOMP, datacomp); mov.put(MOVANA_DATACOMP, datacomp);