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

[Gabriel Gerga]

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

=== modified file 'data/glade/receivable.glade'
--- data/glade/receivable.glade	2010-05-12 17:26:08 +0000
+++ data/glade/receivable.glade	2010-10-20 20:33:56 +0000
@@ -107,6 +107,12 @@
                     </widget>
                 </child>
                 <child>
+                    <widget class="GtkAction" id="CardPaymentSearch">
+                        <property name="name">CardPaymentSearch</property>
+                        <property name="label" translatable="yes">Card Payment...</property>
+                    </widget>
+                </child>
+                <child>
                     <widget class="GtkAction" id="Copy">
                         <property name="name">Copy</property>
                         <property name="tooltip" translatable="yes">Copy selected object into the clipboard</property>
@@ -254,6 +260,7 @@
 	  </menu>
       <menu action="SearchMenu">
         <menuitem action="BillCheckSearch"/>
+        <menuitem action="CardPaymentSearch"/>
       </menu> 
 	  <menu action="help_menu">
 	    <menuitem action="about_menu"/>
 
=== modified file 'stoq/gui/receivable/receivable.py'
--- stoq/gui/receivable/receivable.py	2010-10-01 15:54:39 +0000
+++ stoq/gui/receivable/receivable.py	2010-10-20 20:33:56 +0000
@@ -58,6 +58,7 @@
 from stoqlib.gui.dialogs.saledetails import SaleDetailsDialog
 from stoqlib.gui.dialogs.renegotiationdetails import RenegotiationDetailsDialog
 from stoqlib.gui.search.paymentsearch import InPaymentBillCheckSearch
+from stoqlib.gui.search.paymentsearch import CardPaymentSearch
 from stoqlib.gui.slaves.installmentslave import SaleInstallmentConfirmationSlave
 from stoqlib.gui.wizards.renegotiationwizard import PaymentRenegotiationWizard
 from stoqlib.lib.message import warning
@@ -362,6 +363,9 @@
     def _can_show_comments(self, receivable_views):
         return len(receivable_views) == 1
 
+    def _run_card_payment_search(self):
+        run_dialog(CardPaymentSearch, self, self.conn)
+
     def _run_bill_check_search(self):
         run_dialog(InPaymentBillCheckSearch, self, self.conn)
 
@@ -416,6 +420,9 @@
     def on_BillCheckSearch__activate(self, action):
         self._run_bill_check_search()
 
+    def on_CardPaymentSearch__activate(self, action):
+        self._run_card_payment_search()
+
     def on_Renegotiate__activate(self, action):
         try:        
             Till.get_current(self.conn)