Merge lp:~vauxoo/openerp-mexico-localization/7.0_oml_tmp_attachment-dev-yzk into lp:openerp-mexico-localization/7.0

[Isaac López Zúñiga]

Se deja de usar la función create_report y se corrije problema de creación de archivos en la ruta del server.
Al cancelar facturas, se desvinculan los adjuntos del modelo de account.invoice, sin embargo la relación prevalece en el modelo facturae_attachment.

[lp:~vauxoo/openerp-mexico-localization/7.0_oml_tmp_attachment-dev-yzk]

345. By Isaac López Zúñiga on 2013-12-18

[REF][l10n_mx_ir_attachment_facturae] commented lines removed

346. By Isaac López Zúñiga on 2013-12-18

[IMP][l10n_mx_ir_attachment_facturae]It validates if report_multicompany has records

347. By Isaac López Zúñiga on 2013-12-19

[MERGE][l10n_mx_ir_attachment_facturae] report_name validation reduced

=== modified file 'l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py'
--- l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py	2013-12-16 21:17:24 +0000
+++ l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py	2013-12-19 00:40:58 +0000
@@ -284,20 +284,11 @@
             report_multicompany_obj = self.pool.get('report.multicompany')
             report_ids = report_multicompany_obj.search(
                 cr, uid, [('model', '=', 'account.invoice')], limit=1) or False
-
+            report_name = "account.invoice.facturae.webkit" 
             if report_ids:
                 report_name = report_multicompany_obj.browse(cr, uid, report_ids[0]).report_name
-                if report_name:
-                    report = invoice_obj.create_report(
-                        cr, SUPERUSER_ID, [invoice.id],
-                        report_name,
-                        invoice.fname_invoice)
-            else:
-                report = invoice_obj.create_report(
-                    cr, SUPERUSER_ID, [invoice.id],
-                    "account.invoice.facturae.webkit",
-                    invoice.fname_invoice)
-
+            service = netsvc.LocalService("report."+report_name)
+            (result, format) = service.create(cr, SUPERUSER_ID, [invoice.id], report_name, context=context)                
             attachment_ids = attachment_obj.search(cr, uid, [
                 ('res_model', '=', 'account.invoice'),
                 ('res_id', '=', invoice.id),
@@ -537,6 +528,9 @@
                                 if invoice.state != 'cancel':
                                     inv_cancel_status = invoice_obj.action_cancel(
                                         cr, uid, [invoice.id], context=context)
+                                    cr.execute("""UPDATE ir_attachment
+                                                SET res_id = Null
+                                                WHERE res_id = %s and res_model='account.invoice'""", (invoice.id,))
                                 else:
                                     inv_cancel_status = True
                         else:
@@ -547,6 +541,9 @@
                         if invoice.state != 'cancel':
                             inv_cancel_status = invoice_obj.action_cancel(
                                 cr, uid, [invoice.id], context=context)
+                            cr.execute("""UPDATE ir_attachment
+                                        SET res_id = Null
+                                        WHERE res_id = %s and res_model='account.invoice'""", (invoice.id,))
                         else:
                             inv_cancel_status = True
                         msj = 'cancelled'