From d91dcb8c5c49d4cb433d5d6da27d731113ae7488 Mon Sep 17 00:00:00 2001 From: velz Date: Sat, 1 Dec 2018 19:14:40 +0530 Subject: [PATCH] ASSESSED INCOME CHNAGED3 --- api/application/models/PD_Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index b62f89b0..f25b7dd3 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -921,7 +921,7 @@ class PD_Model extends SPARQ_Model { $gross_profit_calculation_type = $this->selectCustomRecords($fields,$where_condition_array,PDASSESSEDINCOMEESTIMATIONOFGROSSPROFITTYPE); //get sales_calculated_by_itemwise details - $fields = array('sci_id','sales_item','sales_qty','UOM.name as uom_name','fk_uom_id','FREQUENCY.name as frequency_name','rate_per_unit','fk_frequency_id','annual_sale_value','margin_final_value'); + $fields = array('sci_id','sales_item','sales_qty','UOM.name as uom_name','fk_uom_id','FREQUENCY.name as frequency_name','rate_per_unit','fk_frequency_id','annual_sale_value','margin_final_value','margin_per','margin_per_uom'); $table = SALESCALCULATEDBYITEMWISE.' as SALESCALCULATEDBYITEMWISE'; $where_condition_array = array('fk_pd_id'=>$pdid,'SALESCALCULATEDBYITEMWISE.isactive'=>1); $joins = array(