Merge branch 'dev'

Author: dolly-chhabriya-altius

src/main/resources/incrementalSqlScripts/20260123-QAT-6048.sql

@@ -31,7 +31,7 @@ DROP procedure IF EXISTS `fasp`.`shipmentGlobalDemand_CountrySplit`;
 
 DELIMITER $$
 USE `fasp`$$
-CREATE DEFINER=`faspUser`@`localhost` PROCEDURE `shipmentGlobalDemand_CountrySplit`(VAR_USER_ID INT(10), VAR_REALM_ID INT(10), VAR_START_DATE DATE, VAR_STOP_DATE DATE, VAR_REALM_COUNTRY_IDS TEXT, VAR_PROGRAM_IDS TEXT, VAR_EQUIVALENCY_UNIT_ID INT, VAR_PLANNING_UNIT_IDS TEXT, VAR_REPORT_VIEW INT(10), VAR_FUNDING_SOURCE_PROCUREMENT_AGENT_IDS TEXT, VAR_INCLUDE_PLANNED_SHIPMENTS TINYINT(1))
+CREATE DEFINER=`faspUser`@`%` PROCEDURE `shipmentGlobalDemand_CountrySplit`(VAR_USER_ID INT(10), VAR_REALM_ID INT(10), VAR_START_DATE DATE, VAR_STOP_DATE DATE, VAR_REALM_COUNTRY_IDS TEXT, VAR_PROGRAM_IDS TEXT, VAR_EQUIVALENCY_UNIT_ID INT, VAR_PLANNING_UNIT_IDS TEXT, VAR_REPORT_VIEW INT(10), VAR_FUNDING_SOURCE_PROCUREMENT_AGENT_IDS TEXT, VAR_INCLUDE_PLANNED_SHIPMENTS TINYINT(1))
 BEGIN
 
     -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -189,7 +189,7 @@ DROP procedure IF EXISTS `fasp`.`shipmentGlobalDemand_CountryShipmentSplit`;
 
 DELIMITER $$
 USE `fasp`$$
-CREATE DEFINER=`faspUser`@`localhost` PROCEDURE `shipmentGlobalDemand_CountryShipmentSplit`(VAR_USER_ID INT(10), VAR_REALM_ID INT(10), VAR_START_DATE DATE, VAR_STOP_DATE DATE, VAR_REALM_COUNTRY_IDS TEXT, VAR_PROGRAM_IDS TEXT, VAR_EQUIVALENCY_UNIT_ID INT, VAR_PLANNING_UNIT_IDS TEXT, VAR_REPORT_VIEW INT(10), VAR_FUNDING_SOURCE_PROCUREMENT_AGENT_IDS TEXT, VAR_INCLUDE_PLANNED_SHIPMENTS TINYINT(1))
+CREATE DEFINER=`faspUser`@`%` PROCEDURE `shipmentGlobalDemand_CountryShipmentSplit`(VAR_USER_ID INT(10), VAR_REALM_ID INT(10), VAR_START_DATE DATE, VAR_STOP_DATE DATE, VAR_REALM_COUNTRY_IDS TEXT, VAR_PROGRAM_IDS TEXT, VAR_EQUIVALENCY_UNIT_ID INT, VAR_PLANNING_UNIT_IDS TEXT, VAR_REPORT_VIEW INT(10), VAR_FUNDING_SOURCE_PROCUREMENT_AGENT_IDS TEXT, VAR_INCLUDE_PLANNED_SHIPMENTS TINYINT(1))
 BEGIN
     -- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     -- Report no 21 Part 2

src/main/resources/incrementalSqlScripts/20260123-QAT-6049.sql

@@ -398,7 +398,7 @@ INSERT INTO `fasp`.`ap_static_label`(`STATIC_LABEL_ID`,`LABEL_CODE`,`ACTIVE`) VA
 SELECT MAX(l.STATIC_LABEL_ID) INTO @MAX FROM ap_static_label l ;
 
 INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,1,'Total cost per Funding Source across all programs and PUs selected');-- en
-INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,2,'Coût total par source de financement pour l'ensemble des programmes et des unités de programme sélectionnés');-- fr
+INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,2,'Coût total par source de financement pour l\'ensemble des programmes et des unités de programme sélectionnés');-- fr
 INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,3,'Costo total por fuente de financiamiento en todos los programas y unidades de gestión seleccionadas');-- sp
 INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,4,'Custo total por fonte de financiamento em todos os programas e unidades de investigação selecionadas.');-- pr
 INSERT INTO `fasp`.`ap_static_label`(`STATIC_LABEL_ID`,`LABEL_CODE`,`ACTIVE`) VALUES ( NULL,'static.shipmentDetails.costUSDPA','1');