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

[Luis Torres - http://www.vauxoo.com]

Se agregaron las notas de la factura al reporte.

[lp:~vauxoo/openerp-mexico-localization/7.0-comment_report_facturae_dev_luis]

249. By Luis Torres - http://www.vauxoo.com on 2013-08-09

[IMP]Complete help in module l10n_mx_notes_invoice, and add label in notes promissory

[Luis Torres - http://www.vauxoo.com (luis-cleto-)]

Se agrego una etiqueta en las notas del pagare, para que se respeter los 'enter' del texto, y se completo la ayuda del modulo, para indicar que si se quiere utilizar '%' como texto sea con doble %%

review: Needs Resubmitting

=== modified file 'l10n_mx_facturae_report/report/invoice_facturae_html.mako'
--- l10n_mx_facturae_report/report/invoice_facturae_html.mako	2013-06-30 06:23:55 +0000
+++ l10n_mx_facturae_report/report/invoice_facturae_html.mako	2013-08-09 17:02:04 +0000
@@ -245,6 +245,7 @@
             </tr>
             
         </table>
+        <br/>${o.comment or '' |entity}<br/>
         <br clear="all"/>
         <!--code for cfd-->
         %if o.invoice_sequence_id.approval_id.type == 'cfd22':
@@ -281,7 +282,7 @@
             </table>
         %endif
         <table class="basic_table">
-            <tr><td class="center_td">${ get_text_promissory(o.company_id, o.partner_id, o) or ''|entity }</td></tr>
+            <tr><td class="center_td"><pre>${ get_text_promissory(o.company_id, o.partner_id, o) or ''|entity }</pre></td></tr>
         </table>
         <!--code for cfd 3.2-->
         %if o.invoice_sequence_id.approval_id.type == 'cfdi32':

=== modified file 'l10n_mx_notes_invoice/i18n/es.po'
--- l10n_mx_notes_invoice/i18n/es.po	2013-07-12 23:22:28 +0000
+++ l10n_mx_notes_invoice/i18n/es.po	2013-08-09 17:02:04 +0000
@@ -1,13 +1,13 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#   * l10n_mx_notes_invoice
+#	* l10n_mx_notes_invoice
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-12 23:18+0000\n"
-"PO-Revision-Date: 2013-07-12 23:18+0000\n"
+"POT-Creation-Date: 2013-08-09 16:44+0000\n"
+"PO-Revision-Date: 2013-08-09 16:44+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,19 +16,75 @@
 "Plural-Forms: \n"
 
 #. module: l10n_mx_notes_invoice
-#: field:res.company,promissory:0
-msgid "Text promissory facturae"
-msgstr "Texto promisorio facturae "
+#: code:addons/l10n_mx_notes_invoice/res_company.py:48
+#, python-format
+msgid "In the field 'Promissory note' you need put the text that you like that was colocate in the report as promissory, if you like take a data from the parner, company or the invoice you need create a new variable in the field 'Variables to use in text' as follows : \n"
+"'name_variable' : object.value of object, and when you need use an variable you put %(variable)s for use information from an object. \n"
+"When you need information from the partner, use partner.field that you need from the partner, for company use company.field an equal for an field from invoice.\n"
+"NOTE: If you need use symbol '%', you need use %%."
+msgstr "En el campo 'Notas pagaré' se necesita colocar el texto que quieres que aparezca en el reporte como pagaré, si quieres que tome datos del partner, de la compañía o de la factura necesitas crear una nueva variable en el campo 'Variables a usar' de la siguiente manera: \n"
+"'nombre_variable' : objeto.valor_del_objeto, y cuando necesites usar la variable colocar %(variable)s para usar la información del objeto. \n"
+"Cuando se necesite utilizar información del partner, utilizar partner.campo a traer del partner, para la compañia company.campo e igual para un campo de factura, invoice.campo.\n"
+"NOTA: Si necesitas utilizar el simbolo '%', se necesita colocar %%."
+
+#. module: l10n_mx_notes_invoice
+#: field:res.company,details:0
+#: field:res.company,dict_var:0
+#: field:res.company,sample:0
+#: field:res.company,sample_dict:0
+msgid "Variables to use in text"
+msgstr "Variables a usar"
+
+#. module: l10n_mx_notes_invoice
+#: code:addons/l10n_mx_notes_invoice/res_company.py:58
+#, python-format
+msgid "If you like put the text \n"
+"I Partner pay to the order of My Company the amount of $500.00, you need put:"
+msgstr "Si se quiere colocar el texto \n"
+"Yo Partner pagaré a la orden de Mi Compañia la cantidad de $500.00, Necesitas colocar:"
+
+#. module: l10n_mx_notes_invoice
+#: help:res.company,dinamic_text:0
+msgid "This text will put in the report of Invoice"
+msgstr "Este texto será utilizado en el reporte de FacturaE"
 
 #. module: l10n_mx_notes_invoice
 #: model:ir.model,name:l10n_mx_notes_invoice.model_res_company
 msgid "Companies"
-msgstr "Compañias"
-
-#. module: l10n_mx_notes_invoice
-#: help:res.company,promissory:0
-msgid "This legend is used for the report of Electronic Invoice in the legend of promissory"
-msgstr "Esta leyenda se utiliza para el informe de la Factura Electrónica en la leyenda de pagaré"
+msgstr "Compañías"
+
+#. module: l10n_mx_notes_invoice
+#: code:addons/l10n_mx_notes_invoice/res_company.py:62
+#, python-format
+msgid "'partner_name' : partner.name, 'company_name' : company.name, 'invoice_amount' : invoice.amount_total"
+msgstr "'partner_name' : partner.name, 'company_name' : company.name, 'invoice_amount' : invoice.amount_total"
+
+#. module: l10n_mx_notes_invoice
+#: view:res.company:0
+msgid "Sample"
+msgstr "Ejemplo"
+
+#. module: l10n_mx_notes_invoice
+#: help:res.company,dict_var:0
+msgid "Put te variables used in text"
+msgstr "Coloca las variables usadas en el texto"
+
+#. module: l10n_mx_notes_invoice
+#: field:res.company,dinamic_text:0
+#: field:res.company,sample_text:0
+msgid "Promissory note"
+msgstr "Notas pagaré"
+
+#. module: l10n_mx_notes_invoice
+#: code:addons/l10n_mx_notes_invoice/res_company.py:60
+#, python-format
+msgid "'I %(partner_name)s pay to the order of %(company_name)s the amount of %(invoice_amount)s'"
+msgstr "'Yo %(partner_name)s pagaré a la orden de %(company_name)s la cantidad de %(invoice_amount)s'"
+
+#. module: l10n_mx_notes_invoice
+#: view:res.company:0
+msgid "Why fill the information?"
+msgstr "¿Como llenar la información?"
 
 #. module: l10n_mx_notes_invoice
 #: view:res.company:0

=== modified file 'l10n_mx_notes_invoice/res_company.py'
--- l10n_mx_notes_invoice/res_company.py	2013-06-30 07:15:43 +0000
+++ l10n_mx_notes_invoice/res_company.py	2013-08-09 17:02:04 +0000
@@ -53,7 +53,8 @@
             "and when you need use an variable you put %(variable)s for use "\
             "information from an object. \nWhen you need information from "\
             "the partner, use partner.field that you need from the partner, "\
-            "for company use company.field an equal for an field from invoice."),
+            "for company use company.field an equal for an field from invoice."\
+            "\nNOTE: If you need use symbol '%', you need use %%."),
         'sample' : _('If you like put the text \nI Partner pay to the order of '\
             'My Company the amount of $500.00, you need put:'),
         'sample_text' : _("'I %(partner_name)s pay to the order of %(company_"\