04.01.26

modules/purchase_trade/dashboard.py

@@ -238,9 +238,12 @@ class Dashboard(ModelSQL, ModelView):
         Configuration = Pool().get('gr.configuration')
         config = Configuration.search(['id','>',0])[0]
         f1,f2,f3,f4,f5,d1,d2,d3,d4,d5 = self.get_last_five_fx_rates()
-        Pnl = Pool().get('valuation.valuation.line')
-        pnls = Pnl.search(['id','>',0])
-        pnl_amount = "{:,.0f}".format(round(sum([e.amount for e in pnls]),0))
+        Valuation = Pool().get('valuation.valuation')
+        total_t, total_t1, variation = Valuation.get_totals()
+        pnl_amount = "{:,.0f}".format(round(total_t,0))
+        pnl_variation = 0
+        if total_t1:
+            pnl_variation = "{:,.2f}".format(round((total_t/total_t1 - 1)*100,0))
         Open = Pool().get('open.position')
         opens = Open.search(['id','>',0])
         exposure = "{:,.0f}".format(round(sum([e.net_exposure for e in opens]),0))
@@ -303,6 +306,8 @@ class Dashboard(ModelSQL, ModelView):
             config.dashboard + 
             "/dashboard/index.html?pnl_amount="
             + str(pnl_amount)
+            + "&pnl_variation="
+            + str(pnl_variation)
             + "&exposure="
             + str(exposure)
             + "&topay="