[Merge]with: lp:openobject-addons

bzr revid: dbr@tinyerp.com-20110920064550-v90yjoblpzp5ebiq

16 files changed, 36 insertions, 38 deletions

diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py
index 1a10fb5c0ce..c111d0679c1 100644
--- a/addons/purchase_double_validation/__openerp__.py
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -23,6 +23,7 @@
     "name" : "Double Validation for Purchase",
     "version" : "1.1",
     "category": 'Purchases',
+    'complexity': "easy",
     "images" : ["images/purchase_validation.jpeg"],
     "depends" : ["base","purchase"],
     "author" : 'OpenERP SA',
diff --git a/addons/purchase_double_validation/i18n/bg.po b/addons/purchase_double_validation/i18n/bg.po
index ed9b4eff4b6..ca90e74b913 100644
--- a/addons/purchase_double_validation/i18n/bg.po
+++ b/addons/purchase_double_validation/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-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/ca.po b/addons/purchase_double_validation/i18n/ca.po
index 851245c8ddf..3ad284ebb72 100644
--- a/addons/purchase_double_validation/i18n/ca.po
+++ b/addons/purchase_double_validation/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-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/de.po b/addons/purchase_double_validation/i18n/de.po
index 174cb79fc41..67d1376ec0e 100644
--- a/addons/purchase_double_validation/i18n/de.po
+++ b/addons/purchase_double_validation/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-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/es.po b/addons/purchase_double_validation/i18n/es.po
index 518d029c3cf..5d1c4b25e65 100644
--- a/addons/purchase_double_validation/i18n/es.po
+++ b/addons/purchase_double_validation/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-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/fi.po b/addons/purchase_double_validation/i18n/fi.po
index 645ea26abf4..4adee705b0d 100644
--- a/addons/purchase_double_validation/i18n/fi.po
+++ b/addons/purchase_double_validation/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-06-29 04:43+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/fr.po b/addons/purchase_double_validation/i18n/fr.po
index 9399ea57680..6113275968c 100644
--- a/addons/purchase_double_validation/i18n/fr.po
+++ b/addons/purchase_double_validation/i18n/fr.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-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/gl.po b/addons/purchase_double_validation/i18n/gl.po
index aa1b5e4118b..0e29331fced 100644
--- a/addons/purchase_double_validation/i18n/gl.po
+++ b/addons/purchase_double_validation/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-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/hu.po b/addons/purchase_double_validation/i18n/hu.po
index 2059d2d91ff..94526b74fa5 100644
--- a/addons/purchase_double_validation/i18n/hu.po
+++ b/addons/purchase_double_validation/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-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/it.po b/addons/purchase_double_validation/i18n/it.po
index 6fca10f3b46..36ec4bf2add 100644
--- a/addons/purchase_double_validation/i18n/it.po
+++ b/addons/purchase_double_validation/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-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/nl.po b/addons/purchase_double_validation/i18n/nl.po
index fe410f7bee9..36bedf8c353 100644
--- a/addons/purchase_double_validation/i18n/nl.po
+++ b/addons/purchase_double_validation/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-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/pt_BR.po b/addons/purchase_double_validation/i18n/pt_BR.po
index a4baccee9b7..5d434717de1 100644
--- a/addons/purchase_double_validation/i18n/pt_BR.po
+++ b/addons/purchase_double_validation/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-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/ru.po b/addons/purchase_double_validation/i18n/ru.po
index cc0a075da56..59711f91c1d 100644
--- a/addons/purchase_double_validation/i18n/ru.po
+++ b/addons/purchase_double_validation/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-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/tr.po b/addons/purchase_double_validation/i18n/tr.po
index 7b6e2f860c0..1430c5cc83e 100644
--- a/addons/purchase_double_validation/i18n/tr.po
+++ b/addons/purchase_double_validation/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-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/zh_CN.po b/addons/purchase_double_validation/i18n/zh_CN.po
index 91894013962..ad2c0831f37 100644
--- a/addons/purchase_double_validation/i18n/zh_CN.po
+++ b/addons/purchase_double_validation/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-07-13 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
@@ -30,7 +30,7 @@ msgstr "设置进度"
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
 msgid "Define minimum amount after which puchase is needed to be validated."
-msgstr "定义最低金额后采购需要复核"
+msgstr "定义限定金额后采购需要审核"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
@@ -56,7 +56,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"\t这模块修改采购的工作流程订单要复核采购超过设定的最低金额\n"
+"\t这模块修改采购的工作流程采购超过设定的限定金额要审核\n"
 "    "
 
 #. module: purchase_double_validation
@@ -73,7 +73,7 @@ msgstr "res_config_contents"
 #. module: purchase_double_validation
 #: help:purchase.double.validation.installer,limit_amount:0
 msgid "Maximum amount after which validation of purchase is required."
-msgstr "在设定最低金额后采购复核是必须的"
+msgstr "在设定限定金额后采购审核是必须的"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
@@ -83,4 +83,4 @@ msgstr "purchase.double.validation.installer"
 #. module: purchase_double_validation
 #: field:purchase.double.validation.installer,limit_amount:0
 msgid "Maximum Purchase Amount"
-msgstr "最低采购金额"
+msgstr "限定的采购金额"
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index 3ec44c4194b..bc39c837b6b 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
         <!-- configartion view -->
@@ -19,9 +18,9 @@
                   <xpath expr="//label[@string='description']" position="attributes">
                     <attribute name="string">Define minimum amount after which puchase is needed to be validated.</attribute>
                   </xpath>
-                <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                      <attribute name='rowspan'>15</attribute>
-                      <attribute name='string'></attribute>
+                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                      <attribute name="rowspan">15</attribute>
+                      <attribute name="string"/>
                   </xpath>
                 <group string="res_config_contents" position="replace">
                   <field name="limit_amount"/>
@@ -50,8 +49,6 @@
         <record id="config_wizard_step_purchase_limit_amount" model="ir.actions.todo">
             <field name="action_id" ref="action_config_purchase_limit_amount"/>
             <field name="category_id" ref="category_purchase_configuration"/>
-            <field name="type">normal</field>
-            <field name="state">skip</field>
         </record>
         
     </data>