[MERGE]

bzr revid: uco@tinyerp.com-20101230060753-wujam7otb5f13f0z

8 files changed, 62 insertions, 40 deletions

diff --git a/addons/procurement/company.py b/addons/procurement/company.py
index 09865b3aa14..d544181a6e8 100644
--- a/addons/procurement/company.py
+++ b/addons/procurement/company.py
@@ -27,7 +27,7 @@ class company(osv.osv):
         'schedule_range': fields.float('Scheduler Range Days', required=True,
             help="This is the time frame analysed by the scheduler when "\
             "computing procurements. All procurements that are not between "\
-            "today and today+range are skipped for futur computation."),
+            "today and today+range are skipped for future computation."),
     }
     _defaults = {
         'schedule_range': 80.0,
diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po
index 3595b0031ad..40ba10a9664 100644
--- a/addons/procurement/i18n/de.po
+++ b/addons/procurement/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:59+0000\n"
+"PO-Revision-Date: 2010-12-28 22:39+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -47,7 +47,7 @@ msgstr "Gruppierung..."
 #. module: procurement
 #: help:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Draft procurement of the product and location of that orderpoint"
-msgstr ""
+msgstr "Beschaffungsentwurf für Produkt oder Lagerort der Bestellung"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -243,12 +243,12 @@ msgstr ""
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Procurement Orders to Process"
-msgstr ""
+msgstr "Durchzuführende Beschaffungsaufträge"
 
 #. module: procurement
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: procurement
 #: field:procurement.order,priority:0
@@ -458,7 +458,7 @@ msgstr ""
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
-msgstr ""
+msgstr "Bezugnehmende Beschaffungsaufträge"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
@@ -491,6 +491,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
 msgstr ""
+"Durch Deaktivierung können Sie die Ansicht für den Bestellzeitpunkt "
+"ausblenden."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -600,6 +602,7 @@ msgstr "Normal"
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,active:0
@@ -655,7 +658,7 @@ msgstr "Beschaffung Bezeichnung"
 #. module: procurement
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
 
 #. module: procurement
 #: view:procurement.order:0
diff --git a/addons/procurement/i18n/es.po b/addons/procurement/i18n/es.po
index 5763582098b..e0605b76e6d 100644
--- a/addons/procurement/i18n/es.po
+++ b/addons/procurement/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 14:15+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:19+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -47,6 +48,8 @@ msgstr "Agrupar por..."
 #: help:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
+"Abastecimiento borrador del producto y ubicación para esta regla de stock "
+"mínimo"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -198,7 +201,7 @@ msgstr "Preparado"
 #. module: procurement
 #: field:procurement.order.compute.all,automatic:0
 msgid "Automatic orderpoint"
-msgstr "Pedido automático"
+msgstr "Regla de stock mínimo automática"
 
 #. module: procurement
 #: field:mrp.property,composition:0
@@ -238,7 +241,7 @@ msgstr ""
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Procurement Orders to Process"
-msgstr ""
+msgstr "Órdenes de abastecimiento a procesar"
 
 #. module: procurement
 #: constraint:res.company:0
@@ -446,11 +449,14 @@ msgid ""
 "    This is the module for computing Procurements.\n"
 "    "
 msgstr ""
+"\n"
+"    Este es el módulo para calcular abastecimientos.\n"
+"    "
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
-msgstr ""
+msgstr "Órdenes de abastecimiento relacionadas"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
@@ -483,8 +489,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
 msgstr ""
-"Si el campo activo es falso, le permitirá ocultar el punto de pedido sin "
-"eliminarlo."
+"Si el campo activo se desmarca, permite ocultar la regla de stock mínimo sin "
+"eliminarla."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -554,6 +560,17 @@ msgid ""
 "others require manual intervention (those are identified by a specific error "
 "message)"
 msgstr ""
+"Las órdenes de abastecimiento representan la necesidad de una determinada "
+"cantidad de productos, en un momento dado, en una ubicación determinada. Los "
+"pedidos de venta son una fuente típica de las órdenes de abastecimiento "
+"(pero estos son documentos distintos). Dependiendo de los parámetros de "
+"abastecimiento y la configuración de productos, el motor de abastecimientos "
+"tratará de satisfacer la necesidad de reservar los productos del stock, u "
+"ordenar productos de un proveedor, o crear una orden de producción, etc. Se "
+"produce una excepción de abastecimiento cuando el sistema no puede encontrar "
+"una manera de cumplir un abastecimiento. Algunas excepciones se resolverán "
+"de forma automática, pero otras requieren intervención manual (las que se "
+"identifican con un mensaje de error específico)."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -610,7 +627,7 @@ msgstr "Ord. abastecimiento automática: %s"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
-msgstr "Orden automática"
+msgstr "Regla de stock mínimo automática"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
@@ -930,7 +947,7 @@ msgstr "Muy urgente"
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
 msgid "Automatic Orderpoint"
-msgstr "Punto de pedido automático"
+msgstr "Regla de stock mínimo automática"
 
 #. module: procurement
 #: view:procurement.order:0
diff --git a/addons/procurement/i18n/vi.po b/addons/procurement/i18n/vi.po
index 34b1577ceba..4886599278b 100644
--- a/addons/procurement/i18n/vi.po
+++ b/addons/procurement/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 08:19+0000\n"
+"PO-Revision-Date: 2010-12-28 08:57+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -628,7 +628,7 @@ msgstr ""
 #: code:addons/procurement/procurement.py:0
 #, python-format
 msgid "Data Insufficient !"
-msgstr ""
+msgstr "Dữ liệu không đầy đủ !"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property_group
@@ -640,12 +640,12 @@ msgstr ""
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Misc"
-msgstr ""
+msgstr "Các thứ khác"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Locations"
-msgstr ""
+msgstr "Các địa điểm"
 
 #. module: procurement
 #: selection:procurement.order,procure_method:0
@@ -655,7 +655,7 @@ msgstr ""
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "General Information"
-msgstr ""
+msgstr "Thông tin chung"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -665,7 +665,7 @@ msgstr ""
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "Hoàn tất"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
@@ -680,7 +680,7 @@ msgstr ""
 #: view:procurement.order.compute.all:0
 #: view:procurement.orderpoint.compute:0
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,logic:0
@@ -690,12 +690,12 @@ msgstr ""
 #. module: procurement
 #: field:procurement.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Tài liệu gốc"
 
 #. module: procurement
 #: selection:procurement.order,priority:0
 msgid "Not urgent"
-msgstr ""
+msgstr "Không gấp"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute_all
@@ -705,7 +705,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Current"
-msgstr ""
+msgstr "Hiện tại"
 
 #. module: procurement
 #: view:board.board:0
@@ -715,7 +715,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Details"
-msgstr ""
+msgstr "Các chi tiết"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action5
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index c25301b6603..37c300e03ab 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -245,9 +245,10 @@
         <act_window
         context="{'search_default_warehouse_id': active_id}"
         id="act_stock_warehouse_2_stock_warehouse_orderpoint"
-        name="Minimum Stock Rules"
-        res_model="stock.warehouse.orderpoint"
-        src_model="stock.warehouse"/>
+        name="Minimum Stock Rules" 
+        res_model="stock.warehouse.orderpoint" 
+        src_model="stock.warehouse"
+        groups="stock.group_stock_user"/>
 
         <!-- add product_uom to context to be the default value when adding new orderpoints -->
         <act_window
@@ -255,7 +256,8 @@
             id="act_product_product_2_stock_warehouse_orderpoint"
             name="Minimum Stock Rules"
             res_model="stock.warehouse.orderpoint"
-            src_model="product.product"/>
+            src_model="product.product"
+            groups="stock.group_stock_user"/>
 
         <act_window
             context="{'product_uom': locals().has_key('uom_id') and uom_id}"
@@ -263,7 +265,8 @@
             id="act_procurement_2_stock_warehouse_orderpoint"
             name="Minimum Stock Rules"
             res_model="stock.warehouse.orderpoint"
-            src_model="procurement.order"/>
+            src_model="procurement.order"
+            groups="stock.group_stock_user"/>
 
         <!-- Procurements are located in Warehouse menu hierarchy, MRP users should come to Stock application to use it.  -->
         <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="4"/>
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 2e9b44edb63..5bbfa01266b 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -34,8 +34,7 @@
             view_mode="form"
             target="new"
             key2="client_action_multi"
-            id="act_make_procurement"
-            groups="base.group_extended"/>
+            id="act_make_procurement"/>
 
     </data>
 </openerp>
diff --git a/addons/procurement/wizard/orderpoint_procurement.py b/addons/procurement/wizard/orderpoint_procurement.py
index d94e6753231..8f9c1fc3d53 100644
--- a/addons/procurement/wizard/orderpoint_procurement.py
+++ b/addons/procurement/wizard/orderpoint_procurement.py
@@ -63,7 +63,7 @@ class procurement_compute(osv.osv_memory):
         """
         threaded_calculation = threading.Thread(target=self._procure_calculation_orderpoint, args=(cr, uid, ids, context))
         threaded_calculation.start()
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 procurement_compute()
 
diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py
index 5fae2760edf..293a195b4ed 100644
--- a/addons/procurement/wizard/schedulers_all.py
+++ b/addons/procurement/wizard/schedulers_all.py
@@ -59,8 +59,8 @@ class procurement_compute_all(osv.osv_memory):
         """
         threaded_calculation = threading.Thread(target=self._procure_calculation_all, args=(cr, uid, ids, context))
         threaded_calculation.start()
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 procurement_compute_all()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: