Merge lp:~romaia/stoq/pagamentos into lp:~stoq-dev/stoq/master-old

[Ronaldo Maia]

[Ronaldo Maia (romaia)]

Mudanças depois da revisão do bug 4009

[George Kussumoto (georgeyk)]

review: Approve

=== modified file 'data/glade/payable.glade'
--- data/glade/payable.glade	2009-05-20 15:43:45 +0000
+++ data/glade/payable.glade	2009-09-24 19:50:29 +0000
@@ -345,6 +345,18 @@
                                             </packing>
                                         </child>
                                         <child>
+                                            <widget class="GtkButton" id="edit_button">
+                                                <property name="image_position">top</property>
+                                                <property name="label">gtk-edit</property>
+                                                <property name="sensitive">False</property>
+                                                <property name="use_stock">True</property>
+                                                <property name="visible">True</property>
+                                            </widget>
+                                            <packing>
+                                                <property name="position">3</property>
+                                            </packing>
+                                        </child>
+                                        <child>
                                             <widget class="GtkButton" id="print_button">
                                                 <property name="image_position">top</property>
                                                 <property name="label">gtk-print</property>
@@ -353,7 +365,7 @@
                                                 <property name="visible">True</property>
                                             </widget>
                                             <packing>
-                                                <property name="position">3</property>
+                                                <property name="position">4</property>
                                             </packing>
                                         </child>
                                     </widget>

=== modified file 'stoq/gui/payable/payable.py'
--- stoq/gui/payable/payable.py	2009-06-25 16:46:03 +0000
+++ stoq/gui/payable/payable.py	2009-09-24 19:50:29 +0000
@@ -41,6 +41,7 @@
 from stoqlib.database.runtime import new_transaction, finish_transaction
 from stoqlib.domain.payment.payment import Payment
 from stoqlib.domain.payment.views import OutPaymentView
+from stoqlib.domain.purchase import PurchaseOrder
 from stoqlib.gui.base.dialogs import run_dialog
 from stoqlib.gui.base.gtkadds import render_pixbuf
 from stoqlib.gui.dialogs.paymentadditiondialog import \
@@ -49,6 +50,7 @@
                                                      PaymentStatusChangeDialog)
 from stoqlib.gui.dialogs.purchasedetails import PurchaseDetailsDialog
 from stoqlib.gui.dialogs.saledetails import SaleDetailsDialog
+from stoqlib.gui.editors.paymentseditor import PaymentsEditor
 from stoqlib.gui.printing import print_report
 from stoqlib.gui.search.paymentsearch import OutPaymentBillCheckSearch
 from stoqlib.reporting.payment import PayablePaymentReport
@@ -139,6 +141,20 @@
             can_show_details = True
         return can_show_details
 
+    def _can_edit(self, payable_views):
+        """Determines if we can edit the selected payments
+        """
+        if not self._same_purchase(payable_views):
+            return False
+
+        status = payable_views[0].purchase.status
+        if (status == PurchaseOrder.ORDER_CANCELLED or
+            status == PurchaseOrder.ORDER_PENDING):
+            return False
+
+        return True
+
+
     def _change_due_date(self, payable_view):
         """ Receives a payable_view and change the payment due date
         related to the view.
@@ -194,6 +210,13 @@
 
         return payable_views[0].can_change_due_date()
 
+    def _edit(self, payable_views):
+        trans = new_transaction()
+        order = trans.get(payable_views[0].purchase)
+        model = run_dialog(PaymentsEditor, self, trans, order)
+        rv = finish_transaction(trans, model)
+        trans.close()
+
     def _pay(self, payable_views):
         """
         Pay a list of items from a payable_views, note that
@@ -284,7 +307,7 @@
         selected = self.results.get_selected_rows()
         self.details_button.set_sensitive(self._can_show_details(selected))
         self.ChangeDueDate.set_sensitive(self._can_change_due_date(selected))
-        self.pay_order_button.set_sensitive(self._same_purchase(selected))
+        self.edit_button.set_sensitive(self._can_edit(selected))
         self.pay_order_button.set_sensitive(self._can_pay(selected))
         self.print_button.set_sensitive(bool(self.results))
         self.Receipt.set_sensitive(self._are_paid(selected, respect_purchase=True))
@@ -313,6 +336,9 @@
     def on_pay_order_button__clicked(self, button):
         self._pay(self.results.get_selected_rows())
 
+    def on_edit_button__clicked(self, button):
+        self._edit(self.results.get_selected_rows())
+
     def on_results__selection_changed(self, results, selected):
         self._update_widgets()