Merge lp:~bellini666/stoqlib/print_bought_items into lp:~stoq-dev/stoqlib/master

Proposed by Thiago Bellini
Status: Merged
Merged at revision: 3246
Proposed branch: lp:~bellini666/stoqlib/print_bought_items
Merge into: lp:~stoq-dev/stoqlib/master
Diff against target: 69 lines (+34/-1)
2 files modified
stoqlib/gui/search/purchasesearch.py (+6/-0)
stoqlib/reporting/purchase.py (+28/-1)
To merge this branch: bzr merge lp:~bellini666/stoqlib/print_bought_items
Reviewer Review Type Date Requested Status
Ronaldo Maia Approve
Review via email: mp+41506@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ronaldo Maia (romaia) wrote :

Certinho, pode aplicar em lp:stoqlib

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stoqlib/gui/search/purchasesearch.py'
2--- stoqlib/gui/search/purchasesearch.py 2009-02-19 13:49:34 +0000
3+++ stoqlib/gui/search/purchasesearch.py 2010-11-22 19:52:54 +0000
4@@ -35,6 +35,8 @@
5 ThisMonth, NextMonth)
6 from stoqlib.gui.editors.purchaseeditor import PurchaseItemEditor
7 from stoqlib.lib.translation import stoqlib_gettext
8+from stoqlib.gui.printing import print_report
9+from stoqlib.reporting.purchase import PurchasedItemsReport
10
11 _ = stoqlib_gettext
12
13@@ -52,6 +54,10 @@
14 def _get_date_options(self):
15 return [Any, Today, ThisWeek, NextWeek, ThisMonth, NextMonth]
16
17+ def on_print_button_clicked(self, button):
18+ print_report(PurchasedItemsReport, self.results,
19+ filters = self.search.get_search_filters())
20+
21 #
22 # SearchDialog Hooks
23 #
24
25=== modified file 'stoqlib/reporting/purchase.py'
26--- stoqlib/reporting/purchase.py 2010-07-23 18:46:10 +0000
27+++ stoqlib/reporting/purchase.py 2010-11-22 19:52:54 +0000
28@@ -37,7 +37,8 @@
29 from stoqlib.lib.defaults import ALL_ITEMS_INDEX
30 from stoqlib.lib.translation import stoqlib_gettext
31 from stoqlib.reporting.template import BaseStoqReport, ObjectListReport
32-from stoqlib.domain.purchase import PurchaseOrder, PurchaseOrderView
33+from stoqlib.domain.purchase import (PurchaseOrder, PurchaseOrderView,
34+ PurchaseItemView)
35
36 _ = stoqlib_gettext
37
38@@ -77,6 +78,32 @@
39 summary_row=summary_row)
40
41
42+class PurchasedItemsReport(ObjectListReport):
43+ report_name = _("Purchases Items Report")
44+ main_object_name = _("purchased items")
45+ obj_type = PurchaseItemView
46+
47+ def __init__(self, filename, purchases, *args, **kwargs):
48+ self._purchases = purchases
49+ ObjectListReport.__init__(self, filename, purchases, self.report_name,
50+ landscape=True, *args, **kwargs)
51+ self._setup_table()
52+
53+ def _setup_table(self):
54+ totals = [(purchase.purchased, purchase.received, purchase.stocked)
55+ for purchase in self._purchases]
56+ purchased, received, stocked = zip(*totals)
57+ self.add_summary_by_column(_(u'Purchased'),
58+ format_quantity(sum(purchased, Decimal(0))))
59+ self.add_summary_by_column(_(u'Received'),
60+ format_quantity(sum(received, Decimal(0))))
61+ self.add_summary_by_column(_(u'In Stock'),
62+ format_quantity(sum(stocked, Decimal(0))))
63+
64+ self.add_object_table(self._purchases, self.get_columns(),
65+ summary_row=self.get_summary_row())
66+
67+
68 class PurchaseOrderReport(BaseStoqReport):
69 report_name = _("Purchase Order")
70

Subscribers

People subscribed via source and target branches