diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml index 9847e5732f3..e0383a10ae6 100644 --- a/addons/mrp/test/order_process.yml +++ b/addons/mrp/test/order_process.yml @@ -92,7 +92,7 @@ assert proc.location_id.id == order.location_src_id.id, "Input location and procurement location do not correspond" assert proc.product_uom.id == order_line.product_uom.id, "UOM does not correspond in procurement." assert proc.product_uos_qty == order_line.product_uos and order_line.product_uos_qty or order_line.product_qty, "UOS qty does not correspond in procurement." - # procurement state should be `confirmed` at this stage, except if mrp_jit is installed, in which + # procurement state should be `confirmed` at this stage, except if procurement_jit is installed, in which # case it could already be in `running` or `exception` state (not enough stock) expected_states = ('confirmed', 'running', 'exception') assert proc.state in expected_states, 'Procurement state is `%s` for %s, expected one of %s' % \ diff --git a/addons/procurement_jit/test/procurement_jit.yml b/addons/procurement_jit/test/procurement_jit.yml index 1a50fcbe0c2..82a0c5ea480 100644 --- a/addons/procurement_jit/test/procurement_jit.yml +++ b/addons/procurement_jit/test/procurement_jit.yml @@ -1,5 +1,5 @@ - - In order to test mrp_jit module with OpenERP, I create procurement order for + In order to test procurement_jit module with OpenERP, I create procurement order for Computer Case product and check whether it runs without scheduler or not. - !record {model: procurement.order, id: procurement_order_test1}: diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py index 1a8b86fd54f..162de1ff5b7 100644 --- a/addons/stock/res_config.py +++ b/addons/stock/res_config.py @@ -37,11 +37,11 @@ class stock_config_settings(osv.osv_memory): _columns = { 'company_id': fields.many2one('res.company', 'Company', required=True), - 'module_mrp_jit': fields.boolean("Generate procurement in real time", + 'module_procurement_jit': fields.boolean("Generate procurement in real time", help="""This allows Just In Time computation of procurement orders. All procurement orders will be processed immediately, which could in some cases entail a small performance impact. - This installs the module mrp_jit."""), + This installs the module procurement_jit."""), 'module_claim_from_delivery': fields.boolean("Allow claim on deliveries", help='Adds a Claim link to the delivery order.\n' '-This installs the module claim_from_delivery.'), diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml index 4a2f8b2686e..b783caff41e 100644 --- a/addons/stock/res_config_view.xml +++ b/addons/stock/res_config_view.xml @@ -63,8 +63,8 @@