Merge lp:~openerp-dev/openobject-server/printscreen_group_no_lief into lp:~openerp-dev/openobject-server/trunk-dev-framework

[Ravi Gadhia (OpenERP)]

task_id:755
Print screen reports: support for group_by_no_leaf which should print only group by headers and no child nodes.

[lp:~openerp-dev/openobject-server/printscreen_group_no_lief]

2260. By rga <rga@rga-desktop> on 2010-06-29

[Merge] trunk-dev-framework

[Naresh(OpenERP) (nch-openerp)]

Hello,

1: float field not properly aligned.
2: groupby no_leaf the cloumn headers have a lot of space between them.

review: Needs Fixing

=== modified file 'bin/addons/base/i18n/bg.po'
--- bin/addons/base/i18n/bg.po	2010-04-22 03:42:56 +0000
+++ bin/addons/base/i18n/bg.po	2010-06-29 13:12:29 +0000
@@ -7,13 +7,13 @@
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-04-21 04:53+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-05-15 14:19+0000\n"
+"Last-Translator: Boris <[e-mail]>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-22 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-05-17 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -83,7 +83,7 @@
 #. module: base
 #: view:workflow.activity:0
 msgid "Outgoing transitions"
-msgstr "Изходящи промени"
+msgstr "Изходящи преходи"
 
 #. module: base
 #: selection:ir.report.custom,frequency:0
@@ -1754,7 +1754,7 @@
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
-msgstr "Не може да бъде обновен модул '%s'. Той не е инсталиран."
+msgstr "Модул '%s' не може да бъде обновен. Той не е инсталиран."
 
 #. module: base
 #: model:res.country,name:base.cu
@@ -2039,7 +2039,7 @@
 #. module: base
 #: selection:maintenance.contract.wizard,state:0
 msgid "Unvalidated"
-msgstr "Непроверен"
+msgstr "Невалидирано"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_9
@@ -2066,7 +2066,7 @@
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
 msgid "Unable to find a valid contract"
-msgstr "Не може да се намери валиден договор"
+msgstr "Не е намерeн валиден договор"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:0
@@ -5002,7 +5002,7 @@
 #: code:addons/base/module/wizard/wizard_module_import.py:0
 #, python-format
 msgid "Can not create the module file: %s !"
-msgstr "Модулния файл: %s, не можеда да бъде създаден  !"
+msgstr "Модулния файл: %s, не можеда да бъде създаден !"
 
 #. module: base
 #: model:ir.module.module,description:base.module_meta_information
@@ -5028,7 +5028,7 @@
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Please specify server option --smtp-from !"
-msgstr "Моля укажете опцията на сървъра --smtp-from !"
+msgstr "Моля укажете опция на сървъра --smtp-from !"
 
 #. module: base
 #: selection:wizard.module.lang.export,format:0
@@ -6225,7 +6225,7 @@
 #. module: base
 #: field:ir.ui.view_sc,user_id:0
 msgid "User Ref."
-msgstr "Справка за потребител"
+msgstr "Потребителска справка"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config
@@ -6812,7 +6812,7 @@
 #. module: base
 #: view:workflow.activity:0
 msgid "Incoming transitions"
-msgstr "Входящи промени"
+msgstr "Входящи преходи"
 
 #. module: base
 #: model:res.country,name:base.cn
@@ -7277,7 +7277,7 @@
 #. module: base
 #: help:res.partner.address,partner_id:0
 msgid "Keep empty for a private address, not related to partner."
-msgstr "Оставете празно за личен адрес несвързан с партньора"
+msgstr "Оставете празно за личен адрес нямащ отношение към партньора."
 
 #. module: base
 #: model:res.country,name:base.vu
@@ -7296,8 +7296,8 @@
 "Save this document to a .tgz file. This archive containt UTF-8 %s files and "
 "may be uploaded to launchpad."
 msgstr ""
-"Запази документа като .tgz файл. Този архив съдържа %s UTF-8 файлове и може "
-"да бъде качен в launchpad."
+"Запазете документа като .tgz файл. Този архив съдържа %s UTF-8 файлове и "
+"може да бъде качен в launchpad."
 
 #. module: base
 #: wizard_button:module.upgrade,end,config:0
