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

Corretti conflitti su reverse charge in Prima nota

Browse Source 
git-svn-id: svn://10.65.10.50/branches/R_10_00@23082 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2015-05-07 15:48:26 +00:00
parent 0500c3ce1d
commit b46459b21e
4 changed files with 52 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cg/cg2100.cpp
View File

@ -1869,7 +1869,7 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
add_cgs_tot(msk);
TSheet_field& is = ivas();
for (int i = 0; ini.set_paragraph(format("%d,%d", LF_RMOVIVA, i+1)); i++)
for (int i = 0; ini.set_paragraph(LF_RMOVIVA, i+1); i++)
{
TToken_string& riga = is.row(i);
@ -1887,11 +1887,13 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
}
// Genera eventuali righe per ritenute fiscali e sociali
for (short ritid = F_RITFIS; ritid <= F_RITSOC; ritid++)
const short frit[4] = { F_RITFIS, F_RITSOC, F_REVCHARGE, 0 };
const char trit[4] = { 'F', 'S', 'V', '\0' };
for (int i = 0; frit[i]; i++)
{
TEdit_field& ritfld = msk.efield(ritid);
TEdit_field& ritfld = msk.efield(frit[i]);
if (!ritfld.empty() && ritfld.active())
add_cgs_rit(ritid == F_RITFIS);
add_cgs_ritenute(trit[i]);
}
calcola_imp(); // Calcola totale imponibile ed imposte

1
cg/cg2100.h
View File

@ -81,6 +81,7 @@
#define F_CONTO 181
#define F_SOTTOCONTO 182
#define F_SALDOCONTO 183
#define F_REVCHARGE 184
#define F_SHEETCG 190
#define F_SHEETIVA 191

2
cg/cg2102.cpp
View File

@ -408,7 +408,7 @@ int TPrimanota_application::set_cgs_row(int n, const TImporto& imp,
HIDDEN int compare_rows(const TSortable& o1, const TSortable& o2, void* jolly)
{
// Totale, Rit.Fisc., Rit.Soc., da riga IVA, riga contabile, IVA detr., IVA non detr.
// Totale, Rit.Fisc., Rit.Soc., Rev.Charge, da riga IVA, riga contabile, IVA detr., IVA non detr.
const char* const sort_order = "TFSVI DN1APRC";
const TToken_string& r1 = (const TToken_string&)o1;

81
cg/cgtbcbp.uml
View File

@ -1,37 +1,44 @@
#include <relapbar.h>
PA "Causale blocco pagamenti" 0 2 0 0
GR -1 75 7
BE
PR 1 0 ""
FL "R"
EN
ST 101 6
BE
PR 2 2 "Codice "
HE "Codice della causale"
FI CODTAB
FL "U"
KE 1
US %CBP
IN CODTAB 101
DI "Codice" CODTAB
DI "Descrizione @50" S0
OU 101 CODTAB
OU 102 S0
CH REQUIRED
EN
ST 102 50
BE
PR 2 4 "Descrizione "
HE "Descrizione della causale"
FI S0
KE 2
US %CBP KE 2
IN S0 102
DI "Descrizione @50" S0
DI "Codice" CODTAB
CO OU 101
CH REQUIRED
EN
EN
ENDMASK
TOOLBAR "topbar" 0 0 0 2
#include <relapbar.h>
ENDPAGE
PAGE "Causale blocco pagamenti" 0 2 0 0
GROUPBOX DLG_NULL 75 7
BEGIN
PROMPT 1 0 ""
FLAGS "R"
END
STRING 101 6
BEGIN
PROMPT 2 2 "Codice "
HELP "Codice della causale"
FIELD CODTAB
FLAGS "U"
KEY 1
USE %CBP
INPUT CODTAB 101
DISPLAY "Codice" CODTAB
DISPLAY "Descrizione @50" S0
OUTPUT 101 CODTAB
OUTPUT 102 S0
CHECKTYPE REQUIRED
END
STRING 102 50
BEGIN
PROMPT 2 4 "Descrizione "
HELP "Descrizione della causale"
FIELD S0
KEY 2
USE %CBP KEY 2
INPUT S0 102
DISPLAY "Descrizione @50" S0
DISPLAY "Codice" CODTAB
COPY OUTPUT 101
CHECKTYPE REQUIRED
END
ENDPAGE
ENDMASK