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

git-svn-id: svn://10.65.10.50/branches/R_10_00@23084 c028cbd2-c16b-5b4b-a496-9718f37d4682

Browse Source
This commit is contained in:
guy 2015-05-14 13:10:45 +00:00
parent 1f2b50d0c3
commit b89e338952
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cg/cg2102.cpp
View File

@ -91,7 +91,7 @@ real TPrimanota_application::totale_documento()
tot += ritfis; // Somma ritenute fiscali
const real ritsoc = m.get(F_RITSOC);
const real revcha = m.get(F_REVCHARGE);
const real revcha = m.efield(F_REVCHARGE).active() ? m.get_real(F_REVCHARGE) : ZERO;
const bool swapt = test_swap(false); // Totale invertito ?
const bool swaps = test_swap(true); // Ritenute sociali invertite ?
@ -3278,7 +3278,7 @@ bool TPrimanota_application::ritsoc_handler(TMask_field& f, KEY key)
// Certified 100%
bool TPrimanota_application::revcharge_handler(TMask_field& f, KEY key)
{
if (key == K_TAB && f.focusdirty())
if (key == K_TAB && f.focusdirty() && f.active())
app().add_cgs_ritenute('V');
return true;
}
@ -3512,7 +3512,8 @@ bool TPrimanota_application::solaiva_handler(TMask_field& f, KEY key)
a.add_cgs_tot(m); // Genera totale documento
if (!m.efield(F_RITFIS).empty()) a.add_cgs_ritenute('F'); // Genera ritenute fiscali
if (!m.efield(F_RITSOC).empty()) a.add_cgs_ritenute('S'); // Genera ritenute sociali
if (!m.efield(F_REVCHARGE).empty()) a.add_cgs_ritenute('V'); // Genera reverse charge
if (!m.efield(F_REVCHARGE).empty() && !m.efield(F_REVCHARGE).active())
a.add_cgs_ritenute('V'); // Genera reverse charge
TToken_string oldrow(128);
for (int i = 0; i < righe; i++)

2
cg/cglib01.h
View File

@ -150,7 +150,7 @@ public: // TObject
const TString& descrizione() const { return get("S0"); }
const real percentuale() const { return get_real("R0"); }
const TString& tipo() const { return get("S1"); }
int detraibilita() const { return get_int("I1"); }
int detraibilita() const { return get_int("I2"); }
int allegato(char tipocf) const { return get_int(tipocf == 'F' ? "S8" : "S7"); }
bool has_plafond() const { return get_int("S3") > 0; }