From 383bf53a4438860260a2fa16e00941239cce4fb5 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 12 Apr 2011 14:59:51 +0530
Subject: [PATCH 1/7] [ADD]: add button, "preview reports", that print an empty
 report with header and footer

bzr revid: ksa@tinyerp.co.in-20110412092951-ft60g1im3adrw16s
---
 openerp/addons/base/base_update.xml    |  1 +
 openerp/addons/base/res/res_company.py | 62 ++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 914e3a9a488..60c8113e0bc 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -202,6 +202,7 @@
                             <field name="rml_footer1" colspan="4"/>
                             <field name="rml_footer2" colspan="4"/>
                             <field name="currency_id"/>
+                            <button name="createReport" string="Preview Report" type="object" icon="gtk-print"/>
                             <separator colspan="4" string="Your Logo - Use a size of about 450x150 pixels."/>
                             <field colspan="4" name="logo" widget="image"/>
                         </page>
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 0143b03fd2a..ecb14b67977 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -26,6 +26,12 @@ import tools
 from tools.translate import _
 from tools.safe_eval import safe_eval as eval
 
+
+import pooler
+import netsvc
+from report.interface import report_rml
+from tools import to_xml
+
 class multi_company_default(osv.osv):
     """
     Manage multi company default value
@@ -276,7 +282,63 @@ class res_company(osv.osv):
         (osv.osv._check_recursion, 'Error! You can not create recursive companies.', ['parent_id'])
     ]
 
+    def createReport(self, cr, uid, report, ids, name=False):
+        files = []
+        from report import report_sxw
+        myreport = report_sxw.report_sxw('report.my.test', 'base','','')
+        user_obj = pooler.get_pool(cr.dbname).get('res.users')
+        user_name = user_obj.browse(cr, uid, [uid])[0]
+        company = user_obj.browse(cr,uid,[uid])[0].company_id
+
+        for id in ids:
+            header_xml = """<document filename="Preview Report.pdf">
+            <template pageSize="(595.0,842.0)" title="Preview Report" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
+                    <pageTemplate>
+                    <frame id="first" x1="1.3cm" y1="28.1cm" width="18.4cm" height="26.5cm"/>
+                    <pageGraphics>
+                     <setFont name="DejaVu Sans" size="8"/>
+                      <image x="1.3cm" y="28cm" height="40.0" >"""+ to_xml(company.logo or removeParentNode('image')) +"""</image>
+                     <drawString x="16.3cm" y="28.3cm">"""+ to_xml(company.rml_header1) +"""</drawString>
+                    <fill color="black"/>
+                    <stroke color="black"/>
+                    <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
+                    <drawString x="1.3cm" y="27.0cm">"""+ to_xml(company.name) +"""</drawString>
+                    <drawString x="1.3cm" y="27.5cm">"""+ to_xml(company.partner_id.name) +"""</drawString>
+                    <drawString x="1.3cm" y="26.6cm">"""+ to_xml(company.partner_id.address and company.partner_id.address[0].street or '') +"""</drawString>
+                    <drawString x="1.3cm" y="26.2cm">"""+ to_xml(company.partner_id.address and company.partner_id.address[0].zip or '') + """</drawString>
+                    <drawString x="2.2cm" y="26.2cm">"""+ to_xml(company.partner_id.address and company.partner_id.address[0].city or '') + """</drawString>
+                    <drawString x="4.1cm" y="26.2cm">"""+ to_xml("-") + """</drawString>
+                    <drawString x="4.4cm" y="26.2cm">"""+ to_xml(company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name  or '') + """</drawString>
+                    <drawString x="1.3cm" y="25.8cm">Phone:</drawString>
+                    <drawString x="4.8cm" y="25.8cm">"""+ to_xml(company.partner_id.address and company.partner_id.address[0].phone or '' ) + """</drawString>
+                    <drawString x="1.3cm" y="25.4cm">Mail:</drawString>
+                    <drawString x="4.8cm" y="25.4cm">"""+ to_xml( company.partner_id.address and company.partner_id.address[0].email or ''  ) + """</drawString>
+                    <fill color="black"/>
+                    <lines>1.3cm 25.2cm 7.8cm 25.2cm</lines>
+                    <fill color="black"/>
+                    <lines>1.3cm 2.0cm 20cm 2.0cm</lines>
+                    <drawCentredString x="10.5cm" y="1.4cm">"""+ to_xml(company.rml_footer1)+""" </drawCentredString>
+                    <drawCentredString x="10.5cm" y="1.0cm">"""+ to_xml(company.rml_footer2)+"""</drawCentredString>
+                    <drawString x="7.9cm" y="0.5cm">Contact :</drawString>
+                    <drawCentredString x="10.6cm" y="0.5cm">"""+ to_xml(user_name.name)+"""</drawCentredString>
+                    <drawCentredString x="12.0cm" y="0.5cm">"""+ to_xml("-")+"""</drawCentredString>
+                    <drawCentredString x="12.8cm" y="0.5cm">Page: <pageNumber/></drawCentredString>
+                    </pageGraphics>
+                    </pageTemplate>
+              </template>
+              </document>
+              """
+            report_type = 'pdf'
+            pdf = myreport.create_pdf(header_xml)
+            fp = open('/home/ksa/Desktop/test.pdf','wb+')
+            fp.write(pdf);
+            fp.close();
+        return True
+
 res_company()
 
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+
+

From ac1086ffe475141180de91693e8efdbc0147fa4b Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 13 Apr 2011 18:06:57 +0530
Subject: [PATCH 2/7] [IMP]: Make Report to another way

bzr revid: ksa@tinyerp.co.in-20110413123657-ph4b3qdhhdcghn5x
---
 openerp/addons/base/res/res_company.py | 76 ++++++++------------------
 1 file changed, 23 insertions(+), 53 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index ecb14b67977..0cb6cbc3243 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -25,12 +25,13 @@ import os
 import tools
 from tools.translate import _
 from tools.safe_eval import safe_eval as eval
-
+from lxml import etree
 
 import pooler
 import netsvc
 from report.interface import report_rml
 from tools import to_xml
+from report import report_sxw
 
 class multi_company_default(osv.osv):
     """
