From 8243aa6304d0f2ee81ce18a387bc82713c188caf Mon Sep 17 00:00:00 2001
From: lmann99 <lmann@linuxolutions.com>
Date: Sun, 8 Jan 2017 00:40:11 -0500
Subject: [PATCH] Add a Planned Budget column and change sorter on Total Budget
 to Projects List tab

Planned Budget will reflect the amounts planned on project tasks.  Changed the sorter on Total Budget to use the amounts estimated on the
General data tab instead of the amounts on project tasks.
---
 .../java/org/libreplan/web/orders/OrderCRUDController.java     | 1 +
 libreplan-webapp/src/main/webapp/orders/_list.zul              | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
index a5b9a618e..b40776c23 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
@@ -1286,6 +1286,7 @@ public class OrderCRUDController extends GenericForwardComposer {
             appendDate(row, order.getDeadline());
             appendCustomer(row, order.getCustomer());
             appendObject(row, Util.addCurrencySymbol(order.getTotalManualBudget()));
+            appendObject(row, Util.addCurrencySymbol(order.getTotalBudget()));
             appendObject(row, order.getTotalHours());
             appendObject(row, _(order.getState().toString()));
             appendOperations(row, order);
diff --git a/libreplan-webapp/src/main/webapp/orders/_list.zul b/libreplan-webapp/src/main/webapp/orders/_list.zul
index ca72faf86..13803395e 100644
--- a/libreplan-webapp/src/main/webapp/orders/_list.zul
+++ b/libreplan-webapp/src/main/webapp/orders/_list.zul
@@ -32,7 +32,8 @@
                     sort="auto(initDate,deadline)" sortDirection="ascending" sclass="date" hflex="min"/>
             <column label="${i18n:_('Deadline')}" sort="auto(deadline,initDate)" align="center" sclass="date" hflex="min"/>
             <column label="${i18n:_('Customer')}" sort="auto(customerReference)" hflex="min"/>
-            <column label="${i18n:_('Total Budget')}" sort="auto(totalBudget)" align="right" hflex="min"/>
+            <column label="${i18n:_('Total Budget')}" sort="auto(totalManualBudget)" align="right" hflex="min"/>
+            <column label="${i18n:_('Planned Budget')}" sort="auto(totalBudget)" align="right" hflex="min"/>
             <column label="${i18n:_('Hours')}" sort="auto(totalHours)" align="right" hflex="min"/>
             <column label="${i18n:_('State')}" sort="auto(lower(state))" align="center" hflex="min"/>
             <column label="${i18n:_('Operations')}" sclass="operations" width="120px"/>