Merge PR #515 into 12.0

Signed-off-by carmenbianca
beescoop · May 30, 2023 · 37de8db · 37de8db
2 parents f3447bc + 85aca39
commit 37de8db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/portal_pos_order_amount/controllers/main.py b/portal_pos_order_amount/controllers/main.py
@@ -5,7 +5,6 @@
 from itertools import groupby
 
 from odoo.http import request
-from odoo.tools import float_repr
 
 from odoo.addons.portal.controllers.portal import CustomerPortal
 
@@ -28,15 +27,12 @@ def _prepare_portal_layout_values(self):
                 ]
             )
         )
-        values["pos_order_amount"] = float_repr(
-            sum(po.amount_total for po in owned_pos_order), 2
-        )
+        values["pos_order_amount"] = sum(po.amount_total for po in owned_pos_order)
         values["pos_order_amount_by_year"] = [
             {
                 "year": year,
-                "amount": float_repr(
-                    sum(pos_order.amount_total for pos_order in grouped_pos_orders),
-                    2,
+                "amount": sum(
+                    pos_order.amount_total for pos_order in grouped_pos_orders
                 ),
             }
             for year, grouped_pos_orders in groupby(

diff --git a/portal_pos_order_amount/templates/portal_pos_order_amount.xml b/portal_pos_order_amount/templates/portal_pos_order_amount.xml
@@ -20,9 +20,8 @@
                     You have purchased a total amount of
                     <span
                         t-esc="pos_order_amount"
-                        t-esc-options='{"widget": "monetary", "display_currency": "company_currency"}'
-                    />
-                    .
+                        t-options='{"widget": "monetary", "display_currency": company_currency}'
+                    />.
                 </p>
                 <table name="pos_order_amount_by_year" class="table table-striped">
                     <tr>
@@ -40,7 +39,7 @@
                         <td>
                             <t
                                 t-esc="row['amount']"
-                                t-esc-options='{"widget": "monetary", "display_currency": "company_currency"}'
+                                t-options='{"widget": "monetary", "display_currency": company_currency}'
                             />
                         </td>
                     </tr>