diff --git a/XPS/Appunti.txt b/XPS/Appunti.txt
index 928940a..9811723 100644
--- a/XPS/Appunti.txt
+++ b/XPS/Appunti.txt
@@ -5,13 +5,13 @@ OK - togliere codCli (non gli serve)
 OK - togliere data prev da ins magazziniere...
 OK - agganciare filtraggi e filtro ricerca generica
 OK - accettazione x magazziniere, che non possa accettare o cancellare post aver già accettato... idem x editing...
- - inserire voci in mantis varie
+OK - inserire voci in mantis varie
  - una vista x ogni funzione
-  - magazzino (ok quasi)
+OK  - magazzino
   - produzione
    - realizzare allocazione risorse
-  - segreteria
-  - admin (da magazzino... con altri editing & co...)
+OK  - segreteria
+OK  - admin (da magazzino... con altri editing & co...)
  - barcode da web?
  - avanzamento stato: obj mamma ha stato min tra i vari child
  - 
\ No newline at end of file
diff --git a/XPS/Web.config b/XPS/Web.config
index 3b5acf3..df88bc7 100644
--- a/XPS/Web.config
+++ b/XPS/Web.config
@@ -115,6 +115,8 @@
 	<connectionStrings>
   <add name="SteamWare_XPSConnectionString" connectionString="Data Source=localhost;Initial Catalog=SteamWare_XPS;Persist Security Info=True;User id=sa;Password=keyhammer"
    providerName="System.Data.SqlClient" />
+  <add name="SteamWare_XPSConnectionString1" connectionString="Data Source=localhost;Initial Catalog=SteamWare_XPS;Integrated Security=True"
+   providerName="System.Data.SqlClient" />
  </connectionStrings>
 	<system.webServer>
 		<validation validateIntegratedModeConfiguration="false"/>
diff --git a/XPS/elencoCommMag.aspx b/XPS/elencoCommMag.aspx
new file mode 100644
index 0000000..e3f876d
--- /dev/null
+++ b/XPS/elencoCommMag.aspx
@@ -0,0 +1,8 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" CodeFile="elencoCommMag.aspx.cs" Inherits="elencoCommMag" %>
+
+<%@ Register src="mod_elencoComm.ascx" tagname="mod_elencoComm" tagprefix="uc1" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+    <uc1:mod_elencoComm ID="Mod_elencoComm1" runat="server" />
+</asp:Content>
+
diff --git a/XPS/elencoCommMag.aspx.cs b/XPS/elencoCommMag.aspx.cs
new file mode 100644
index 0000000..df4afcb
--- /dev/null
+++ b/XPS/elencoCommMag.aspx.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+public partial class elencoCommMag : System.Web.UI.Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        Mod_elencoComm1.eh_selValore += new EventHandler(Mod_elencoComm1_eh_selValore);
+    }
+
+    void Mod_elencoComm1_eh_selValore(object sender, EventArgs e)
+    {
+        Response.Redirect("detComm.aspx");
+    }
+}
diff --git a/XPS/elencoCommProd.aspx b/XPS/elencoCommProd.aspx
new file mode 100644
index 0000000..8d4d83a
--- /dev/null
+++ b/XPS/elencoCommProd.aspx
@@ -0,0 +1,7 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" CodeFile="elencoCommProd.aspx.cs" Inherits="elencoCommProd" %>
+
+<%@ Register src="mod_elencoComm.ascx" tagname="mod_elencoComm" tagprefix="uc1" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+    <uc1:mod_elencoComm ID="Mod_elencoComm1" runat="server" />
+</asp:Content>
\ No newline at end of file
diff --git a/XPS/elencoCommProd.aspx.cs b/XPS/elencoCommProd.aspx.cs
new file mode 100644
index 0000000..b4b8032
--- /dev/null
+++ b/XPS/elencoCommProd.aspx.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+public partial class elencoCommProd : System.Web.UI.Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        Mod_elencoComm1.eh_selValore += new EventHandler(Mod_elencoComm1_eh_selValore);
+    }
+
+    void Mod_elencoComm1_eh_selValore(object sender, EventArgs e)
+    {
+        Response.Redirect("detComm.aspx");
+    }
+}
diff --git a/XPS/elencoCommSegr.aspx b/XPS/elencoCommSegr.aspx
new file mode 100644
index 0000000..b42adf7
--- /dev/null
+++ b/XPS/elencoCommSegr.aspx
@@ -0,0 +1,7 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" CodeFile="elencoCommSegr.aspx.cs" Inherits="elencoCommSegr" %>
+
+<%@ Register src="mod_elencoComm.ascx" tagname="mod_elencoComm" tagprefix="uc1" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+    <uc1:mod_elencoComm ID="Mod_elencoComm1" runat="server" />
+</asp:Content>
\ No newline at end of file
diff --git a/XPS/elencoCommSegr.aspx.cs b/XPS/elencoCommSegr.aspx.cs
new file mode 100644
index 0000000..74677cf
--- /dev/null
+++ b/XPS/elencoCommSegr.aspx.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+public partial class elencoCommSegr : System.Web.UI.Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        Mod_elencoComm1.eh_selValore += new EventHandler(Mod_elencoComm1_eh_selValore);
+    }
+
+    void Mod_elencoComm1_eh_selValore(object sender, EventArgs e)
+    {
+        Response.Redirect("detComm.aspx");
+    }
+}
diff --git a/XPS/mod_elencoComm.ascx b/XPS/mod_elencoComm.ascx
index 9229b56..0a09de7 100644
--- a/XPS/mod_elencoComm.ascx
+++ b/XPS/mod_elencoComm.ascx
@@ -6,6 +6,16 @@
     <table width="100%">
         <tr>
             <td>