@@ -282,58 +283,27 @@ class res_company(osv.osv):
         (osv.osv._check_recursion, 'Error! You can not create recursive companies.', ['parent_id'])
     ]
 
-    def createReport(self, cr, uid, report, ids, name=False):
-        files = []
-        from report import report_sxw
-        myreport = report_sxw.report_sxw('report.my.test', 'base','','')
-        user_obj = pooler.get_pool(cr.dbname).get('res.users')
-        user_name = user_obj.browse(cr, uid, [uid])[0]
-        company = user_obj.browse(cr,uid,[uid])[0].company_id
-
-        for id in ids:
-            header_xml = """<document filename="Preview Report.pdf">
-            <template pageSize="(595.0,842.0)" title="Preview Report" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-                    <pageTemplate>
-                    <frame id="first" x1="1.3cm" y1="28.1cm" width="18.4cm" height="26.5cm"/>
-                    <pageGraphics>
-                     <setFont name="DejaVu Sans" size="8"/>
-                      <image x="1.3cm" y="28cm" height="40.0" >"""+ to_xml(company.logo or removeParentNode('image')) +"""</image>
-                     <drawString x="16.3cm" y="28.3cm">"""+ to_xml(company.rml_header1) +"""</drawString>
-                    <fill color="black"/>
-                    <stroke color="black"/>
-                    <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
-                    <drawString x="1.3cm" y="27.0cm">"""+ to_xml(company.name) +"""</drawString>
-                    <drawString x="1.3cm" y="27.5cm">"""+ to_xml(company.partner_id.name) +"""</drawString>
-                    <drawString x="1.3cm" y="26.6cm">"""+ to_xml(company.partner_id.address and company.partner_id.address[0].street or '') +"""</drawString>
-                    <drawString x="1.3cm" y="26.2cm">"""+ to_xml(company.partner_id.address and company.partner_id.address[0].zip or '') + """</drawString>
-                    <drawString x="2.2cm" y="26.2cm">"""+ to_xml(company.partner_id.address and company.partner_id.address[0].city or '') + """</drawString>
-                    <drawString x="4.1cm" y="26.2cm">"""+ to_xml("-") + """</drawString>
-                    <drawString x="4.4cm" y="26.2cm">"""+ to_xml(company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name  or '') + """</drawString>
-                    <drawString x="1.3cm" y="25.8cm">Phone:</drawString>
-                    <drawString x="4.8cm" y="25.8cm">"""+ to_xml(company.partner_id.address and company.partner_id.address[0].phone or '' ) + """</drawString>
-                    <drawString x="1.3cm" y="25.4cm">Mail:</drawString>
-                    <drawString x="4.8cm" y="25.4cm">"""+ to_xml( company.partner_id.address and company.partner_id.address[0].email or ''  ) + """</drawString>
-                    <fill color="black"/>
-                    <lines>1.3cm 25.2cm 7.8cm 25.2cm</lines>
-                    <fill color="black"/>
-                    <lines>1.3cm 2.0cm 20cm 2.0cm</lines>
-                    <drawCentredString x="10.5cm" y="1.4cm">"""+ to_xml(company.rml_footer1)+""" </drawCentredString>
-                    <drawCentredString x="10.5cm" y="1.0cm">"""+ to_xml(company.rml_footer2)+"""</drawCentredString>
-                    <drawString x="7.9cm" y="0.5cm">Contact :</drawString>
-                    <drawCentredString x="10.6cm" y="0.5cm">"""+ to_xml(user_name.name)+"""</drawCentredString>
-                    <drawCentredString x="12.0cm" y="0.5cm">"""+ to_xml("-")+"""</drawCentredString>
-                    <drawCentredString x="12.8cm" y="0.5cm">Page: <pageNumber/></drawCentredString>
-                    </pageGraphics>
-                    </pageTemplate>
-              </template>
-              </document>
-              """
-            report_type = 'pdf'
-            pdf = myreport.create_pdf(header_xml)
-            fp = open('/home/ksa/Desktop/test.pdf','wb+')
-            fp.write(pdf);
-            fp.close();
-        return True
+    def createReport(self, cr, uid, ids, context=None):
+        company = self.browse(cr, uid, ids)[0]
+        rml = etree.XML(company.rml_header)
+        rml = rml.getchildren()[0]
+        header_xml = """<document filename="Preview Report.pdf">
+        <template pageSize="(595.0,842.0)" title="Preview Report" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">""" + etree.tostring(rml) +  """
+          </template>
+          </document>
+          """
+        tmppath= '/tmp/previews.rml'
+        fp = open(tmppath, 'wb+')
+        fp.write(header_xml)
+        fp.close()
+        if not netsvc.Service._services.get('report.comapany.report'):
+            myreport = report_sxw.report_sxw('report.comapany.report', 'res.company', tmppath,  header=False)
+        return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'comapany.report',
+                'datas': {'ids': ids, 'model': 'res.company'},
+                'nodestroy': True
+            }
 
 res_company()
 

From 9d1a9795f1225c993de170d5261d81470f60a5fb Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Fri, 15 Apr 2011 15:36:28 +0530
Subject: [PATCH 3/7] [IMP]: improvement in report for netsvc service

bzr revid: ksa@tinyerp.co.in-20110415100628-z6esc0005xj5yumo
---
 openerp/addons/base/res/res_company.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 0cb6cbc3243..6c384669855 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -284,7 +284,16 @@ class res_company(osv.osv):
     ]
 
     def createReport(self, cr, uid, ids, context=None):
-        company = self.browse(cr, uid, ids)[0]
+        company = self.browse(cr, uid, ids, context=context)[0]
+#        partner, address, country, phone, email = company.partner_id.name, company.partner_id.address and company.partner_id.address[0].street or  '',\
+#                    company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name  or '',\
+#                    company.partner_id.address and company.partner_id.address[0].phone or '',\
+#                    company.partner_id.address and company.partner_id.address[0].email or '',
+        class company_parser(report_sxw.rml_parse):
+            def __init__(self, cr, uid, name, context):
+                super(company_parser, self).__init__(cr, uid, name, context=context)
+                self.setCompany(company)
+
         rml = etree.XML(company.rml_header)
         rml = rml.getchildren()[0]
         header_xml = """<document filename="Preview Report.pdf">
@@ -296,18 +305,18 @@ class res_company(osv.osv):
         fp = open(tmppath, 'wb+')
         fp.write(header_xml)
         fp.close()
-        if not netsvc.Service._services.get('report.comapany.report'):
-            myreport = report_sxw.report_sxw('report.comapany.report', 'res.company', tmppath,  header=False)
+        if netsvc.Service._services.get('report.company.report'):
+            netsvc.Service._services.pop('report.company.report')
+        myreport = report_sxw.report_sxw('report.company.report', 'res.company', tmppath, parser=company_parser)
         return {
                 'type': 'ir.actions.report.xml',
-                'report_name': 'comapany.report',
+                'report_name': 'company.report',
                 'datas': {'ids': ids, 'model': 'res.company'},
                 'nodestroy': True
             }
 
 res_company()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 

From 4ab3faacb5c2411e7f66b503289c648c60e1febc Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 19 Apr 2011 11:49:53 +0530
Subject: [PATCH 4/7] [IMP]: Solve the cursor problem in report

bzr revid: ksa@tinyerp.co.in-20110419061953-sdn1drm3wufa47tm
---
 openerp/addons/base/res/res_company.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 6c384669855..bd6755aba64 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -284,16 +284,15 @@ class res_company(osv.osv):
     ]
 
     def createReport(self, cr, uid, ids, context=None):
+        # Used new cursor as it was closed explicitly somewhere and because of this partner data was not printed
+        # Tocheck: its not closed
+        cr = pooler.get_db(cr.dbname).cursor()
         company = self.browse(cr, uid, ids, context=context)[0]
-#        partner, address, country, phone, email = company.partner_id.name, company.partner_id.address and company.partner_id.address[0].street or  '',\
-#                    company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name  or '',\
-#                    company.partner_id.address and company.partner_id.address[0].phone or '',\
-#                    company.partner_id.address and company.partner_id.address[0].email or '',
+
         class company_parser(report_sxw.rml_parse):
             def __init__(self, cr, uid, name, context):
                 super(company_parser, self).__init__(cr, uid, name, context=context)
                 self.setCompany(company)
-
         rml = etree.XML(company.rml_header)
         rml = rml.getchildren()[0]
         header_xml = """<document filename="Preview Report.pdf">
