merge

bzr revid: fp@tinyerp.com-20091222190039-sz4f5q5r02v6jptu

addons/mrp_jit/__terp__.py

@@ -25,15 +25,23 @@
     'version': '1.0',
     'category': 'Generic Modules/Production',
     'description': """
-    This module allows Just In Time computation of all procurement.
-
-    If you install this module, you will not have to run the schedulers anymore.
-    Each document is computed in real time. Note that this module can slow down your
-    system a little bit.
+    This module allows Just In Time computation of procurement orders.
 
+    If you install this module, you will not have to run the procurement scheduler
+    manually anymore, or wait for it to execute.
+    Each procurement order (resulting from a sale order, for instance) will be computed 
+    when confirmed, without waiting for the procurement scheduler to run.
+    
+    Warning: this does not take into account minimum stock rules (order points), which still 
+    require to run the appropriate scheduler, or wait for it to run nightly.
+     
+    Note that the procurement computation can be resource-intensive, so you may 
+    want to be careful with this, depending on your mrp configuration and system 
+    usage.
     It may also increase your stock size because products are reserved as soon
-    as possible. In that case, you can not use priorities any more on the different
-    picking.
+    as possible. In that case, you can not use priorities any more.
+    
+    
     """,
     'author': 'Tiny',
     'depends': ['mrp', 'sale'],

addons/product/i18n/fr.po

@@ -105,11 +105,11 @@ msgstr "Intervention senior sur site"
 #. module: product
 #: help:product.supplierinfo,qty:0
 msgid ""
-"The minimal quantity to purchase for this supplier, expressed in the default "
+"The minimal quantity to purchase for this supplier, expressed in the purchase "
 "unit of measure."
 msgstr ""
 "La quantité minimum d'achat pour ce fournisseur, exprimée dans l'unité de "
-"mesure par défaut"
+"mesure d'achat"
 
 #. module: product
 #: field:product.template,weight_net:0

addons/product/i18n/nl.po

@@ -67,11 +67,11 @@ msgstr "Onsite Senior Intervention"
 #. module: product
 #: help:product.supplierinfo,qty:0
 msgid ""
-"The minimal quantity to purchase for this supplier, expressed in the default "
+"The minimal quantity to purchase for this supplier, expressed in the purchase "
 "unit of measure."
 msgstr ""
 "Het minimale aantal om in te kopen voor deze leverancier, uitgedrukt in de "
-"standaard meeteenheid."
+"inkoop-meeteenheid."
 
 #. module: product
 #: field:product.template,weight_net:0

addons/product/product.py

@@ -629,7 +629,7 @@ class product_supplierinfo(osv.osv):
         'product_name': fields.char('Partner Product Name', size=128, help="Name of the product for this partner, will be used when printing a request for quotation. Keep empty to use the internal one."),
         'product_code': fields.char('Partner Product Code', size=64, help="Code of the product for this partner, will be used when printing a request for quotation. Keep empty to use the internal one."),
         'sequence' : fields.integer('Priority'),
-        'qty' : fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase for this supplier, expressed in the default unit of measure."),
+        'qty' : fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase for this supplier, expressed in the purchase unit of measure."),
         'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
         'delay' : fields.integer('Delivery Delay', required=True, help="Delay in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."),
         'pricelist_ids': fields.one2many('pricelist.partnerinfo', 'suppinfo_id', 'Supplier Pricelist'),