Merge lp:~joao-gama/openerp-mgmtsystem/6.1-bug-1090581-mgmtsystem_audit into lp:openerp-mgmtsystem/6.1

[Joao Alfredo Gama Batista]

Check if the action line is linked with a procedure before try to reach the procedure.

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Approve

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM.

Additional note: on line 42, you may want to mark the "Yes / No" string as translatable.

review: Approve (code review, no test)

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

Make yes_no translatable as suggested.

review: Needs Fixing

[lp:~joao-gama/openerp-mgmtsystem/6.1-bug-1090581-mgmtsystem_audit]

31. By Joao Alfredo Gama Batista on 2012-12-19

[IMP] Make the verification List report translatable

Unmerged revisions

=== modified file 'mgmtsystem_audit/report/verification_list.py'
--- mgmtsystem_audit/report/verification_list.py	2012-05-04 22:50:44 +0000
+++ mgmtsystem_audit/report/verification_list.py	2012-12-19 23:22:21 +0000
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
 #
@@ -15,12 +15,13 @@
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import time
 from report import report_sxw
+from tools.translate import _
 
 class mgmtsystem_audit_verification_list(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
@@ -35,12 +36,16 @@
         v = {}
         p = []
         for l in verification_lines:
-            proc_nm = self.pool.get('wiki.wiki').read(self.cr, self.uid, l.procedure_id.id, ['name'])
+            if l.procedure_id:
+                proc_nm = self.pool.get('wiki.wiki').read(self.cr, self.uid, l.procedure_id.id, ['name'])['name']
+            else:
+                proc_nm = ''
+
             p.append({"id": l.id,
-                      "procedure": proc_nm['name'],
+                      "procedure": proc_nm,
                       "name": l.name,
-                      "yes_no": "Yes / No"})
-                    
+                      "yes_no": _('Yes / No')})
+
         p = sorted(p, key=lambda k: k["procedure"])
 
         proc_line = False
@@ -49,7 +54,7 @@
         for i in range(len(p)):
             if proc_name != p[i]['procedure']:
                 proc_line = True
-                
+
             if proc_line:
                 q.append({"id": p[i]['id'],
                           "procedure": p[i]['procedure'],
@@ -61,12 +66,10 @@
             q.append({"id": p[i]['id'],
                       "procedure": "",
                       "name": p[i]['name'],
-                      "yes_no": "Yes / No"})
-
-            
+                      "yes_no": _('Yes / No')})
 
         return q
-        
+
 report_sxw.report_sxw(
     'report.mgmtsystem.audit.verificationlist',
     'mgmtsystem.audit',
 
=== modified file 'mgmtsystem_audit/report/verification_list.rml'
--- mgmtsystem_audit/report/verification_list.rml	2012-05-04 22:50:44 +0000
+++ mgmtsystem_audit/report/verification_list.rml	2012-12-19 23:22:21 +0000
@@ -72,9 +72,7 @@
     </blockTable>
     </pto_header>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
+    <para style="terp_default_8">[[ setLang(user.context_lang) ]]</para>
     <para style="terp_header_Centre">Verification List</para>
     <para style="terp_header_Centre">[[ o.name ]]</para>
     <para style="terp_default_8">