Merge lp:~pcsol/openobject-server/print_trunk into lp:openobject-server

[Cédric Krier]

Add number and email in report result to use with the client from lp:~pcsol/openobject-client/print_trunk

[Christophe CHAUVET (christophe-chauvet)]

It work for me

Regards,

review: Approve

[xrg (xrg)]

I would prefer that extra fields in reports are defined in an addon, eg. like the code I have had since Dec. 2008, account_greek_fiscal

http://git.hellug.gr/?p=xrg/openobject-addons;a=blob;f=account_greek_fiscal/ir_actions_report.py;h=7b257d23020dd1f86e6d5ae9dd6232e231d29b18;hb=refs/heads/trunk-xrg

Said that, we can still discuss your proposal.

review: Abstain

[Vo Minh Thu (thu)]

I'm a bit puzzled by this merge prop, and the 'It work for me' comment... (I would have been happy to discuss the proposal but xrg's comment remains alone. Also, this code adds more than the two mentioned field: an seemingly unused attachment_use; more importantly the variable number will be uninitialized (numner, instead of number, is initialized).

Unmerged revisions

2570. By Cédric Krier on 2010-08-02

Add number and email in report result

=== modified file 'bin/addons/base/ir/ir.xml'
--- bin/addons/base/ir/ir.xml	2010-07-23 06:17:04 +0000
+++ bin/addons/base/ir/ir.xml	2010-08-02 08:17:44 +0000
@@ -341,6 +341,8 @@
                                 <field name="report_rml"/>
                                 <field name="header"/>
                                 <field name="auto"/>
+                                <field name="number"/>
+                                <field name="email" colspan="3"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator string="XML Report" colspan="2"/>

=== modified file 'bin/addons/base/ir/ir_actions.py'
--- bin/addons/base/ir/ir_actions.py	2010-07-28 07:17:23 +0000
+++ bin/addons/base/ir/ir_actions.py	2010-08-02 08:17:44 +0000
@@ -117,6 +117,9 @@
         'report_sxw_content': fields.function(_report_content, fnct_inv=_report_content_inv, method=True, type='binary', string='SXW content',),
         'report_rml_content': fields.function(_report_content, fnct_inv=_report_content_inv, method=True, type='binary', string='RML content'),
 
+        'attachment_use': fields.boolean('Reload from Attachment', help='If you check this, then the second time the user prints with same attachment name, it returns the previous report.'),
+        'number': fields.integer('Copy Number'),
+        'email': fields.char('Email', size=256),
     }
     _defaults = {
         'type': lambda *a: 'ir.actions.report.xml',

=== modified file 'bin/report/interface.py'
--- bin/report/interface.py	2010-03-30 11:30:26 +0000
+++ bin/report/interface.py	2010-08-02 08:17:44 +0000
@@ -94,10 +94,16 @@
         pool = pooler.get_pool(cr.dbname)
         ir_actions_report_xml_obj = pool.get('ir.actions.report.xml')
         report_xml_ids = ir_actions_report_xml_obj.search(cr, uid, [('report_name', '=', self.name[7:])], context=context)
-        self.title = report_xml_ids and ir_actions_report_xml_obj.browse(cr,uid,report_xml_ids)[0].name or 'OpenERP Report'
+        self.title = 'OpenERP Report'
+        numner = 1
+        if report_xml_ids:
+            report = ir_actions_report_xml_obj.browse(cr, uid, report_xml_ids[0],
+                    context=context)
+            self.title = report.name
+            numner = report.number
         create_doc = self.generators[report_type]
         pdf = create_doc(rml, title=self.title)
-        return (pdf, report_type)
+        return (pdf, report_type, self.title, number)
 
     def create_xml(self, cr, uid, ids, datas, context=None):
         if not context:

=== modified file 'bin/report/report_sxw.py'
--- bin/report/report_sxw.py	2010-07-16 07:34:53 +0000
+++ bin/report/report_sxw.py	2010-08-02 08:17:44 +0000
@@ -347,7 +347,7 @@
                 def __init__(self, *args, **argv):
                     for key,arg in argv.items():
                         setattr(self, key, arg)
-            report_xml = a(title=title, report_type=report_type, report_rml_content=rml, name=title, attachment=False, header=self.header)
+            report_xml = a(title=title, report_type=report_type, report_rml_content=rml, name=title, attachment=False, header=self.header, number=1)
         report_type = report_xml.report_type
         if report_type in ['sxw','odt']:
             fnct = self.create_source_odt
@@ -362,7 +362,7 @@
         fnct_ret = fnct(cr, uid, ids, data, report_xml, context)
         if not fnct_ret:
             return (False,False)
-        return fnct_ret
+        return fnct_ret + (report_xml.name, report_xml.number)
 
     def create_source_odt(self, cr, uid, ids, data, report_xml, context=None):
         return self.create_single_odt(cr, uid, ids, data, report_xml, context or {})

=== modified file 'bin/service/web_services.py'
--- bin/service/web_services.py	2010-07-27 15:22:11 +0000
+++ bin/service/web_services.py	2010-08-02 08:17:44 +0000
@@ -706,13 +706,15 @@
             import sys
             try:
                 obj = netsvc.LocalService('report.'+object)
-                (result, format) = obj.create(cr, uid, ids, datas, context)
+                (result, format, name, number) = obj.create(cr, uid, ids, datas, context)
                 if not result:
                     tb = sys.exc_info()
                     self._reports[id]['exception'] = ExceptionWithTraceback('RML is not available at specified location or not enough data to print!', tb)
                 self._reports[id]['result'] = result
                 self._reports[id]['format'] = format
                 self._reports[id]['state'] = True
+                self._reports[id]['name'] = name
+                self._reports[id]['number'] = number
             except Exception, exception:
                 
                 tb = sys.exc_info()
@@ -748,6 +750,8 @@
             if res2:
                 res['result'] = base64.encodestring(res2)
             res['format'] = result['format']
+            res['name'] = result['name']
+            res['number'] = result['number']
             del self._reports[report_id]
         return res