Hotfix#203

l10n_mx_ir_attachment_facturae/invoice.py

self).action_cancel(cr, uid, ids, context)
def create_ir_attachment_facturae(self, cr, uid, ids, context = None):
+        atach = ''
ir_attach_obj = self.pool.get('ir.attachment.facturae.mx')
invoice = self.browse(cr, uid, ids, context = context)[0]
if invoice.invoice_sequence_id.approval_id:
-            invoice_types = ['cfdi32', 'cfd22', 'cbb']
-            if invoice.invoice_sequence_id.approval_id.type in invoice_types:
-                attach = ir_attach_obj.create(cr, uid, {
+            attach = ir_attach_obj.create(cr, uid, {
'name': invoice.fname_invoice, 'invoice_id': ids[0],
'type': invoice.invoice_sequence_id.approval_id.type},
context = context)
-            wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(
-                uid, 'ir.attachment.facturae.mx', attach, 'action_confirm', cr)
-            ir_model_data = self.pool.get('ir.model.data')
-            form_res = ir_model_data.get_object_reference(
-                cr, uid, 'l10n_mx_ir_attachment_facturae',
-                'view_ir_attachment_facturae_mx_form')
-            form_id = form_res and form_res[1] or False
-            tree_res = ir_model_data.get_object_reference(
-                cr, uid, 'l10n_mx_ir_attachment_facturae',
-                'view_ir_attachment_facturae_mx_tree')
-            tree_id = tree_res and tree_res[1] or False
-
-            return {
-                'name': _('Attachment Factura E MX'),
-                'view_type': 'form',
-                'view_mode': 'form,tree',
-                'res_model': 'ir.attachment.facturae.mx',
-                'res_id': attach,
-                'view_id': False,
-                'views': [(form_id, 'form'), (tree_id, 'tree')],
-                'type': 'ir.actions.act_window',
-            }
+            if attach:
+                wf_service = netsvc.LocalService("workflow")
+                wf_service.trg_validate(
+                    uid, 'ir.attachment.facturae.mx', attach, 'action_confirm', cr)
+                ir_model_data = self.pool.get('ir.model.data')
+                form_res = ir_model_data.get_object_reference(
+                    cr, uid, 'l10n_mx_ir_attachment_facturae',
+                    'view_ir_attachment_facturae_mx_form')
+                form_id = form_res and form_res[1] or False
+                tree_res = ir_model_data.get_object_reference(
+                    cr, uid, 'l10n_mx_ir_attachment_facturae',
+                    'view_ir_attachment_facturae_mx_tree')
+                tree_id = tree_res and tree_res[1] or False
+                return {
+                    'name': _('Attachment Factura E MX'),
+                    'view_type': 'form',
+                    'view_mode': 'form,tree',
+                    'res_model': 'ir.attachment.facturae.mx',
+                    'res_id': attach,
+                    'view_id': False,
+                    'views': [(form_id, 'form'), (tree_id, 'tree')],
+                    'type': 'ir.actions.act_window',
+                }

l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py

#    You should have received a copy of the GNU Affero General Public License
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
##########################################################################
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
from openerp.tools.translate import _
from openerp import pooler, tools
from openerp import netsvc
import tempfile
import base64
import os
+import logging
+
+
+_logger = logging.getLogger(__name__)
class ir_attachment_facturae_mx(osv.Model):
if partner_mail:
if user_mail:
+                        _logger.debug('Sending mail to  %s from %s', partner_mail, user_mail)
if mssg.get('partner_ids', False) and tmp_id:
mssg['partner_ids'] = [(6, 0, mssg['partner_ids'])]
mssg['attachment_ids'] = [(6, 0, attachments)]
mssg_id = self.pool.get(
'mail.compose.message').create(cr, uid, mssg, context = None)
+                            _logger.debug('Message created with id %s', mssg_id)
state = self.pool.get('mail.compose.message').send_mail(
cr, uid, [mssg_id], context = context)
asunto = mssg['subject']
if id_mail:
for mail in obj_mail_mail.browse(cr, uid, id_mail, context = None):
if mail.state == 'exception':
-                                        msj = _(
-                                            '\nNot correct email of the user or customer. Check in Menu Configuración\Tecnico\Email\Emails\n')
+                                        _logger.info('Not correct email of the user or customer. Check in Menu Configuración\Tecnico\Email\Emails\n')
else:
-                                msj = _('Email Send Successfully.\
-                                Attached is sent to %s \
-                                for Outgoing Mail Server "FacturaeE"\
-                                                ') % (partner_mail)
+                                _logger.info('Email Send Successfully. Attached is sent to %s for Outgoing Mail Server "FacturaeE"', partner_mail)
else:
raise osv.except_osv(_('Warning'), _('This user\
does not have mail'))
type = self.browse(cr, uid, ids)[0].type
state = self.browse(cr, uid, ids)[0].state
invoice = self.browse(cr, uid, ids)[0].invoice_id
-        # msj = self.browse(cr, uid, ids)[0].msj
-        if type == 'cfd22':
-            msj = _('Cancel\n')
-        if type == 'cfdi32':
-            if state not in ['draft', 'confirmed', 'cancel']:
-                status = invoice_obj.action_cancel(
-                    cr, uid, [invoice.id], context)
+        if state not in ['draft', 'confirmed', 'cancel']:
+             if type == 'cbb':
+                 invoice_obj.action_cancel(cr, uid, [invoice.id], context)
+                 msj = _('Cancel\n')
+             if type == 'cfd22':
+                 invoice_obj.action_cancel(cr, uid, [invoice.id], context)
+                 msj = _('Cancel\n')
+             if type == 'cfdi32':
sf_cancel = invoice_obj.sf_cancel(
cr, uid, [invoice.id], context = {})
msj = _('Cancel\n')
msj += tools.ustr(sf_cancel.get('message', False))
+                status = invoice_obj.action_cancel(
+                     cr, uid, [invoice.id], context)
# Para que no aparescan los adjuntos en facturas canceladas
# #adjuntos = attach_obj.search(cr, uid, [(
# #'res_model', '=', 'account.invoice'),
# #for attachment in self.browse(cr, uid, adjuntos, context):
# #ids2 = attach_obj.write(cr, uid, [attachment.id], {
# #'res_id': False, }, context={})
-            else:
-                 msj = _('Cancel\n')
+
return self.write(cr, uid, ids,
{'state': 'cancel',
'last_date': time.strftime('%Y-%m-%d %H:%M:%S'),

l10n_mx_ir_attachment_facturae/l10n_mx_facturae_mail_templates_data.xml

<field name="model_id" ref="account.model_account_invoice"/>
<field name="auto_delete" eval="True"/>
<field name="body_html"><![CDATA[
-<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
-    <p>Hello ${object.partner_id.name},</p>
-    
-    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}: </p>
-    <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
-       &nbsp;&nbsp;<strong>REFERENCES</strong><br />
-       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />
-       &nbsp;&nbsp;Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />
-       &nbsp;&nbsp;Order date: ${object.date_order}<br />
+<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
+<p>Hola ${object.partner_id.name},</p>
+<p>Hay una nueva factura disponible: </p>
+    
+<p style="border-left: 1px solid #8e0000; margin-left: 30px;">
+       &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />
+       &nbsp;&nbsp;Nº de factura: <strong>${object.number}</strong><br />
+       &nbsp;&nbsp;Total de la factura: <strong>${object.amount_total} ${object.currency_id.name}</strong><br />
+       &nbsp;&nbsp;Fecha de factura: ${object.date_invoice}<br />
% if object.origin:
-       &nbsp;&nbsp;Order reference: ${object.origin}<br />
-       % endif
-       % if object.client_order_ref:
-       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />
+       &nbsp;&nbsp;Referencia del pedido: ${object.origin}<br />
% endif
% if object.user_id:
-       &nbsp;&nbsp;Your contact: <a href="mailto:${object.user_id.email or ''}?subject=Order%20${object.name}">${object.user_id.name}</a>
+       &nbsp;&nbsp;Su contacto: <a href="mailto:${object.user_id.email or ''}?subject=Factura%20${object.number}">${object.user_id.name}</a>
% endif
-    </p>
-
-    <% set signup_url = object.get_signup_url() %>
-    % if signup_url:
-    <p>
-    You can access this document and pay online via our Customer Portal:
-    </p>
-        <a style="display:block; width: 150px; height:20px; margin-left: 120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;"
-           href="${signup_url}">View ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'}</a>
-    % endif
-
+    </p>  
+    
% if object.paypal_url:
<br/>
-    <p>It is also possible to directly pay with Paypal:</p>
+    <p>Es posible pagarla directamente con Paypal:</p>
<a style="margin-left: 120px;" href="${object.paypal_url}">
<img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
</a>
% endif
-
+    
<br/>
-    <p>If you have any question, do not hesitate to contact us.</p>
-    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>
+    <p>Si tiene cualquier pregunta, no dude en contactarnos.</p>
+    <p>Gracias por elegir ${object.company_id.name or 'us'}!</p>
<br/>
<br/>
<div style="width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;">
</span>
% if object.company_id.phone:
<div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; ">
-                Phone:&nbsp; ${object.company_id.phone}
+                Teléfono:&nbsp; ${object.company_id.phone}
</div>
% endif
% if object.company_id.website:
<div>
Web :&nbsp;<a href="${object.company_id.website}">${object.company_id.website}</a>
</div>
-        % endif
+        %endif
<p></p>
</div>
</div>

l10n_mx_ir_attachment_facturae/res_config.py

-# -*- coding: utf-8 -*-
+    # -*- coding: utf-8 -*-
##############################################################################
#
#    OpenERP, Open Source Business Applications
'email_tmp_id': fields.many2one('email.template', 'Email Template'),
}
-    def get_default_email_tmp_id(self, cr, uid, fields, context=None):
+    def get_default_email_tmp_id(self, cr, uid, fields, context = None):
email_tmp_id = False
cr.execute(
""" select max(id) as email_tmp_id from l10n_mx_email_config_settings """)
else:
try:
email_tmp_id = self.pool.get('ir.model.data').get_object(cr,
-                    uid, 'l10n_mx_ir_attachment_facturae',
-                    'email_template_template_facturae_mx')
+                                                                         uid, 'l10n_mx_ir_attachment_facturae',
+                                                                         'email_template_template_facturae_mx')
except:
pass
return {'email_tmp_id': email_tmp_id and email_tmp_id.id or False}