Merge lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_unification_create_report-dev_luis into lp:openerp-mexico-localization/7.0

[Luis Torres - http://www.vauxoo.com]

Se unifico la función create_report y se removió la funcion create_report_pdf porque ya no se manda llamar

Unmerged revisions

323. By Luis Torres - http://www.vauxoo.com on 2013-11-01

[IMP][l10n_mx_ir_attachment_facturae]Remove function create_report_pdf

322. By Luis Torres - http://www.vauxoo.com on 2013-11-01

[REF][l10n_mx_facturae]Unification of function create_report

=== modified file 'l10n_mx_facturae/invoice.py'
--- l10n_mx_facturae/invoice.py	2013-10-10 01:02:59 +0000
+++ l10n_mx_facturae/invoice.py	2013-11-01 23:13:47 +0000
@@ -118,56 +118,32 @@
 class account_invoice(osv.Model):
     _inherit = 'account.invoice'
 
-    def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None):
-        """
-        @param report_name : Name of report with the name of object more type
-            of report
-        @param file_name : Path where is save the report temporary more the
-            name of report that is 'openerp___facturae__' more six random
-            characters for no files duplicate
-        """
-        if context is None:
-                context = {}
-        if not report_name or not res_ids:
-            return (False, Exception('Report name and Resources ids are required !!!'))
-        # try:
-        ret_file_name = file_name+'.pdf'
-        service = netsvc.LocalService("report."+report_name)
-        (result, format) = service.create(cr, uid, res_ids, report_name, context=context)
-        fp = open(ret_file_name, 'wb+')
-        fp.write(result)
-        fp.close()
-        # except Exception,e:
-            # print 'Exception in create report:',e
-            # return (False,str(e))
-        return (True, ret_file_name)
-
-    def create_report_pdf(self, cr, uid, ids, context={}):
-        if not context:
-            context = {}
-        id = ids[0]
-        (fileno, fname) = tempfile.mkstemp(
-            '.pdf', 'openerp_' + (False or '') + '__facturae__')
-        os.close(fileno)
-        file = self.create_report(cr, uid, [
-                                  id], "account.invoice.facturae.pdf", fname)
-        is_file = file[0]
-        fname = file[1]
-        if is_file and os.path.isfile(fname):
-            f = open(fname, "r")
-            data = f.read()
-            f.close()
-            data_attach = {
-                'name': context.get('fname'),
-                'datas': data and base64.encodestring(data) or None,
-                'datas_fname': context.get('fname'),
-                'description': 'Factura-E PDF',
-                'res_model': self._name,
-                'res_id': id,
-            }
-            self.pool.get('ir.attachment').create(
-                cr, uid, data_attach, context=context)
-        return True
+    #~ def create_report_pdf(self, cr, uid, ids, context={}):
+        #~ if not context:
+            #~ context = {}
+        #~ id = ids[0]
+        #~ (fileno, fname) = tempfile.mkstemp(
+            #~ '.pdf', 'openerp_' + (False or '') + '__facturae__')
+        #~ os.close(fileno)
+        #~ file = self.create_report(cr, uid, [
+                                  #~ id], "account.invoice.facturae.pdf", fname)
+        #~ is_file = file[0]
+        #~ fname = file[1]
+        #~ if is_file and os.path.isfile(fname):
+            #~ f = open(fname, "r")
+            #~ data = f.read()
+            #~ f.close()
+            #~ data_attach = {
+                #~ 'name': context.get('fname'),
+                #~ 'datas': data and base64.encodestring(data) or None,
+                #~ 'datas_fname': context.get('fname'),
+                #~ 'description': 'Factura-E PDF',
+                #~ 'res_model': self._name,
+                #~ 'res_id': id,
+            #~ }
+            #~ self.pool.get('ir.attachment').create(
+                #~ cr, uid, data_attach, context=context)
+        #~ return True
 
     def action_make_cfd(self, cr, uid, ids, *args):
         self._attach_invoice(cr, uid, ids)

=== modified file 'l10n_mx_facturae_cbb/invoice.py'
--- l10n_mx_facturae_cbb/invoice.py	2013-05-10 17:00:10 +0000
+++ l10n_mx_facturae_cbb/invoice.py	2013-11-01 23:13:47 +0000
@@ -87,57 +87,37 @@
         #'date_invoice': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
 
