Merge branch 'master' of ijackson@chiark:things/Yarrgweb/ypp-sc-tools

[ypp-sc-tools.db-live.git] / yarrg / web / routetrade

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 62286eb3c6f4f77e8401ed06e1cc29ea4a184985..07789cf412564330fbfcd3d3606d30077c28b20b 100644 (file)
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -34,6 +34,13 @@
 
 ========== TODO ==========
 16:36 <ceb> alpha,byrne,papaya,turtle,jorvik,luthien is my example
+xi,heph for mixed arbitrage/trade
+
+initial/final stocks feature
+
+display net cash flow
+
+onload thing broken, need proper framework
 
 use POST for update.  Hrrm.
 
@@ -669,9 +676,9 @@ Sail to <% $islandname |h %>
 <%perl>
      };
 
-     $show_flows->('org',1,'Collect');  $show_total->('(Arbitrage) outlay');
-     $show_flows->('dst',1,'Deliver');
      $show_flows->('dst',0,'Deliver');  $show_total->('Proceeds');
+     $show_flows->('org',1,'Collect');  $show_total->('(Arbitrage) outlay');
+     $show_flows->('dst',1,'Deliver');  $show_total->('(Arbitrage) proceeds');
      $show_flows->('org',0,'Collect');  $show_total->('Outlay');
 
 }