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

Proposed by Juan Carlos Hernandez
Status: Merged
Merged at revision: 303
Proposed branch: lp:~vauxoo/openerp-mexico-localization/7.0_l10n_mx_view_hierarchical_dev_carlos
Merge into: lp:openerp-mexico-localization/7.0
Diff against target: 71 lines (+19/-25)
2 files modified
l10n_mx_ir_attachment_facturae/invoice.py (+14/-22)
l10n_mx_ir_attachment_facturae/ir_attachment_facturae_view.xml (+5/-3)
To merge this branch: bzr merge lp:~vauxoo/openerp-mexico-localization/7.0_l10n_mx_view_hierarchical_dev_carlos
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Approve
Juan Carlos Hernandez (community) Needs Resubmitting
Julio Serna-http://www.vauxoo.com Pending
Isaac López Zúñiga Pending
OpenERP Mexico Maintainer Pending
Review via email: mp+187436@code.launchpad.net

Description of the change

se corrigió vista al validar la factura electronica,
Se hizo como la hace openerp nativo,se baso en un ejemplo como el que está en el modulo sale al mostrar la factura,este cambio no muestra la vista tree.

To post a comment you must log in.
301. By Juan Carlos Hernandez

[FIX][l10n_mx_ir_attachment_facturae]fix view_type

302. By Juan Carlos Hernandez

[IMP][l10n_mx_ir_attachmnet_facturae]delete comment

Revision history for this message
Juan Carlos Hernandez (openerp1) wrote :

se corrigió vista al validar la factura electronica,
Se hizo como la hace openerp nativo,se baso en un ejemplo como el que está en el modulo sale al mostrar la factura,este cambio no muestra la vista tree.

review: Needs Resubmitting
Revision history for this message
Moisés López - http://www.vauxoo.com (moylop260) wrote :

Aprobado.
@Isaac,
Puedes mezclar esta rama por favor.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_mx_ir_attachment_facturae/invoice.py'
2--- l10n_mx_ir_attachment_facturae/invoice.py 2013-08-25 09:18:53 +0000
3+++ l10n_mx_ir_attachment_facturae/invoice.py 2013-09-25 21:20:25 +0000
4@@ -52,7 +52,8 @@
5 def create_ir_attachment_facturae(self, cr, uid, ids, context=None):
6 attach = ''
7 ir_attach_obj = self.pool.get('ir.attachment.facturae.mx')
8- ir_model_data_obj = self.pool.get('ir.model.data')
9+ mod_obj = self.pool.get('ir.model.data')
10+ act_obj = self.pool.get('ir.actions.act_window')
11 attach_ids = []
12 inv_type_facturae = {
13 'out_invoice': True,
14@@ -69,24 +70,15 @@
15 context=None)#Context, because use a variable type of our code but we dont need it.
16 )
17 if attach_ids:
18- form_res = ir_model_data_obj.get_object_reference(
19- cr, uid, 'l10n_mx_ir_attachment_facturae',
20- 'view_ir_attachment_facturae_mx_form')
21- form_id = form_res and form_res[1] or False
22-
23- tree_res = ir_model_data_obj.get_object_reference(
24- cr, uid, 'l10n_mx_ir_attachment_facturae',
25- 'view_ir_attachment_facturae_mx_tree')
26- tree_id = tree_res and tree_res[1] or False
27-
28- return {
29- 'name': _('Attachment Factura E MX'),
30- 'view_type': 'form',
31- 'view_mode': 'form,tree',
32- 'res_model': 'ir.attachment.facturae.mx',
33- 'res_id': attach_ids[0],
34- 'view_id': False,
35- 'views': [(form_id, 'form'), (tree_id, 'tree')],
36- 'type': 'ir.actions.act_window',
37- }
38- return {}
39+ result = mod_obj.get_object_reference(cr, uid, 'l10n_mx_ir_attachment_facturae',
40+ 'action_ir_attachment_facturae_mx')
41+ id = result and result[1] or False
42+ result = act_obj.read(cr, uid, [id], context=context)[0]
43+ #choose the view_mode accordingly
44+ result['domain'] = "[('id','in',["+','.join(map(str, attach_ids))+"])]"
45+ result['res_id'] = attach_ids and attach_ids[0] or False
46+ res = mod_obj.get_object_reference(cr, uid, 'l10n_mx_ir_attachment_facturae',
47+ 'view_ir_attachment_facturae_mx_form')
48+ result['views'] = [(res and res[1] or False, 'form')]
49+ return result
50+ return True
51
52=== modified file 'l10n_mx_ir_attachment_facturae/ir_attachment_facturae_view.xml'
53--- l10n_mx_ir_attachment_facturae/ir_attachment_facturae_view.xml 2013-08-13 16:45:52 +0000
54+++ l10n_mx_ir_attachment_facturae/ir_attachment_facturae_view.xml 2013-09-25 21:20:25 +0000
55@@ -70,11 +70,13 @@
56 </tree>
57 </field>
58 </record>
59- <record id="action_menu_ir_attachment_facturae_mx" model="ir.actions.act_window">
60- <field name="name">Wizard.ir.attachment.facturae.mx</field>
61+ <record id="action_ir_attachment_facturae_mx" model="ir.actions.act_window">
62+ <field name="name">action.ir.attachment.facturae.mx</field>
63+ <field name="type">ir.actions.act_window</field>
64 <field name="res_model">ir.attachment.facturae.mx</field>
65 <field name="view_type">form</field>
66- <field name="view_mode">form</field>
67+ <field name="view_mode">tree,form</field>
68+ <field eval="False" name="view_id"/>
69 </record>
70 <!--
71 <menuitem id="menu_ir_attachment_facturae_mx"