ASSESSED INCOME CHNAGED2

This commit is contained in:
velz 2018-12-01 18:48:23 +05:30
parent 94d060227d
commit 465f5ee1bf
2 changed files with 2 additions and 2 deletions

View File

@ -377,7 +377,7 @@ defined('SOURCEOFBALANCETRANSFER') OR define('SOURCEOFBALANCETRANSFER','m_source
defined('STATUSOFCONSTRUCTION') OR define('STATUSOFCONSTRUCTION','m_status_of_construction'); defined('STATUSOFCONSTRUCTION') OR define('STATUSOFCONSTRUCTION','m_status_of_construction');
// Assessed Income related Tables Not added in test DB // Assessed Income related Tables
defined('SALESDECLAREDBYCUSTOMER') OR define('SALESDECLAREDBYCUSTOMER','t_pd_sales_declared_by_customer'); defined('SALESDECLAREDBYCUSTOMER') OR define('SALESDECLAREDBYCUSTOMER','t_pd_sales_declared_by_customer');
defined('SALESDECLAREDBYCUSTOMERID') OR define('SALESDECLAREDBYCUSTOMERID','sdc_id'); defined('SALESDECLAREDBYCUSTOMERID') OR define('SALESDECLAREDBYCUSTOMERID','sdc_id');

View File

@ -912,7 +912,7 @@ class PD_Model extends SPARQ_Model {
$assessed_income = array(); $assessed_income = array();
//get sales_declared_by_customer details //get sales_declared_by_customer details
$fields = array('sdc_id','sales_declared_by_customer'); $fields = array('sdc_id','sales_declared_by_customer','margin_per','margin_value');
$where_condition_array = array('fk_pd_id'=>$pdid,'isactive'=>1); $where_condition_array = array('fk_pd_id'=>$pdid,'isactive'=>1);
$sales_declared_by_customer = $this->selectCustomRecords($fields,$where_condition_array,SALESDECLAREDBYCUSTOMER); $sales_declared_by_customer = $this->selectCustomRecords($fields,$where_condition_array,SALESDECLAREDBYCUSTOMER);
//get Gross Profit calculatio Mode details //get Gross Profit calculatio Mode details