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

[Jorge Angel Naranjo Rogel - http://www.vauxoo.com]

Se cambia todo lo del modelo ir_actions_report_xml_multicompany por report_multicompany en ir_attachment y settings

[Moisés López - http://www.vauxoo.com (moylop260)]

review: Approve

=== modified file 'l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py'
--- l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py	2013-12-09 19:21:48 +0000
+++ l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py	2013-12-16 19:45:31 +0000
@@ -272,13 +272,12 @@
                                                #~ "account.invoice.facturae.webkit",
                                                #~ fname)
 
-            actions_obj = self.pool.get('ir.actions.report.xml')
-            report_ids = actions_obj.search(
-                cr, uid, [('model', '=', 'account.invoice'),('active', '=', True), ('report_type', '=', 'webkit'), 
-                          ('company_id','=',invoice.company_id.id)],order='sequence', limit=1) or False
+            report_multicompany_obj = self.pool.get('report.multicompany')
+            report_ids = report_multicompany_obj.search(
+                cr, uid, [('model', '=', 'account.invoice')], limit=1) or False
 
             if report_ids:
-                report_name = actions_obj.browse(cr, uid, report_ids[0]).report_name
+                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],
@@ -373,12 +372,11 @@
                         'mail.compose.message')
                     email_pool = self.pool.get('email.template')
 
-                    actions_obj = self.pool.get('ir.actions.report.xml')
-                    report_ids = actions_obj.search(
-                        cr, uid, [('model', '=', 'account.invoice'),('active', '=', True), ('report_type', '=', 'webkit'), 
-                                  ('company_id','=',invoice.company_id.id)],order='sequence', limit=1) or False
+                    report_multicompany_obj = self.pool.get('report.multicompany')
+                    report_ids = report_multicompany_obj.search(
+                                    cr, uid, [('model', '=', 'account.invoice')], limit=1) or False
                     if report_ids:
-                        report_name = actions_obj.browse(cr, uid, report_ids[0]).report_name
+                        report_name = report_multicompany_obj.browse(cr, uid, report_ids[0]).report_name
                         if report_name:
                             tmp_id = email_pool.search(
                                 cr, uid, [(

=== modified file 'l10n_mx_settings_facturae/__openerp__.py'
--- l10n_mx_settings_facturae/__openerp__.py	2013-11-13 18:32:55 +0000
+++ l10n_mx_settings_facturae/__openerp__.py	2013-12-16 19:45:31 +0000
@@ -28,7 +28,7 @@
         'account',
         'email_template',
         'email_template_multicompany',
-        'ir_actions_report_xml_multicompany'
+        'report_multicompany'
     ],
     "author": "Vauxoo",
     "description" : """

=== modified file 'l10n_mx_settings_facturae/model/res_config.py'
--- l10n_mx_settings_facturae/model/res_config.py	2013-11-14 19:59:41 +0000
+++ l10n_mx_settings_facturae/model/res_config.py	2013-12-16 19:45:31 +0000
@@ -78,44 +78,41 @@
         data = dat and dat[0] or False
         if data:
             email_tmp_id = email_obj.browse(cr, uid, data)
-        return {'email_tmp_id': email_tmp_id and email_tmp_id.id or False,}
+        return {'email_tmp_id': email_tmp_id and email_tmp_id.id or False, }
     
     def get_default_mail_server_id(self, cr, uid, fields, context=None):
-        company_id = self.pool.get('res.users')._get_company(cr, uid, context=context)
+        company_id = self.pool.get(
+            'res.users')._get_company(cr, uid, context=context)
         mail_server_obj = self.pool.get('ir.mail_server')
-        mail_server_id = mail_server_obj.search(cr, uid, [('company_id', '=', company_id),
-            ('active', '=', True)], order = 'sequence', limit = 1)
+        mail_server_id = mail_server_obj.search(
+            cr, uid, [('company_id', '=', company_id),
+            ('active', '=', True)], limit = 1)
         return {'mail_server_id': mail_server_id or False}
 
     def get_default_temp_report_id(self, cr, uid, fields, context=None):
-        company_id = self.pool.get('res.users')._get_company(cr, uid, context=context)
-        temp_report_obj = self.pool.get('ir.actions.report.xml')
-        temp_report_id = temp_report_obj.search(cr, uid, [('company_id', '=', company_id), 
-            ('active', '=', True), ('report_type', '=', 'webkit'),
-                ('model', '=', 'account.invoice')], limit = 1)
-        return {'temp_report_id': temp_report_id or False}
+        report_id = False
+        temp_report_obj = self.pool.get('report.multicompany')
+        temp_report_ids = temp_report_obj.search(
+            cr, uid, [('model', '=', 'account.invoice')], limit=1)
+        if temp_report_ids:
+            report_id = temp_report_obj.browse(
+                cr, uid, temp_report_ids)[0].report_id.id
+        return {'temp_report_id': report_id or False}
 
     def create(self, cr, uid, values, context=None):
         confg_id = super(facturae_config_settings, self).create(
             cr, uid, values, context)
+        report_company_obj = self.pool.get('report.multicompany')
+        email_obj = self.pool.get('email.template')
         if values.get('mail_server_id') and values.get('company_id') and values.get('email_tmp_id') and values.get('temp_report_id'):
-            email_obj = self.pool.get('email.template')
-            actions_obj = self.pool.get('ir.actions.report.xml')
-            webkit_header_obj = self.pool.get('ir.header_webkit')
-            report_data = actions_obj.browse(
-                cr, SUPERUSER_ID, [values.get('temp_report_id')])
             confg_data = self.browse(cr, uid, confg_id, context=context)
-            if report_data:
-                actions_obj.write(cr, uid, [values.get('temp_report_id')], {
-                                        'company_id': confg_data.company_id.id}, context=context)
-                webkit_header_obj.write(cr, SUPERUSER_ID, [report_data[0].webkit_header.id], {
-                                        'company_id': confg_data.company_id.id}, context=context)
             email_obj.write(cr, uid, [confg_data.email_tmp_id.id], {
                             'company_id': confg_data.company_id.id,
                             'mail_server_id': confg_data.mail_server_id.id,
-                            'report_template': values['temp_report_id']},
+                            'report_template': values.get('temp_report_id')},
                             context=context)
-
+            report_company_obj.report_multicompany_create(
+                cr, uid, values.get('temp_report_id'), context=context)        
         return confg_id
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: