[MERGE]: Merge with latest trunk

bzr revid: rpa@tinyerp.com-20111102052827-0bctjrhb4amyg6pl

30 files changed, 106 insertions, 104 deletions

diff --git a/addons/procurement/i18n/bg.po b/addons/procurement/i18n/bg.po
index 7bf651d9b6c..ba01793fed0 100644
--- a/addons/procurement/i18n/bg.po
+++ b/addons/procurement/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/ca.po b/addons/procurement/i18n/ca.po
index 9674edef5ef..08ab449d3ce 100644
--- a/addons/procurement/i18n/ca.po
+++ b/addons/procurement/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/cs.po b/addons/procurement/i18n/cs.po
index fe0120930be..f782876225d 100644
--- a/addons/procurement/i18n/cs.po
+++ b/addons/procurement/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/da.po b/addons/procurement/i18n/da.po
index 8f52d25c29a..0d4263fcdf2 100644
--- a/addons/procurement/i18n/da.po
+++ b/addons/procurement/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-19 04:41+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -30,7 +30,7 @@ msgstr ""
 #. module: procurement
 #: model:ir.model,name:procurement.model_make_procurement
 msgid "Make Procurements"
-msgstr ""
+msgstr "Foretag indkøb"
 
 #. module: procurement
 #: help:procurement.order.compute.all,automatic:0
@@ -54,7 +54,7 @@ msgstr ""
 #: code:addons/procurement/procurement.py:288
 #, python-format
 msgid "No supplier defined for this product !"
-msgstr ""
+msgstr "Ingen leverandør er valgt til denne vare!"
 
 #. module: procurement
 #: field:make.procurement,uom_id:0
@@ -162,7 +162,7 @@ msgstr ""
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Lager flytning"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -198,7 +198,7 @@ msgstr "Forsøg igen"
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
 msgid "Parameters"
-msgstr ""
+msgstr "Parametre"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -243,7 +243,7 @@ msgstr "Placering"
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Plukkeliste"
 
 #. module: procurement
 #: field:make.procurement,warehouse_id:0
@@ -434,7 +434,7 @@ msgstr "Haster"
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "plus"
-msgstr ""
+msgstr "plus"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:325
@@ -624,7 +624,7 @@ msgstr ""
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "from stock"
-msgstr ""
+msgstr "Fra lager"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -725,23 +725,23 @@ msgstr ""
 #: field:procurement.order,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Vare"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Temporary"
-msgstr ""
+msgstr "Midlertidig"
 
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
 msgid "Description"
-msgstr ""
+msgstr "Beskrivelse:"
 
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
-msgstr ""
+msgstr "min."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po
index 98888d3094c..84fa338d884 100644
--- a/addons/procurement/i18n/de.po
+++ b/addons/procurement/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/es.po b/addons/procurement/i18n/es.po
index 5a33adc9fce..65b115e8767 100644
--- a/addons/procurement/i18n/es.po
+++ b/addons/procurement/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:44+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/es_EC.po b/addons/procurement/i18n/es_EC.po
index 348cdf1475c..36e010ff0fa 100644
--- a/addons/procurement/i18n/es_EC.po
+++ b/addons/procurement/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:44+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/fi.po b/addons/procurement/i18n/fi.po
index 35716fd50c7..76177735540 100644
--- a/addons/procurement/i18n/fi.po
+++ b/addons/procurement/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/fr.po b/addons/procurement/i18n/fr.po
index b43a26ed7f1..e3939e37242 100644
--- a/addons/procurement/i18n/fr.po
+++ b/addons/procurement/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -308,10 +308,10 @@ msgid ""
 msgstr ""
 "Un ordre d'approvisionnement est utilisé pour enregistrer le besoin d'un "
 "produit spécifique à un endroit spécifique. Un ordre d'approvisionnement est "
-"habituellement créé automatiquement à partir des bons de commande, des "
+"habituellement créé automatiquement à partir des commandes de vente, des "
 "règles de logistique ou des règles de stock minimum. Quand l'ordre "
 "d'approvisionnement est confirmé, il crée automatiquement les opérations "
-"nécessaires pour combler le besoin : proposition de bon de commande, ordre "
+"nécessaires pour combler le besoin : proposition de commandes d'achat, ordre "
 "de fabrication, etc."
 
 #. module: procurement
@@ -363,8 +363,8 @@ msgid ""
 "If you encode manually a Procurement, you probably want to use a make to "
 "order method."
 msgstr ""
-"Si vous saisissez manuellement un approvisionnement, vous voulez "
-"probablement utiliser une méthode de fabrication à la commande."
+"Si vous saisissez manuellement un approvisionnement, vous voudrez "
+"probablement choisir \"Production à la demande\"."
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement
@@ -402,7 +402,7 @@ msgstr "Exceptions"
 #: model:process.node,note:procurement.process_node_serviceonorder0
 msgid "Assignment from Production or Purchase Order."
 msgstr ""
-"Affectation à partir d'un ordre de fabrication ou d'un bon de commande."
+"Affectation à partir d'un ordre de fabrication ou d'une commande d'achat."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property
@@ -501,7 +501,7 @@ msgstr ""
 #: help:procurement.orderpoint.compute,automatic:0
 msgid "If the stock of a product is under 0, it will act like an orderpoint"
 msgstr ""
-"Si le stock d'un produit est négatif, il est considéré comme un point de "
+"Si le stock d'un produit est négatif, cela sera considéré comme un point de "
 "commande"
 
 #. module: procurement
@@ -675,7 +675,7 @@ msgstr "Emplacements"
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "from stock"
-msgstr "du stock"
+msgstr "Sur stock"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -737,7 +737,7 @@ msgstr "Actuel"
 #. module: procurement
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr "Besoins en exception"
+msgstr "Approvisionnements en exception"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -814,7 +814,7 @@ msgstr "UdM du produit"
 #. module: procurement
 #: model:process.node,name:procurement.process_node_serviceonorder0
 msgid "Make to Order"
-msgstr "Fabrication à la commande"
+msgstr "Production à la demande"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -852,7 +852,7 @@ msgstr "Réservation"
 #. module: procurement
 #: model:process.node,note:procurement.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr "Le moyen de satisfaire le besoin dépend du type de produit"
+msgstr "Le moyen d’approvisionnement dépend du type de produit"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -889,7 +889,7 @@ msgstr "UdV du produit"
 #: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
-msgstr "à partir du stock : produits affectés."
+msgstr "Sur stock : produits affectés."
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_compute_schedulers
@@ -913,16 +913,17 @@ msgid ""
 "message)."
 msgstr ""
 "Les ordres d'approvisionnement représentent le besoin d'une certaine "
-"quantité de produit, à un moment et pour un emplacement donnés. Les bons de "
-"commande sont une source typique d'ordres d'approvisionnement (mais ce sont "
-"des documents distincts). Selon les paramètres d'approvisionnement et la "
-"configuration du produit, le moteur d'approvisionnement essaiera de "
-"satisfaire le besoin en allouant des produits à partir du stock, en "
-"commandant les produits à un fournisseur, ou en passant un ordre de "
-"fabrication, etc. Un incident d'approvisionnement arrive quand le système ne "
-"trouve pas de moyen pour satisfaire le besoin. Quelques incidents se "
-"résoudront automatiquement, mais d'autres nécessiteront une intervention "
-"manuelle (ceux-ci sont identifiés par un message d'erreur particulier)."
+"quantité de produit, à un moment et pour un emplacement donnés. Les "
+"commandes de vente sont une source typique d'ordres d'approvisionnement "
+"(mais ce sont des documents distincts). Selon les paramètres "
+"d'approvisionnement et la configuration du produit, le moteur "
+"d'approvisionnement essaiera de satisfaire le besoin en allouant des "
+"produits à partir du stock, en commandant les produits à un fournisseur, ou "
+"en passant un ordre de fabrication, etc. Un incident d'approvisionnement "
+"arrive quand le système ne trouve pas de moyen pour satisfaire le besoin. "
+"Quelques incidents se résoudront automatiquement, mais d'autres "
+"nécessiteront une intervention manuelle (ceux-ci sont identifiés par un "
+"message d'erreur particulier)."
 
 #. module: procurement
 #: field:procurement.order,product_uom:0
