merged with trunk

bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv

39 files changed, 26 insertions, 21 deletions

diff --git a/addons/procurement/__init__.py b/addons/procurement/__init__.py
index 3420ef1f75e..3420ef1f75e 100644..100755
--- a/addons/procurement/__init__.py
+++ b/addons/procurement/__init__.py
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index 1cdc1462f89..1cdc1462f89 100644..100755
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml
index bf11fe79166..bf11fe79166 100644..100755
--- a/addons/procurement/board_mrp_procurement_view.xml
+++ b/addons/procurement/board_mrp_procurement_view.xml
diff --git a/addons/procurement/company.py b/addons/procurement/company.py
index 09865b3aa14..d544181a6e8 100644..100755
--- 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/company_view.xml b/addons/procurement/company_view.xml
index 4d14f69edde..4d14f69edde 100644..100755
--- a/addons/procurement/company_view.xml
+++ b/addons/procurement/company_view.xml
diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po
index 3595b0031ad..40ba10a9664 100644..100755
--- 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/en_US.po b/addons/procurement/i18n/en_US.po
index 249709f42cf..249709f42cf 100644..100755
--- a/addons/procurement/i18n/en_US.po
+++ b/addons/procurement/i18n/en_US.po
diff --git a/addons/procurement/i18n/es.po b/addons/procurement/i18n/es.po
index c125550766e..e0605b76e6d 100644..100755
--- a/addons/procurement/i18n/es.po
+++ b/addons/procurement/i18n/es.po
@@ -8,14 +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-27 18:12+0000\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-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/fr.po b/addons/procurement/i18n/fr.po
index ba336d1fa9f..ba336d1fa9f 100644..100755
--- a/addons/procurement/i18n/fr.po
+++ b/addons/procurement/i18n/fr.po
diff --git a/addons/procurement/i18n/it.po b/addons/procurement/i18n/it.po
index f9d05a9fc89..f9d05a9fc89 100644..100755
--- a/addons/procurement/i18n/it.po
+++ b/addons/procurement/i18n/it.po
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index 653203742e7..653203742e7 100644..100755
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.po
diff --git a/addons/procurement/i18n/nl.po b/addons/procurement/i18n/nl.po
index a67bb72b552..a67bb72b552 100644..100755
--- a/addons/procurement/i18n/nl.po
+++ b/addons/procurement/i18n/nl.po
diff --git a/addons/procurement/i18n/pl.po b/addons/procurement/i18n/pl.po
index a8b82fb3ee9..a8b82fb3ee9 100644..100755
--- a/addons/procurement/i18n/pl.po
+++ b/addons/procurement/i18n/pl.po
diff --git a/addons/procurement/i18n/procurement.pot b/addons/procurement/i18n/procurement.pot
index 92b93e249e0..92b93e249e0 100644..100755
--- a/addons/procurement/i18n/procurement.pot
+++ b/addons/procurement/i18n/procurement.pot
diff --git a/addons/procurement/i18n/pt.po b/addons/procurement/i18n/pt.po
index 3a65989e695..3a65989e695 100644..100755
--- a/addons/procurement/i18n/pt.po
+++ b/addons/procurement/i18n/pt.po
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index 2f31dd258d7..2f31dd258d7 100644..100755
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.po
diff --git a/addons/procurement/i18n/sr.po b/addons/procurement/i18n/sr.po
index 049223ab53a..049223ab53a 100644..100755
--- a/addons/procurement/i18n/sr.po
+++ b/addons/procurement/i18n/sr.po
diff --git a/addons/procurement/i18n/sr@latin.po b/addons/procurement/i18n/sr@latin.po
index cd84aac5a19..cd84aac5a19 100644..100755
--- a/addons/procurement/i18n/sr@latin.po
+++ b/addons/procurement/i18n/sr@latin.po
diff --git a/addons/procurement/i18n/sv.po b/addons/procurement/i18n/sv.po
index 9d294e2e9da..9d294e2e9da 100644..100755
--- a/addons/procurement/i18n/sv.po
+++ b/addons/procurement/i18n/sv.po
diff --git a/addons/procurement/i18n/vi.po b/addons/procurement/i18n/vi.po
index 8bb9d5c7897..4886599278b 100644..100755
--- 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-27 06:22+0000\n"
-"Last-Translator: Phong Nguyen <Unknown>\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-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/zh_CN.po b/addons/procurement/i18n/zh_CN.po
index bb40c4f9e6f..bb40c4f9e6f 100644..100755
--- a/addons/procurement/i18n/zh_CN.po
+++ b/addons/procurement/i18n/zh_CN.po
diff --git a/addons/procurement/process/procurement_process.xml b/addons/procurement/process/procurement_process.xml
index 955d9cf6416..955d9cf6416 100644..100755
--- a/addons/procurement/process/procurement_process.xml
+++ b/addons/procurement/process/procurement_process.xml
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 1b2d7c93466..1b2d7c93466 100644..100755
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
diff --git a/addons/procurement/procurement_data.xml b/addons/procurement/procurement_data.xml
index 6a83d525c68..6a83d525c68 100644..100755
--- a/addons/procurement/procurement_data.xml
+++ b/addons/procurement/procurement_data.xml
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index c25301b6603..bea250a25f5 100644..100755
--- 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,13 +265,14 @@
             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"/>
             <menuitem action="action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="20" groups="stock.group_stock_manager"/>
             <menuitem action="procurement_exceptions" id="menu_stock_procurement_action" parent="menu_stock_sched" sequence="50" groups="stock.group_stock_manager"/>
