|
@@ -3989,7 +3989,7 @@ open class DashboardService( |
|
|
+ " c.code as customerCode, " |
|
|
+ " c.code as customerCode, " |
|
|
+ " su.name as subsidiary, " |
|
|
+ " su.name as subsidiary, " |
|
|
+ " coalesce(pf.projectFee, 0) as totalFee, " |
|
|
+ " coalesce(pf.projectFee, 0) as totalFee, " |
|
|
+ " (coalesce(pf.projectFee, 0) - ifnull(p.subContractFee, 0)) * 0.8 as totalBudget, " |
|
|
|
|
|
|
|
|
+ " coalesce(pf.projectFee, 0) * 0.8 as totalBudget, " |
|
|
+ " coalesce(me.manhourExpense, 0) as manhourExpense, " |
|
|
+ " coalesce(me.manhourExpense, 0) as manhourExpense, " |
|
|
+ " coalesce(id.invoicedAmount, 0) as invoicedAmount, " |
|
|
+ " coalesce(id.invoicedAmount, 0) as invoicedAmount, " |
|
|
// + " coalesce(id.uninvoicedAmount, 0) as uninvoicedAmount, " |
|
|
// + " coalesce(id.uninvoicedAmount, 0) as uninvoicedAmount, " |
|
|