@@ -301,13 +300,13 @@ class res_company(osv.osv):
           </template>
           </document>
           """
-        tmppath= '/tmp/previews.rml'
-        fp = open(tmppath, 'wb+')
+        tempfilename= os.tempnam()
+        fp = open(tempfilename, 'wb+')
         fp.write(header_xml)
         fp.close()
         if netsvc.Service._services.get('report.company.report'):
             netsvc.Service._services.pop('report.company.report')
-        myreport = report_sxw.report_sxw('report.company.report', 'res.company', tmppath, parser=company_parser)
+        myreport = report_sxw.report_sxw('report.company.report', 'res.company', tempfilename, parser=company_parser)
         return {
                 'type': 'ir.actions.report.xml',
                 'report_name': 'company.report',

From a576a5601ba9f4f45b517ea2bb6370c2172c4937 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 19 Apr 2011 12:23:02 +0530
Subject: [PATCH 5/7] [IMP]: store temp file

bzr revid: ksa@tinyerp.co.in-20110419065302-10f2phdpq0xtok94
---
 openerp/addons/base/base_update.xml    | 1 +
 openerp/addons/base/res/res_company.py | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index e72e6f50eda..de634846bbe 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -203,6 +203,7 @@
                             <field name="rml_footer1" colspan="4"/>
                             <field name="rml_footer2" colspan="4"/>
                             <field name="currency_id" colspan="2"/>
+                            <button name="createReport" string="Preview Report" type="object" icon="gtk-print"/>
                         </page>
                         <page string="Header/Footer" groups="base.group_extended">
                             <field colspan="4" name="rml_header" nolabel="1"/>
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index c44a7c77a9f..6fc0e549b67 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -144,7 +144,7 @@ class res_company(osv.osv):
             return []
         ids =  self.search(cr, uid, [('parent_id','child_of',[company])])
         return ids
-    
+
 #  For Report
 
     def createReport(cr, uid, report, ids, name=False):
@@ -160,9 +160,9 @@ class res_company(osv.osv):
                 fp = open(report_file,'wb+')
                 fp.write(result);
                 fp.close();
-                files += [report_file]    
+                files += [report_file]
             except Exception,e:
-                continue        
+                continue
         return files
 
     def _get_partner_hierarchy(self, cr, uid, company_id, context={}):
@@ -319,7 +319,7 @@ class res_company(osv.osv):
           </template>
           </document>
           """
-        tempfilename= os.tempnam()
+        tempfilename= '/tmp/previews.rml'
         fp = open(tempfilename, 'wb+')
         fp.write(header_xml)
         fp.close()

From e8644a9e8bd55157d6cf1a151762074940994d92 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 28 Apr 2011 17:22:37 +0530
Subject: [PATCH 6/7] [IMP]: Improvement in preview report function

bzr revid: rpa@tinyerp.com-20110428115237-awuvi6fqhnnb03u9
---
 openerp/addons/base/base_update.xml    |  1 -
 openerp/addons/base/res/res_company.py | 11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index de634846bbe..e72e6f50eda 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -203,7 +203,6 @@
                             <field name="rml_footer1" colspan="4"/>
                             <field name="rml_footer2" colspan="4"/>
                             <field name="currency_id" colspan="2"/>
-                            <button name="createReport" string="Preview Report" type="object" icon="gtk-print"/>
                         </page>
                         <page string="Header/Footer" groups="base.group_extended">
                             <field colspan="4" name="rml_header" nolabel="1"/>
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 6fc0e549b67..05ee19c3033 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -26,11 +26,10 @@ import tools
 from tools.translate import _
 from tools.safe_eval import safe_eval as eval
 from lxml import etree
+import tempfile
 
 import pooler
 import netsvc
-from report.interface import report_rml
-from tools import to_xml
 from report import report_sxw
 
 class multi_company_default(osv.osv):
@@ -302,7 +301,7 @@ class res_company(osv.osv):
         (osv.osv._check_recursion, 'Error! You can not create recursive companies.', ['parent_id'])
     ]
 
-    def createReport(self, cr, uid, ids, context=None):
+    def preview_report(self, cr, uid, ids, context=None):
         # Used new cursor as it was closed explicitly somewhere and because of this partner data was not printed
         # Tocheck: its not closed
         cr = pooler.get_db(cr.dbname).cursor()
@@ -312,6 +311,7 @@ class res_company(osv.osv):
             def __init__(self, cr, uid, name, context):
                 super(company_parser, self).__init__(cr, uid, name, context=context)
                 self.setCompany(company)
+
         rml = etree.XML(company.rml_header)
         rml = rml.getchildren()[0]
         header_xml = """<document filename="Preview Report.pdf">
@@ -319,12 +319,14 @@ class res_company(osv.osv):
           </template>
           </document>
           """
-        tempfilename= '/tmp/previews.rml'
+        tempfileid, tempfilename= tempfile.mkstemp('.rml', 'openerp_')
         fp = open(tempfilename, 'wb+')
         fp.write(header_xml)
         fp.close()
+
         if netsvc.Service._services.get('report.company.report'):
             netsvc.Service._services.pop('report.company.report')
+
         myreport = report_sxw.report_sxw('report.company.report', 'res.company', tempfilename, parser=company_parser)
         return {
                 'type': 'ir.actions.report.xml',
@@ -339,3 +341,4 @@ res_company()
 
 
 
+

From f6b6b02921fa05bd937ebfcb87acee222552c4d8 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 28 Apr 2011 17:58:35 +0530
Subject: [PATCH 7/7] [REM]: removed unwanted lines

bzr revid: rpa@tinyerp.com-20110428122835-jbs2l6ze4a17hkvu
---
 openerp/addons/base/res/res_company.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 05ee19c3033..ae01b7a6c5b 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -339,6 +339,3 @@ res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
-
-
-