diff --git a/addons/procurement/i18n/gl.po b/addons/procurement/i18n/gl.po
index ca4c8568213..6978ecfd100 100644
--- a/addons/procurement/i18n/gl.po
+++ b/addons/procurement/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/hu.po b/addons/procurement/i18n/hu.po
index cc10e1e0a1c..33b9f0c7e40 100644
--- a/addons/procurement/i18n/hu.po
+++ b/addons/procurement/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/id.po b/addons/procurement/i18n/id.po
index d0e33b3285f..68beb1c214f 100644
--- a/addons/procurement/i18n/id.po
+++ b/addons/procurement/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/it.po b/addons/procurement/i18n/it.po
index 70691c06c85..66c1723a8d5 100644
--- a/addons/procurement/i18n/it.po
+++ b/addons/procurement/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index 7462db9be11..690712dd4cf 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/nb.po b/addons/procurement/i18n/nb.po
index 03690cc6db9..3fe02677542 100644
--- a/addons/procurement/i18n/nb.po
+++ b/addons/procurement/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/nl.po b/addons/procurement/i18n/nl.po
index 6097716b5e7..d3932a55fc8 100644
--- a/addons/procurement/i18n/nl.po
+++ b/addons/procurement/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/pl.po b/addons/procurement/i18n/pl.po
index cf449fa68f7..5af987c1350 100644
--- a/addons/procurement/i18n/pl.po
+++ b/addons/procurement/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/pt.po b/addons/procurement/i18n/pt.po
index 778c62a2193..ca2f463ff41 100644
--- a/addons/procurement/i18n/pt.po
+++ b/addons/procurement/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:43+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/pt_BR.po b/addons/procurement/i18n/pt_BR.po
index 6675c67bb8c..56749f96b6f 100644
--- a/addons/procurement/i18n/pt_BR.po
+++ b/addons/procurement/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:44+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/ro.po b/addons/procurement/i18n/ro.po
index f24aaede764..20acb6f5795 100644
--- a/addons/procurement/i18n/ro.po
+++ b/addons/procurement/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:44+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index c9b57c9087d..bdd4147e844 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:44+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/sr.po b/addons/procurement/i18n/sr.po
index 3f8ce240133..3d9f24f3971 100644
--- a/addons/procurement/i18n/sr.po
+++ b/addons/procurement/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:44+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/sr@latin.po b/addons/procurement/i18n/sr@latin.po
index 29cfddfe88c..024f94cce8f 100644
--- a/addons/procurement/i18n/sr@latin.po
+++ b/addons/procurement/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:44+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/sv.po b/addons/procurement/i18n/sv.po
index 1eba11b9860..2e4df85cbe0 100644
--- a/addons/procurement/i18n/sv.po
+++ b/addons/procurement/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:44+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/tr.po b/addons/procurement/i18n/tr.po
index 1aad82fb8dc..7a48775bacb 100644
--- a/addons/procurement/i18n/tr.po
+++ b/addons/procurement/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:44+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/vi.po b/addons/procurement/i18n/vi.po
index f57919ca1b1..492e7bddfeb 100644
--- a/addons/procurement/i18n/vi.po
+++ b/addons/procurement/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:44+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/zh_CN.po b/addons/procurement/i18n/zh_CN.po
index 7e16198efd7..b9b4d41c3d4 100644
--- a/addons/procurement/i18n/zh_CN.po
+++ b/addons/procurement/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:44+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 9b298915f12..7382b1577e7 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -375,11 +375,10 @@ class procurement_order(osv.osv):
             id = procurement.move_id.id
             if not (procurement.move_id.state in ('done','assigned','cancel')):
                 ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
-                cr.execute('select count(id) from stock_warehouse_orderpoint where product_id=%s', (procurement.product_id.id,))
-                res = cr.fetchone()[0]
-                if not res and not ok:
+                order_point_id = self.pool.get('stock.warehouse.orderpoint').search(cr, uid, [('product_id', '=', procurement.product_id.id)], context=context)
+                if not order_point_id and not ok:
                      message = _("Not enough stock and no minimum orderpoint rule defined.")
-                elif not res:
+                elif not order_point_id:
                     message = _("No minimum orderpoint rule defined.")
                 elif not ok:
                     message = _("Not enough stock.")
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index d72651ed55a..2aa47f69393 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -53,7 +53,7 @@ class procurement_order(osv.osv):
 
             procurement_obj = self.pool.get('procurement.order')
             if not ids:
-                ids = procurement_obj.search(cr, uid, [], order="date_planned")
+                ids = procurement_obj.search(cr, uid, [('state', '=', 'exception')], order="date_planned")
             for id in ids:
                 wf_service.trg_validate(uid, 'procurement.order', id, 'button_restart', cr)
             if use_new_cursor:
@@ -67,15 +67,14 @@ class procurement_order(osv.osv):
             report_except = 0
             report_later = 0
             while True:
