Subversion Repositories SmartDukaan

Rev

Rev 30803 | Rev 30806 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 30803 Rev 30805
Line 918... Line 918...
918 
					if (!collectionPlan.getCommittedDate().isAfter(startDate)) {
 918 
					if (!collectionPlan.getCommittedDate().isAfter(startDate)) {
919 
						totalPartnerTargetCollection += targetCollection;
 919 
						totalPartnerTargetCollection += targetCollection;
920 
 
 920 
 
921 
					}
 921 
					}
922 
 
 922 
 
923 
					if (!collectionPlan.getCommittedDate().isAfter(startDate)
 923 
					if (collectionPlan.getCommittedDate().toLocalDate().isEqual(startDate.toLocalDate())
- 
 
 924 
							|| collectionPlan.getRank() == 2
- 
 
 925 
 
924 
							&& collectionPlan.getAchievementPlan() != null) {
 926 
									&& collectionPlan.getAchievementPlan() != null) {
925 
						totalPartnerAchievement += collectionPlan.getAchievementPlan();
 927 
						totalPartnerAchievement += collectionPlan.getAchievementPlan();
926 
					}
 928 
					}
927 
 
 929 
 
928 
				}
 930 
				}
929 
			}
 931 
			}