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

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

Se cambio el campo que se agrega en el reporte de la factura electronica como el 'Debemos y ...', para que sea dinamico

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

231. By Luis Torres - http://www.vauxoo.com on 2013-06-30

[IMP][l10n_mx_notes_invoice]Better functions and added fields to help

232. By Luis Torres - http://www.vauxoo.com on 2013-06-30

[IMP][l10n_mx_facturae_report]Added translation

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

Se mejoro la manera de realizar la funcion, se agrego ayuda y se agrego traduccion

review: Needs Resubmitting

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

se uso "try-except" para evitar problemas con "dict_var" en caso de que este vacio

review: Needs Resubmitting

=== added directory 'l10n_mx_facturae_report/i18n'
=== added file 'l10n_mx_facturae_report/i18n/es.po'
--- l10n_mx_facturae_report/i18n/es.po	1970-01-01 00:00:00 +0000
+++ l10n_mx_facturae_report/i18n/es.po	2013-07-16 19:12:25 +0000
@@ -0,0 +1,93 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_mx_notes_invoice
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-30 06:59+0000\n"
+"PO-Revision-Date: 2013-06-30 06:59+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. 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
+#: 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  usar"
+
+#. module: l10n_mx_notes_invoice
+#: code:addons/l10n_mx_notes_invoice/res_company.py:57
+#, 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
+#: field:res.company,sample_text:0
+msgid "Promissory not"
+msgstr "Notas Pagaré"
+
+#. module: l10n_mx_notes_invoice
+#: 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."
+msgstr "En el campo 'Notas pagaré' se necesita colocar el texto que se quiere colocar en el Reporte como leyenda de pagaré, si se quiere tomar un dato del partner, compañia o de la factura se necesita crear una nueva variabe en el campo 'Variables para el texto' como se muestra: \n'nombre_variable' : objeto.valor del objeto, y cuando se necesite usar una variable se colocará %(variable)s para utilizar a informacion del objeto. \n"
+"Cuando se necesite informacion del partner, usar partner.campo que se necesita, para la compañia usar company.campo, al igual para la factura."
+
+#. 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ñías"
+
+#. module: l10n_mx_notes_invoice
+#: code:addons/l10n_mx_notes_invoice/res_company.py:61
+#, 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
+msgid "Promissory note"
+msgstr "Notas pagaré"
+
+#. module: l10n_mx_notes_invoice
+#: code:addons/l10n_mx_notes_invoice/res_company.py:59
+#, 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 "Notes Invoice"
+msgstr "Notas de Factura"
+

=== modified file 'l10n_mx_facturae_report/report/invoice_facturae_html.mako'
--- l10n_mx_facturae_report/report/invoice_facturae_html.mako	2013-06-10 20:23:17 +0000
+++ l10n_mx_facturae_report/report/invoice_facturae_html.mako	2013-07-16 19:12:25 +0000
@@ -281,7 +281,7 @@
             </table>
         %endif
         <table class="basic_table">
-            <tr><td class="center_td">${ o.company_emitter_id.promissory or ''|entity }</td></tr>
+            <tr><td class="center_td">${ get_text_promissory(o.company_id, o.partner_id, o) or ''|entity }</td></tr>
         </table>
         <!--code for cfd 3.2-->
         %if o.invoice_sequence_id.approval_id.type == 'cfdi32':

=== modified file 'l10n_mx_facturae_report/report/invoice_facturae_html.py'
--- l10n_mx_facturae_report/report/invoice_facturae_html.py	2013-06-11 06:21:43 +0000
+++ l10n_mx_facturae_report/report/invoice_facturae_html.py	2013-07-16 19:12:25 +0000
@@ -55,6 +55,7 @@
             'get_sum_total': self._get_sum_total,
             'has_disc': self._has_disc,
             'get_data_certificate': self._get_data_certificate,
+            'get_text_promissory' : self._get_text_promissory,
         })
         self.taxes = []
 
@@ -237,6 +238,21 @@
             })
         return res
         
+    def _get_text_promissory(self, company, partner, invoice):
+        text = ''
+        context = {}
+        lang = self.pool.get('res.partner').browse(self.cr, self.uid,\
+            partner.id).lang
+        if lang:
+            context.update({'lang' : lang})
+        company = self.pool.get('res.company').browse(self.cr, self.uid,\
+            company.id, context=context)
+        if company.dinamic_text:
+            try:
+                text = company.dinamic_text % eval("{" + company.dict_var + "}")
+            except:
+                return text
+        return text
         
 
 report_sxw.report_sxw('report.account.invoice.facturae.webkit',

=== modified file 'l10n_mx_notes_invoice/res_company.py'
--- l10n_mx_notes_invoice/res_company.py	2013-05-15 17:48:49 +0000
+++ l10n_mx_notes_invoice/res_company.py	2013-07-16 19:12:25 +0000
@@ -34,8 +34,32 @@
     _inherit = 'res.company'
 
     _columns = {
-        'promissory': fields.text('Text promissory facturae',
-            help='This legend is used for the report of Electronic Invoice in the legend of promissory'),
+        'dinamic_text' : fields.text('Promissory note', translate=True,
+            help='This text will put in the report of Invoice'),
+        'dict_var' : fields.text('Variables to use in text',
+            help='Put te variables used in text'),
+        'sample_text' : fields.text('Promissory note', readonly=True),
+        'sample_dict' : fields.text('Variables to use in text', readonly=True),
+        'details' : fields.text('Variables to use in text', readonly=True),
+        'sample' : fields.text('Variables to use in text', readonly=True),
+    }
+    
+    _defaults = {
+        'details' : _("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. \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."),
+        '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_"\
+            "name)s the amount of %(invoice_amount)s'"),
+        'sample_dict' : _("'partner_name' : partner.name, 'company_name' : "\
+            "company.name, 'invoice_amount' : invoice.amount_total"),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_mx_notes_invoice/res_company_view.xml'
--- l10n_mx_notes_invoice/res_company_view.xml	2013-04-20 00:14:08 +0000
+++ l10n_mx_notes_invoice/res_company_view.xml	2013-07-16 19:12:25 +0000
@@ -9,7 +9,18 @@
             <field name="arch" type="xml">
                  <xpath expr="//page[@string='Configuration']" position="after">
                     <page string="Notes Invoice">
-                        <field name="promissory"/>
+                        <group>
+                            <field name="dinamic_text"/>
+                            <field name="dict_var"/>
+                        </group>
+                        <separator string='Why fill the information?'/>
+                        <field name="details"/>
+                        <separator string='Sample'/>
+                        <field name="sample"/>
+                        <group>
+                            <field name="sample_text"/>
+                            <field name="sample_dict"/>
+                        </group>
                     </page>
                 </xpath>
             </field>