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

Patch level : 12.0 830

Browse Source 
Files correlati     : cg2.exe cg2100c.msk
Commento            : - [Prima nota] Aggiunta percentuale iva e natura su sheet iva
This commit is contained in:
Simone Palacino 2019-06-21 13:11:45 +02:00
parent 6e5ebe6716
commit 19272e0564
4 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/cg/cg2100.cpp
View File

@ -2271,6 +2271,7 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
msk.set(F_TOTALE, calcola_imp());
msk.set(F_COLFPPRO, "X");
msk.set(FS_RECALC, "");
load_perc_nat(msk, ini);
}
if (_f1_liq && msk.find_by_id(F_DIFFERITA) != NULL)
{
@ -2281,6 +2282,24 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
}
}
void TPrimanota_application::load_perc_nat(const TMask& msk, TConfig& ini)
{
TString riga;
TSheet_field& iva = ivas();
int i = 0;
/*for(TToken_string& row = iva.row(0); TString(row.get(0)).full() || TString(row.get(3)).full(); row = iva.row(++i))
{
TToken_string old(row);
iva_notify(iva, i, K_DEL);
iva_notify(iva, i, K_SPACE);
row.add(old.get(cid2index(IVA_IMPONIBILE)), cid2index(IVA_IMPONIBILE));
row.add(old.get(cid2index(IVA_IMPOSTA)), cid2index(IVA_IMPOSTA));
row.add(ini.get("PERCIVA", TString("25,") << i+1),cid2index(IVA_PERCIVA));
row.add(ini.get("NATURA", TString("25,") << i+1), cid2index(IVA_NATURIVA));
iva_notify(iva, i, K_ENTER);
}*/
}
bool TPrimanota_application::save(bool check_dirty)
{
if (_swap_mask == true)

4
src/cg/cg2100.h
View File

@ -119,7 +119,9 @@
#define IVA_GRUPPO 107
#define IVA_CONTO 108
#define IVA_SOTTOCONTO 109
#define IVA_NOTAVARECF 111
#define IVA_PERCIVA 111
#define IVA_NATURIVA 112
#define IVA_NOTAVARECF 113
// Campi ripetuti sulla seconda pagina
#define H_DATAREG 201

2
src/cg/cg2100c.uml
View File

@ -717,6 +717,8 @@ BEGIN
ITEM "Co."
ITEM "Sottoc.@6"
ITEM "Descrizione Conto@50"
ITEM "%IVA@5"
ITEM "Natura@5"
END
CURRENCY F_IMPONIBILI 18

12
src/cg/cg21iva.uml
View File

@ -55,6 +55,18 @@ BEGIN
PROMPT 2 4 "Imponibile "
END
STRING IVA_PERCIVA 3
BEGIN
PROMPT 20 4 "Perc."
FLAGS "D"
END
STRING IVA_NATURIVA 4
BEGIN
PROMPT 40 4 "Nat."
FLAGS "D"
END
CURRENCY IVA_IMPOSTA 18
BEGIN
PROMPT 48 4 "Imposta "