diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml
index df4a6805afb..17b4bc486bc 100644
--- a/addons/board_manufacturing/board_manufacturing_view.xml
+++ b/addons/board_manufacturing/board_manufacturing_view.xml
@@ -15,7 +15,7 @@
-
+
@@ -37,7 +37,7 @@
-
+
- Requisitions
+ Procurements
ir.actions.act_window
mrp.procurement
form
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 9162051086c..17d72a520f2 100755
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -1,102 +1,102 @@
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -137,83 +137,83 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -240,7 +240,7 @@
-
+
@@ -249,5 +249,5 @@
-
-
\ No newline at end of file
+
+
diff --git a/addons/mrp/schedulers.py b/addons/mrp/schedulers.py
index 097f81f7529..f857f01dba7 100644
--- a/addons/mrp/schedulers.py
+++ b/addons/mrp/schedulers.py
@@ -115,7 +115,7 @@ class mrp_procurement(osv.osv):
'''% (start_date, end_date, report_total, report_except, report_later)
summary += '\n'.join(report)
request.create(cr, uid,
- {'name': "Requisition calculation report.",
+ {'name': "Procurement calculation report.",
'act_from': uid,
'act_to': uid,
'body': summary,
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index d395214b87a..0fc6a0ddc89 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -44,13 +44,13 @@ class stock_warehouse_orderpoint(osv.osv):
'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
'product_min_qty': fields.float('Min Quantity', required=True,
help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
- "a requisition to bring the virtual stock to the Max Quantity."),
+ "a procurement to bring the virtual stock to the Max Quantity."),
'product_max_qty': fields.float('Max Quantity', required=True,
help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
- "a requisition to bring the virtual stock to the Max Quantity."),
+ "a procurement to bring the virtual stock to the Max Quantity."),
'qty_multiple': fields.integer('Qty Multiple', required=True,
- help="The requisition quantity will by rounded up to this multiple."),
- 'procurement_id': fields.many2one('mrp.procurement', 'Latest Requisition'),
+ help="The procurement quantity will by rounded up to this multiple."),
+ 'procurement_id': fields.many2one('mrp.procurement', 'Latest procurement'),
'company_id': fields.many2one('res.company','Company',required=True),
}
_defaults = {
@@ -94,7 +94,7 @@ class StockMove(osv.osv):
_inherit = 'stock.move'
_columns = {
'production_id': fields.many2one('mrp.production', 'Production', select=True),
- 'procurements': fields.one2many('mrp.procurement', 'move_id', 'Requisitions'),
+ 'procurements': fields.one2many('mrp.procurement', 'move_id', 'Procurements'),
}
def copy(self, cr, uid, id, default=None, context=None):
default = default or {}
diff --git a/addons/mrp/wizard/make_procurement_view.xml b/addons/mrp/wizard/make_procurement_view.xml
index 08c4b2cabf5..c60f2818ab2 100644
--- a/addons/mrp/wizard/make_procurement_view.xml
+++ b/addons/mrp/wizard/make_procurement_view.xml
@@ -1,39 +1,39 @@
-
+
-
-
- Requisition Request
+
+
+ Procurement Request
make.procurement
form
-
-
-
-
-
+
+
+
+
diff --git a/addons/mrp/wizard/mrp_procurement_view.xml b/addons/mrp/wizard/mrp_procurement_view.xml
index 6d78f89793d..817f7011e0c 100644
--- a/addons/mrp/wizard/mrp_procurement_view.xml
+++ b/addons/mrp/wizard/mrp_procurement_view.xml
@@ -1,34 +1,34 @@
-
+
-
-
+
+
Compute Procurements
mrp.procurement.compute
form
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/addons/mrp_jit/mrp_jit.xml b/addons/mrp_jit/mrp_jit.xml
index 14821c63e63..90f6f94cfa0 100644
--- a/addons/mrp_jit/mrp_jit.xml
+++ b/addons/mrp_jit/mrp_jit.xml
@@ -3,7 +3,7 @@
# -----------------------------------------------------------
- # Requisition - Automatic schedule
+ # Procurements - Automatic schedule
# -----------------------------------------------------------
diff --git a/addons/product/product.py b/addons/product/product.py
index 72fcfa5afd2..6c3d7ef17b5 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -256,11 +256,11 @@ class product_template(osv.osv):
'description': fields.text('Description',translate=True),
'description_purchase': fields.text('Purchase Description',translate=True),
'description_sale': fields.text('Sale Description',translate=True),
- 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way requisitions are processed. Consumables are stockable products with infinite stock, or for use when you have no inventory management in the system."),
+ 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumables are stockable products with infinite stock, or for use when you have no inventory management in the system."),
'supply_method': fields.selection([('produce','Produce'),('buy','Buy')], 'Supply method', required=True, help="Produce will generate production order or tasks, according to the product type. Purchase will trigger purchase orders when requested."),
'sale_delay': fields.float('Customer Lead Time', help="This is the average time between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
'produce_delay': fields.float('Manufacturing Lead Time', help="Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
- 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Requisition 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 requisition request."),
+ '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."),
'rental': fields.boolean('Can be Rent'),
'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]"),
'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Sale Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index a01649850c7..bf6b2d56740 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -84,7 +84,7 @@
-
+
@@ -118,7 +118,7 @@
-
+
@@ -528,7 +528,7 @@
-
+
@@ -562,7 +562,7 @@
-
+
diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml
index b087883618f..78c858f43dc 100755
--- a/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@ -6,7 +6,7 @@
Process Node
-->
-
+
@@ -46,9 +46,9 @@
Process Transition
-->
-
+
-
+
@@ -65,35 +65,10 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/project_mrp/project.py b/addons/project_mrp/project.py
index 4f0cbdc2251..4a304362ec2 100644
--- a/addons/project_mrp/project.py
+++ b/addons/project_mrp/project.py
@@ -26,7 +26,7 @@ class project_task(osv.osv):
_name = "project.task"
_inherit = "project.task"
_columns = {
- 'procurement_id': fields.many2one('mrp.procurement', 'Requisition', ondelete='set null')
+ 'procurement_id': fields.many2one('mrp.procurement', 'Procurement', ondelete='set null')
}
def do_close(self, cr, uid, ids, *args):
res = super(project_task, self).do_close(cr, uid, ids, *args)
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 106bdd8793d..5da1a96f8d4 100755
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -33,7 +33,7 @@
-
+
@@ -66,8 +66,8 @@
-
-
+
+
@@ -158,8 +158,8 @@
-
-
+
+
@@ -167,7 +167,7 @@
-
+
@@ -200,8 +200,8 @@
-
-
+
+
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 8b77719171a..5428cd1c360 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -776,12 +776,12 @@ class sale_order_line(osv.osv):
'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
'invoiced': fields.boolean('Invoiced', readonly=True),
- 'procurement_id': fields.many2one('mrp.procurement', 'Requisition'),
+ 'procurement_id': fields.many2one('mrp.procurement', 'Procurement'),
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft':[('readonly',False)]}),
'price_net': fields.function(_amount_line_net, method=True, string='Net Price', digits_compute= dp.get_precision('Sale Price')),
'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft':[('readonly',False)]}),
- 'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Requisition Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+ 'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft':[('readonly',False)]}),
'address_allotment_id': fields.many2one('res.partner.address', 'Allotment Partner'),
'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5b496586864..e193c0609f9 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -200,8 +200,8 @@
-
-
+
+
diff --git a/addons/stock/product.py b/addons/stock/product.py
index ce933686760..ad189ee546a 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -335,7 +335,7 @@ class product_template(osv.osv):
'stock.location',
type='many2one',
relation='stock.location',
- string="Requisition Location",
+ string="Procurement Location",
method=True,
view_load=True,
domain=[('usage','like','procurement')],
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8d034b0ecee..512acab90e3 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1439,7 +1439,7 @@
-
+
@@ -1517,7 +1517,7 @@
-
+
diff --git a/addons/stock_location/stock_view.xml b/addons/stock_location/stock_view.xml
index b3730cb4979..bdb62963c09 100644
--- a/addons/stock_location/stock_view.xml
+++ b/addons/stock_location/stock_view.xml
@@ -40,7 +40,7 @@
form
-
+