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

[Juan Carlos Hernandez]

observaciones funcionales para CFD y CFDI

=== modified file 'l10n_mx_facturae_seq/ir_sequence.py'
--- l10n_mx_facturae_seq/ir_sequence.py	2013-05-30 21:28:32 +0000
+++ l10n_mx_facturae_seq/ir_sequence.py	2013-08-13 23:55:43 +0000
@@ -85,7 +85,8 @@
                 SELECT *
                 FROM ir_sequence_approval
                ) approval_2
-               ON approval_2.sequence_id = approval_1.sequence_id
+               ON approval_2.sequence_id = approval_1.sequence_id and 
+               approval_2.company_id = approval_1.company_id
               AND approval_2.id <> approval_1.id
             WHERE approval_1.sequence_id = %d
               AND ( approval_1.number_start between approval_2.number_start \
@@ -100,7 +101,7 @@
 
     _constraints = [
         (_check_numbers_range, 'Error ! There ranges of numbers underhand between approvals.',\
-            ['sequence_id', 'number_start', 'number_end'])
+            ['sequence_id', 'number_start', 'number_end', 'company_id'])
     ]
 
 

=== modified file 'l10n_mx_ir_attachment_facturae/__openerp__.py'
--- l10n_mx_ir_attachment_facturae/__openerp__.py	2013-08-06 04:27:35 +0000
+++ l10n_mx_ir_attachment_facturae/__openerp__.py	2013-08-13 23:55:43 +0000
@@ -39,6 +39,7 @@
     "demo" : ["demo/l10n_mx_facturae_email_demo.xml",
     ],
     "data" : [
+        "security/l10n_mx_ir_attachment_facturae_security.xml",
         "security/ir.model.access.csv",
         "ir_attachment_facturae_view.xml",
         "l10n_mx_facturae_workflow.xml",

=== modified file 'l10n_mx_ir_attachment_facturae/invoice.py'
--- l10n_mx_ir_attachment_facturae/invoice.py	2013-08-06 04:27:35 +0000
+++ l10n_mx_ir_attachment_facturae/invoice.py	2013-08-13 23:55:43 +0000
@@ -59,39 +59,37 @@
         ir_attach_obj = self.pool.get('ir.attachment.facturae.mx')
         invoice = self.browse(cr, uid, ids, context=context)[0]
         if invoice._columns.has_key('invoice_sequence_id') and invoice.invoice_sequence_id and invoice.invoice_sequence_id.approval_id:#FIX: Just in runbot generate a bug of field no exists in account.invoice model.
-            if invoice.invoice_sequence_id.approval_id.type == 'cfdi32':
-                pac = self.pool.get('params.pac').search(
-                    cr, uid, [('active', '=', True)], context)
-                # if not pac:
-                    # raise osv.except_osv(_('Warning !'),_('Not Params PAC.'))
-            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)
-            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',
-                }
+            if invoice.invoice_sequence_id and invoice.invoice_sequence_id.approval_id and invoice.invoice_sequence_id.approval_id.type:
+                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)
+                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',
+                    }
+            else:
+                raise osv.except_osv(_('Warning'), _('No exists type of electroncic invoice'))
+        else:
+            raise osv.except_osv(_('Warning'), _('No valid approval of folios'))