Dépôt officiel du code source de l'ERP OpenConcerto
svn://code.openconcerto.org/openconcerto
Compare Revisions
- This comparison shows the changes necessary to convert path
- /trunk/Modules/Module Subscription/src/org/openconcerto/modules/subscription/SubscriptionChecker.java @ 168
- → /trunk/Modules/Module Subscription/src/org/openconcerto/modules/subscription/SubscriptionChecker.java @ 169
- ↔ Reverse comparison
Regard whitespace Rev 168 → Rev 169
| /trunk/Modules/Module Subscription/src/org/openconcerto/modules/subscription/SubscriptionChecker.java |
|---|
| 47,7 → 47,10 |
| vals.put("NUMERO", null); |
| vals.put("DATE", null); |
| vals.put("ID_ABONNEMENT", null); |
| final boolean containsPrev = this.table.contains("PREVISIONNELLE"); |
| if (containsPrev) { |
| vals.put("PREVISIONNELLE", null); |
| } |
| vals.put("CREATION_AUTO_VALIDER", null); |
| final SQLRowValuesListFetcher fetcher = new SQLRowValuesListFetcher(vals); |
| 75,7 → 78,7 |
| } |
| // Verification du renouvellement des abonnements |
| SQLSelect selAb = new SQLSelect(this.table.getDBSystemRoot(), true); |
| SQLSelect selAb = new SQLSelect(); |
| SQLTable tableAb = Configuration.getInstance().getRoot().findTable("ABONNEMENT"); |
| selAb.addSelectStar(tableAb); |
| List<SQLRow> rows = SQLRowListRSH.execute(selAb); |
| 94,7 → 97,7 |
| Calendar calStartFact = sqlRow.getDate("DATE_DEBUT_" + this.type); |
| SQLRowValues rowFact = map.get(sqlRow.getID()); |
| if (rowFact != null) { |
| if (rowFact.getObject("PREVISIONNELLE") != null && !rowFact.getBoolean("PREVISIONNELLE")) { |
| if (!containsPrev || (rowFact.getObject("PREVISIONNELLE") != null && !rowFact.getBoolean("PREVISIONNELLE"))) { |
| calStartFact = rowFact.getDate("DATE"); |
| } else { |
| // Si le dernier element de l'abonnement n'a pas été validé on ne crée pas |