Merge lp:~vauxoo/openerp-mexico-localization/7.0-changed_in_report_facturae-dev-ernesto into lp:openerp-mexico-localization/7.0

[Luis Ernesto García Medina - http://www.vauxoo.com]

Se mejoro el reporte para evitar cambios al imprimir el reporte con notas (problemas con reducción del tamaño de la fuente)

[lp:~vauxoo/openerp-mexico-localization/7.0-changed_in_report_facturae-dev-ernesto]

295. By Luis Ernesto García Medina - http://www.vauxoo.com on 2013-09-18

[REF][l10n_mx_facturae_report] will change the font of the notes to make it look better

296. By Luis Ernesto García Medina - http://www.vauxoo.com on 2013-09-19

[REF][l10n_mx_facturae_report] Added validation for when there are no values ​​in dinamic_text

=== modified file 'l10n_mx_facturae_report/data.xml'
--- l10n_mx_facturae_report/data.xml	2013-09-06 01:07:43 +0000
+++ l10n_mx_facturae_report/data.xml	2013-09-19 00:09:09 +0000
@@ -245,6 +245,15 @@
 p.cadena_with_cbb_cfd{
 width:55em;
 }
+pre {
+font-size: 6pt;
+font-family:helvetica;
+white-space: pre-wrap;
+white-space: -moz-pre-wrap !important;
+white-space: -pre-wrap;
+white-space: -o-pre-wrap;
+word-wrap: break-word;
+}
 ]]> </field>
             <field name="name">Facturae</field>
         </record>

=== modified file 'l10n_mx_facturae_report/report/invoice_facturae_html.mako'
--- l10n_mx_facturae_report/report/invoice_facturae_html.mako	2013-09-06 01:07:43 +0000
+++ l10n_mx_facturae_report/report/invoice_facturae_html.mako	2013-09-19 00:09:09 +0000
@@ -282,9 +282,6 @@
                 %endfor
             </table>
         %endif
-        <table class="basic_table">
-            <tr><td class="address"><pre>${ get_text_promissory(o.company_id, o.partner_id, address_emitter, o) or ''|entity }</pre></td></tr>
-        </table>
         <!--code for cfd 3.2-->
         %if 'cfdi' in o.invoice_sequence_id.approval_id.type:
             <table class="basic_table" rules="cols" style="border:1.5px solid grey;">
@@ -405,15 +402,22 @@
                         %endif
                     </tr>
                 </table>
-                <!--</span> si se activan, forzan un brinco de linea
-            </div>-->
+                <!--</span> si se activan, forzan un brinco de linea-->
+            </div>
         %endif
         %if not o.invoice_sequence_id.approval_id.type:
             <hr>
             ${_('No se encontr&oacute; la aprobaci&oacute;n')}
             <hr>
         %endif
-                                 
+        <br></br>
+        <section>
+            %if o.company_id.dinamic_text:
+                <table class="basic_table" style="border:1.5px solid grey;">
+                    <tr><td class="address"><pre style='pre'>${ get_text_promissory(o.company_id, o.partner_id, address_emitter, o) or ''|entity }</pre></td></tr>
+                </table>
+            %endif
+        </section>
     <p style="page-break-after:always"></p>
     %endfor
 

=== modified file 'l10n_mx_facturae_report/report/invoice_facturae_html.py'
--- l10n_mx_facturae_report/report/invoice_facturae_html.py	2013-09-04 00:41:46 +0000
+++ l10n_mx_facturae_report/report/invoice_facturae_html.py	2013-09-19 00:09:09 +0000
@@ -250,7 +250,10 @@
             company.id, context=context)
         if company.dinamic_text:
             try:
-                text = company.dinamic_text % eval("{" + company.dict_var + "}")
+                if company.dict_var:
+                    text = company.dinamic_text % eval("{" + company.dict_var + "}")
+                else:
+                    text = company.dinamic_text
             except:
                 return text
         return text