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

[Thiago Bellini]

Opção de ter produtos inativos.
Correções para o #4304

[lp:~bellini666/stoqlib/closed_product]

3321. By Thiago Bellini on 2011-02-23

Quick Fix: Correcting a traceback on POS app when checkout payment method was 'check' or 'bill'

3322. By Thiago Bellini on 2011-02-24

Quick fix: Hope this will fix all problems when using a payment slave.

3323. By Gabriel Gerga on 2011-02-24

Exportar vendas a vista para NF-e. r=romaia

3324. By Ronaldo Maia on 2011-02-28

Viewable select results didn't include objects created inside a transaction,
even when selecting from that transaction.

Fix a test afected by this

3325. By Ronaldo Maia on 2011-02-28

Update a few report tests pdfs

3326. By Thiago Bellini on 2011-03-02

Make the labels of the 'yesno' dialog buttons more useful.

3327. By Gabriel Gerga on 2011-03-02

Corrected values used in payments editor according freight, surcharge and discount. r=romaia

3328. By Thiago Bellini on 2011-03-02

Quick Fix: Forgot a closing ')' on sellableeditor. Sorry! :(

3329. By Ronaldo Maia on 2011-03-04

Adicionando suporte experimental para boletos bancários

- Importando Projeto Pyboleto (com algumas mudanças nosssas)
- Adicionando opção de imprimir boletos (no formato carnê) a partir dos
  detalhes de uma venda

3335. By Thiago Bellini on 2011-02-23

Removing the editor from Closed Products Search and code adjustments.

3336. By Thiago Bellini on 2011-02-24

Code corrections.

3337. By Thiago Bellini on 2011-02-28

Add tests for new methods and views.

3338. By Thiago Bellini on 2011-02-28

Code corrections.

3339. By Thiago Bellini on 2011-03-04

More code corrections.

=== modified file 'external/sqlobject/viewable.py'
--- external/sqlobject/viewable.py	2011-02-28 15:29:21 +0000
+++ external/sqlobject/viewable.py	2011-03-04 18:09:29 +0000
@@ -149,7 +149,7 @@
 
         setup_attributes(cls, new_attrs)
 
-        columns = new_attrs['columns']
+        columns = new_attrs.get('columns', getattr(cls, 'columns', None))
         if not columns:
             return
 

=== modified file 'stoqlib/domain/sellable.py'
--- stoqlib/domain/sellable.py	2011-02-08 14:06:58 +0000
+++ stoqlib/domain/sellable.py	2011-03-04 18:09:29 +0000
@@ -378,6 +378,10 @@
 
     commission = property(_get_commission, _set_commission)
 
+    #
+    #  Accessors
+    #
+
     def can_be_sold(self):
         """Whether the sellable is available and can be sold.
         @returns: if the item can be sold
@@ -401,6 +405,19 @@
             raise ValueError('This sellable is already unavailable')
         self.status = self.STATUS_UNAVAILABLE
 
+    def is_closed(self):
+        """Whether the sellable is closed or not.
+
+        @returns: True if closed, False otherwise.
+        """
+        return self.status == Sellable.STATUS_CLOSED
+
+    def close(self):
+        """Mark the sellable as closed"""
+        if self.is_closed():
+            raise ValueError('This sellable is already closed')
+        self.status = Sellable.STATUS_CLOSED
+
     def cancel(self):
         """Cancel the sellable"""
         if self.can_be_sold():

=== modified file 'stoqlib/domain/test/test_sellable.py'
--- stoqlib/domain/test/test_sellable.py	2011-02-08 14:06:58 +0000
+++ stoqlib/domain/test/test_sellable.py	2011-03-04 18:09:29 +0000
@@ -29,6 +29,9 @@
                                      SellableCategory)
 from stoqlib.domain.product import Product
 from stoqlib.domain.test.domaintest import DomainTest
+from stoqlib.domain.views import (ProductFullStockView,
+                                  ProductFullWithClosedStockView,
+                                  ProductClosedStockView)
 
 
 class TestSellableCategory(DomainTest):
@@ -230,3 +233,52 @@
         constant3 = self.create_sellable_tax_constant()
         sellable.tax_constant = constant3
         self.assertEquals(sellable.get_tax_constant(), constant3)
+
+    def testClose(self):
+        results_not_closed = ProductFullStockView.select(connection=self.trans)
+        results_with_closed = ProductFullWithClosedStockView.select(
+                                                         connection=self.trans)
+        results_only_closed = ProductClosedStockView.select(
+                                                         connection=self.trans)
+        # Count the already there results. ProductClosedStockView should
+        # not have any.
+        # obs. Using len(list(res)) instead of res.count() because of a bug
+        #      on sqlobject that returns wrong count() on that views.
+        count_not_closed = len(list(results_not_closed))
+        count_with_closed = len(list(results_with_closed))
+        count_only_closed = len(list(results_only_closed))
+        self.assertEqual(count_only_closed, 0)
+
+        # Here we create a sellable. It should show on
+        # ProductFullStockView and ProductFullWithClosedStock View,
+        # but not on ProductClosedStockView.
+        sellable = self.create_sellable()
+        self.assertEqual(len(list(results_not_closed)), count_not_closed + 1L)
+        self.assertEqual(len(list(results_with_closed)), count_with_closed + 1L)
+        self.assertEqual(len(list(results_only_closed)), count_only_closed)
+        ids = [result.id for result in results_not_closed]
+        self.failIf(sellable.id not in ids)
+        ids = [result.id for result in results_with_closed]
+        self.failIf(sellable.id not in ids)
+        ids = [result.id for result in results_only_closed]
+        self.failIf(sellable.id in ids)
+
+        # Here we close that sellable. It should now show on
+        # ProductClosedStockViewand ProductFullWithClosedStock View,
+        # but not on ProductFullStockView.
+        sellable.close()
+        self.assertEquals(sellable.status, Sellable.STATUS_CLOSED)
+        self.assertTrue(sellable.is_closed())
+        self.assertEqual(len(list(results_not_closed)), count_not_closed)
+        self.assertEqual(len(list(results_with_closed)), count_with_closed + 1L)
+        self.assertEqual(len(list(results_only_closed)), count_only_closed + 1L)
+        ids = [result.id for result in results_not_closed]
+        self.failIf(sellable.id in ids)
+        ids = [result.id for result in results_with_closed]
+        self.failIf(sellable.id not in ids)
+        ids = [result.id for result in results_only_closed]
+        self.failIf(sellable.id not in ids)
+
+        # When trying to close an already closed sellable, it should
+        # raise a ValueError.
+        self.assertRaises(ValueError, sellable.close)

=== modified file 'stoqlib/domain/views.py'
--- stoqlib/domain/views.py	2011-02-15 10:21:17 +0000
+++ stoqlib/domain/views.py	2011-03-04 18:09:29 +0000
@@ -79,6 +79,8 @@
         )
 
     joins = [
+        INNERJOINOn(None, BaseSellableInfo,
+                    BaseSellableInfo.q.id == Sellable.q.base_sellable_infoID),
         # Tax Constant
         LEFTJOINOn(None, SellableTaxConstant,
                    SellableTaxConstant.q.id == Sellable.q.tax_constantID),
@@ -96,9 +98,7 @@
                    ProductAdaptToStorable.q.id),
         ]
 
-    clause = AND(
-        BaseSellableInfo.q.id == Sellable.q.base_sellable_infoID,
-        )
+    clause = Sellable.q.status != Sellable.STATUS_CLOSED
 
     @classmethod
     def select_by_branch(cls, query, branch, having=None, connection=None):
@@ -154,6 +154,19 @@
         return sellable.price
 
 
+class ProductFullWithClosedStockView(ProductFullStockView):
+    """Stores information about products, showing the closed ones too.
+    """
+
+    clause = None
+
+class ProductClosedStockView(ProductFullWithClosedStockView):
+    """Stores information about products that were closed.
+    """
+
+    clause = Sellable.q.status == Sellable.STATUS_CLOSED
+
+
 class ProductComponentView(ProductFullStockView):
     columns = ProductFullStockView.columns
     clause = AND(ProductFullStockView.clause,

=== modified file 'stoqlib/gui/editors/sellableeditor.py'
--- stoqlib/gui/editors/sellableeditor.py	2011-03-02 15:16:10 +0000
+++ stoqlib/gui/editors/sellableeditor.py	2011-03-04 18:09:29 +0000
@@ -236,23 +236,34 @@
             code = u'%d' % self._sellable.id
             self.code.update(code)
         self.setup_widgets()
-        if model and self._sellable.can_remove():
-            button = self.add_button('Remove', 'gtk-delete')
-            button.connect('clicked', self._on_delete_button__activate)
 
         self.set_description(
             self.model.sellable.base_sellable_info.description)
 
-    def _on_delete_button__activate(self, button):
-        msg = _(u"This will delete '%s' from the database. Are you sure?"
-                % self._sellable.get_description())
-        if not yesno(msg, gtk.RESPONSE_NO, _(u"Delete"), _(u"Don't Delete")):
-            return
-
-        self._sellable.remove()
-        # We don't call self.confirm since it will call validate_confirm
-        self.cancel()
-        self.main_dialog.retval = True
+        self._setup_delete_close_reopen_button()
+
+    def _add_extra_button(self, label, stock=None,
+                          callback_func=None, connect_on='clicked'):
+        button = self.add_button(label, stock)
+        if callback_func:
+            button.connect(connect_on, callback_func, label)
+
+    def _setup_delete_close_reopen_button(self):
+        if self.model and self._sellable.can_remove():
+            self._add_extra_button(_('Remove'), 'gtk-delete',
+                                   self._on_delete_button__clicked)
+        elif self.model and self._sellable.is_unavailable():
+            label = (self._sellable.product and
+                     _('Close Product') or _('Close Service'))
+
+            self._add_extra_button(label, None,
+                                   self._on_close_sellable_button__clicked)
+        elif self.model and self._sellable.is_closed():
+            label = (self._sellable.product and
+                     _('Reopen Product') or _('Reopen Service'))
+
+            self._add_extra_button(label, None,
+                                   self._on_reopen_sellable_button__clicked)
 
     def add_extra_tab(self, tabname, tabslave):
         self.sellable_notebook.set_show_tabs(True)
@@ -402,6 +413,41 @@
     # Kiwi handlers
     #
 
+    def _on_delete_button__clicked(self, button, parent_button_label=None):
+        msg = _(u"This will delete '%s' from the database. Are you sure?"
+                % self._sellable.get_description())
+        if not yesno(msg, gtk.RESPONSE_NO, _(u"Delete"), _(u"Don't Delete")):
+            return
+
+        self._sellable.remove()
+        # We don't call self.confirm since it will call validate_confirm
+        self.cancel()
+        self.main_dialog.retval = True
+
+    def _on_close_sellable_button__clicked(self, button,
+                                           parent_button_label=None):
+        msg = _(u"Do you really want to close '%s'?\n"
+                u"Please note that when it's closed, you won't be able to "
+                u"commercialize it anymore." % self._sellable.get_description())
+        if not yesno(msg, gtk.RESPONSE_NO,
+                      parent_button_label, _(u"Don't Close")):
+            return
+
+        self._sellable.close()
+        self.confirm()
+
+    def _on_reopen_sellable_button__clicked(self, button,
+                                            parent_button_label=None):
+        msg = _(u"Do you really want to reopen '%s'?\n"
+                u"Note that when it's opened, you will be able to "
+                u"commercialize it again." % self._sellable.get_description())
+        if not yesno(msg, gtk.RESPONSE_NO,
+                      parent_button_label, _(u"Keep Closed")):
+            return
+
+        self._sellable.set_unavailable()
+        self.confirm()
+
     def on_tax_constant__changed(self, combo):
         self._update_tax_value()
 

=== modified file 'stoqlib/gui/search/productsearch.py'
--- stoqlib/gui/search/productsearch.py	2011-02-15 10:21:17 +0000
+++ stoqlib/gui/search/productsearch.py	2011-03-04 18:09:29 +0000
@@ -37,7 +37,9 @@
 from stoqlib.domain.product import Product
 from stoqlib.domain.sellable import Sellable
 from stoqlib.domain.views import (ProductFullStockView, ProductQuantityView,
-                                  ProductFullStockItemView, SoldItemView)
+                                  ProductFullStockItemView, SoldItemView,
+                                  ProductFullWithClosedStockView,
+                                  ProductClosedStockView)
 from stoqlib.gui.base.dialogs import run_dialog
 from stoqlib.gui.base.gtkadds import change_button_appearance
 from stoqlib.gui.base.search import (SearchDialog, SearchEditor,
@@ -50,8 +52,8 @@
 from stoqlib.lib.translation import stoqlib_gettext
 from stoqlib.lib.validators import format_quantity, get_formatted_cost
 from stoqlib.reporting.product import (ProductReport, ProductQuantityReport,
-                                       ProductPriceReport,
-                                       ProductStockReport,
+                                       ProductClosedStockReport,
+                                       ProductPriceReport, ProductStockReport,
                                        ProductsSoldReport)
 
 _ = stoqlib_gettext
@@ -61,7 +63,7 @@
     title = _('Product Search')
     table = Product
     size = (775, 450)
-    search_table = ProductFullStockView
+    search_table = ProductFullWithClosedStockView
     editor_class = ProductEditor
     footer_ok_label = _('Add products')
     searchbar_result_strings = (_('product'), _('products'))
@@ -413,3 +415,46 @@
         if branch is not None:
             branch = PersonAdaptToBranch.get(branch, connection=conn)
         return self.table.select_by_branch(query, branch, connection=conn)
+
+
+class ProductClosedStockSearch(ProductSearch):
+    """A SearchEditor for Closed Products"""
+
+    title = _('Closed Product Stock Search')
+    table = search_table = ProductClosedStockView
+    has_new_button = False
+
+    def __init__(self, conn, hide_footer=True, hide_toolbar=True,
+                 selection_mode=gtk.SELECTION_BROWSE,
+                 hide_cost_column=True, use_product_statuses=None,
+                 hide_price_column=True):
+        ProductSearch.__init__(self, conn, hide_footer, hide_toolbar,
+                               selection_mode, hide_cost_column,
+                               use_product_statuses, hide_price_column)
+
+    def create_filters(self):
+        self.set_text_field_columns(['description', 'barcode',
+                                     'category_description'])
+        self.executer.set_query(self.executer_query)
+
+        # Branch
+        branch_filter = self.create_branch_filter(_('In branch:'))
+        branch_filter.select(None)
+        self.add_filter(branch_filter, columns=[])
+        self.branch_filter = branch_filter
+
+    def _setup_print_slave(self):
+        pass
+
+    def _has_rows(self, results, obj):
+        SearchEditor._has_rows(self, results, obj)
+
+    #
+    # SearchDialog Hooks
+    #
+
+    def on_print_button_clicked(self, widget):
+        print_report(ProductClosedStockReport, self.results,
+                     filters=self.search.get_search_filters(),
+                     branch_name=self.branch_filter.combo.get_active_text())
+

=== modified file 'stoqlib/reporting/product.py'
--- stoqlib/reporting/product.py	2011-02-15 10:21:17 +0000
+++ stoqlib/reporting/product.py	2011-03-04 18:09:29 +0000
@@ -32,9 +32,9 @@
 from stoqlib.lib.validators import format_quantity, get_formatted_price
 from stoqlib.lib.translation import stoqlib_gettext as _
 from stoqlib.domain.product import ProductHistory
-from stoqlib.domain.views import (ProductFullStockView,
+from stoqlib.domain.views import (SoldItemView, ProductFullStockView,
                                   ProductFullStockItemView,
-                                  SoldItemView)
+                                  ProductClosedStockView)
 
 
 class ProductReport(ObjectListReport):
@@ -237,3 +237,13 @@
 
         self.add_object_table(self._stock_products, self.get_columns(),
                               summary_row=self.get_summary_row())
+
+
+class ProductClosedStockReport(ProductStockReport):
+    report_name = _("Closed Product Stock Report")
+    main_object_name = _("closed products")
+    obj_type = ProductClosedStockView
+
+    def _setup_table(self):
+        self.add_object_table(self._stock_products, self.get_columns(),
+                              summary_row=self.get_summary_row())