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

Status: Merged
Merged at revision: 254
Proposed branch: lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_facturae_report_fix_property_company_dev_jorge
Merge into: lp:openerp-mexico-localization/7.0
Diff against target: 20 lines (+8/-3)
1 file modified
l10n_mx_facturae_report/l10n_mx_facturae_report_webkit.xml (+8/-3)
To merge this branch: bzr merge lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_facturae_report_fix_property_company_dev_jorge
Reviewer Review Type Date Requested Status
Rodolfo Lopez Pending
Nhomar - Vauxoo Pending
Moisés López - http://www.vauxoo.com Pending
Jorge Angel Naranjo Rogel - http://www.vauxoo.com Pending
Review via email: mp+180407@code.launchpad.net

Description of the change

Se corrige detalle de que asigne en el webkit en el reporte de facturación electrónica una compañía por defecto. Mediante la creación de un property.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_mx_facturae_report/l10n_mx_facturae_report_webkit.xml'
2--- l10n_mx_facturae_report/l10n_mx_facturae_report_webkit.xml 2013-03-02 00:20:03 +0000
3+++ l10n_mx_facturae_report/l10n_mx_facturae_report_webkit.xml 2013-08-15 19:58:23 +0000
4@@ -9,8 +9,13 @@
5 string="Factura Electronica Report"
6 report_type="webkit"
7 attachment_use="1"
8- attachment="(object.state in ('open','paid')) and (object.fname_invoice and (object.fname_invoice + ''))"
9- webkit_header="ir_header_webkit_facturae"/>
10+ attachment="(object.state in ('open','paid')) and (object.fname_invoice and (object.fname_invoice + ''))"/>
11+
12+ <record id="property_l10n_mx_facturae_report_webkit" model="ir.property">
13+ <field name="name">webkit_header</field>
14+ <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
15+ <field eval="'ir.header_webkit,'+str(ref('l10n_mx_facturae_report.ir_header_webkit_facturae'))" model="ir.header_webkit" name="value"/>
16+ <field eval="'ir.actions.report.xml,'+str(ref('l10n_mx_facturae_report.account_invoice_facturae_webkit'))" model="ir.actions.report.xml" name="res_id"/>
17+ </record>
18 </data>
19 </openerp>
20-