Resolved conflict

src/main/resources/db/changelog/db.changelog-1.0.0.xml

@@ -2386,4 +2386,11 @@
             <column name="product_id" type="numeric"></column>
         </addColumn>
     </changeSet>
+    <changeSet id="06-02-2025_PK_165700" author="Piyush Kag">
+
+        <sqlFile dbms="postgresql"
+                 path="db/dump/update_form_field_data_06-02-2025.sql"/>
+
+    </changeSet>
+
 </databaseChangeLog>

src/main/resources/db/dump/update_form_field_data_06-02-2025.sql

@@ -0,0 +1,14 @@
+
+INSERT INTO FORM_FIELD (ID, SORT_ORDER, NAME, LABEL, DESCRIPTION, SETTINGS, VALIDATORS, CREATED_DATE, UPDATED_DATE)
+VALUES
+(
+    22,
+    22,
+    'switch',
+    'Casella di spunta "Checklist"',
+    'Per selezioni binarie, accettazioni, conferme',
+    '[{"name":"label","value":"Casella di Spunta"},{"name":"isChecklistItem","value":true}]',
+    '{"isRequired":false}',
+    CURRENT_TIMESTAMP,
+    CURRENT_TIMESTAMP
+);

src/main/resources/message_en.properties

@@ -368,5 +368,6 @@ either.applicationId.or.assignedApplicationId.must.be.provided=Either applicatio
 assigned.application.status.updated.successfully=Assigned application status updated successfully.
 
 validation.required.requested.amount=The Requested Amount configuration should be mandatory.
+formula.amount.not.matches.requested.amount= The {0} does not matches to calculated amount.
 
 

src/main/resources/message_it.properties

@@ -359,6 +359,5 @@ either.applicationId.or.assignedApplicationId.must.be.provided = "<22> necessario
 assigned.application.status.updated.successfully=Stato dell'applicazione assegnata aggiornato con successo.
 
 validation.required.requested.amount=La configurazione dell'importo richiesto <20> obbligatoria.
-
-
+formula.amount.not.matches.requested.amount=Il {0} non corrisponde all'importo calcolato.