diff --git a/controllers/jobs_controller.php b/controllers/jobs_controller.php index 8e592da0..c8fb6ff9 100755 --- a/controllers/jobs_controller.php +++ b/controllers/jobs_controller.php @@ -2,7 +2,7 @@ class JobsController extends AppController { var $name = 'Jobs'; - var $helpers = array('Html', 'Form', 'Text', 'Javascript'); + var $helpers = array('Html', 'Form', 'Text', 'Javascript', 'Number'); var $components = array('RequestHandler'); diff --git a/views/jobs/view_report.ctp b/views/jobs/view_report.ctp index 7828b04c..f0b744c3 100644 --- a/views/jobs/view_report.ctp +++ b/views/jobs/view_report.ctp @@ -19,6 +19,16 @@ Net Sales Converted to or Charge in AUD GP% Excl Commissions ATO Exchange Rate + + Gross Australian Sales Foreign Currency + Net Australian Sales Foreign Currency + Gross Profit value Australian Sales Foreign Currency + Gross Export Sales Foreign Currency + Net Export Sales Foreign Currency + Gross Profit Value After Discount Exports Foreign Currency + Gross Commissions + Net Commisions + @@ -29,6 +39,15 @@ $net_sales_aud_total = 0; $gross_profit_total = 0; $count = 0; + $gross_profit_exports_aud_total = 0; + $gross_australian_sales_foreign_currency_total = 0; + $net_australian_sales_foreign_currency_total = 0; + $gross_profit_value_australian_sales_foreign_currency_total = 0; + $gross_export_sales_foreign_currency_total =0; + $net_export_sales_foreign_currency_total = 0; + $gross_profit_value_after_discount_exports_foreign_currency_total =0; + $gross_commissions_total =0; + $net_commissions_total = 0; ?> @@ -70,28 +89,47 @@ - + + - + - + - + - + - + - + + + - - */?> - @@ -102,12 +140,22 @@ - - - + currency($gross_sales_aud_total)?> + currency($net_sales_aud_total)?> + currency($gross_profit_total)?> + + currency($gross_australian_sales_foreign_currency_total);?> + currency($net_australian_sales_foreign_currency_total);?> + currency($gross_profit_value_australian_sales_foreign_currency_total);?> + currency($gross_export_sales_foreign_currency_total);?> + currency($net_export_sales_foreign_currency_total);?> + currency($gross_profit_value_after_discount_exports_foreign_currency_total);?> + currency($gross_commissions_total);?> + currency($net_commissions_total);?> +