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

Patch level : 12.0 846

Browse Source 
Files correlati     : cg2.exe cg2FPPRO.msk
Commento            :
- Cambiata icona ricarica fatture su 'Fatture SDI'
- Aggiunta importazione percent. e natura iva da ini con f1
This commit is contained in:
Simone Palacino 2019-06-25 14:54:19 +02:00
parent 67ce351385
commit 08f2915f28
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/cg/cg2100.cpp
View File

@ -2129,7 +2129,11 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
TBill c; ini2bill(ini, c, false); TBill c; ini2bill(ini, c, false);
if (c.gruppo() > 0) if (c.gruppo() > 0)
c.add_to(riga, 4, 0x7); // Conto 105-110 c.add_to(riga, 4, 0x7); // Conto 105-110
if (_f1_ini)
{
add_not_empty(riga, 10, ini, "PERCIVA"); // Perc. IVA 111
add_not_empty(riga, 11, ini, "NATURA"); // Natura IVA 112
}
iva_notify(is, i, K_ENTER); iva_notify(is, i, K_ENTER);
} }
@ -2271,7 +2275,6 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
//msk.set(F_TOTALE, calcola_imp()); //msk.set(F_TOTALE, calcola_imp());
msk.set(F_COLFPPRO, "X"); msk.set(F_COLFPPRO, "X");
msk.set(FS_RECALC, ""); msk.set(FS_RECALC, "");
load_perc_nat(msk, ini);
} }
if (_f1_liq && msk.find_by_id(F_DIFFERITA) != NULL) if (_f1_liq && msk.find_by_id(F_DIFFERITA) != NULL)
{ {
@ -2282,24 +2285,6 @@ 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) bool TPrimanota_application::save(bool check_dirty)
{ {
if (_swap_mask == true) if (_swap_mask == true)

1
src/cg/cg2102.h
View File

@ -210,7 +210,6 @@ protected: // TApplication
virtual void print(); virtual void print();
void dump_rec(TConfig & ini, const TRectype & rec, int row = 0, int pref = 0); void dump_rec(TConfig & ini, const TRectype & rec, int row = 0, int pref = 0);
void dump_fatt(TConfig& ini, TPartita & game, int rigafatt, int pref = 0); void dump_fatt(TConfig& ini, TPartita & game, int rigafatt, int pref = 0);
void load_perc_nat(const TMask& msk, TConfig& ini);
virtual void ini2mask(TConfig& ini, TMask& msk, bool query); virtual void ini2mask(TConfig& ini, TMask& msk, bool query);
virtual void mask2ini(const TMask& msk, TConfig& ini); virtual void mask2ini(const TMask& msk, TConfig& ini);

2
src/cg/cg2FPPRO.uml
View File

@ -5,7 +5,7 @@ TOOLBAR "topbar" 0 0 0 2
BUTTON DLG_CONFIG 2 2 BUTTON DLG_CONFIG 2 2
BEGIN BEGIN
PROMPT 1 1 "Ricarica Fatture" PROMPT 1 1 "Ricarica Fatture"
PICTURE TOOL_ELABORA PICTURE TOOL_CONVERT
END END
BUTTON DLG_OK 2 2 BUTTON DLG_OK 2 2