-        <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5" groups="base.group_extended"/>
+        <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/>
             <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="menu_stock_procurement" sequence="10"/>
 
     </data>
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index 23b0a08af78..23b0a08af78 100644..100755
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 3a6e3336472..3a6e3336472 100644..100755
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
diff --git a/addons/procurement/security/ir.model.access.csv b/addons/procurement/security/ir.model.access.csv
index a09115daecf..a09115daecf 100644..100755
--- a/addons/procurement/security/ir.model.access.csv
+++ b/addons/procurement/security/ir.model.access.csv
diff --git a/addons/procurement/security/procurement_security.xml b/addons/procurement/security/procurement_security.xml
index b6b15d565c6..b6b15d565c6 100644..100755
--- a/addons/procurement/security/procurement_security.xml
+++ b/addons/procurement/security/procurement_security.xml
diff --git a/addons/procurement/stock_orderpoint.xml b/addons/procurement/stock_orderpoint.xml
index 433078263c1..433078263c1 100644..100755
--- a/addons/procurement/stock_orderpoint.xml
+++ b/addons/procurement/stock_orderpoint.xml
diff --git a/addons/procurement/wizard/__init__.py b/addons/procurement/wizard/__init__.py
index ae70ffbf941..ae70ffbf941 100644..100755
--- a/addons/procurement/wizard/__init__.py
+++ b/addons/procurement/wizard/__init__.py
diff --git a/addons/procurement/wizard/make_procurement_product.py b/addons/procurement/wizard/make_procurement_product.py
index 0f5acf2f5c8..0f5acf2f5c8 100644..100755
--- a/addons/procurement/wizard/make_procurement_product.py
+++ b/addons/procurement/wizard/make_procurement_product.py
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 2e9b44edb63..5bbfa01266b 100644..100755
--- 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/mrp_procurement.py b/addons/procurement/wizard/mrp_procurement.py
index 7fa28adf5fe..7fa28adf5fe 100644..100755
--- a/addons/procurement/wizard/mrp_procurement.py
+++ b/addons/procurement/wizard/mrp_procurement.py
diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index 1d071ea300f..1d071ea300f 100644..100755
--- a/addons/procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
diff --git a/addons/procurement/wizard/orderpoint_procurement.py b/addons/procurement/wizard/orderpoint_procurement.py
index d94e6753231..d94e6753231 100644..100755
--- a/addons/procurement/wizard/orderpoint_procurement.py
+++ b/addons/procurement/wizard/orderpoint_procurement.py
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index c8d0d30d1de..c8d0d30d1de 100644..100755
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py
index 5fae2760edf..5fae2760edf 100644..100755
--- a/addons/procurement/wizard/schedulers_all.py
+++ b/addons/procurement/wizard/schedulers_all.py
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index 00b6225101e..00b6225101e 100644..100755
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml