From afc15c6e2dd19c48bba20aa8ee736822edfdd998 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 18 Nov 2011 14:08:49 +0100
Subject: [PATCH] [FIX] edi: _.sprintf moved to _.str.sprintf due to recent
 update of web framework

bzr revid: odo@openerp.com-20111118130849-rb9h7b4gs2sm4vib
---
 addons/edi/static/src/xml/edi_account.xml     | 22 +++++++++----------
 .../edi/static/src/xml/edi_sale_purchase.xml  | 18 +++++++--------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/addons/edi/static/src/xml/edi_account.xml b/addons/edi/static/src/xml/edi_account.xml
index d9c9af9c401..dc6fb7f9754 100644
--- a/addons/edi/static/src/xml/edi_account.xml
+++ b/addons/edi/static/src/xml/edi_account.xml
@@ -31,7 +31,7 @@
                 </p>
            </div>
        </div>
-       <h1 class="oe_edi_doc_title">Invoice <t t-esc="doc.internal_number"/>: <t t-esc="_.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></h1>
+       <h1 class="oe_edi_doc_title">Invoice <t t-esc="doc.internal_number"/>: <t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></h1>
        <table width="100%" class="oe_edi_data oe_edi_shade">
             <tr class="oe_edi_floor">
                 <th align="left">Description</th>
@@ -60,10 +60,10 @@
                                 <pre class="oe_edi_inner_note"><t t-esc="invoice_line.note"/></pre>
                             </t>
                         </td>
-                        <td align="right"><t t-esc="_.sprintf('%.2f',invoice_line.quantity)"/> <t t-esc="invoice_line.uos_id[1]"/></td>
-                        <td align="right"><t t-esc="_.sprintf('%.2f',invoice_line.price_unit)"/></td>
-                        <td align="right"><t t-esc="_.sprintf('%.2f',invoice_line.discount)"/></td>
-                        <td align="right"><t t-esc="_.sprintf('%.2f',invoice_line.price_subtotal)"/> <t t-esc="doc.currency.code"/></td>
+                        <td align="right"><t t-esc="_.str.sprintf('%.2f',invoice_line.quantity)"/> <t t-esc="invoice_line.uos_id[1]"/></td>
+                        <td align="right"><t t-esc="_.str.sprintf('%.2f',invoice_line.price_unit)"/></td>
+                        <td align="right"><t t-esc="_.str.sprintf('%.2f',invoice_line.discount)"/></td>
+                        <td align="right"><t t-esc="_.str.sprintf('%.2f',invoice_line.price_subtotal)"/> <t t-esc="doc.currency.code"/></td>
                     </tr>
                 </t>
             <tr>
@@ -73,7 +73,7 @@
                         Net Total:
                     </div>
                     <div class="oe_edi_summary_value">
-                        <t t-esc="_.sprintf('%.2f',doc.amount_untaxed)"/> <t t-esc="doc.currency.code"/>
+                        <t t-esc="_.str.sprintf('%.2f',doc.amount_untaxed)"/> <t t-esc="doc.currency.code"/>
                     </div>
                 </td>
             </tr>
@@ -84,7 +84,7 @@
                         Taxes:
                     </div>
                     <div class="oe_edi_summary_value">
-                        <t t-esc="_.sprintf('%.2f',doc.amount_tax)"/> <t t-esc="doc.currency.code"/>
+                        <t t-esc="_.str.sprintf('%.2f',doc.amount_tax)"/> <t t-esc="doc.currency.code"/>
                     </div>
                 </td>
             </tr>
@@ -95,7 +95,7 @@
                         Total:
                     </div>
                     <div class="oe_edi_summary_value">
-                        <t t-esc="_.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/>
+                        <t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/>
                     </div>
                 </th>
             </tr>
@@ -110,8 +110,8 @@
             <t t-if="doc.tax_line"><t t-foreach="doc.tax_line" t-as="tax_line">
                 <tr class="oe_edi_data_row">
                     <td align="left"><t t-esc="tax_line.name"/></td>
-                    <td align="right"><t t-esc="_.sprintf('%.2f',tax_line.base_amount)"/> <t t-esc="doc.currency.code"/></td>
-                    <td align="right"><t t-esc="_.sprintf('%.2f',tax_line.amount)"/> <t t-esc="doc.currency.code"/></td>
+                    <td align="right"><t t-esc="_.str.sprintf('%.2f',tax_line.base_amount)"/> <t t-esc="doc.currency.code"/></td>
+                    <td align="right"><t t-esc="_.str.sprintf('%.2f',tax_line.amount)"/> <t t-esc="doc.currency.code"/></td>
                 </tr>
                 </t>
             </t>
@@ -145,7 +145,7 @@
                     <label for="oe_edi_pay_wire" id="oe_edi_pay_wire" class="oe_edi_pay_choice_label">Bank Wire Transfer</label>
                 </div>
                 <p class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
-                    Please transfer <strong><t t-esc="_.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></strong> to
+                    Please transfer <strong><t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></strong> to
                     <strong><t t-esc="doc.company_id[1]"/></strong> (postal address on the invoice header)
                      using one of the following bank accounts. Be sure to mention the invoice
                      reference <strong><t t-esc="doc.internal_number"/></strong> on the transfer:
diff --git a/addons/edi/static/src/xml/edi_sale_purchase.xml b/addons/edi/static/src/xml/edi_sale_purchase.xml
index cbd16507b62..4e0fdd7fc4e 100644
--- a/addons/edi/static/src/xml/edi_sale_purchase.xml
+++ b/addons/edi/static/src/xml/edi_sale_purchase.xml
@@ -33,7 +33,7 @@
        </div>
    </div>
 
-   <h1 class="oe_edi_doc_title">Order <t t-esc="doc.name"/>: <t t-esc="_.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></h1>
+   <h1 class="oe_edi_doc_title">Order <t t-esc="doc.name"/>: <t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></h1>
 
     <table width="100%" class="oe_edi_data oe_edi_shade">
         <tr class="oe_edi_floor">
@@ -68,11 +68,11 @@
                     </t>
                 </td>
                 <td align="right">
-                    <t t-esc="_.sprintf('%.2f',doc_line.product_qty)"/> <t t-esc="doc_line.product_uom[1]"/>
+                    <t t-esc="_.str.sprintf('%.2f',doc_line.product_qty)"/> <t t-esc="doc_line.product_uom[1]"/>
                 </td>
-                <td align="right"><t t-esc="_.sprintf('%.2f',doc_line.price_unit)"/></td>
-                <td align="right"><t t-esc="_.sprintf('%.2f',doc_line.discount or 0.0)"/></td>
-                <td align="right"><t t-esc="_.sprintf('%.2f',doc_line.price_subtotal)"/> <t t-esc="doc.currency.code"/></td>
+                <td align="right"><t t-esc="_.str.sprintf('%.2f',doc_line.price_unit)"/></td>
+                <td align="right"><t t-esc="_.str.sprintf('%.2f',doc_line.discount or 0.0)"/></td>
+                <td align="right"><t t-esc="_.str.sprintf('%.2f',doc_line.price_subtotal)"/> <t t-esc="doc.currency.code"/></td>
             </tr>
         </t>
         <tr>
@@ -82,7 +82,7 @@
                     Net Total:
                 </div>
                 <div class="oe_edi_summary_value">
-                    <t t-esc="_.sprintf('%.2f',doc.amount_untaxed)"/> <t t-esc="doc.currency.code"/>
+                    <t t-esc="_.str.sprintf('%.2f',doc.amount_untaxed)"/> <t t-esc="doc.currency.code"/>
                 </div>
             </td>
         </tr>
@@ -93,7 +93,7 @@
                     Taxes:
                 </div>
                 <div class="oe_edi_summary_value">
-                    <t t-esc="_.sprintf('%.2f',doc.amount_tax)"/> <t t-esc="doc.currency.code"/>
+                    <t t-esc="_.str.sprintf('%.2f',doc.amount_tax)"/> <t t-esc="doc.currency.code"/>
                 </div>
             </td>
         </tr>
@@ -104,7 +104,7 @@
                     Total:
                 </div>
                 <div class="oe_edi_summary_value">
-                    <t t-esc="_.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/>
+                    <t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/>
                 </div>
             </th>
         </tr>
@@ -137,7 +137,7 @@
                     <label for="oe_edi_pay_wire" id="oe_edi_pay_wire" class="oe_edi_pay_choice_label">Bank Wire Transfer</label>
                 </div>
                 <p class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
-                    Please transfer <strong><t t-esc="_.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></strong> to
+                    Please transfer <strong><t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></strong> to
                     <strong><t t-esc="doc.company_id[1]"/></strong> (postal address on the order header)
                      using one of the following bank accounts. Be sure to mention the document
                      reference <strong><t t-esc="doc.name"/></strong> on the transfer: