SMC-CET/smc_cet_financials_backend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sum_api_changes:GWM

Browse Source
This commit is contained in:
sriramv 2021-09-24 16:09:29 +05:30
parent d4f6c75ced
commit 451a3d112b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/financial.controller.js
View File

@ -369,7 +369,7 @@ exports.createFinancialYear = async (req, res) => {
const Y4_st_type = Entityfinyearsdata.dataValues.Y3_st_type; const Y4_st_type = Entityfinyearsdata.dataValues.Y3_st_type;
const additional_year_type = req.body.additional_year_type; const additional_year_type = req.body.additional_year_type;
const crnt_yr = new Date().getFullYear(); 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 }}) 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 => { .then(UpdatedEntityfinyearsdata => {

4
app/services/financial.controller.helper.js.js
View File

@ -9,11 +9,11 @@
let add_new_FY_flag; let add_new_FY_flag;
if(Year_1 >= current_year && 3 < current_month) 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 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; return add_new_FY_flag;
} }