+                <uc1:mod_filtro ID="mf_tipoFiltro" runat="server" changeCheckEnabled="false" changeCheckVisible="false" />
+                <asp:ObjectDataSource ID="odsTipoFiltro" runat="server" OldValuesParameterFormatString="original_{0}"
+                    SelectMethod="getByUrl" TypeName="DS_utilityTableAdapters.v_selFiltriTableAdapter">
+                    <SelectParameters>
+                        <asp:ControlParameter ControlID="lblPag" DefaultValue="*" Name="url" PropertyName="Text"
+                            Type="String" />
+                    </SelectParameters>
+                </asp:ObjectDataSource>
+                <asp:Label runat="server" ID="lblPag" Visible="false" />
+                &nbsp;
                 <uc1:mod_filtro ID="mf_clienti" runat="server" />
                 <asp:ObjectDataSource ID="odsFiltroClienti" runat="server" OldValuesParameterFormatString="original_{0}"
                     SelectMethod="GetData" TypeName="DS_utilityTableAdapters.v_selClientiTableAdapter">
@@ -152,15 +162,20 @@
         </asp:TemplateField>
     </Columns>
 </asp:GridView>
-<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
-    SelectMethod="GetData" TypeName="DS_applicazioneTableAdapters.v_commesseTableAdapter"
-    DeleteMethod="sp_delObj" FilterExpression=" Cliente LIKE '%{0}%' OR DDT LIKE '%{0}%' OR Descrizione LIKE '%{0}%' ">
+<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}"
+    SelectMethod="getByCodFiltro" TypeName="DS_applicazioneTableAdapters.v_commesseTableAdapter"
+    DeleteMethod="sp_delObj" 
+    FilterExpression=" Cliente LIKE '%{0}%' OR DDT LIKE '%{0}%' OR Descrizione LIKE '%{0}%' ">
     <DeleteParameters>
         <asp:Parameter Name="Original_Cod" Type="String" />
     </DeleteParameters>
     <FilterParameters>
         <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
     </FilterParameters>
+    <SelectParameters>
+        <asp:ControlParameter ControlID="mf_tipoFiltro" DefaultValue="*" Name="CodFiltro" 
+            PropertyName="Valore" Type="String" />
+    </SelectParameters>
 </asp:ObjectDataSource>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label><br />
 <asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
\ No newline at end of file
diff --git a/XPS/mod_elencoComm.ascx.cs b/XPS/mod_elencoComm.ascx.cs
index b8fd25a..8b1bf7a 100644
--- a/XPS/mod_elencoComm.ascx.cs
+++ b/XPS/mod_elencoComm.ascx.cs
@@ -150,9 +150,17 @@ public partial class mod_elencoComm : ApplicationUserControl
         base.OnInit(e);
         _idxGridView = "CodDDT";
         mf_clienti.eh_selValore += new EventHandler(mf_clienti_eh_selValore);
+    }
+
+    protected override void SetUpByUserRight()
+    {
+        base.SetUpByUserRight();
         if (!Page.IsPostBack)
         {
+            // imposto la pag corrente nel controllo di filtraggio...
+            lblPag.Text = _paginaCorrente;
             mf_clienti.ods = odsFiltroClienti;
+            mf_tipoFiltro.ods = odsTipoFiltro;
         }
     }
 
diff --git a/db/SteamWare_XPS.zip b/db/SteamWare_XPS.zip
index 8ee1928..1902a74 100644
Binary files a/db/SteamWare_XPS.zip and b/db/SteamWare_XPS.zip differ