Merge

trytond/ir/action.py

@@ -256,18 +256,19 @@ class ActionActWindow(OSV):
         ('tree','Tree'),
         ('form','Form'),
         ('board', 'Board'),
-        ],
-       string='Type of view')
+        ], string='Type of view')
     usage = fields.Char('Action Usage', size=32)
     act_window_views = fields.One2Many('ir.action.act_window.view',
-       'act_window', 'Views')
+            'act_window', 'Views')
     views = fields.Function('views_get_fnc', type='binary',
-       string='Views')
+            string='Views')
     limit = fields.Integer('Limit',
-       help='Default limit for the list view')
+            help='Default limit for the list view')
     auto_refresh = fields.Integer('Auto-Refresh',
-       help='Add an auto-refresh on the view')
+            help='Add an auto-refresh on the view')
     action = fields.Many2One('ir.action', 'Action', required=True)
+    window_name = fields.Boolean('Window Name', required=True,
+            help='Use the action name as window name')
 
     def default_type(self, cursor, user, context=None):
         return 'ir.action.act_window'
@@ -284,6 +285,9 @@ class ActionActWindow(OSV):
     def default_auto_refresh(self, cursor, user, context=None):
         return 0
 
+    def default_window_name(self, cursor, user, context=None):
+        return True
+
     def views_get_fnc(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for act in self.browse(cursor, user, ids, context=context):

trytond/ir/action.xml

@@ -163,9 +163,11 @@
                     <label name="context"/>
                     <field name="context" colspan="5"/>
                     <label name="limit"/>
-                    <field name="limit" colspan="2"/>
+                    <field name="limit"/>
                     <label name="auto_refresh"/>
-                    <field name="auto_refresh" colspan="2"/>
+                    <field name="auto_refresh"/>
+                    <label name="window_name"/>
+                    <field name="window_name"/>
                     <field name="keywords" colspan="6">
                         <tree string="Keywords">
                             <field name="keyword"/>

trytond/netsvc.py

@@ -178,7 +178,7 @@ class GenericXMLRPCRequestHandler:
             meth = getattr(service, method)
             res = meth(*params)
             return res
-        except Exception, exp:
+        except:
             tb_s = reduce(lambda x, y: x+y, traceback.format_exception(
                 sys.exc_type, sys.exc_value, sys.exc_traceback))
             for path in sys.path:
@@ -187,7 +187,7 @@ class GenericXMLRPCRequestHandler:
                 import pdb
                 traceb = sys.exc_info()[2]
                 pdb.post_mortem(traceb)
-            raise xmlrpclib.Fault(str(exp), tb_s)
+            raise xmlrpclib.Fault(str(sys.exc_value), tb_s)
 
 
 class SimpleXMLRPCRequestHandler(GenericXMLRPCRequestHandler,
@@ -353,7 +353,7 @@ class TinySocketClientThread(threading.Thread):
                 method = getattr(service, msg[1])
                 res = method(*msg[2:])
                 pysocket.send(res)
-            except Exception, exp:
+            except:
                 tb_s = reduce(lambda x, y: x+y,
                         traceback.format_exception(sys.exc_type,
                             sys.exc_value, sys.exc_traceback))
@@ -363,7 +363,7 @@ class TinySocketClientThread(threading.Thread):
                     import pdb
                     tback = sys.exc_info()[2]
                     pdb.post_mortem(tback)
-                pysocket.send(str(exp), exception=True, traceback=tb_s)
+                pysocket.send(str(sys.exc_value), exception=True, traceback=tb_s)
         pysocket.disconnect()
         self.threads.remove(self)
         return True
@@ -412,7 +412,7 @@ class TinySocketServerThread(threading.Thread):
                     self.threads.append(c_thread)
                     c_thread.start()
             self.socket.close()
-        except Exception, exp:
+        except:
             self.socket.close()
             return False
 

trytond/osv/orm.py

@@ -1764,7 +1764,7 @@ class ORM(object):
                     del res[i]
         return res
 
-    def view_header_get(self, cursor, user, view_id=None, view_type='form',
+    def view_header_get(self, cursor, user, value, view_type='form',
             context=None):
         """
         Overload this method if you need a window title
@@ -1809,7 +1809,10 @@ class ORM(object):
 
         elif node.nodeType == node.ELEMENT_NODE \
                 and node.localName in ('form', 'tree', 'graph'):
-            result = self.view_header_get(cursor, user, False, node.localName,
+            value = ''
+            if node.hasAttribute('string'):
+                value = node.getAttribute('string').encode('utf8')
+            result = self.view_header_get(cursor, user, value, node.localName,
                     context)
             if result:
                 node.setAttribute('string', result.decode('utf8'))

trytond/report/report.py

@@ -12,6 +12,7 @@ import zipfile
 import locale
 import time
 import os
+import datetime
 
 MODULE_LIST = []
 MODULE_CLASS_LIST = {}
@@ -323,6 +324,7 @@ class Report(object):
                     self.format_lang(value, digits=digits, date=date,
                             localcontext=localcontext)
             ctx['time'] = time
+            ctx['datetime'] = datetime
             try:
                 res = eval(node.nodeValue, ctx)
             except: