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

Proposed by Ronaldo Maia
Status: Merged
Merged at revision: not available
Proposed branch: lp:~romaia/stoq/pagamentos
Merge into: lp:~stoq-dev/stoq/master-old
Diff against target: 104 lines
2 files modified
data/glade/payable.glade (+13/-1)
stoq/gui/payable/payable.py (+27/-1)
To merge this branch: bzr merge lp:~romaia/stoq/pagamentos
Reviewer Review Type Date Requested Status
George Kussumoto (community) Approve
Review via email: mp+12376@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ronaldo Maia (romaia) wrote :

Mudanças depois da revisão do bug 4009

Revision history for this message
George Kussumoto (georgeyk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
345 </packing>345 </packing>
346 </child>346 </child>
347 <child>347 <child>
348 <widget class="GtkButton" id="edit_button">
349 <property name="image_position">top</property>
350 <property name="label">gtk-edit</property>
351 <property name="sensitive">False</property>
352 <property name="use_stock">True</property>
353 <property name="visible">True</property>
354 </widget>
355 <packing>
356 <property name="position">3</property>
357 </packing>
358 </child>
359 <child>
348 <widget class="GtkButton" id="print_button">360 <widget class="GtkButton" id="print_button">
349 <property name="image_position">top</property>361 <property name="image_position">top</property>
350 <property name="label">gtk-print</property>362 <property name="label">gtk-print</property>
@@ -353,7 +365,7 @@
353 <property name="visible">True</property>365 <property name="visible">True</property>
354 </widget>366 </widget>
355 <packing>367 <packing>
356 <property name="position">3</property>368 <property name="position">4</property>
357 </packing>369 </packing>
358 </child>370 </child>
359 </widget>371 </widget>
360372
=== 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 @@
41from stoqlib.database.runtime import new_transaction, finish_transaction41from stoqlib.database.runtime import new_transaction, finish_transaction
42from stoqlib.domain.payment.payment import Payment42from stoqlib.domain.payment.payment import Payment
43from stoqlib.domain.payment.views import OutPaymentView43from stoqlib.domain.payment.views import OutPaymentView
44from stoqlib.domain.purchase import PurchaseOrder
44from stoqlib.gui.base.dialogs import run_dialog45from stoqlib.gui.base.dialogs import run_dialog
45from stoqlib.gui.base.gtkadds import render_pixbuf46from stoqlib.gui.base.gtkadds import render_pixbuf
46from stoqlib.gui.dialogs.paymentadditiondialog import \47from stoqlib.gui.dialogs.paymentadditiondialog import \
@@ -49,6 +50,7 @@
49 PaymentStatusChangeDialog)50 PaymentStatusChangeDialog)
50from stoqlib.gui.dialogs.purchasedetails import PurchaseDetailsDialog51from stoqlib.gui.dialogs.purchasedetails import PurchaseDetailsDialog
51from stoqlib.gui.dialogs.saledetails import SaleDetailsDialog52from stoqlib.gui.dialogs.saledetails import SaleDetailsDialog
53from stoqlib.gui.editors.paymentseditor import PaymentsEditor
52from stoqlib.gui.printing import print_report54from stoqlib.gui.printing import print_report
53from stoqlib.gui.search.paymentsearch import OutPaymentBillCheckSearch55from stoqlib.gui.search.paymentsearch import OutPaymentBillCheckSearch
54from stoqlib.reporting.payment import PayablePaymentReport56from stoqlib.reporting.payment import PayablePaymentReport
@@ -139,6 +141,20 @@
139 can_show_details = True141 can_show_details = True
140 return can_show_details142 return can_show_details
141143
144 def _can_edit(self, payable_views):
145 """Determines if we can edit the selected payments
146 """
147 if not self._same_purchase(payable_views):
148 return False
149
150 status = payable_views[0].purchase.status
151 if (status == PurchaseOrder.ORDER_CANCELLED or
152 status == PurchaseOrder.ORDER_PENDING):
153 return False
154
155 return True
156
157
142 def _change_due_date(self, payable_view):158 def _change_due_date(self, payable_view):
143 """ Receives a payable_view and change the payment due date159 """ Receives a payable_view and change the payment due date
144 related to the view.160 related to the view.
@@ -194,6 +210,13 @@
194210
195 return payable_views[0].can_change_due_date()211 return payable_views[0].can_change_due_date()
196212
213 def _edit(self, payable_views):
214 trans = new_transaction()
215 order = trans.get(payable_views[0].purchase)
216 model = run_dialog(PaymentsEditor, self, trans, order)
217 rv = finish_transaction(trans, model)
218 trans.close()
219
197 def _pay(self, payable_views):220 def _pay(self, payable_views):
198 """221 """
199 Pay a list of items from a payable_views, note that222 Pay a list of items from a payable_views, note that
@@ -284,7 +307,7 @@
284 selected = self.results.get_selected_rows()307 selected = self.results.get_selected_rows()
285 self.details_button.set_sensitive(self._can_show_details(selected))308 self.details_button.set_sensitive(self._can_show_details(selected))
286 self.ChangeDueDate.set_sensitive(self._can_change_due_date(selected))309 self.ChangeDueDate.set_sensitive(self._can_change_due_date(selected))
287 self.pay_order_button.set_sensitive(self._same_purchase(selected))310 self.edit_button.set_sensitive(self._can_edit(selected))
288 self.pay_order_button.set_sensitive(self._can_pay(selected))311 self.pay_order_button.set_sensitive(self._can_pay(selected))
289 self.print_button.set_sensitive(bool(self.results))312 self.print_button.set_sensitive(bool(self.results))
290 self.Receipt.set_sensitive(self._are_paid(selected, respect_purchase=True))313 self.Receipt.set_sensitive(self._are_paid(selected, respect_purchase=True))
@@ -313,6 +336,9 @@
313 def on_pay_order_button__clicked(self, button):336 def on_pay_order_button__clicked(self, button):
314 self._pay(self.results.get_selected_rows())337 self._pay(self.results.get_selected_rows())
315338
339 def on_edit_button__clicked(self, button):
340 self._edit(self.results.get_selected_rows())
341
316 def on_results__selection_changed(self, results, selected):342 def on_results__selection_changed(self, results, selected):
317 self._update_widgets()343 self._update_widgets()
318344

Subscribers

People subscribed via source and target branches