From db08eb4d0a40b15557505bbddbac05f6ff04f91f Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 29 Aug 2012 11:50:22 +0200
Subject: [PATCH] [REF] base_gengo: misc code improvements made during code
 review

bzr revid: qdp-launchpad@openerp.com-20120829095022-i3fsdc0nvok78q25
---
 addons/base_gengo/ir_translation.py                  |  7 +------
 addons/base_gengo/ir_translation.xml                 | 11 ++++-------
 addons/base_gengo/wizard/gengo_update_translation.py |  6 +++---
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index edf939b3851..c8a5f9ef070 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -26,12 +26,7 @@ class ir_translation(osv.Model):
     _name = "ir.translation"
     _inherit = "ir.translation"
     _columns = {
-        'gengo_comment': fields.text("Comments & Activity"),
         'gengo_translation': fields.boolean("Gengo Auto Translation ?", help='If checked the term will be translated by Gengo automatically.'),
-        'gengo_control': fields.boolean('Gengo Traslated', help="If Term is translated using Gengo Service, the check box will be checked.", readonly=True),
+        'gengo_comment': fields.text("Comments & Activity Linked to Gengo"),
         'job_id': fields.char('Gengo JobId', size=32),
     }
-
-    _defaults = {
-        'gengo_control': False,
-    }
diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
index 8a0e6a238b8..6725504df8a 100644
--- a/addons/base_gengo/ir_translation.xml
+++ b/addons/base_gengo/ir_translation.xml
@@ -7,8 +7,7 @@
             <field name="inherit_id" ref="base.view_translation_search"/>
             <field name="arch" type="xml">
                 <search string="Translations">
-                     <filter icon="terp-project" string="In Progress" domain="[('state','=','inprogress')]"></filter>
-                     <filter string="To Control" domain="[('state','=','translated')]"></filter>
+                     <filter string="To Approve In Gengo" domain="[('state','=','inprogress'),('gengo_translation','=',True)]"></filter>
                 </search>
             </field>
         </record>
@@ -20,12 +19,10 @@
             <field name="model">ir.translation</field>
             <field name="arch" type="xml">
                  <xpath expr="//form[@string='Translations']/sheet" position="inside">
-                    <group string="Gengo Comments &amp; Activity" col="1">
-                        <field name="gengo_comment" nolabel="1" placeholder="Gengo Comments &amp; Activity..."/>
-                    </group>
-                    <group col="4">
+                    <group string="Gengo Translation Service" col="4" colspan="4">
                         <field name="gengo_translation" />
-                        <field name="gengo_control" />
+                        <label string="Note: If the translation state is 'In Progress', it means that the translation has to be approved to be uploaded in this system. You are suppose to do that directly by using your Gengo Account"/>
+                        <field name="gengo_comment" nolabel="1" placeholder="Gengo Comments &amp; Activity..." colspan="4"/>
                     </group>
                 </xpath>
             </field>
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 2299af02480..357d2a5bf74 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -65,7 +65,7 @@ CRON_VALS = {
     'numbercall': -1,
     'model': "'base.update.translations'",
     'function': "",
-    'args': "'(20,)'",#not sure
+    'args': "'(%s,)'" %s GENGO_DEFAULT_LIMIT,
 }
 
 
@@ -175,6 +175,7 @@ class base_update_translation(osv.osv_memory):
             model, res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base_gengo', xml_id)
             cron_pool.write(cr, uid, [res], {'active': True}, context=context)
         except:
+            #the cron job was not found, probably deleted previously, so we create it again using default values
             CRON_VALS.update({'name': name, "function": fn})
             return cron_pool.create(cr, uid, CRON_VALS, context)
 
@@ -243,8 +244,7 @@ class base_update_translation(osv.osv_memory):
                         continue
                     if job_response['response']['job']['status'] == 'approved':
                         vals.update({'state': 'translated',
-                            'value': job_response['response']['job']['body_tgt'],
-                            'gengo_control': True})
+                            'value': job_response['response']['job']['body_tgt'])
                         up_term += 1
                     job_comment = gengo.getTranslationJobComments(id=term.job_id)
                     if job_comment['opstat']=='ok':