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

Prospetto rimborso su 13a

Browse Source 
Messo a posto menu indice con ditte miste o quater


git-svn-id: svn://10.65.10.50/trunk@1422 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
villa 1995-06-01 08:47:37 +00:00
parent 9241f8a5fa
commit 235c319b49
4 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cg/cg4300.h
View File

@ -373,8 +373,8 @@ public:
// supporto stampa // supporto stampa
void describe_firm(int month); void describe_firm(int month);
void describe_att(int month, const char* codatt, bool isresult); void describe_att(int month, const char* codatt, bool isresult, char flags);
void describe_name(int month, TToken_string& atts); void describe_name(int month, TToken_string& atts, char flags);
void describe_plafond(int month, const char* codatt); void describe_plafond(int month, const char* codatt);
void describe_ventilation(int month, const char* codatt); void describe_ventilation(int month, const char* codatt);
void describe_agricolo(int month, const char* codatt); void describe_agricolo(int month, const char* codatt);

6
cg/cg4301.cpp
View File

@ -272,7 +272,7 @@ bool TLiquidazione_app::update_firm(int month, bool recalc)
} }
if (month == _month) if (month == _month)
describe_att(month,cattiv,gheravergot); describe_att(month,cattiv,gheravergot, '0' + (_mixed ? tipoatt : 0));
atts.add(cattiv); atts.add(cattiv);
cattivs.add(cattiv); cattivs.add(cattiv);
@ -280,13 +280,13 @@ bool TLiquidazione_app::update_firm(int month, bool recalc)
// se attivita' mista stampa riepilogo // se attivita' mista stampa riepilogo
if (_mixed && month == _month) if (_mixed && month == _month)
describe_att(month,cattivs, TRUE); describe_att(month,cattivs, TRUE, 'M');
} }
while (_nditte->next_match(LF_ATTIV)); while (_nditte->next_match(LF_ATTIV));
// se quater stampa riepilogo // se quater stampa riepilogo
if (quater && month == _month) if (quater && month == _month)
describe_att(month,atts, TRUE); describe_att(month,atts, TRUE, 'Q');
// occorre poterla chiamare altre volte con mesi diversi // occorre poterla chiamare altre volte con mesi diversi
_nditte->restore_status(); _nditte->restore_status();

5
cg/cg4303.cpp
View File

@ -282,7 +282,7 @@ _DescrItem* TLiquidazione_app::recalc_rimborso(int month, const char* codatts)
while ((tmpatt = atts.get()) != NULL) while ((tmpatt = atts.get()) != NULL)
{ {
att = tmpatt; att = tmpatt;
for (int m = month - 2; m <= month; m++) for (int m = (month == 13 ? 1 : (month - 2)); m <= month; m++)
{ {
if (!look_plm(m,att)) continue; if (!look_plm(m,att)) continue;
@ -437,7 +437,8 @@ _DescrItem* TLiquidazione_app::recalc_rimborso(int month, const char* codatts)
int ryear = atoi((const char*)(*_rmb_anno)); int ryear = atoi((const char*)(*_rmb_anno));
int rmese = atoi((const char*)(*_rmb_mese)); int rmese = atoi((const char*)(*_rmb_mese));
if (year != ryear || (rmese < (month - 2) || rmese > month)) if (year != ryear ||
(month != 13 && (rmese < (month - 2) || rmese > month)))
continue; continue;
real imp = _rmb->get("R0"); real imp = _rmb->get("R0");

23
cg/cg4304.cpp
View File

@ -97,13 +97,14 @@ bool TLiquidazione_app::preprocess_page(int file, int cnt)
// Print description // Print description
// ---------------------------------------------------------------- // ----------------------------------------------------------------
void TLiquidazione_app::describe_att(int month, const char* codatt, bool isresult) void TLiquidazione_app::describe_att(int month, const char* codatt,
bool isresult, char flags)
{ {
TToken_string atts(codatt); TToken_string atts(codatt);
if (_isprint && _canprint) if (_isprint && _canprint)
{ {
describe_name(month, atts); describe_name(month, atts, flags);
if (atts.items() == 1 && _isplafond) if (atts.items() == 1 && _isplafond)
describe_plafond(month, codatt); describe_plafond(month, codatt);
if (atts.items() == 1 && _isvent) if (atts.items() == 1 && _isvent)
@ -119,7 +120,7 @@ void TLiquidazione_app::describe_att(int month, const char* codatt, bool isresul
} }
} }
void TLiquidazione_app::describe_name(int month, TToken_string& codatts) void TLiquidazione_app::describe_name(int month, TToken_string& codatts, char flags)
{ {
_DescrItem* d = new _DescrItem(CHG_PARMS); _DescrItem* d = new _DescrItem(CHG_PARMS);
@ -131,8 +132,7 @@ void TLiquidazione_app::describe_name(int month, TToken_string& codatts)
d->_f1 = month; d->_f1 = month;
d->_f2 = _isbenzinaro; d->_f2 = _isbenzinaro;
d->_f3 = (word)flags;
// TBI: bookmark!
if (_mixed && codatts.items() == 1) if (_mixed && codatts.items() == 1)
d->_f0 = atoi(codatts.mid(5)); d->_f0 = atoi(codatts.mid(5));
@ -857,9 +857,17 @@ void TLiquidazione_app::set_att(_DescrItem& d)
TString att_title(48); TString att_title(48);
// Bookmark // Bookmark
TString book_name(d._s3);
char flags = (char)d._f3;
if (flags == '1') book_name << " (servizi)";
else if (flags == '2') book_name << " (altre)";
else if (flags == 'M') book_name = "Riepilogo att. mista";
else if (flags == 'Q') book_name = "Riepilogo quater";
if (_firm_bookmark == -1) if (_firm_bookmark == -1)
_firm_bookmark = set_bookmark(d._s1); _firm_bookmark = set_bookmark(d._s1);
_att_bookmark = set_bookmark(d._s3, _firm_bookmark); _att_bookmark = set_bookmark(book_name, _firm_bookmark);
tim_title << "Liquidazione IVA"; tim_title << "Liquidazione IVA";
@ -886,7 +894,8 @@ void TLiquidazione_app::set_att(_DescrItem& d)
if (d._s3.empty()) if (d._s3.empty())
{ {
att_title = "Riepilogo attivita' "; att_title = flags == 'M' ? "Riepilogo attivita' mista" :
"Riepilogo quater";
// att_title << d._s2; // att_title << d._s2;
} }
else else