Merge lp:~jfb-tempo-consulting/unifield-server/US-5023 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/register_accounting/report/report_fully_report.py'
--- bin/addons/register_accounting/report/report_fully_report.py	2018-06-15 09:18:20 +0000
+++ bin/addons/register_accounting/report/report_fully_report.py	2018-09-04 12:11:53 +0000
@@ -260,6 +260,15 @@
             color = 'red'
         return color
 
-
-SpreadsheetReport('report.fully.report','account.bank.statement','addons/register_accounting/report/fully_report_xls.mako', parser=report_fully_report)
+class SpreadsheetReportX(SpreadsheetReport):
+    def create(self, cr, uid, ids, data, context=None):
+        if not context:
+            context = {}
+        context['pathit'] = True
+        return super(SpreadsheetReportX, self).create(cr, uid, ids, data, context=context)
+
+
+
+
+SpreadsheetReportX('report.fully.report','account.bank.statement','addons/register_accounting/report/fully_report_xls.mako', parser=report_fully_report)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/spreadsheet_xml/spreadsheet_xml_write.py'
--- bin/addons/spreadsheet_xml/spreadsheet_xml_write.py	2017-10-09 21:06:10 +0000
+++ bin/addons/spreadsheet_xml/spreadsheet_xml_write.py	2018-09-04 12:11:53 +0000
@@ -2,6 +2,7 @@
 
 from tools.translate import _
 from tools.misc import file_open
+from tools.misc import Path
 from osv import osv
 from report_webkit.webkit_report import WebKitParser
 from report import report_sxw
@@ -126,6 +127,10 @@
             os.unlink(tmpname)
             return (out, 'zip')
 
+        if context.get('pathit'):
+            os.close(null)
+            return (Path(tmpname, delete=True), 'xls')
+
         out = file(tmpname, 'rb').read()
         os.close(null)
         os.unlink(tmpname)