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

Patch level : 12.0 602

Browse Source 
Files correlati     : cg2.exe

Aggiunta la possibilità di corregere l'importo della riga e il totale docmento negli incassi e pagamenti con saldaconto.
This commit is contained in:
AlexBonazzi 2018-07-12 13:49:01 +02:00
parent f1a667af0b
commit ca043c8d0f
10 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/Cg0.vcxproj
View File

@ -89,6 +89,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

1
build/Cg1.vcxproj
View File

@ -92,6 +92,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

1
build/Cg2.vcxproj
View File

@ -142,6 +142,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

1
build/Cg3.vcxproj
View File

@ -93,6 +93,7 @@
<Version>12.0</Version>
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

1
build/Cg4.vcxproj
View File

@ -142,6 +142,7 @@
<TargetMachine>MachineX86</TargetMachine>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

1
build/Cg5.vcxproj
View File

@ -95,6 +95,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

1
build/Cg6.vcxproj
View File

@ -95,6 +95,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

1
build/Cg7.vcxproj
View File

@ -95,6 +95,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

30
src/cg/cg2102.cpp
View File

@ -557,7 +557,7 @@ HIDDEN bool imptot_error(const TImporto& imptot, const TImporto& impsal, bool va
if (abs(residuo.valore()) >= 0.001) // if (!residuo.is_zero())
{
TPrimanota_application& a = app();
const TMask& m = a.curr_mask();
TMask& m = a.curr_mask();
TString4 codval;
if (val)
codval = m.get(SK_VALUTA);
@ -577,17 +577,11 @@ HIDDEN bool imptot_error(const TImporto& imptot, const TImporto& impsal, bool va
euro.set_num(residuo.valore());
msg << TR("per cui il residuo è ") << euro.string(true);
if (impsal.is_zero())
{
/* fastidioso per Pragma
msg << TR("\nSi desidera registrare ugualmente?");
ok = a.cgs().yesno_box(msg);
*/
}
else
ok = a.cgs().error_box(msg);
}
msg << TR("\nSi desidera correggere il totale documento?");
ok = a.cgs().yesno_box(msg);
if (ok)
m.set(F_TOTALE, cassa.valore());
}
return ok;
}
@ -691,8 +685,16 @@ bool TPrimanota_application::cg_handler(TMask_field& f, KEY k)
msg << TR("\nSi desidera registrare ugualmente?");
ok = f.yesno_box(msg);
}
else
ok = f.error_box(msg);
else
{
msg << TR("\nSi desidera correggere l'importo della riga?");
ok = f.yesno_box(msg);
if (ok)
{
a.set_cgs_imp(i, speso);
a.calcola_saldo();
}
}
if (!ok)
return false;
}

11
src/cg/cg2104.cpp
View File

@ -847,7 +847,7 @@ bool TPrimanota_application::read_scadenze(TMask& m)
const TCurrency totdoc_s(totale_sc, codval);
const char* i1 = totdoc_c.string(true);
const char* i2 = totdoc_s.string(true);
warning_box(FR("Il totale documento (%s) non corrisponde a quello del saldaconto (%s)."), i1, i2);
warning_box(FR("Il totale documento (%s) non corrisponde a quello del saldaconto (%s)."), i1, i2);
}
if (iva() != nessuna_iva && !is_split)
{
@ -1172,7 +1172,14 @@ bool TPrimanota_application::showpartite_handler(TMask_field& f, KEY k)
msg.format(FR("L'importo sul saldaconto della riga %d è %s"), (riga+1), (const char*)curr.string(true));
if (!speso.is_zero())
msg << (speso.sezione() == 'A' ? TR(" Avere") : TR(" Dare"));
return f.error_box(msg);
msg << ". Si desidera correggere l'importo dela riga ?";
const bool ok = f.yesno_box(msg);
if (ok)
{
a.set_cgs_imp(riga, speso);
a.calcola_saldo();
}
return ok;
}
f.set_focus();
}