diff --git a/api/application/helpers/otherfamilyform_helper.php b/api/application/helpers/otherfamilyform_helper.php index 0e25bd50..8749d1f3 100644 --- a/api/application/helpers/otherfamilyform_helper.php +++ b/api/application/helpers/otherfamilyform_helper.php @@ -4,7 +4,7 @@ class Otherfamilyform { public static function getFamilyDetails($values){ $mergeResult=array(); - + //print_r($values);die(); $male_gender_array = array('1','2','4','5','11','12','14','16','17','19','21','24'); // $gender = 'DEFAULT'; $rupee_symbol = "₹"; @@ -39,9 +39,9 @@ public static function getFamilyDetails($values){ if($tag['family_member_earning_status']==1){ $getFamilyEarning= 'Earning '; $getFamilyOccupation = $tag['earning_segment']==1 ? $tag['earning_if_others_segment'].' Income of '.$tag['earning_gross_income_per_month'].' per month. ':' Income of '.'₹'.' '.MYUTIL::customIndianNumberFormat($tag['earning_gross_income_per_month']).' per month '; - $getFamilyOccupation .= $tag['earning_name_of_the_employer_or_business'] ? ' received from '.$tag['earning_name_of_the_employer_or_business'].'. ' : ''; - - $getFamilyOccupation .= $gender.' has been working for '.$tag['earning_number_of_years_in_employment_or_business'].' '.$year_to_display; + $getFamilyOccupation .= $tag['earning_name_of_the_employer_or_business'] ? ' received from '.$tag['earning_name_of_the_employer_or_business'].'' : ''; + $getFamilyOccupation .= $tag['earning_segment_master'] ? '(' . $tag['earning_segment_master'] . ').': '.'; + $getFamilyOccupation .= ' ' . $gender.' has been working for '.$tag['earning_number_of_years_in_employment_or_business'].' '.$year_to_display; // ? .' years earning Rs.'. : $tag['earning_segment_master'].' with '.$tag['earning_name_of_the_employer_or_business'].' since '.$tag['earning_number_of_years_in_employment_or_business'].' years earning Rs.'.$tag['earning_gross_income_per_month'].' per month '; } diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 4db0a7c7..abefdd11 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -512,7 +512,7 @@ class PD_Model extends SPARQ_Model { foreach($logs as $log_key => $log) { - if($log_key == 0) + if($log_key == 0 && $log['field_name'] == 'pd_status') { $log_string = 'PD Created with '.$log['old_value'].'" status "'; $user = $log['createdby']; diff --git a/api/application/views/report_templates/JSONTOREPORT_CLIX.php b/api/application/views/report_templates/JSONTOREPORT_CLIX.php index 6ea999ed..5a20a830 100644 --- a/api/application/views/report_templates/JSONTOREPORT_CLIX.php +++ b/api/application/views/report_templates/JSONTOREPORT_CLIX.php @@ -3146,7 +3146,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); { echo '
Raw material Stock not required to be maintained.
'; } - echo ''.$stock_remarks.'
'; + //echo ''.$stock_remarks.'
'; //serivce if(!strcasecmp($is_sufficiant_service_goods,'yes')) @@ -3596,7 +3596,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); // echo ''; // echo ''; // } - echo ""; + //echo ""; // ?>