branch feature/1297-FixClosePeriodicEntryBookDao updated (3c2eaa6 -> 9fd0c2f)
This is an automated email from the git hooks/post-receive script. New change to branch feature/1297-FixClosePeriodicEntryBookDao in repository lima. See http://git.chorem.org/lima.git discards 3c2eaa6 refs #1297correction pour ne pas remonter les entitées ayant une date > à celle indiquée dans la période adds 0112481 refs #1290 A la création d'une transaction si aucune n'a été créée lors de la même session est qu'une transaction est sélectionnée alors la nouvelle trasaction prend la date de celle-ci adds d100451 refs #1289 calcul de la colonne Solde dans l'onglet recherche des entrées adds acefd82 refs #1289refactoring adds 32aa3f8 refs #1289 Le solde est positif si le solde est débiteur adds 13b9893 Merge branch 'feature/1289-SearchEntriescomputeSold' into develop adds 26111c4 refs #1293 "Onglet Saisie des écritures" La saisie dans le champ jour est dirrectement prise en compte adds 54e25dd refs #1293 Auto selection du compte si un seul compte correspond à la recherche adds 785fc80 refs #1295 Même objet sélectionné entre la combobox et le model adds c51843f Merge branch 'feature/1295-improveEditEntryView' into develop adds 2d2c8a4 refs #1241 ordonne les entrée par date adds 8ef9bf6 refs #1286 Regrouppement des entrées par pièces comptable dans la saisie d'écriture adds bce1075 refs #1286 La solution adopter n'est pas idéale, il faudra revoir le model pour ordonnée les entrée d'une transaction voir ref #1207 adds 4bbfd4d Merge branch 'feature/1286-ordered-entries' into develop adds 636a5ba refs #1242 verifivation que l'on filtre bien sur un compte adds ae8502c fixes #1243 la sortie du champ date ou le clic sur une autre action entraine bien la prise en compte des dates saisies adds 2dc6345 refs #1242 Modification pour plus de lisibilité suite à revue de code Kevin adds 79ebf7d refs #1242 Refactoring pour plus de lisibilité adds 4d8ac91 refs #1242 correction de merge adds 7288ae1 Merge branch 'feature/1242-no-account-research-exception' into develop new 9fd0c2f refs #1297correction pour ne pas remonter les entitées ayant une date > à celle indiquée dans la période This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3c2eaa6) \ N -- N -- N refs/heads/feature/1297-FixClosePeriodicEntryBookDao (9fd0c2f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9fd0c2f2e7e59bd6050d4c95059d57b6e5df31a4 Author: dcosse <cosse@codelutin.com> Date: Fri Sep 18 10:33:19 2015 +0200 refs #1297correction pour ne pas remonter les entitées ayant une date > à celle indiquée dans la période Summary of changes: .../ejb/FinancialTransactionServiceImpl.java | 2 +- .../java/org/chorem/lima/entity/EntryTopiaDao.java | 19 +++++--- .../AccountCondition/AccountConditionHandler.java | 6 ++- .../ui/Filter/dateCondition/DateConditionView.jaxx | 2 +- .../DateIntervalConditionView.jaxx | 7 +-- .../lima/ui/celleditor/AccountTableCellEditor.java | 28 +++++++++-- .../lima/ui/celleditor/DayTableCellEditor.java | 30 +++++------- .../ui/common/FinancialTransactionTableModel.java | 56 +++++++++++++++++++++- .../ui/financialtransaction/AccountColumn.java | 48 +++++++++++++------ .../ui/financialtransaction/BalanceColumn.java | 35 +++++++++++--- .../lima/ui/financialtransaction/DayColumn.java | 6 ++- .../FinancialTransactionViewHandler.java | 23 +++++++-- .../FinancialTransactionSearchTableModel.java | 15 ++++-- pom.xml | 2 +- 14 files changed, 211 insertions(+), 68 deletions(-) copy lima-business-api/src/main/java/org/chorem/lima/LimaTechnicalException.java => lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DayTableCellEditor.java (64%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/1297-FixClosePeriodicEntryBookDao in repository lima. See http://git.chorem.org/lima.git commit 9fd0c2f2e7e59bd6050d4c95059d57b6e5df31a4 Author: dcosse <cosse@codelutin.com> Date: Fri Sep 18 10:33:19 2015 +0200 refs #1297correction pour ne pas remonter les entitées ayant une date > à celle indiquée dans la période --- .../org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java index 6abae2d..cdae5fa 100644 --- a/lima-business/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java +++ b/lima-business/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java @@ -83,7 +83,7 @@ public class ClosedPeriodicEntryBookTopiaDao extends AbstractClosedPeriodicEntry HqlAndParametersBuilder<ClosedPeriodicEntryBook> builder = newHqlAndParametersBuilder(); builder.addGreaterOrEquals(PROPERTY_BEGIN_DATE, beginDate); - builder.addGreaterOrEquals(PROPERTY_END_DATE, endDate); + builder.addLowerOrEquals(PROPERTY_END_DATE, endDate); builder.setOrderByArguments(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK + "." + EntryBook.PROPERTY_CODE); List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = findAll(builder.getHql(), builder.getHqlParameters()); @@ -104,7 +104,7 @@ public class ClosedPeriodicEntryBookTopiaDao extends AbstractClosedPeriodicEntry HqlAndParametersBuilder<ClosedPeriodicEntryBook> builder = newHqlAndParametersBuilder(); builder.addGreaterOrEquals(PROPERTY_BEGIN_DATE, beginDate); - builder.addGreaterOrEquals(PROPERTY_END_DATE, endDate); + builder.addLowerOrEquals(PROPERTY_END_DATE, endDate); builder.addEquals(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK, entryBook); List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = findAll(builder.getHql(), builder.getHqlParameters()); @@ -125,7 +125,7 @@ public class ClosedPeriodicEntryBookTopiaDao extends AbstractClosedPeriodicEntry HqlAndParametersBuilder<ClosedPeriodicEntryBook> builder = newHqlAndParametersBuilder(); builder.addGreaterOrEquals(PROPERTY_BEGIN_DATE, beginDate); - builder.addGreaterOrEquals(PROPERTY_END_DATE, endDate); + builder.addLowerOrEquals(PROPERTY_END_DATE, endDate); builder.addEquals(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK, entryBook); builder.addEquals(ClosedPeriodicEntryBook.PROPERTY_LOCKED, true); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm