[POS-commit] r3919 - in stoqlib/trunk/stoqlib: gui/editors

[Lincoln Vieira de Lana Molica]

Author: lincoln
Date: Thu Jul 13 17:17:44 2006
New Revision: 3919

Modified:
   stoqlib/trunk/stoqlib/domain/giftcertificate.py
   stoqlib/trunk/stoqlib/domain/product.py
   stoqlib/trunk/stoqlib/domain/sellable.py
   stoqlib/trunk/stoqlib/domain/service.py
   stoqlib/trunk/stoqlib/gui/editors/sellable.py

Log:
Fixed bug 2529, atribute notes removed from Product, Service and
GiftCertificate classes, added on AbstractSellable.
r=henrique



Modified: stoqlib/trunk/stoqlib/domain/giftcertificate.py
==============================================================================
--- stoqlib/trunk/stoqlib/domain/giftcertificate.py	(original)
+++ stoqlib/trunk/stoqlib/domain/giftcertificate.py	Thu Jul 13 17:17:44 2006
@@ -89,7 +89,6 @@
     certificate is a paper which will be used in the future as a payment
     method in a certain sale.
     """
-    notes = UnicodeCol(default=None)
 
 #
 # Adapters

Modified: stoqlib/trunk/stoqlib/domain/product.py
==============================================================================
--- stoqlib/trunk/stoqlib/domain/product.py	(original)
+++ stoqlib/trunk/stoqlib/domain/product.py	Thu Jul 13 17:17:44 2006
@@ -94,7 +94,6 @@
 class Product(Domain):
     """Class responsible to store basic products informations."""
 
-    notes = UnicodeCol(default='')
     suppliers = MultipleJoin('ProductSupplierInfo')
 
     #

Modified: stoqlib/trunk/stoqlib/domain/sellable.py
==============================================================================
--- stoqlib/trunk/stoqlib/domain/sellable.py	(original)
+++ stoqlib/trunk/stoqlib/domain/sellable.py	Thu Jul 13 17:17:44 2006
@@ -196,12 +196,13 @@
                 STATUS_BLOCKED:     _(u"Blocked")}
 
     code = AutoIncCol('stoqlib_sellable_code_seq')
-    barcode = UnicodeCol(default="")
+    barcode = UnicodeCol(default='')
     # This default status is used when a new sellable is created,
     # so it must be *always* SOLD (that means no stock for it).
     status = IntCol(default=STATUS_SOLD)
     markup = DecimalCol(default=0)
     cost = PriceCol(default=0)
+    notes = UnicodeCol(default='')
     unit = ForeignKey("SellableUnit", default=None)
     base_sellable_info = ForeignKey('BaseSellableInfo')
     on_sale_info = ForeignKey('OnSaleInfo')

Modified: stoqlib/trunk/stoqlib/domain/service.py
==============================================================================
--- stoqlib/trunk/stoqlib/domain/service.py	(original)
+++ stoqlib/trunk/stoqlib/domain/service.py	Thu Jul 13 17:17:44 2006
@@ -50,8 +50,6 @@
 class Service(Domain):
     """Class responsible to store basic service informations."""
 
-    notes = UnicodeCol(default='')
-
 
 class ServiceSellableItem(AbstractSellableItem):
     """A service implementation as a sellable item."""

Modified: stoqlib/trunk/stoqlib/gui/editors/sellable.py
==============================================================================
--- stoqlib/trunk/stoqlib/gui/editors/sellable.py	(original)
+++ stoqlib/trunk/stoqlib/gui/editors/sellable.py	Thu Jul 13 17:17:44 2006
@@ -154,7 +154,6 @@
     model_type = None
 
     gladefile = 'SellableEditor'
-    product_widgets = ('notes',)
     sellable_unit_widgets = ("unit_combo",
                              "unit_entry")
     barcode_widgets = 'barcode',
@@ -162,8 +161,9 @@
                         'description',
                         'category_combo',
                         'cost',
-                        'price')
-    proxy_widgets = (product_widgets + sellable_unit_widgets +
+                        'price',
+                        'notes')
+    proxy_widgets = (sellable_unit_widgets +
                      sellable_widgets + barcode_widgets)
 
     storable_widgets = ('stock_total_lbl',)
@@ -175,7 +175,6 @@
                                             "weighing"))
         BaseEditor.__init__(self, conn, model)
         self._original_barcode = self._sellable.barcode
-        self.notes.set_accepts_tab(False)
         self.setup_widgets()
 
     def set_widget_formats(self):
@@ -255,8 +254,6 @@
     def setup_proxies(self):
         self.set_widget_formats()
         self.setup_combos()
-        self.main_proxy = self.add_proxy(self.model,
-                                         SellableEditor.product_widgets)
         self._sellable = ISellable(self.model, connection=self.conn)
 
         barcode = self._sellable.barcode