diff --git a/template.py b/template.py
index 0ede19f0f4..f64add6cf9 100644
--- a/template.py
+++ b/template.py
@@ -4,7 +4,7 @@ STATES = {
     'readonly': "active == False",
 }
 
-class ProductTemplate(OSV):
+class Template(OSV):
     "Product Template"
     _name = "product.template"
     _description = __doc__
@@ -12,12 +12,19 @@ class ProductTemplate(OSV):
 
     name = fields.Char('Name', size=64, required=True, translate=True,
                        select=True, states=STATES,)
-    type = fields.Selection([('product','Stockable Product'),
-                             ('consu', 'Consumable'),('service','Service')],
-                            'Product Type', required=True, states=STATES,)
+    type = fields.Selection([('stockable','Stockable Product'),
+                             ('consumable', 'Consumable'),('service','Service')],
+                            'Type', required=True, states=STATES,)
     category = fields.Many2One('product.category','Category', required=True,
                                states=STATES,)
-    list_price = fields.Numeric('List Price', digits=(12, 6), states=STATES,) #XXX digit ?
+    list_price_db = fields.Numeric('DB List Price', states=STATES,)
+    list_price = fields.Function(
+        '_list_price',fnct_inv="_list_price_inv", string='List Price',
+        type="numeric", digits=(12, 2),)
+    cost_price = fields.numeric('Cost Price', states=STATES, digits=(12, 2))
+    cost_price_method = fields.Selection(
+        [("static","Static cost"),("average","Weighted average")],
+        "Cost Method")
     default_uom = fields.Many2One('product.uom', 'Default UOM', required=True,
                                   states=STATES,)
     active = fields.Boolean('Active',)
@@ -25,4 +32,33 @@ class ProductTemplate(OSV):
     def default_active(self, cursor, user, context=None):
         return 1
 
-ProductTemplate()
+    def default_type(self, cursor, user, context=None):
+        return 'consumable'
+
+    def default_cost_price_method(self, cursor, user, context=None):
+        return 'static'
+
+    def _list_price(self, cursor, user, ids, name, arg, context=None):
+        product_uom_obj = self.pool.get('product.uom')
+        res = {}
+        if context and 'uom' in context:
+            to_uom = self.pool.get('product.uom').browse(
+                cursor, user, context['uom'], context=context)
+            for product in self.browse(cursor, user, ids, context=context):
+                res[product.id] = product_uom_obj._compute_price(
+                    cursor, user, product.default_uom, product.list_price_db,
+                    to_uom)
+        else:
+            for product in self.browse(cursor, user, ids, context=context):
+                res[product.id] = product.list_price_db
+        return res
+
+    def _list_price_inv(self, cursor, user, id, name, value, arg, context=None):
+        if context and 'read_delta' in context:
+            context = context.copy()
+            del context['read_delta']
+
+        return self.write(cursor, user, id, {'list_price_db': value},
+                          context=context)
+
+Template()