November 2015 - Lima-commits - mailman.cloud.codelutin.com

02/04: fixes #1243 la sortie du champ date ou le clic sur une autre action entraine bien la prise en compte des dates saisies
by chorem.org scm 28 Nov '15

28 Nov '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1242-no-account-research-exception in repository lima. See http://git.chorem.org/lima.git commit ae8502c6e4ead0749acab5d1b714228efbc35370 Author: dcosse <cosse(a)codelutin.com> Date: Tue Jun 30 16:55:21 2015 +0200 fixes #1243 la sortie du champ date ou le clic sur une autre action entraine bien la prise en compte des dates saisies --- .../org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx | 2 +- .../ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx index 93e365c..7c7168f 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx @@ -39,5 +39,5 @@ <JAXXDatePicker id='datePicker' date='{handler.getDate()}' formats='{handler.getFormats()}' - onActionPerformed='handler.setDate(datePicker.getDate())'/> + onPropertyChange='handler.setDate(datePicker.getDate())'/> </JInternalFrame> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx index a5fa4f6..bf261b6 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx @@ -28,7 +28,8 @@ org.chorem.lima.beans.DateCondition </import> <DateIntervalConditionHandler id="handler" - javaBean="new DateIntervalConditionHandler(this)"/> + constructorParams="this"/> + <Table> <row> <cell> @@ -38,7 +39,7 @@ <JAXXDatePicker id='beginDatePicker' date='{handler.getBeginDate()}' formats='{handler.getFormats()}' - onActionPerformed='handler.setBeginDate(beginDatePicker.getDate())'/> + onPropertyChange='handler.setBeginDate(beginDatePicker.getDate())'/> </cell> </row> <row> @@ -49,7 +50,7 @@ <JAXXDatePicker id='endDatePicker' date='{handler.getEndDate()}' formats='{handler.getFormats()}' - onActionPerformed='handler.setEndDate(endDatePicker.getDate())'/> + onPropertyChange='handler.setEndDate(endDatePicker.getDate())'/> </cell> </row> </Table> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/04: refs #1242 verifivation que l'on filtre bien sur un compte
by chorem.org scm 28 Nov '15

