Altered JS code to fix edit button press
Merge remote-tracking branch 'upstream/master' into soap_kpi_newprods