openerp-mexico-localization

Merge lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_facturae_report-pagare-dev-julio into lp:openerp-mexico-localization/7.0

  1. 7.0-l10n_mx_facturae_report-pagare-dev-julio
  2. Merge into 7.0
Proposed by Julio Serna-http://www.vauxoo.com
Status: Merged
Merged at revision: 278
Proposed branch: lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_facturae_report-pagare-dev-julio
Merge into: lp:openerp-mexico-localization/7.0
Diff against target: 49 lines (+5/-4)
2 files modified
l10n_mx_facturae_report/report/invoice_facturae_html.mako (+3/-3)
l10n_mx_facturae_report/report/invoice_facturae_html.py (+2/-1)
To merge this branch: bzr merge lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_facturae_report-pagare-dev-julio
Reviewer Review Type Date Requested Status
Isaac López Zúñiga Pending
Moisés López - http://www.vauxoo.com Pending
Review via email: mp+183791@code.launchpad.net

Description of the change

Se modifico la función y estilo de las notas de pagare, se agrego la variable address_emitter para poder obtener la información de la compañia.

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/report/invoice_facturae_html.mako'
2--- l10n_mx_facturae_report/report/invoice_facturae_html.mako 2013-09-03 00:36:01 +0000
3+++ l10n_mx_facturae_report/report/invoice_facturae_html.mako 2013-09-04 01:05:15 +0000
4@@ -7,13 +7,13 @@
5 <body>
6 %for o in objects :
7 ${set_global_data(o)}
8- <table>
9+ <table class="basic_table">
10 <tr>
11 <td style="vertical-align: top;">
12 ${helper.embed_image('jpeg',str(o.company_emitter_id.logo),180, 85)}
13 </td>
14 <td>
15- <table>
16+ <table class="basic_table">
17 <tr>
18 <td width='50%'>
19 <div class="title">${o.company_emitter_id.address_invoice_parent_company_id.name or ''|entity}</div>
20@@ -282,7 +282,7 @@
21 </table>
22 %endif
23 <table class="basic_table">
24- <tr><td class="center_td"><pre>${ get_text_promissory(o.company_id, o.partner_id, o) or ''|entity }</pre></td></tr>
25+ <tr><td class="address"><pre>${ get_text_promissory(o.company_id, o.partner_id, address_emitter, o) or ''|entity }</pre></td></tr>
26 </table>
27 <!--code for cfd 3.2-->
28 %if 'cfdi' in o.invoice_sequence_id.approval_id.type:
29
30=== modified file 'l10n_mx_facturae_report/report/invoice_facturae_html.py'
31--- l10n_mx_facturae_report/report/invoice_facturae_html.py 2013-08-14 21:11:08 +0000
32+++ l10n_mx_facturae_report/report/invoice_facturae_html.py 2013-09-04 01:05:15 +0000
33@@ -34,6 +34,7 @@
34 from openerp import netsvc
35 import openerp
36 from report_webkit import webkit_report
37+import datetime
38
39 class invoice_facturae_html(report_sxw.rml_parse):
40 def __init__(self, cr, uid, name, context):
41@@ -238,7 +239,7 @@
42 })
43 return res
44
45- def _get_text_promissory(self, company, partner, invoice):
46+ def _get_text_promissory(self, company, partner, address_emitter, invoice):
47 text = ''
48 context = {}
49 lang = self.pool.get('res.partner').browse(self.cr, self.uid,\