Stoq

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

  1. status-column
  2. Merge into master-old
Proposed by George Kussumoto
Status: Merged
Merged at revision: not available
Proposed branch: lp:~georgeyk/stoq/status-column
Merge into: lp:~stoq-dev/stoq/master-old
Diff against target: 56 lines (+8/-2)
3 files modified
stoq/gui/production/production.py (+2/-0)
stoq/gui/purchase/purchase.py (+3/-1)
stoq/gui/till/till.py (+3/-1)
To merge this branch: bzr merge lp:~georgeyk/stoq/status-column
Reviewer Review Type Date Requested Status
Ronaldo Maia Approve
Review via email: mp+20924@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ronaldo Maia (romaia) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stoq/gui/production/production.py'
2--- stoq/gui/production/production.py 2010-02-22 19:31:59 +0000
3+++ stoq/gui/production/production.py 2010-03-08 19:49:23 +0000
4@@ -110,6 +110,8 @@
5 def get_columns(self):
6 return [SearchColumn('id', title=_(u'# '), sorted=True, data_type=int,
7 format='%04d'),
8+ Column('status_str', title=_(u'Status'), data_type=str,
9+ visible=False),
10 SearchColumn('description', title=_(u'Description'),
11 data_type=str, expand=True),
12 Column('responsible.person.name', title=_(u'Responsible'),
13
14=== modified file 'stoq/gui/purchase/purchase.py'
15--- stoq/gui/purchase/purchase.py 2009-09-09 17:38:16 +0000
16+++ stoq/gui/purchase/purchase.py 2010-03-08 19:49:23 +0000
17@@ -35,7 +35,7 @@
18 from kiwi.enums import SearchFilterPosition
19 from kiwi.python import all
20 from kiwi.ui.search import DateSearchFilter, ComboSearchFilter
21-from kiwi.ui.objectlist import SearchColumn
22+from kiwi.ui.objectlist import Column, SearchColumn
23 from stoqlib.database.runtime import (new_transaction, rollback_and_begin,
24 finish_transaction)
25 from stoqlib.lib.message import warning, yesno
26@@ -90,6 +90,8 @@
27 return [SearchColumn('id', title=_('Number'), sorted=True,
28 data_type=int, justify=gtk.JUSTIFY_RIGHT,
29 width=80),
30+ Column('status_str', title=_(u'Status'), data_type=str,
31+ visible=False),
32 SearchColumn('open_date', title=_('Opened'),
33 long_title='Date Opened',
34 data_type=datetime.date),
35
36=== modified file 'stoq/gui/till/till.py'
37--- stoq/gui/till/till.py 2009-07-13 13:09:20 +0000
38+++ stoq/gui/till/till.py 2010-03-08 19:49:23 +0000
39@@ -35,7 +35,7 @@
40 from kiwi.log import Logger
41 from kiwi.enums import SearchFilterPosition
42 from kiwi.ui.search import DateSearchFilter, ComboSearchFilter
43-from kiwi.ui.objectlist import SearchColumn
44+from kiwi.ui.objectlist import Column, SearchColumn
45 from stoqlib.exceptions import StoqlibError, TillError
46 from stoqlib.database.runtime import (new_transaction, get_current_branch,
47 rollback_and_begin, finish_transaction)
48@@ -106,6 +106,8 @@
49 def get_columns(self):
50 return [SearchColumn('id', title=_('Number'), width=80,
51 data_type=int, format='%05d', sorted=True),
52+ Column('status_name', title=_(u'Status'), data_type=str,
53+ visible=False),
54 SearchColumn('open_date', title=_('Date Started'), width=120,
55 data_type=date, justify=gtk.JUSTIFY_RIGHT),
56 SearchColumn('client_name', title=_('Client'),

Subscribers

People subscribed via source and target branches