[POS-commit] r6406 - in stoq/trunk/stoq/gui: admin purchase till warehouse

[Johan Dahlin]

Author: jdahlin
Date: Fri Apr 20 15:43:23 2007
New Revision: 6406

Modified:
   stoq/trunk/stoq/gui/admin/admin.py
   stoq/trunk/stoq/gui/purchase/purchase.py
   stoq/trunk/stoq/gui/till/till.py
   stoq/trunk/stoq/gui/warehouse/warehouse.py

Log:
Remove all searchbar references

Modified: stoq/trunk/stoq/gui/admin/admin.py
==============================================================================
--- stoq/trunk/stoq/gui/admin/admin.py	(original)
+++ stoq/trunk/stoq/gui/admin/admin.py	Fri Apr 20 15:43:23 2007
@@ -119,7 +119,7 @@
     def _add_user(self):
         model = run_person_role_dialog(UserEditor, self, self.conn)
         if finish_transaction(self.conn, model):
-            self.searchbar.search_items()
+            self.refresh()
             model = self.table.get(model.id, connection=self.conn)
             self.results.select(model)
 

Modified: stoq/trunk/stoq/gui/purchase/purchase.py
==============================================================================
--- stoq/trunk/stoq/gui/purchase/purchase.py	(original)
+++ stoq/trunk/stoq/gui/purchase/purchase.py	Fri Apr 20 15:43:23 2007
@@ -75,10 +75,10 @@
         date_filter = DateSearchFilter(_('Open date is:'))
         self.add_filter(
             date_filter, ['open_date'])
-        status_filter = ComboSearchFilter(_('Show orders with status'),
-                                          self._get_status_values())
-        status_filter.select(PurchaseOrder.ORDER_CONFIRMED)
-        self.add_filter(status_filter, ['status'], SearchFilterPosition.TOP)
+        self.status_filter = ComboSearchFilter(_('Show orders with status'),
+                                               self._get_status_values())
+        self.status_filter.select(PurchaseOrder.ORDER_CONFIRMED)
+        self.add_filter(self.status_filter, ['status'], SearchFilterPosition.TOP)
 
     def get_columns(self):
         return [Column('id', title=_('Number'), sorted=True,
@@ -192,11 +192,12 @@
             order = trans.get(order_view.purchase)
             order.confirm()
         trans.commit()
-        self.searchbar.search_items()
+        self.refresh()
 
     def _print_selected_items(self):
         items = self.results.get_selected_rows() or self.results
-        self.searchbar.print_report(PurchaseReport, items)
+        self.print_report(PurchaseReport, self.results,
+                          self.status_filter.get_state().value)
 
     def _cancel_order(self):
         order_views = self.results.get_selected_rows()
@@ -211,7 +212,7 @@
             order.cancel()
         trans.commit()
         self._update_totals()
-        self.searchbar.search_items()
+        self.refresh()
 
     def _get_status_values(self):
         items = [(text, value)
@@ -264,8 +265,8 @@
 
     def _on_order_action_clicked(self, action):
         self._open_order()
-        self.searchbar.search_items()
-
+        self.refresh()
+        
     def _on_base_categories_action_clicked(self, action):
         self.run_dialog(BaseSellableCatSearch, self.conn)
 

Modified: stoq/trunk/stoq/gui/till/till.py
==============================================================================
--- stoq/trunk/stoq/gui/till/till.py	(original)
+++ stoq/trunk/stoq/gui/till/till.py	Fri Apr 20 15:43:23 2007
@@ -304,10 +304,10 @@
     # Callbacks
     #
 
-    def on_searchbar_activate(self, slave, objs):
-        SearchableAppWindow.on_searchbar_activate(self, slave, objs)
-        self._update_toolbar_buttons()
-        self._update_total()
+#     def on_searchbar_activate(self, slave, objs):
+#         SearchableAppWindow.on_searchbar_activate(self, slave, objs)
+#         self._update_toolbar_buttons()
+#         self._update_total()
 
     #
     # Kiwi callbacks

Modified: stoq/trunk/stoq/gui/warehouse/warehouse.py
==============================================================================
--- stoq/trunk/stoq/gui/warehouse/warehouse.py	(original)
+++ stoq/trunk/stoq/gui/warehouse/warehouse.py	Fri Apr 20 15:43:23 2007
@@ -170,7 +170,7 @@
 
     def on_print_button__clicked(self, button):
         results = self.results.get_selected_rows() or self.results
-        self.searchbar.print_report(ProductReport, results)
+        self.print_report(ProductReport, results)
 
     def on_history_button__clicked(self, button):
         selected = self._klist.get_selected_rows()