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 1c09d51 Migration sur gitlab + utilisation chorempom 5-rc-2 new 205012d refs #1182 valeur de clef de traduction manquante new ce75d95 refs #1158 Il est de nouveau possible de créer une transaction sur une periode ou un exercice non clos new 2bbb45e Merge branch 'feature/1158-Corriger-le-comportement-d-ajout-de-transaction' into develop 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 2bbb45e35b7b1f6410e5da3b158edca6b6fc063e Merge: 1c09d51 ce75d95 Author: dcosse <cosse@codelutin.com> Date: Wed Jan 20 18:47:58 2016 +0100 Merge branch 'feature/1158-Corriger-le-comportement-d-ajout-de-transaction' into develop commit ce75d9536716f8bee8179994cf34f874634beeae Author: dcosse <cosse@codelutin.com> Date: Wed Jan 20 18:40:32 2016 +0100 refs #1158 Il est de nouveau possible de créer une transaction sur une periode ou un exercice non clos commit 205012da03a170376e3c4d30eecd41989f6b704a Author: dcosse <cosse@codelutin.com> Date: Wed Jan 20 18:39:17 2016 +0100 refs #1182 valeur de clef de traduction manquante Summary of changes: .../FinancialTransactionViewHandler.java | 15 ++++++++++++++- .../src/main/resources/i18n/lima-swing_fr_FR.properties | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) -- 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 develop in repository lima. See http://git.chorem.org/lima.git commit 205012da03a170376e3c4d30eecd41989f6b704a Author: dcosse <cosse@codelutin.com> Date: Wed Jan 20 18:39:17 2016 +0100 refs #1182 valeur de clef de traduction manquante --- lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties index 133a4af..63aba53 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties @@ -514,7 +514,7 @@ lima.report.investments=investissements lima.report.label=Intitulé lima.report.liabilities=passif lima.report.totalForPeriod=Total période -lima.retainedEarnings.wait= +lima.retainedEarnings.wait=Report à nouveau en cours lima.structure=Structure lima.table.account=Compte lima.table.balance=Solde -- 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 develop in repository lima. See http://git.chorem.org/lima.git commit ce75d9536716f8bee8179994cf34f874634beeae Author: dcosse <cosse@codelutin.com> Date: Wed Jan 20 18:40:32 2016 +0100 refs #1158 Il est de nouveau possible de créer une transaction sur une periode ou un exercice non clos --- .../FinancialTransactionViewHandler.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java index 027dff2..e3b02d4 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java @@ -328,6 +328,7 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo if ( event.getStateChange() == ItemEvent.SELECTED ) { updateFinancialTransactions(); computePeriodStatusText(); + setAddEntryAllowed(); } } @@ -340,6 +341,7 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo if ( event.getStateChange() == ItemEvent.SELECTED ) { updateFinancialTransactions(); computePeriodStatusText(); + setAddEntryAllowed(); } } @@ -371,10 +373,20 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo if (financialPeriod != null && entryBook != null) { ClosedPeriodicEntryBook closedPeriodicEntryBook = financialPeriodService.getClosedPeriodicEntryBook(entryBook, financialPeriod); result = closedPeriodicEntryBook.isLocked(); + if (log.isDebugEnabled()) { + log.debug("Locked:" + result); + } } return result; } + public boolean getIsTableLock() { + FinancialPeriod financialPeriod = (FinancialPeriod) view.getFinancialPeriodComboBox().getSelectedItem(); + EntryBook entryBook = (EntryBook) view.getEntryBookComboBox().getSelectedItem(); + boolean isLock = isTableLock(financialPeriod, entryBook); + return isLock; + } + public void selectionChanged() { FinancialTransactionTable table = view.getFinancialTransactionTable(); FinancialTransactionTableModel tableModel = view.getFinancialTransactionTableModel(); @@ -1089,7 +1101,8 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo } protected void setAddEntryAllowed() { - view.setAddEntryAllowed(view.getFinancialTransactionTable().isEditable() && view.getEntryBookComboBoxModel().getSelectedItem() != null); + boolean isTableLock = getIsTableLock(); + view.setAddEntryAllowed(!isTableLock); } } -- 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 develop in repository lima. See http://git.chorem.org/lima.git commit 2bbb45e35b7b1f6410e5da3b158edca6b6fc063e Merge: 1c09d51 ce75d95 Author: dcosse <cosse@codelutin.com> Date: Wed Jan 20 18:47:58 2016 +0100 Merge branch 'feature/1158-Corriger-le-comportement-d-ajout-de-transaction' into develop .../FinancialTransactionViewHandler.java | 15 ++++++++++++++- .../src/main/resources/i18n/lima-swing_fr_FR.properties | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm