Merge lp:~vauxoo/openerp-mexico-localization/7.0_l10n_mx_ir_attachment_facturae-add_button_forward_email-dev_carlos into lp:openerp-mexico-localization/7.0

[Juan Carlos Hernandez]

se agrego botón para reenviar el adjunto por correo otra vez

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

review: Approve

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

Levanta un runbot con este branch, por favor.

=== modified file 'l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py'
--- l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py	2013-10-08 21:32:07 +0000
+++ l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py	2013-10-08 23:06:28 +0000
@@ -385,6 +385,11 @@
                                     else:
                                         msj = _('Email Send Successfully.Attached is sent to %s for Outgoing Mail Server %s') % (
                                             partner_mail, server_name)
+                                        self.write(cr, uid, ids, {
+                                                                'msj': msj, 
+                                                                'last_date': time.strftime('%Y-%m-%d %H:%M:%S')})
+                                        wf_service.trg_validate( uid, self._name, ids[0], 'action_send_customer', cr)
+                                        return True
                             else:
                                 raise osv.except_osv(
                                     _('Warning'), _('This user does not have mail'))
@@ -397,11 +402,6 @@
                 else:
                     raise osv.except_osv(_('Warning'), _('Not Found\
                     outgoing mail server.Configure the outgoing mail server named "FacturaE"'))
-                self.write(
-                    cr, uid, ids, {'msj': msj, 'last_date': time.strftime('%Y-%m-%d %H:%M:%S')})
-                wf_service.trg_validate(
-                    uid, self._name, ids[0], 'action_send_customer', cr)
-            return True
         except Exception, e:
             error = tools.ustr( traceback.format_exc() )
             self.write(cr, uid, ids, {'msj': error}, context=context)
@@ -524,6 +524,24 @@
             wf_service.trg_create(uid, self._name, row, cr)
         return True
 
+    def forward_email(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        ids = isinstance(ids, (int, long)) and [ids] or ids
+        try:
+            self.signal_send_customer(cr, uid, ids, context=context)
+            msj = _('Forward Email')
+            self.write(cr, uid, ids, {'msj': msj,
+                                      'last_date': time.strftime('%Y-%m-%d %H:%M:%S')
+                                      }, context=context)
+            status_forward = True
+        except Exception, e:
+            error = tools.ustr( traceback.format_exc() )
+            self.write(cr, uid, ids, {'msj': error}, context=context)
+            _logger.error( error )
+            status_forward = False
+        return status_forward
+
 
 class ir_attachment(osv.Model):
     _inherit = 'ir.attachment'

=== modified file 'l10n_mx_ir_attachment_facturae/ir_attachment_facturae_view.xml'
--- l10n_mx_ir_attachment_facturae/ir_attachment_facturae_view.xml	2013-09-25 02:14:46 +0000
+++ l10n_mx_ir_attachment_facturae/ir_attachment_facturae_view.xml	2013-10-08 23:06:28 +0000
@@ -31,6 +31,7 @@
                         <button name="signal_done" states="sent_backup" string="Done" type="object" groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_user"/>
                         <button name="signal_cancel" states="draft,confirmed,signed,printable,sent_backup,sent_customer,done" string="Cancel" type="object" groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_user"/>
                         <button name="reset_to_draft" states="cancel" string="Reset to Draft" type="object" groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_manager"/>
+                        <button name="forward_email" states="sent_customer,sent_backup,done" string="Forward Email" type="object" groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,signed,printable,sent_customer,sent_backup,done,cancel" statusbar_colors='{"invoice_except":"red","waiting_date":"blue"}'/>
                     </header>
                     <sheet string="Attachment Factura-E">