CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 38 Packages Projects Releases Wiki Activity

mifosx-986 fixes from andrew

Browse Source
This commit is contained in:
andrew-dzak
2014-03-26 00:15:10 -07:00
committed by Vishwas Babu A J
parent 025a18b54a
commit 09f26f1213
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/transfer/service/TransferWritePlatformServiceJpaRepositoryImpl.java
+13 -3
View File
@@ -191,7 +191,12 @@ public class TransferWritePlatformServiceJpaRepositoryImpl implements TransferWr
* loans
**/
final Staff destinationGroupLoanOfficer = destinationGroup.getStaff();
if (destinationGroupLoanOfficer != null) {
/** In case of a loan officer transfer, set the new loan officer value **/
if (sourceGroup.getId().equals(destinationGroup.getId()) && newLoanOfficer != null) {
client.updateStaff(newLoanOfficer);
}/*** Else default to destination group Officer (If present) ***/
else if (destinationGroupLoanOfficer != null) {
client.updateStaff(destinationGroupLoanOfficer);
}
@@ -215,8 +220,13 @@ public class TransferWritePlatformServiceJpaRepositoryImpl implements TransferWr
}
}
// change client group membership
client.getGroups().remove(sourceGroup);
/**
* change client group membership (only if source group and destination
* group are not the same, i.e only Loan officer Transfer)
**/
if (!sourceGroup.getId().equals(destinationGroup.getId())) {
client.getGroups().remove(sourceGroup);
}
}