Index: /trunk/core/promogest/modules/VenditaDettaglio/gui/_scontrini_emessi_elements.glade
===================================================================
--- /trunk/core/promogest/modules/VenditaDettaglio/gui/_scontrini_emessi_elements.glade (revision 658)
+++ /trunk/core/promogest/modules/VenditaDettaglio/gui/_scontrini_emessi_elements.glade (revision 874)
@@ -6,5 +6,5 @@
   <object class="GtkTable" id="scontrini_filter_table">
     <property name="visible">True</property>
-    <property name="n_rows">3</property>
+    <property name="n_rows">5</property>
     <property name="n_columns">2</property>
     <property name="row_spacing">3</property>
@@ -113,4 +113,55 @@
       </packing>
     </child>
+    <child>
+      <object class="GtkLabel" id="mag_label">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Mag/P.V.</property>
+      </object>
+      <packing>
+        <property name="top_attach">3</property>
+        <property name="bottom_attach">4</property>
+        <property name="x_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="pos_label">
+        <property name="visible">True</property>
+        <property name="xpad">3</property>
+        <property name="label" translatable="yes">Punto cassa</property>
+      </object>
+      <packing>
+        <property name="top_attach">4</property>
+        <property name="bottom_attach">5</property>
+        <property name="x_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkComboBox" id="id_magazzino_filter_combobox">
+        <property name="width_request">200</property>
+        <property name="visible">True</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="right_attach">2</property>
+        <property name="top_attach">3</property>
+        <property name="bottom_attach">4</property>
+        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+        <property name="y_options"></property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkComboBox" id="id_pos_filter_combobox">
+        <property name="width_request">200</property>
+        <property name="visible">True</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="right_attach">2</property>
+        <property name="top_attach">4</property>
+        <property name="bottom_attach">5</property>
+        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+        <property name="y_options"></property>
+      </packing>
+    </child>
   </object>
 </interface>
Index: /trunk/core/promogest/modules/VenditaDettaglio/ui/GestioneScontrini.py
===================================================================
--- /trunk/core/promogest/modules/VenditaDettaglio/ui/GestioneScontrini.py (revision 865)
+++ /trunk/core/promogest/modules/VenditaDettaglio/ui/GestioneScontrini.py (revision 874)
@@ -23,4 +23,5 @@
 from promogest.ui.utils import *
 from promogest.ui import utils
+from promogest.modules.VenditaDettaglio.ui.VenditaDettaglioUtils import fillComboboxPos
 
 from promogest.lib.HtmlHandler import createHtmlObj, renderTemplate, renderHTML
@@ -146,4 +147,11 @@
         else:
             self.filters.a_data_filter_entry.set_text(self_aData)
+        fillComboboxMagazzini(self.filters.id_magazzino_filter_combobox)
+        if hasattr(Environment.conf.VenditaDettaglio, "magazzino"):
+            findComboboxRowFromStr(self.filters.id_magazzino_filter_combobox, Environment.conf.VenditaDettaglio.magazzino,2)
+        fillComboboxPos(self.filters.id_pos_filter_combobox)
+        if hasattr(Environment.conf.VenditaDettaglio, "puntocassa"):
+            findComboboxRowFromStr(self.filters.id_pos_filter_combobox, Environment.conf.VenditaDettaglio.puntocassa,2)
+
 
         self.refreshHtml()
@@ -153,4 +161,9 @@
         # Annullamento filtro
         self.filters.id_articolo_filter_customcombobox.set_active(0)
+        if hasattr(Environment.conf.VenditaDettaglio, "magazzino"):
+            findComboboxRowFromStr(self.filters.id_magazzino_filter_combobox, Environment.conf.VenditaDettaglio.magazzino,2)
+        if hasattr(Environment.conf.VenditaDettaglio, "puntocassa"):
+            findComboboxRowFromStr(self.filters.id_pos_filter_combobox, Environment.conf.VenditaDettaglio.puntocassa,2)
+
         self.filters.da_data_filter_entry.setNow()
         self.filters.a_data_filter_entry.setNow()
@@ -163,7 +176,12 @@
         daData = stringToDate(self.filters.da_data_filter_entry.get_text())
         aData = stringToDateBumped(self.filters.a_data_filter_entry.get_text())
+        idPuntoCassa = findIdFromCombobox(self.filters.id_pos_filter_combobox)
+        idMagazzino = findIdFromCombobox(self.filters.id_magazzino_filter_combobox)
+
         self.filterss.numRecords = TestataScontrino().count(idArticolo=idArticolo,
                                                                       daData=daData,
-                                                                      aData=aData)
+                                                                      aData=aData,
+                                                                      idMagazzino = idMagazzino,
+                                                                      idPuntoCassa = idPuntoCassa)
         self.filterss._refreshPageCount()
 
@@ -172,4 +190,6 @@
                                                      daData=daData,
                                                      aData=aData,
+                                                     idMagazzino = idMagazzino,
+                                                     idPuntoCassa = idPuntoCassa,
                                                      offset=self.filterss.offset,
                                                      batchSize=self.filterss.batchSize)