-    def create_report(self, cr, uid, res_ids, report_name=False, file_name=False):
-        """
-        @param report_name : Name of report with the name of object more type
-            of report
-        @param file_name : Path where is save the report temporary more the
-            name of report that is 'openerp___facturae__' more six random
-            characters for no files duplicate
-        """
-        if not report_name or not res_ids:
-            return (False, Exception('Report name and Resources ids are required !!!'))
-        # try:
-        ret_file_name = file_name+'.pdf'
-        service = netsvc.LocalService("report."+report_name)
-        (result, format) = service.create(cr, uid, res_ids, {}, {})
-        fp = open(ret_file_name, 'wb+')
-        fp.write(result)
-        fp.close()
-        # except Exception,e:
-            # print 'Exception in create report:',e
-            # return (False,str(e))
-        return (True, ret_file_name)
-
-    def create_report_pdf(self, cr, uid, ids, context={}):
-        if not context:
-            context = {}
-        id = ids[0]
-
-        (fileno, fname) = tempfile.mkstemp(
-            '.pdf', 'openerp_' + (False or '') + '__facturae__')
-        os.close(fileno)
-
-        file = self.create_report(cr, uid, [
-                                  id], "account.invoice.facturae.pdf2", fname)
-        is_file = file[0]
-        fname = file[1]
-        if is_file and os.path.isfile(fname):
-            f = open(fname, "r")
-            data = f.read()
-            f.close()
-
-            data_attach = {
-                'name': context.get('fname'),
-                'datas': data and base64.encodestring(data) or None,
-                'datas_fname': context.get('fname'),
-                'description': u'Factura-E CBB PDF',
-                'res_model': self._name,
-                'res_id': id,
-            }
-            self.pool.get('ir.attachment').create(
-                cr, uid, data_attach, context=context)
-        return True
+    #~ def create_report_pdf(self, cr, uid, ids, context={}):
+        #~ if not context:
+            #~ context = {}
+        #~ id = ids[0]
+#~ 
+        #~ (fileno, fname) = tempfile.mkstemp(
+            #~ '.pdf', 'openerp_' + (False or '') + '__facturae__')
+        #~ os.close(fileno)
+#~ 
+        #~ file = self.create_report(cr, uid, [
+                                  #~ id], "account.invoice.facturae.pdf2", fname)
+        #~ is_file = file[0]
+        #~ fname = file[1]
+        #~ if is_file and os.path.isfile(fname):
+            #~ f = open(fname, "r")
+            #~ data = f.read()
+            #~ f.close()
+#~ 
+            #~ data_attach = {
+                #~ 'name': context.get('fname'),
+                #~ 'datas': data and base64.encodestring(data) or None,
+                #~ 'datas_fname': context.get('fname'),
+                #~ 'description': u'Factura-E CBB PDF',
+                #~ 'res_model': self._name,
+                #~ 'res_id': id,
+            #~ }
+            #~ self.pool.get('ir.attachment').create(
+                #~ cr, uid, data_attach, context=context)
+        #~ return True
+        #~ 
+    #~ 
 
     """def action_cancel_draft(self, cr, uid, ids, context=None):
         attachment_obj = self.pool.get('ir.attachment')

=== modified file 'l10n_mx_ir_attachment_facturae/invoice.py'
--- l10n_mx_ir_attachment_facturae/invoice.py	2013-09-25 21:19:59 +0000
+++ l10n_mx_ir_attachment_facturae/invoice.py	2013-11-01 23:13:47 +0000
@@ -82,3 +82,23 @@
             result['views'] = [(res and res[1] or False, 'form')]
             return result
         return True
+        
+    def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None):
+        """
+        @param report_name : Name of report with the name of object more type
+            of report
+        @param file_name : Path where is save the report temporary more the
+            name of report that is 'openerp___facturae__' more six random
+            characters for no files duplicate
+        """
+        if not context:
+            context = {}
+        if not report_name or not res_ids:
+            return (False, Exception('Report name and Resources ids are required !!!'))
+        ret_file_name = file_name + '.pdf'
+        service = netsvc.LocalService("report."+report_name)
+        (result, format) = service.create(cr, uid, res_ids, report_name, context=context)
+        fp = open(ret_file_name, 'wb+')
+        fp.write(result)
+        fp.close()
+        return (True, ret_file_name)