diff --git a/src/cg/cg2100.cpp b/src/cg/cg2100.cpp index 5ea975c7a..1dff5d08b 100755 --- a/src/cg/cg2100.cpp +++ b/src/cg/cg2100.cpp @@ -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) diff --git a/src/cg/cg2100.h b/src/cg/cg2100.h index 9a5b80e2d..ae01aa6fb 100755 --- a/src/cg/cg2100.h +++ b/src/cg/cg2100.h @@ -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 diff --git a/src/cg/cg2100c.uml b/src/cg/cg2100c.uml index 6b583d805..ab90aa454 100755 --- a/src/cg/cg2100c.uml +++ b/src/cg/cg2100c.uml @@ -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 diff --git a/src/cg/cg21iva.uml b/src/cg/cg21iva.uml index 8badcbfe4..a0ec7a18d 100755 --- a/src/cg/cg21iva.uml +++ b/src/cg/cg21iva.uml @@ -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 "