@@ -7728,7 +7728,7 @@
 "invoice, then `object.invoice_address_id.mobile` is the field which gives "
 "the correct mobile number"
 msgstr ""
-"Оказва полетата които ще се използват за доставяне на мобилен номер, напр., "
+"Указва полетата които ще се използват за доставяне на мобилен номер, напр., "
 "когато изберете фактура, тогава 'object.invoice_address_id.mobile' е полето "
 "което дава правилния мобилен номер"
 
@@ -8080,7 +8080,7 @@
 #. module: base
 #: field:ir.exports,name:0
 msgid "Export Name"
-msgstr "Име на извлечането"
+msgstr "Име на изнасянето"
 
 #. module: base
 #: help:res.partner.address,type:0

=== modified file 'bin/addons/base/i18n/hr.po'
--- bin/addons/base/i18n/hr.po	2010-05-14 04:55:01 +0000
+++ bin/addons/base/i18n/hr.po	2010-06-29 13:12:29 +0000
@@ -7,13 +7,13 @@
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-13 04:54+0000\n"
+"PO-Revision-Date: 2010-05-17 04:48+0000\n"
 "Last-Translator: goranc <[e-mail]>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-14 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-05-17 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 

=== modified file 'bin/addons/base/i18n/it.po'
--- bin/addons/base/i18n/it.po	2010-05-14 04:55:01 +0000
+++ bin/addons/base/i18n/it.po	2010-06-29 13:12:29 +0000
@@ -7,13 +7,13 @@
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-13 09:24+0000\n"
-"Last-Translator: Carlo - didotech.com <Unknown>\n"
+"PO-Revision-Date: 2010-05-16 16:24+0000\n"
+"Last-Translator: eLBati - albatos.com <[e-mail]>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-14 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-05-17 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -901,7 +901,7 @@
 #. module: base
 #: field:ir.model.access,perm_read:0
 msgid "Read Access"
-msgstr "Accesso di Lettura"
+msgstr "Accesso in lettura"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_exports
@@ -3875,7 +3875,7 @@
 #. module: base
 #: field:ir.model.access,perm_create:0
 msgid "Create Access"
-msgstr "Crea Accesso"
+msgstr "Accesso in creazione"
 
 #. module: base
 #: field:res.partner.address,state_id:0
@@ -5506,7 +5506,7 @@
 #. module: base
 #: field:ir.model.access,perm_write:0
 msgid "Write Access"
-msgstr "Accesso Scrittura"
+msgstr "Accesso in scrittura"
 
 #. module: base
 #: field:res.bank,city:0
@@ -7411,7 +7411,7 @@
 #. module: base
 #: field:ir.model.access,perm_unlink:0
 msgid "Delete Permission"
-msgstr "Cancella Autorizzazione"
+msgstr "Permesso di cancellazione"
 
 #. module: base
 #: model:ir.model,name:base.model_multi_company_default

=== modified file 'bin/addons/base/i18n/ja.po'
--- bin/addons/base/i18n/ja.po	2010-05-14 04:55:01 +0000
+++ bin/addons/base/i18n/ja.po	2010-06-29 13:12:29 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-13 04:56+0000\n"
+"PO-Revision-Date: 2010-05-17 04:47+0000\n"
 "Last-Translator: Harry (Open ERP) <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-14 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-05-17 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

=== modified file 'bin/addons/base/i18n/sv.po'
--- bin/addons/base/i18n/sv.po	2010-05-14 04:55:01 +0000
+++ bin/addons/base/i18n/sv.po	2010-06-29 13:12:29 +0000
@@ -7,13 +7,13 @@
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-13 04:57+0000\n"
+"PO-Revision-Date: 2010-05-17 04:45+0000\n"
 "Last-Translator: Anders Wallenquist <[e-mail]>\n"
 "Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-14 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-05-17 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

=== modified file 'bin/addons/base/i18n/uk.po'
--- bin/addons/base/i18n/uk.po	2010-05-14 04:55:01 +0000
+++ bin/addons/base/i18n/uk.po	2010-06-29 13:12:29 +0000
@@ -7,13 +7,13 @@
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-13 04:57+0000\n"
+"PO-Revision-Date: 2010-05-17 04:49+0000\n"
 "Last-Translator: Fabien (Open ERP) <[e-mail]>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-14 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-05-17 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

