diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js index fe6cbf0..7eb8680 100644 --- a/app/controllers/financial.controller.js +++ b/app/controllers/financial.controller.js @@ -369,7 +369,7 @@ exports.createFinancialYear = async (req, res) => { const Y4_st_type = Entityfinyearsdata.dataValues.Y3_st_type; const additional_year_type = req.body.additional_year_type; const crnt_yr = new Date().getFullYear(); - if(req.body.fy <= crnt_yr && req.body.fy != Y2) + if(req.body.fy != 0) { Entityfinyears.update({ Y1:Y1,Y2:Y2,Y3:Y3,Y4:Y4,Y1_st_type:Y1_st_type,Y2_st_type:Y2_st_type,Y3_st_type:Y3_st_type,Y4_st_type:Y4_st_type,additional_year_type:additional_year_type },{ where: { id: id }}) .then(UpdatedEntityfinyearsdata => { diff --git a/app/services/financial.controller.helper.js.js b/app/services/financial.controller.helper.js.js index d6a9283..c3bd118 100644 --- a/app/services/financial.controller.helper.js.js +++ b/app/services/financial.controller.helper.js.js @@ -9,11 +9,11 @@ let add_new_FY_flag; if(Year_1 >= current_year && 3 < current_month) { - add_new_FY_flag = {show_add_finyear_button:0}; + add_new_FY_flag = {show_add_finyear_button:0,FY:0}; } else { - add_new_FY_flag = {show_add_finyear_button:1,FY:current_year}; + add_new_FY_flag = {show_add_finyear_button:1,FY:Year_1 + 1}; } return add_new_FY_flag; }