[POS-commit] r5495 - in stoq/trunk/stoq/gui: admin purchase sales warehouse

[Johan Dahlin]

Author: jdahlin
Date: Tue Dec 19 09:20:33 2006
New Revision: 5495

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

Log:
#3028: "Any" should be show before any other sale status, and "ORDER" sales should not be shown.
Patch by Marco Antonio Porcho Souza, r=jdahlin


Modified: stoq/trunk/stoq/gui/admin/admin.py
==============================================================================
--- stoq/trunk/stoq/gui/admin/admin.py	(original)
+++ stoq/trunk/stoq/gui/admin/admin.py	Tue Dec 19 09:20:33 2006
@@ -68,7 +68,7 @@
 
     def get_filter_slave_items(self):
         items = [(value, key) for key, value in self.table.statuses.items()]
-        items.append((_('Any'), ALL_ITEMS_INDEX))
+        items.insert(0, (_('Any'), ALL_ITEMS_INDEX))
         return items
 
     def on_searchbar_activate(self, slave, objs):

Modified: stoq/trunk/stoq/gui/purchase/purchase.py
==============================================================================
--- stoq/trunk/stoq/gui/purchase/purchase.py	(original)
+++ stoq/trunk/stoq/gui/purchase/purchase.py	Tue Dec 19 09:20:33 2006
@@ -201,8 +201,7 @@
     def get_filter_slave_items(self):
         items = [(text, value)
                     for value, text in PurchaseOrder.statuses.items()]
-        first_item = (_('Any'), ALL_ITEMS_INDEX)
-        items.append(first_item)
+        items.insert(0, (_('Any'), ALL_ITEMS_INDEX))
         return items
 
     def on_searchbar_activate(self, slave, objs):

Modified: stoq/trunk/stoq/gui/sales/sales.py
==============================================================================
--- stoq/trunk/stoq/gui/sales/sales.py	(original)
+++ stoq/trunk/stoq/gui/sales/sales.py	Tue Dec 19 09:20:33 2006
@@ -153,7 +153,7 @@
         items = [(value, key) for key, value in Sale.statuses.items()
                     # No reason to show orders in sales app
                     if key != Sale.STATUS_ORDER]
-        items.append((_('Any'), ALL_ITEMS_INDEX))
+        items.insert(0, (_('Any'), ALL_ITEMS_INDEX))
         return items
 
     def get_filterslave_default_selected_item(self):
@@ -178,7 +178,7 @@
             self._setup_columns(status)
             self._columns_set = True
         if status == ALL_ITEMS_INDEX:
-            return
+            return SaleView.q.status != Sale.STATUS_ORDER
         return SaleView.q.status == status
 
     #

Modified: stoq/trunk/stoq/gui/warehouse/warehouse.py
==============================================================================
--- stoq/trunk/stoq/gui/warehouse/warehouse.py	(original)
+++ stoq/trunk/stoq/gui/warehouse/warehouse.py	Tue Dec 19 09:20:33 2006
@@ -82,7 +82,7 @@
             raise DatabaseInconsistency('You should have at least one '
                                         'branch on your database.'
                                         'Found zero')
-        items.append(ALL_BRANCHES)
+        items.insert(0, ALL_BRANCHES)
         return items
 
     def _update_widgets(self):