diff --git a/src/tf/tf0400.cpp b/src/tf/tf0400.cpp index 438a0d068..bf67639be 100644 --- a/src/tf/tf0400.cpp +++ b/src/tf/tf0400.cpp @@ -6,7 +6,7 @@ #include #include #include // cache() -#include "felib.h" // TAnagrafica +#include "../fe/felib.h" // TAnagrafica /**************************************************************************************************** @@ -57,6 +57,20 @@ bool TSpeCheck_msk::on_field_event(TOperable_field& o, TField_event e, long joll case DLG_DELREC: deleteAll(); break; + case DLG_EDIT: + if(e == fe_button) + { + TSheet_field& sheet = sfield(F_RIGHE); + if(sheet.items() > 0) + { + sheet.esporta(); + } + else + { + warning_box("Impossibile esportare una griglia vuota"); + } + } + break; default: break; @@ -118,6 +132,7 @@ void TSpeCheck_msk::fillNoFilter() int nrec = rset.items(); TSheet_field& s = sfield(F_RIGHE); + if(s.items() > 0) s.destroy(); @@ -486,6 +501,8 @@ void TSpeCheck_msk::selectAll() TSheet_field& s = sfield(F_RIGHE); FOR_EACH_SHEET_ROW(s, r, strarr) { + // Salto tutte le righe provenienti dalla prima nota + if(get_long(F_TIPOCONTROLLO) == 1 && r % 2 == 0) continue; strarr->add(_selected ? "X" : "", s.cid2index(A_ELIMINA)); } s.force_update(); diff --git a/src/tf/tf0400a.uml b/src/tf/tf0400a.uml index 632c9ac47..b1ec1977a 100644 --- a/src/tf/tf0400a.uml +++ b/src/tf/tf0400a.uml @@ -8,24 +8,30 @@ BEGIN PICTURE TOOL_CONVERT END -BUTTON DLG_ALL 2 2 -BEGIN - PROMPT 1 1 "Seleziona" - PICTURE TOOL_MULTISEL -END - BUTTON DLG_SAVEREC 2 2 BEGIN PROMPT 1 1 "Salva" PICTURE TOOL_SAVEREC END +BUTTON DLG_ALL 2 2 +BEGIN + PROMPT 1 1 "Seleziona" + PICTURE TOOL_MULTISEL +END + BUTTON DLG_DELREC 2 2 BEGIN PROMPT 1 1 "Elimina" PICTURE TOOL_DELREC END +BUTTON DLG_EDIT 10 2 +BEGIN + PROMPT 3 1 "E~xcel" + PICTURE TOOL_EXCEL +END + #include ENDPAGE diff --git a/src/tf/tfmenu.men b/src/tf/tfmenu.men index 324b06b68..5d936f406 100644 --- a/src/tf/tfmenu.men +++ b/src/tf/tfmenu.men @@ -5,7 +5,7 @@ Module = tf Flags = "" Item_01 = "Trasferimento Fatture", "tf0 -0", ""+ Item_02 = "Cambio stato Trasferimento fatture", "tf0 -2", "" -//Item_03 = "Controllo Trasferimento fatture", "tf0 -3", "" +Item_03 = "Controllo Trasferimento fatture", "tf0 -3", "" Item_04 = "Report Trasferimento fatture", "ba8 -4 tftotivaliq.rep", "" Item_05 = "Liquidazione IVA Periodica", "tf0 -1", "" Item_06 = "Invio Liquidazione IVA Periodica", "tf0 -4", ""