Merge lp:~georgeyk/stoq/status-column into lp:~stoq-dev/stoq/master-old

[George Kussumoto]

http://bugs.async.com.br/show_bug.cgi?id=3996

[Ronaldo Maia (romaia)]

review: Approve

=== modified file 'stoq/gui/production/production.py'
--- stoq/gui/production/production.py	2010-02-22 19:31:59 +0000
+++ stoq/gui/production/production.py	2010-03-08 19:49:23 +0000
@@ -110,6 +110,8 @@
     def get_columns(self):
         return [SearchColumn('id', title=_(u'# '), sorted=True, data_type=int,
                              format='%04d'),
+                Column('status_str', title=_(u'Status'), data_type=str,
+                        visible=False),
                 SearchColumn('description', title=_(u'Description'),
                              data_type=str, expand=True),
                 Column('responsible.person.name', title=_(u'Responsible'),
 
=== modified file 'stoq/gui/purchase/purchase.py'
--- stoq/gui/purchase/purchase.py	2009-09-09 17:38:16 +0000
+++ stoq/gui/purchase/purchase.py	2010-03-08 19:49:23 +0000
@@ -35,7 +35,7 @@
 from kiwi.enums import SearchFilterPosition
 from kiwi.python import all
 from kiwi.ui.search import DateSearchFilter, ComboSearchFilter
-from kiwi.ui.objectlist import SearchColumn
+from kiwi.ui.objectlist import Column, SearchColumn
 from stoqlib.database.runtime import (new_transaction, rollback_and_begin,
                                       finish_transaction)
 from stoqlib.lib.message import warning, yesno
@@ -90,6 +90,8 @@
         return [SearchColumn('id', title=_('Number'), sorted=True,
                              data_type=int, justify=gtk.JUSTIFY_RIGHT,
                              width=80),
+                Column('status_str', title=_(u'Status'), data_type=str,
+                       visible=False),
                 SearchColumn('open_date', title=_('Opened'),
                               long_title='Date Opened',
                               data_type=datetime.date),
 
=== modified file 'stoq/gui/till/till.py'
--- stoq/gui/till/till.py	2009-07-13 13:09:20 +0000
+++ stoq/gui/till/till.py	2010-03-08 19:49:23 +0000
@@ -35,7 +35,7 @@
 from kiwi.log import Logger
 from kiwi.enums import SearchFilterPosition
 from kiwi.ui.search import DateSearchFilter, ComboSearchFilter
-from kiwi.ui.objectlist import SearchColumn
+from kiwi.ui.objectlist import Column, SearchColumn
 from stoqlib.exceptions import StoqlibError, TillError
 from stoqlib.database.runtime import (new_transaction, get_current_branch,
                                       rollback_and_begin, finish_transaction)
@@ -106,6 +106,8 @@
     def get_columns(self):
         return [SearchColumn('id', title=_('Number'), width=80,
                              data_type=int, format='%05d', sorted=True),
+                Column('status_name', title=_(u'Status'), data_type=str,
+                        visible=False),
                 SearchColumn('open_date', title=_('Date Started'), width=120,
                              data_type=date, justify=gtk.JUSTIFY_RIGHT),
                 SearchColumn('client_name', title=_('Client'),