Stoq

Merge lp:~gergagabriel/stoq/bug4194 into lp:~stoq-dev/stoq/master-old

  1. bug4194
  2. Merge into master-old
Proposed by Gabriel Gerga
Status: Merged
Merged at revision: 1624
Proposed branch: lp:~gergagabriel/stoq/bug4194
Merge into: lp:~stoq-dev/stoq/master-old
Diff against target: 56 lines (+14/-0)
2 files modified
data/glade/receivable.glade (+7/-0)
stoq/gui/receivable/receivable.py (+7/-0)
To merge this branch: bzr merge lp:~gergagabriel/stoq/bug4194
Reviewer Review Type Date Requested Status
Stoq Developers Pending
Review via email: mp+38979@code.launchpad.net

Description of the change

Added menu -> card payment search in accounts receivable application.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/glade/receivable.glade'
2--- data/glade/receivable.glade 2010-05-12 17:26:08 +0000
3+++ data/glade/receivable.glade 2010-10-20 20:33:56 +0000
4@@ -107,6 +107,12 @@
5 </widget>
6 </child>
7 <child>
8+ <widget class="GtkAction" id="CardPaymentSearch">
9+ <property name="name">CardPaymentSearch</property>
10+ <property name="label" translatable="yes">Card Payment...</property>
11+ </widget>
12+ </child>
13+ <child>
14 <widget class="GtkAction" id="Copy">
15 <property name="name">Copy</property>
16 <property name="tooltip" translatable="yes">Copy selected object into the clipboard</property>
17@@ -254,6 +260,7 @@
18 </menu>
19 <menu action="SearchMenu">
20 <menuitem action="BillCheckSearch"/>
21+ <menuitem action="CardPaymentSearch"/>
22 </menu>
23 <menu action="help_menu">
24 <menuitem action="about_menu"/>
25
26=== modified file 'stoq/gui/receivable/receivable.py'
27--- stoq/gui/receivable/receivable.py 2010-10-01 15:54:39 +0000
28+++ stoq/gui/receivable/receivable.py 2010-10-20 20:33:56 +0000
29@@ -58,6 +58,7 @@
30 from stoqlib.gui.dialogs.saledetails import SaleDetailsDialog
31 from stoqlib.gui.dialogs.renegotiationdetails import RenegotiationDetailsDialog
32 from stoqlib.gui.search.paymentsearch import InPaymentBillCheckSearch
33+from stoqlib.gui.search.paymentsearch import CardPaymentSearch
34 from stoqlib.gui.slaves.installmentslave import SaleInstallmentConfirmationSlave
35 from stoqlib.gui.wizards.renegotiationwizard import PaymentRenegotiationWizard
36 from stoqlib.lib.message import warning
37@@ -362,6 +363,9 @@
38 def _can_show_comments(self, receivable_views):
39 return len(receivable_views) == 1
40
41+ def _run_card_payment_search(self):
42+ run_dialog(CardPaymentSearch, self, self.conn)
43+
44 def _run_bill_check_search(self):
45 run_dialog(InPaymentBillCheckSearch, self, self.conn)
46
47@@ -416,6 +420,9 @@
48 def on_BillCheckSearch__activate(self, action):
49 self._run_bill_check_search()
50
51+ def on_CardPaymentSearch__activate(self, action):
52+ self._run_card_payment_search()
53+
54 def on_Renegotiate__activate(self, action):
55 try:
56 Till.get_current(self.conn)

Subscribers

People subscribed via source and target branches