[MERGE] Sync with trunk

bzr revid: odo@openerp.com-20121211170119-5spf2iqzl89kphnk

5 files changed, 50 insertions, 26 deletions

diff --git a/addons/purchase_double_validation/i18n/hr.po b/addons/purchase_double_validation/i18n/hr.po
index 07f6afd7fcc..a6cf61bb869 100644
--- a/addons/purchase_double_validation/i18n/hr.po
+++ b/addons/purchase_double_validation/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-12-12 07:16+0000\n"
-"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"PO-Revision-Date: 2012-12-10 06:50+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@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: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
+"X-Generator: Launchpad (build 16356)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
@@ -25,7 +25,7 @@ msgstr ""
 #. module: purchase_double_validation
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "Neodobreni nalozi."
 
 #. module: purchase_double_validation
 #: field:purchase.config.settings,limit_amount:0
@@ -36,12 +36,12 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
 msgid "Purchase Orders Waiting Approval"
-msgstr ""
+msgstr "Nalozi koji čekaju odobrenje"
 
 #. module: purchase_double_validation
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "Za odobriti"
 
 #. module: purchase_double_validation
 #: help:purchase.config.settings,limit_amount:0
diff --git a/addons/purchase_double_validation/i18n/pt_BR.po b/addons/purchase_double_validation/i18n/pt_BR.po
index 8946c584996..e1cdaefbab0 100644
--- a/addons/purchase_double_validation/i18n/pt_BR.po
+++ b/addons/purchase_double_validation/i18n/pt_BR.po
@@ -8,46 +8,45 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-07-28 21:05+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2012-12-07 16:41+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
 msgid "purchase.config.settings"
-msgstr ""
+msgstr "purchase.config.settings"
 
 #. module: purchase_double_validation
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "Pedidos de compra que ainda não foram aprovados"
 
 #. module: purchase_double_validation
 #: field:purchase.config.settings,limit_amount:0
 msgid "limit to require a second approval"
-msgstr ""
+msgstr "limitar para solicitar uma segunda aprovação"
 
 #. module: purchase_double_validation
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
 msgid "Purchase Orders Waiting Approval"
-msgstr ""
+msgstr "Pedidos de Compra Aguardando Aprovação"
 
 #. module: purchase_double_validation
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "Para Aprovar"
 
 #. module: purchase_double_validation
 #: help:purchase.config.settings,limit_amount:0
 msgid "Amount after which validation of purchase is required."
-msgstr ""
+msgstr "Valor a partir do qual é solicitada validação da compra."
 
 #~ msgid "Configure Limit Amount for Purchase"
 #~ msgstr "Configura o Valor Limite para Compra"
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.py b/addons/purchase_double_validation/purchase_double_validation_installer.py
index 1e2181fc9f3..5bd7bd24cb1 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.py
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.py
@@ -34,16 +34,16 @@ class purchase_config_settings(osv.osv_memory):
 
     def get_default_limit_amount(self, cr, uid, fields, context=None):
         ir_model_data = self.pool.get('ir.model.data')
-        transition = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_waiting_confirmed')
+        transition = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_lt')
         field, value = transition.condition.split('<', 1)
         return {'limit_amount': int(value)}
 
     def set_limit_amount(self, cr, uid, ids, context=None):
         ir_model_data = self.pool.get('ir.model.data')
         config = self.browse(cr, uid, ids[0], context)
-        waiting = ir_model_data.get_object(cr, uid, 'purchase', 'trans_confirmed_router')
+        waiting = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_gt')
         waiting.write({'condition': 'amount_total >= %s' % config.limit_amount})
-        confirm = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_waiting_confirmed')
+        confirm = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_lt')
         confirm.write({'condition': 'amount_total < %s' % config.limit_amount})
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index 5ad03705035..f0bed5e99b0 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="purchase.view_purchase_configuration"/>
             <field name="arch" type="xml">
                 <div name="module_purchase_double_validation" position="inside">
-                    <span attrs="{'invisible': [('module_purchase_double_validation','=',False)]}" class="oe_separate-from-text">
+                    <span class="oe_separate-from-text">
                         <label for="limit_amount"/>
                         <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
                     </span>
diff --git a/addons/purchase_double_validation/purchase_double_validation_workflow.xml b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
index 61503564246..673063ff049 100644
--- a/addons/purchase_double_validation/purchase_double_validation_workflow.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
@@ -2,17 +2,42 @@
 <openerp>
     <data>
 
-         <record id="purchase.trans_confirmed_router" model="workflow.transition">
+        <record id="act_double_wait" model="workflow.activity">
+            <field name="wkf_id" ref="purchase.purchase_order"/>
+            <field name="name">WaitForApproval</field>
+            <field name="kind">dummy</field>
+        </record>
+
+        <record id="act_double_check" model="workflow.activity">
+            <field name="wkf_id" ref="purchase.purchase_order"/>
+            <field name="name">CheckForApproval</field>
+            <field name="split_mode">OR</field>
+            <field name="kind">dummy</field>
+        </record>
+
+         <record id="trans_confirmed_double_check" model="workflow.transition">
+            <field name="act_from" ref="purchase.act_confirmed"/>
+            <field name="act_to" ref="act_double_check"/>
+        </record>
+        
+        <record id="trans_confirmed_double_gt" model="workflow.transition">
+            <field name="act_from" ref="act_double_check"/>
+            <field name="act_to" ref="act_double_wait"/>
             <field name="condition">amount_untaxed &gt;= 5000</field>
             <field name="signal">purchase_approve</field>
             <field name="group_id" ref="purchase.group_purchase_manager"/>
         </record>
 
-        <record id="trans_waiting_confirmed" model="workflow.transition">
-            <field name="act_from" ref="purchase.act_confirmed"/>
-            <field name="act_to" ref="purchase.act_router"/>
+        <record id="trans_confirmed_double_lt" model="workflow.transition">
+            <field name="act_from" ref="act_double_check"/>
+            <field name="act_to" ref="act_double_wait"/>
             <field name="condition">amount_untaxed &lt; 5000</field>
         </record>
 
+        <record id="trans_double_app_conf" model="workflow.transition">
+            <field name="act_from" ref="act_double_wait"/>
+            <field name="act_to" ref="purchase.act_router"/>
+        </record>
+
     </data>
 </openerp>