28 Nov '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1242-no-account-research-exception in repository lima. See http://git.chorem.org/lima.git commit 636a5ba8c0db0f3bc3fd6675c69b6abc108541cd Author: dcosse <cosse(a)codelutin.com> Date: Mon Jun 29 14:49:57 2015 +0200 refs #1242 verifivation que l'on filtre bien sur un compte --- .../lima/ui/Filter/AccountCondition/AccountConditionHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java index 4138fdc..e5ba896 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java @@ -80,7 +80,8 @@ public class AccountConditionHandler implements ConditionHandler { public void accountComboBoxChange(PropertyChangeEvent event) { if (event.getPropertyName().equals(AccountComboBox.PROPERTY_SELECTED_ITEM)) { - setAccount((Account) event.getNewValue()); + Account account = event.getNewValue() == null ? null : event.getNewValue() instanceof Account ? (Account) event.getNewValue() : null; + setAccount(account); } } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch develop updated (c51843f -> 4bbfd4d)
by chorem.org scm 28 Nov '15

28 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from c51843f Merge branch 'feature/1295-improveEditEntryView' into develop new 2d2c8a4 refs #1241 ordonne les entrée par date new 8ef9bf6 refs #1286 Regrouppement des entrées par pièces comptable dans la saisie d'écriture new 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 new 4bbfd4d Merge branch 'feature/1286-ordered-entries' into develop The 4 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 4bbfd4df04b1594992b3960b624bc263dc7e77ca Merge: c51843f bce1075 Author: dcosse <cosse(a)codelutin.com> Date: Sat Nov 28 07:39:06 2015 +0100 Merge branch 'feature/1286-ordered-entries' into develop commit bce107591c00c85ca9e22f3eab9da0fcd885fdb2 Author: dcosse <cosse(a)codelutin.com> Date: Thu Sep 10 15:15:23 2015 +0200 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 commit 8ef9bf6da82fe25065cf64ef685e46ce5addb5ec Author: dcosse <cosse(a)codelutin.com> Date: Thu Sep 10 13:27:41 2015 +0200 refs #1286 Regrouppement des entrées par pièces comptable dans la saisie d'écriture commit 2d2c8a4284257e4fe073f1ee15e8e7049ed3e8b5 Author: dcosse <cosse(a)codelutin.com> Date: Wed Sep 9 15:47:01 2015 +0200 refs #1241 ordonne les entrée par date Summary of changes: .../ejb/FinancialTransactionServiceImpl.java | 2 +- .../java/org/chorem/lima/entity/EntryTopiaDao.java | 19 +++++--- .../ui/common/FinancialTransactionTableModel.java | 56 +++++++++++++++++++++- .../FinancialTransactionSearchTableModel.java | 9 +++- 4 files changed, 75 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 4

branch feature/1286-ordered-entries deleted (was bce1075)
by chorem.org scm 28 Nov '15

28 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1286-ordered-entries in repository lima. See http://git.chorem.org/lima.git was 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 This change permanently discards the following revisions: discards 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 discards 8ef9bf6 refs #1286 Regrouppement des entrées par pièces comptable dans la saisie d'écriture discards 2d2c8a4 refs #1241 ordonne les entrée par date -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/1286-ordered-entries updated (35c36c4 -> bce1075)
by chorem.org scm 28 Nov '15

28 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1286-ordered-entries in repository lima. See http://git.chorem.org/lima.git discards 35c36c4 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 discards 98c9ba0 refs #1286 Regrouppement des entrées par pièces comptable dans la saisie d'écriture discards 396e0c6 refs #1241 ordonne les entrée par date 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 new 2d2c8a4 refs #1241 ordonne les entrée par date new 8ef9bf6 refs #1286 Regrouppement des entrées par pièces comptable dans la saisie d'écriture new 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 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 (35c36c4) \ N -- N -- N refs/heads/feature/1286-ordered-entries (bce1075) 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 3 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 bce107591c00c85ca9e22f3eab9da0fcd885fdb2 Author: dcosse <cosse(a)codelutin.com> Date: Thu Sep 10 15:15:23 2015 +0200 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 commit 8ef9bf6da82fe25065cf64ef685e46ce5addb5ec Author: dcosse <cosse(a)codelutin.com> Date: Thu Sep 10 13:27:41 2015 +0200 refs #1286 Regrouppement des entrées par pièces comptable dans la saisie d'écriture commit 2d2c8a4284257e4fe073f1ee15e8e7049ed3e8b5 Author: dcosse <cosse(a)codelutin.com> Date: Wed Sep 9 15:47:01 2015 +0200 refs #1241 ordonne les entrée par date Summary of changes: .../lima/ui/celleditor/AccountTableCellEditor.java | 28 +++++++++++++---- .../lima/ui/celleditor/DayTableCellEditor.java | 30 ++++++++----------- .../ui/financialtransaction/AccountColumn.java | 6 ++-- .../ui/financialtransaction/BalanceColumn.java | 35 ++++++++++++++++++---- .../lima/ui/financialtransaction/DayColumn.java | 6 ++-- .../FinancialTransactionViewHandler.java | 23 ++++++++++++-- .../FinancialTransactionSearchTableModel.java | 6 ++-- pom.xml | 2 +- 8 files changed, 97 insertions(+), 39 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(a)chorem.org>.

1 3

branch develop updated (13b9893 -> c51843f)
by chorem.org scm 28 Nov '15

28 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from 13b9893 Merge branch 'feature/1289-SearchEntriescomputeSold' into develop new 26111c4 refs #1293 "Onglet Saisie des écritures" La saisie dans le champ jour est dirrectement prise en compte new 54e25dd refs #1293 Auto selection du compte si un seul compte correspond à la recherche new 785fc80 refs #1295 Même objet sélectionné entre la combobox et le model new c51843f Merge branch 'feature/1295-improveEditEntryView' into develop The 4 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 c51843f855cc7b9e512e5b642fdbfacba935265d Merge: 13b9893 785fc80 Author: dcosse <cosse(a)codelutin.com> Date: Sat Nov 28 07:37:05 2015 +0100 Merge branch 'feature/1295-improveEditEntryView' into develop commit 785fc805b17ab9ba7d003eb0828fe07661a11475 Author: dcosse <cosse(a)codelutin.com> Date: Thu Sep 24 15:56:37 2015 +0200 refs #1295 Même objet sélectionné entre la combobox et le model commit 54e25dd273e118c5a7df3c7dba3a21edc6635f5f Author: dcosse <cosse(a)codelutin.com> Date: Wed Sep 16 14:55:59 2015 +0200 refs #1293 Auto selection du compte si un seul compte correspond à la recherche commit 26111c4ea63593e5122ebaf4cf69dc0349bbac10 Author: dcosse <cosse(a)codelutin.com> Date: Wed Sep 16 00:07:52 2015 +0200 refs #1293 "Onglet Saisie des écritures" La saisie dans le champ jour est dirrectement prise en compte Summary of changes: .../lima/ui/celleditor/AccountTableCellEditor.java | 28 ++++++++++++++++---- .../lima/ui/celleditor/DayTableCellEditor.java | 30 ++++++++++------------ .../ui/financialtransaction/AccountColumn.java | 6 +++-- .../lima/ui/financialtransaction/DayColumn.java | 6 +++-- pom.xml | 2 +- 5 files changed, 45 insertions(+), 27 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(a)chorem.org>.

1 4

branch feature/1295-improveEditEntryView deleted (was 785fc80)
by chorem.org scm 28 Nov '15

28 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1295-improveEditEntryView in repository lima. See http://git.chorem.org/lima.git was 785fc80 refs #1295 Même objet sélectionné entre la combobox et le model This change permanently discards the following revisions: discards 785fc80 refs #1295 Même objet sélectionné entre la combobox et le model discards 54e25dd refs #1293 Auto selection du compte si un seul compte correspond à la recherche discards 26111c4 refs #1293 "Onglet Saisie des écritures" La saisie dans le champ jour est dirrectement prise en compte -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/1295-improveEditEntryView updated (c2a0f03 -> 785fc80)
by chorem.org scm 28 Nov '15

28 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1295-improveEditEntryView in repository lima. See http://git.chorem.org/lima.git discards c2a0f03 refs #1295 Même objet sélectionné entre la combobox et le model discards 4cfad9e refs #1293 Auto selection du compte si un seul compte correspond à la recherche discards 016dc2a refs #1293 "Onglet Saisie des écritures" La saisie dans le champ jour est dirrectement prise en compte 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 new 26111c4 refs #1293 "Onglet Saisie des écritures" La saisie dans le champ jour est dirrectement prise en compte new 54e25dd refs #1293 Auto selection du compte si un seul compte correspond à la recherche new 785fc80 refs #1295 Même objet sélectionné entre la combobox et le model 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 (c2a0f03) \ N -- N -- N refs/heads/feature/1295-improveEditEntryView (785fc80) 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 3 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 785fc805b17ab9ba7d003eb0828fe07661a11475 Author: dcosse <cosse(a)codelutin.com> Date: Thu Sep 24 15:56:37 2015 +0200 refs #1295 Même objet sélectionné entre la combobox et le model commit 54e25dd273e118c5a7df3c7dba3a21edc6635f5f Author: dcosse <cosse(a)codelutin.com> Date: Wed Sep 16 14:55:59 2015 +0200 refs #1293 Auto selection du compte si un seul compte correspond à la recherche commit 26111c4ea63593e5122ebaf4cf69dc0349bbac10 Author: dcosse <cosse(a)codelutin.com> Date: Wed Sep 16 00:07:52 2015 +0200 refs #1293 "Onglet Saisie des écritures" La saisie dans le champ jour est dirrectement prise en compte Summary of changes: .../ui/financialtransaction/BalanceColumn.java | 35 ++++++++++++++++++---- .../FinancialTransactionViewHandler.java | 23 ++++++++++++-- .../FinancialTransactionSearchTableModel.java | 6 ++-- 3 files changed, 52 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

branch develop updated (34f7074 -> 13b9893)
by chorem.org scm 28 Nov '15

28 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from 34f7074 refs #1240 ajout de controles new 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 new d100451 refs #1289 calcul de la colonne Solde dans l'onglet recherche des entrées new acefd82 refs #1289refactoring new 32aa3f8 refs #1289 Le solde est positif si le solde est débiteur new 13b9893 Merge branch 'feature/1289-SearchEntriescomputeSold' into develop The 5 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 13b9893a0e4ba421ac214015805ca069b174c1ef Merge: 0112481 32aa3f8 Author: dcosse <cosse(a)codelutin.com> Date: Sat Nov 28 07:33:15 2015 +0100 Merge branch 'feature/1289-SearchEntriescomputeSold' into develop commit 32aa3f8d32f27b0d013c8edf9e2d8e29d2299d4e Author: dcosse <cosse(a)codelutin.com> Date: Fri Sep 11 14:56:45 2015 +0200 refs #1289 Le solde est positif si le solde est débiteur commit acefd825d3c5187b1c0ba92a8150e3359672d276 Author: dcosse <cosse(a)codelutin.com> Date: Wed Sep 9 18:51:12 2015 +0200 refs #1289refactoring commit d10045132bb560aa1ecd583793893a047d922fe0 Author: dcosse <cosse(a)codelutin.com> Date: Wed Sep 9 18:21:17 2015 +0200 refs #1289 calcul de la colonne Solde dans l'onglet recherche des entrées commit 01124814ae59b5e4f3c088da637410822e6be0fd Author: dcosse <cosse(a)codelutin.com> Date: Thu Sep 10 15:06:06 2015 +0200 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 Summary of changes: .../ui/financialtransaction/BalanceColumn.java | 35 ++++++++++++++++++---- .../FinancialTransactionViewHandler.java | 23 ++++++++++++-- .../FinancialTransactionSearchTableModel.java | 6 ++-- 3 files changed, 52 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 5

branch feature/1289-SearchEntriescomputeSold deleted (was 32aa3f8)
by chorem.org scm 28 Nov '15

28 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1289-SearchEntriescomputeSold in repository lima. See http://git.chorem.org/lima.git was 32aa3f8 refs #1289 Le solde est positif si le solde est débiteur This change permanently discards the following revisions: discards 32aa3f8 refs #1289 Le solde est positif si le solde est débiteur discards acefd82 refs #1289refactoring discards d100451 refs #1289 calcul de la colonne Solde dans l'onglet recherche des entrées discards 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 -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0