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

Correatta generazione deleghe e spostato campo "con data" sulla maschera

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@1349 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1995-05-10 09:28:43 +00:00
parent 23c4652cd3
commit 7cf8bfd058
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cg/cg4300a.uml
View File

@ -116,7 +116,7 @@ END
DATE CG43_FLD_DATA DATE CG43_FLD_DATA
BEGIN BEGIN
PROMPT 15 11 "con data " PROMPT 18 11 "con data "
HELP "Data di stampa del prospetto delle liquidazioni" HELP "Data di stampa del prospetto delle liquidazioni"
FLAGS "A" FLAGS "A"
END END

6
cg/cg4302.cpp
View File

@ -619,8 +619,8 @@ bool TLiquidazione_app::look_conc(TString& uffcon, TString& uffiva)
// c'e', dal comune (primo non vuoto) se non // c'e', dal comune (primo non vuoto) se non
// Assume _nditte correctly positioned // Assume _nditte correctly positioned
TString codana(_nditte->lfile().get("TIPOA")); TString ana(_nditte->lfile().get("TIPOA"));
TString ana(_nditte->lfile().get("CODANAGR")); TString codana(_nditte->lfile().get("CODANAGR"));
// look anagrafica // look anagrafica
TLocalisamfile anagr(LF_ANAG); TLocalisamfile anagr(LF_ANAG);
anagr.zero(); anagr.zero();
@ -632,7 +632,7 @@ bool TLiquidazione_app::look_conc(TString& uffcon, TString& uffiva)
TString com(anagr.get("COMRF")); TString com(anagr.get("COMRF"));
// se non c'e', residenza // se non c'e', residenza
if (com.empty()) if (com.empty())
com = anagr.get("COMRIF"); com = anagr.get("COMRES");
if (com.empty()) return FALSE; if (com.empty()) return FALSE;

8
cg/cg4305.cpp
View File

@ -157,7 +157,8 @@ bool TLiquidazione_app::extract_delega(int month, TArray& desc)
if (look_lim(month)) if (look_lim(month))
{ {
real topay = result_liq(month); real topay = result_liq(month);
real intr = _lim->get_real("R14"); topay += _lim->get_real("R14");
topay.round(-3);
if (!topay.is_zero()) if (!topay.is_zero())
{ {
@ -166,14 +167,15 @@ bool TLiquidazione_app::extract_delega(int month, TArray& desc)
tt->add(_nditte->curr().get("RAGSOC")); tt->add(_nditte->curr().get("RAGSOC"));
tt->add(_freqviva); tt->add(_freqviva);
tt->add(topay.string()); tt->add(topay.string());
tt->add(intr.string()); tt->add("");
// tt->add(intr.string());
} }
if (topay.sign() > 0) if (topay.sign() > 0)
{ {
look_del(month, _isannual ? 2 : 1, TRUE); look_del(month, _isannual ? 2 : 1, TRUE);
_del->put("R0",topay); _del->put("R0",topay);
_del->put("R1",intr); // _del->put("R1",intr);
_del->rewrite(); _del->rewrite();
tt->add(_del->get("S7")); tt->add(_del->get("S7"));