=== modified file 'bin/addons/base/i18n/zh_CN.po'
--- bin/addons/base/i18n/zh_CN.po	2010-05-14 04:55:01 +0000
+++ bin/addons/base/i18n/zh_CN.po	2010-06-29 13:12:29 +0000
@@ -7,13 +7,13 @@
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-13 04:57+0000\n"
+"PO-Revision-Date: 2010-05-17 04:47+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-14 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-05-17 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

=== modified file 'bin/report/printscreen/ps_list.py'
--- bin/report/printscreen/ps_list.py	2010-04-09 10:28:15 +0000
+++ bin/report/printscreen/ps_list.py	2010-06-29 13:12:29 +0000
@@ -61,6 +61,7 @@
             context={}
         self.context = context
         self.groupby = context.get('group_by',[])
+        self.groupby_no_leaf = context.get('group_by_no_leaf',False)
         pool = pooler.get_pool(cr.dbname)
         model = pool.get(datas['model'])
         model_id = pool.get('ir.model').search(cr, uid, [('model','=',model._name)])
@@ -80,6 +81,7 @@
                 records =  model.read_group(cr, uid, domain, fields_order, groupby , 0, None, context)
                 for rec in records:
                     rec['__group'] = True
+                    rec['__no_leaf'] = self.groupby_no_leaf
                     for f in fields_order:
                         if f not in rec:
                             rec.update({f:False})
@@ -89,6 +91,8 @@
                     if groupby:
                         get_groupby_data(groupby, domain)
                     else:
+                        if self.groupby_no_leaf:
+                            continue
                         child_ids = model.search(cr, uid, domain)
                         res = model.read(cr, uid, child_ids, result['fields'].keys(), context)
                         rows.extend(res)
@@ -167,8 +171,6 @@
                 if fields[f]['type']=='many2one' and line[f]:
                     if not line.get('__group'):
                         line[f]= line[f][1]
-                    else:
-                        line[f]= line[f]
                 if fields[f]['type']=='selection' and line[f]:
                     for key, value in fields[f]['selection']:
                         if key == line[f]:
@@ -207,12 +209,16 @@
                     line[f] = new_d1
                 if line.get('__group'):
                     col = etree.SubElement(node_line, 'col', para='group', tree='no')
+                    if fields[f]['type'] =='integer':
+                        col.set('tree','float')
                 else:
                     col = etree.SubElement(node_line, 'col', para='yes', tree='no')
                 if line[f] != None:
                     col.text = tools.ustr(line[f] or '')
                     if float_flag:
                        col.set('tree','float')
+                    if line.get('__no_leaf') and temp[count] == 1 and f != 'id' and not line['__context']['group_by']:
+                        tsum[count] = float(tsum[count]) + float(line[f])
                     if not line.get('__group') and f != 'id' and temp[count] == 1:
                         tsum[count] = float(tsum[count])  + float(line[f]);
                 else:

=== modified file 'bin/sql_db.py'
--- bin/sql_db.py	2010-04-01 19:33:19 +0000
+++ bin/sql_db.py	2010-06-29 13:12:29 +0000
@@ -100,7 +100,7 @@
             msg = "Cursor not closed explicitly\n"  \
                   "Cursor was created at %s:%s"
             self.__logger.warn(msg, *self.__caller)
-            self.close()
+            self._close(True)
 
     @check
     def execute(self, query, params=None):
@@ -118,7 +118,7 @@
             params = params or None
             res = self._obj.execute(query, params)
         except psycopg2.ProgrammingError, pe:
-            self.__logger.error("Programming error: %s, in query %s" % (pe, query))
+            self.__logger.error("Programming error: %s, in query %s", pe, query)
             raise
         except Exception:
             self.__logger.exception("bad query: %s", self._obj.query)
@@ -177,6 +177,9 @@
 
     @check
     def close(self):
+        return self._close(False)
+
+    def _close(self, leak=False):
         if not self._obj:
             return
 
@@ -194,7 +197,12 @@
         # part because browse records keep a reference to the cursor.
         del self._obj
         self.__closed = True
