[IMP] product: Add the filter for Consumable product and change the label

bzr revid: sbh@tinyerp.com-20100907054837-rr30yk86holutc06

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ede23a6..1d40945 100644 (file)
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -10,6 +10,8 @@
             <field name="arch" type="xml">
                 <search string="Product">
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
+                  <filter icon="terp-accessories-archiver" string="Consumable"
+                        domain="[('type','=', 'consumable')]"/>                   
                    <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
                    <separator orientation="vertical"/>
                    <filter string="To Sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>

diff --git a/addons/stock/product.py b/addons/stock/product.py
index b2eac04..951c3ba 100644 (file)
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -317,7 +317,7 @@ class product_product(osv.osv):
         'track_production': fields.boolean('Track Manufacturing Lots' , help="Forces to specify a Production Lot for all moves containing this product and generated by a Manufacturing Order"),
         'track_incoming': fields.boolean('Track Incoming Lots', help="Forces to specify a Production Lot for all moves containing this product and coming from a Supplier Location"),
         'track_outgoing': fields.boolean('Track Outgoing Lots', help="Forces to specify a Production Lot for all moves containing this product and going to a Customer Location"),
-        'location_id': fields.dummy(string='Location', relation='stock.location', type='many2one'),
+        'location_id': fields.dummy(string='Stock Location', relation='stock.location', type='many2one'),
         'valuation':fields.selection([('manual_periodic', 'Periodic (manual)'),
                                         ('real_time','Real Time (automatized)'),], 'Stock Valuation', help="Decide if the system must automatically creates account moves based on stock moves", required=True),
     }