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); add_cgs_tot(msk);
TSheet_field& is = ivas(); 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); 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 // 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()) if (!ritfld.empty() && ritfld.active())
add_cgs_rit(ritid == F_RITFIS); add_cgs_ritenute(trit[i]);
} }
calcola_imp(); // Calcola totale imponibile ed imposte calcola_imp(); // Calcola totale imponibile ed imposte

1
cg/cg2100.h
View File

@ -81,6 +81,7 @@
#define F_CONTO 181 #define F_CONTO 181
#define F_SOTTOCONTO 182 #define F_SOTTOCONTO 182
#define F_SALDOCONTO 183 #define F_SALDOCONTO 183
#define F_REVCHARGE 184
#define F_SHEETCG 190 #define F_SHEETCG 190
#define F_SHEETIVA 191 #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) 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 char* const sort_order = "TFSVI DN1APRC";
const TToken_string& r1 = (const TToken_string&)o1; const TToken_string& r1 = (const TToken_string&)o1;

77
cg/cgtbcbp.uml
View File

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