-        self._pool.give_back(self._cnx)
+
+        if leak:
+            self._cnx.leaked = True
+        else:
+            keep_in_pool = self.dbname not in ('template1', 'template0', 'postgres')
+            self._pool.give_back(self._cnx, keep_in_pool=keep_in_pool)
 
     @check
     def autocommit(self, on):
@@ -214,6 +222,9 @@
         return getattr(self._obj, name)
 
 
+class PsycoConnection(psycopg2.extensions.connection):
+    pass
+
 class ConnectionPool(object):
 
     __logger = logging.getLogger('db.connection_pool')
@@ -239,57 +250,64 @@
         count = len(self._connections)
         return "ConnectionPool(used=%d/count=%d/max=%d)" % (used, count, self._maxconn)
 
-    def _debug(self, msg):
-        self.__logger.debug(repr(self))
-        self.__logger.debug(msg)
+    def _debug(self, msg, *args):
+        msg = '%r ' + msg
+        self.__logger.debug(msg, self, *args)
 
     @locked
     def borrow(self, dsn):
-        self._debug('Borrow connection to %s' % (dsn,))
-
-        result = None
+        self._debug('Borrow connection to %r', dsn)
+
+        # free leaked connections
+        for i, (cnx, _) in tools.reverse_enumerate(self._connections):
+            if getattr(cnx, 'leaked', False):
+                delattr(cnx, 'leaked')
+                self._connections.pop(i)
+                self._connections.append((cnx, False))
+                self._debug('Free leaked connection to %r', cnx.dsn)
+
         for i, (cnx, used) in enumerate(self._connections):
             if not used and dsn_are_equals(cnx.dsn, dsn):
-                self._debug('Existing connection found at index %d' % i)
-
                 self._connections.pop(i)
                 self._connections.append((cnx, True))
+                self._debug('Existing connection found at index %d', i)
 
-                result = cnx
-                break
-        if result:
-            return result
+                return cnx
 
         if len(self._connections) >= self._maxconn:
             # try to remove the oldest connection not used
             for i, (cnx, used) in enumerate(self._connections):
                 if not used:
-                    self._debug('Removing old connection at index %d: %s' % (i, cnx.dsn))
                     self._connections.pop(i)
+                    self._debug('Removing old connection at index %d: %r', i, cnx.dsn)
                     break
             else:
                 # note: this code is called only if the for loop has completed (no break)
                 raise PoolError('The Connection Pool Is Full')
 
+        result = psycopg2.connect(dsn=dsn, connection_factory=PsycoConnection)
+        self._connections.append((result, True))
         self._debug('Create new connection')
-        result = psycopg2.connect(dsn=dsn)
-        self._connections.append((result, True))
         return result
 
     @locked
-    def give_back(self, connection):
-        self._debug('Give back connection to %s' % (connection.dsn,))
+    def give_back(self, connection, keep_in_pool=True):
+        self._debug('Give back connection to %r', connection.dsn)
         for i, (cnx, used) in enumerate(self._connections):
             if cnx is connection:
                 self._connections.pop(i)
-                self._connections.append((cnx, False))
+                if keep_in_pool:
+                    self._connections.append((cnx, False))
+                    self._debug('Put connection to %r in pool', cnx.dsn)
+                else:
+                    self._debug('Forgot connection to %r', cnx.dsn)
                 break
         else:
             raise PoolError('This connection does not below to the pool')
 
     @locked
     def close_all(self, dsn):
-        self._debug('Close all connections to %s' % (dsn,))
+        self._debug('Close all connections to %r', dsn)
         for i, (cnx, used) in tools.reverse_enumerate(self._connections):
             if dsn_are_equals(cnx.dsn, dsn):
                 cnx.close()
@@ -305,7 +323,7 @@
 
     def cursor(self, serialized=False):
         cursor_type = serialized and 'serialized ' or ''
-        self.__logger.debug('create %scursor to "%s"' % (cursor_type, self.dbname,))
+        self.__logger.debug('create %scursor to %r', cursor_type, self.dbname)
         return Cursor(self._pool, self.dbname, serialized=serialized)
 
     def serialized_cursor(self):