-                cr.execute("select id from procurement_order where state='confirmed' and procure_method='make_to_order' order by priority,date_planned limit 500 offset %s", (offset,))
-                ids = map(lambda x: x[0], cr.fetchall())
+                ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_order')], offset=offset, limit=500, order='priority, date_planned', context=context)
                 for proc in procurement_obj.browse(cr, uid, ids, context=context):
                     if maxdate >= proc.date_planned:
                         wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
                     else:
                         offset += 1
                         report_later += 1
-                for proc in procurement_obj.browse(cr, uid, ids, context=context):
+
                     if proc.state == 'exception':
                         report.append(_('PROC %d: on order - %3.2f %-5s - %s') % \
                                 (proc.id, proc.product_qty, proc.product_uom.name,
@@ -98,12 +97,13 @@ class procurement_order(osv.osv):
                     else:
                         report_later += 1
                     report_total += 1
-                for proc in procurement_obj.browse(cr, uid, report_ids, context=context):
+
                     if proc.state == 'exception':
                         report.append(_('PROC %d: from stock - %3.2f %-5s - %s') % \
                                 (proc.id, proc.product_qty, proc.product_uom.name,
                                     proc.product_id.name,))
                         report_except += 1
+
                 if use_new_cursor:
                     cr.commit()
                 offset += len(ids)
@@ -156,11 +156,7 @@ class procurement_order(osv.osv):
         wf_service = netsvc.LocalService("workflow")
 
         warehouse_ids = warehouse_obj.search(cr, uid, [], context=context)
-
-        cr.execute('select p.id from product_product p \
-                        join product_template t on (p.product_tmpl_id=t.id) \
-                        where p.active=True and t.purchase_ok=True')
-        products_id = [x for x, in cr.fetchall()]
+        products_id = product_obj.search(cr, uid, [('purchase_ok', '=', True)], order='id', context=context)
 
         for warehouse in warehouse_obj.browse(cr, uid, warehouse_ids, context=context):
             context['warehouse'] = warehouse
@@ -183,6 +179,7 @@ class procurement_order(osv.osv):
                     'product_qty': -product.virtual_available,
                     'product_uom': product.uom_id.id,
                     'location_id': location_id,
+                    'company_id': warehouse.company_id.id,
                     'procure_method': 'make_to_order',
                     })
                 wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
@@ -241,8 +238,7 @@ class procurement_order(osv.osv):
                         if op.procurement_draft_ids:
                         # Check draft procurement related to this order point
                             pro_ids = [x.id for x in op.procurement_draft_ids]
-                            cr.execute('select id, product_qty from procurement_order where id in %s order by product_qty desc', (tuple(pro_ids), ))
-                            procure_datas = cr.dictfetchall()
+                            procure_datas = procurement_obj.read(cr, uid, pro_ids, ['id','product_qty'], context=context, order='product_qty desc')
                             to_generate = qty
                             for proc_data in procure_datas:
                                 if to_generate >= proc_data['product_qty']:
@@ -259,6 +255,7 @@ class procurement_order(osv.osv):
                             'date_planned': newdate.strftime('%Y-%m-%d'),
                             'product_id': op.product_id.id,
                             'product_qty': qty,
+                            'company_id': op.company_id.id,
                             'product_uom': op.product_uom.id,
                             'location_id': op.location_id.id,
                             'procure_method': 'make_to_order',
diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py
index 293a195b4ed..2eed5381efc 100644
--- a/addons/procurement/wizard/schedulers_all.py
+++ b/addons/procurement/wizard/schedulers_all.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import threading
+import pooler
 
 from osv import osv, fields
 
@@ -44,9 +45,13 @@ class procurement_compute_all(osv.osv_memory):
         @param context: A standard dictionary
         """
         proc_obj = self.pool.get('procurement.order')
-        for proc in self.browse(cr, uid, ids, context=context):
-            proc_obj.run_scheduler(cr, uid, automatic=proc.automatic, use_new_cursor=cr.dbname,\
+        #As this function is in a new thread, i need to open a new cursor, because the old one may be closed
+        new_cr = pooler.get_db(cr.dbname).cursor()
+        for proc in self.browse(new_cr, uid, ids, context=context):
+            proc_obj.run_scheduler(new_cr, uid, automatic=proc.automatic, use_new_cursor=new_cr.dbname,\
                     context=context)
+        #close the new cursor
+        new_cr.close()
         return {}
 
     def procure_calculation(self, cr, uid, ids, context=None):