diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml index ab7568d704e..174f82f9b6b 100644 --- a/addons/event_sale/event_sale_view.xml +++ b/addons/event_sale/event_sale_view.xml @@ -4,7 +4,7 @@ event.product product.product - +
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index c685eb3f95b..61b091d1d51 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -243,7 +243,7 @@ class product_product(osv.osv): data_obj = self.pool.get('ir.model.data') cat_id = data_obj._get_id(cr, uid, 'hr_expense', 'cat_expense') categ_id = data_obj.browse(cr, uid, cat_id).res_id - res = {'value' : {'type':'service','procure_method':'make_to_stock','supply_method':'buy', 'sale_ok' :False,'categ_id':categ_id }} + res = {'value' : {'type':'service','purchase_ok':True,'sale_ok' :False,'categ_id':categ_id }} return res product_product() diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py index 73564f2b460..66806c4f350 100644 --- a/addons/mrp/__openerp__.py +++ b/addons/mrp/__openerp__.py @@ -29,7 +29,7 @@ 'sequence': 18, 'summary': 'Manufacturing Orders, Bill of Materials, Routing', 'images': ['images/bill_of_materials.jpeg', 'images/manufacturing_order.jpeg', 'images/planning_manufacturing_order.jpeg', 'images/production_analysis.jpeg', 'images/production_dashboard.jpeg','images/routings.jpeg','images/work_centers.jpeg'], - 'depends': ['procurement', 'stock', 'resource', 'purchase', 'product','process'], + 'depends': ['product','procurement', 'stock', 'resource', 'purchase','process'], 'description': """ Manage the Manufacturing process in OpenERP =========================================== diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index abf0f823e5c..ba643cf4e51 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -961,10 +961,10 @@ - + product.normal.form.mrp.inherit product.product - + False @@ -975,7 +975,7 @@ order using the bill of materials assigned to this product. The delivery order will be ready once the production is done.

- + @@ -1050,7 +1050,5 @@ - - diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index dfd0d73ad55..788c301a04f 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -1300,7 +1300,7 @@ class product_product(osv.osv): 'expense_pdt': fields.boolean('Point of Sale Cash Out', help="This is a product you can use to take cash from a statement for the point of sale backend, exemple: money lost, transfer to bank, etc."), 'pos_categ_id': fields.many2one('pos.category','Point of Sale Category', help="If you want to sell this product through the point of sale, select the category it belongs to."), - 'to_weight' : fields.boolean('To Weight', help="This category contains products that should be weighted, mainly used for the self-checkout interface"), + 'to_weight' : fields.boolean('To Weigh', help="This category contains products that should to be weighed, mainly used for the self-checkout interface"), } def _default_pos_categ_id(self, cr, uid, context=None): diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py index a1aed1dfba8..7c224298f81 100644 --- a/addons/procurement/__openerp__.py +++ b/addons/procurement/__openerp__.py @@ -47,6 +47,7 @@ depending on the product's configuration. 'security/ir.model.access.csv', 'security/procurement_security.xml', 'procurement_data.xml', + 'procurement_demo.xml', 'wizard/make_procurement_view.xml', 'wizard/mrp_procurement_view.xml', 'wizard/orderpoint_procurement_view.xml', diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 5d81bcbb9ba..afa4eb2af0b 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -102,7 +102,6 @@ class procurement_order(osv.osv): 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]}, readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \ " a make to order method."), - 'note': fields.text('Note'), 'message': fields.char('Latest error', size=124, help="Exception occurred while computing procurement orders."), 'state': fields.selection([ @@ -642,6 +641,18 @@ class stock_warehouse_orderpoint(osv.osv): 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."), + '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': lambda *a: 'make_to_stock', + 'supply_method': lambda *a: 'buy', + } +product_template() class product_product(osv.osv): _inherit="product.product" @@ -649,6 +660,6 @@ class product_product(osv.osv): '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 --git a/addons/procurement/procurement_demo.xml b/addons/procurement/procurement_demo.xml new file mode 100644 index 00000000000..e28927815e3 --- /dev/null +++ b/addons/procurement/procurement_demo.xml @@ -0,0 +1,201 @@ + + + + + make_to_order + produce + + + make_to_order + produce + + + product + make_to_order + produce + + + + product + make_to_order + produce + + + + product + make_to_order + produce + + + + product + + + + product + + + + product + + + + product + make_to_order + + + + product + + + + product + + + + product + make_to_order + + + + product + + + + product + + + + product + + + + product + make_to_order + produce + + + + product + + + + product + make_to_order + produce + + + + product + make_to_order + produce + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + make_to_order + produce + + + + product + + + + product + + + + product + + + + product + + + + product + + + + product + make_to_order + + + + product + + + + product + + + + product + + + + product + make_to_order + + + + product + + + + product + + + + make_to_order + produce + + + + product + + + + product + + + + product + + + + product + + + + + \ No newline at end of file diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index bf73b383216..8c3ae9a2336 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -303,8 +303,45 @@