Resolved conflicts

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

@@ -3167,4 +3167,10 @@
             <column name="attachments" type="TEXT"></column>
         </addColumn>
     </changeSet>
+
+    <changeSet id="18-11-2025_RK_132242" author="Rajesh Khore">
+        <addColumn tableName="application">
+            <column name="company_document" type="VARCHAR(255)"></column>
+        </addColumn>
+    </changeSet>
 </databaseChangeLog>

src/main/resources/message_en.properties

@@ -427,5 +427,8 @@ subject.body.required=Subject and body is required to create contract.
 mail.send.successfully=Mail sent succesfully.
 email.log.fetched=Email log fetched successfully.
 amendment.appropiate.status=Application amendment is not in appropiate status for this operation.
+upload.company.document.to.application=Uploaded company document to application successfully.
+company.document.not.found.with.ids=Company document not found. Missing IDs: {0}
+
 
 

src/main/resources/message_it.properties

@@ -418,3 +418,5 @@ subject.body.required=Per creare un contratto sono necessari oggetto e corpo.
 mail.send.successfully=Email inviata con successo.
 email.log.fetched=Registro email recuperato correttamente.
 amendment.appropiate.status=L'emendamento dell'applicazione non <20> in stato appropriato per questa operazione.
+upload.company.document.to.application=Documento aziendale caricato correttamente nell'applicazione.
+company.document.not.found.with.ids=Documento aziendale non trovato. ID mancanti: {0}