[MERGE]

bzr revid: fp@openerp.com-20121010203818-32otffomve5ifm16

diff --cc addons/hr_expense/hr_expense_view.xml
Simple merge

diff --cc addons/mrp/mrp_view.xml
Simple merge

diff --cc addons/procurement/procurement.py
index c6a1c0c,6d36cb5..b21cef3
--- 1/addons/procurement/procurement.py
--- 2/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@@ -630,14 -640,29 +629,25 @@@ class stock_warehouse_orderpoint(osv.os
          })
          return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context)
  
--stock_warehouse_orderpoint()
 -
+ class product_template(osv.osv):
+     _inherit="product.template"
+ 
+     _columns = {
+         'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),
+         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
+         'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
+     }
+     _defaults = {
+         'procure_method': 'make_to_stock',
+         'supply_method': 'buy',
+     }
  
 -product_template()
 -
  class product_product(osv.osv):
      _inherit="product.product"
      _columns = {
          'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
      }
  
- product_product()
+ 
 -product_product()
 +
  # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/purchase/purchase.py
index cb4235f,abb45ae..db6ed8b
--- 1/addons/purchase/purchase.py
--- 2/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@@ -1106,4 -1095,16 +1106,16 @@@ class mail_mail(osv.osv)
  
  mail_mail()
  
+ class product_template(osv.osv):
+     _name = 'product.template'
+     _inherit = 'product.template'
+     _columns = {
 -                'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
 -            }
++        'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
++    }
+     _defaults = {
 -             'purchase_ok': 1,
 -            }
++        'purchase_ok': 1,
++    }
+ 
+ product_template()
+ 
  # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/purchase/purchase_view.xml
Simple merge