branch feature/1293-addAccountViewerTabWithCloseColumnAndDTO updated (0eeda16 -> 423c0bc)
This is an automated email from the git hooks/post-receive script. New change to branch feature/1293-addAccountViewerTabWithCloseColumnAndDTO in repository lima. See http://git.chorem.org/lima.git from 0eeda16 refs #1293 Ajout d'une colone Clos, est utilisation d'un DTO à la place de Entry new 423c0bc refs #1293 correction de merge 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 423c0bc9307ff74af9051b85ecaf3b677a5db7bb Author: dcosse <cosse@codelutin.com> Date: Mon Nov 30 15:56:25 2015 +0100 refs #1293 correction de merge Summary of changes: .../business/api/FinancialTransactionService.java | 2 +- .../ejb/FinancialTransactionServiceImpl.java | 2 +- .../ui/accountViewer/AccountViewerViewHandler.java | 2 +- .../org/chorem/lima/ui/lettering/LetteringView.css | 8 -------- .../lima/ui/lettering/LetteringViewHandler.java | 21 --------------------- .../main/resources/i18n/lima-swing_en_GB.properties | 2 +- .../main/resources/i18n/lima-swing_fr_FR.properties | 4 +--- 7 files changed, 5 insertions(+), 36 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 feature/1293-addAccountViewerTabWithCloseColumnAndDTO in repository lima. See http://git.chorem.org/lima.git commit 423c0bc9307ff74af9051b85ecaf3b677a5db7bb Author: dcosse <cosse@codelutin.com> Date: Mon Nov 30 15:56:25 2015 +0100 refs #1293 correction de merge --- .../business/api/FinancialTransactionService.java | 2 +- .../ejb/FinancialTransactionServiceImpl.java | 2 +- .../ui/accountViewer/AccountViewerViewHandler.java | 2 +- .../org/chorem/lima/ui/lettering/LetteringView.css | 8 -------- .../lima/ui/lettering/LetteringViewHandler.java | 21 --------------------- .../main/resources/i18n/lima-swing_en_GB.properties | 2 +- .../main/resources/i18n/lima-swing_fr_FR.properties | 4 +--- 7 files changed, 5 insertions(+), 36 deletions(-) diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java index f548b76..d653bc8 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java @@ -123,7 +123,7 @@ public interface FinancialTransactionService { * pour un compte et la présence d'un lettrage ou (xor) non * @param filter filtre sur les entrees, selon le compte, les dates de debut et de fin, et le lettrage * */ - List<Entry> getAllEntriesByDatesAndAccountAndLettering(LetteringFilter filter); + List<Entry> getAllEntrieByDatesAndAccountAndLettering(LetteringFilter filter); /** * diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java index a3f18a5..71f5d0d 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java @@ -461,7 +461,7 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme } @Override - public List<Entry> getAllEntriesByDatesAndAccountAndLettering(LetteringFilter filter) { + public List<Entry> getAllEntrieByDatesAndAccountAndLettering(LetteringFilter filter) { EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); List<Entry> entries = entryTopiaDao.findAllEntryByFilter(filter); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerViewHandler.java index a72fca3..b3eee9d 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerViewHandler.java @@ -230,7 +230,7 @@ public class AccountViewerViewHandler { && filter.getDateStart() != null && filter.getDateEnd() != null) { - List<Entry> entries = financialTransactionService.getAllEntriesByDatesAndAccountAndLettering(filter); + List<Entry> entries = financialTransactionService.getAllEntrieByDatesAndAccountAndLettering(filter); List<AccountViewerEntryDto> result = Lists.newArrayListWithExpectedSize(entries.size()); if (CollectionUtils.isNotEmpty(entries)) { diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css index 520059d..f5c7736 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css @@ -70,19 +70,11 @@ labelFor : {beginPeriodPicker}; } -#beginPeriodPicker { - patternLayout: {handler.DATE_FORMAT}; -} - #endPeriodLabel { text : "lima.lettering.period.end"; labelFor : {endPeriodPicker}; } -#endPeriodPicker { - patternLayout: {handler.DATE_FORMAT}; -} - #letteredEntryLabel { actionIcon : "choose-entry"; labelFor : {letteredEntryComboBox}; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java index 10e148c..284d266 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java @@ -454,27 +454,6 @@ public class LetteringViewHandler{ } } - public void setAccount(Account account) { - if (filter != null) { - filter.setAccount(account); - updateAllEntries(); - } - } - - public Account getAccount() { - Account account = null; - if (filter != null) { - account = filter.getAccount(); - } - return account; - } - - public void setTypeEntry(TypeEntry typeEntry) { - filter.setDisplayLettered(typeEntry.isLettered()); - filter.setDisplayUnlettred(typeEntry.isNoLettered()); - updateAllEntries(); - } - public void updateAllEntries() { if (initializationComplete diff --git a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties index 3aeaf9e..885ce98 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties @@ -455,8 +455,8 @@ lima.lettering.account=Accounts lima.lettering.account.aAll=All lima.lettering.account.back=← lima.lettering.account.next=→ -lima.lettering.balanceStatus=<html>Debit\: <b>%s</b> - Credit\: <b>%s</b> - Sold\: <b>%s</b>. Selected entries\: Debit\: <b>%s</b> - Credit\: <b>%s</b> - Sold\: <b>%s</b> lima.lettering.accountViewerBalanceStatus=<html>From %s to %s\: D\: <b>%s</b> - C\: <b>%s</b> - S\: <b>%s</b> - Selected entries\: D\: <b>%s</b> - C\: <b>%s</b> - S\: <b>%s</b> +lima.lettering.balanceStatus=<html>Debit\: <b>%s</b> - Credit\: <b>%s</b> - Sold\: <b>%s</b>. Selected entries\: Debit\: <b>%s</b> - Credit\: <b>%s</b> - Sold\: <b>%s</b> lima.lettering.checkAll=All lima.lettering.checkLettredEntry=Lettered lima.lettering.checkNoLettredEntry=Not lettered 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 07b9572..8f7d412 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 @@ -467,8 +467,6 @@ lima.lettering.account=Comptes lima.lettering.account.aAll=TOUS lima.lettering.account.back=← lima.lettering.account.next=→ -lima.lettering.balanceStatus=<html>Débit\: <b>%s</b> - Crédit\: <b>%s</b> - Solde\: <b>%s</b>. Entrées sélectionnées\: Débit\: <b>%s</b> - Crédit\: <b>%s</b> - Solde\: <b>%s</b> -lima.lettering.accountViewerBalanceStatus=<html>Pour la période du %s au %s\: D\: <b>%s</b> - C\: <b>%s</b> - S\: <b>%s</b> - Pour la sélection\: D\: <b>%s</b> - C\: <b>%s</b> - S\: <b>%s</b> lima.lettering.accountViewerBalanceStatus=<html>Pour la période du %s au %s le solde est\:<b>%s</b> - <b>%s</b> \= <b>%s</b> - Pour la sélection le solde est\: <b>%s</b> - <b>%s</b> \= <b>%s</b> lima.lettering.balanceStatus=<html>Débit\: <b>%s</b> - Crédit\: <b>%s</b> - Solde\: <b>%s</b> lima.lettering.checkAll=Toutes @@ -542,7 +540,6 @@ lima.table.provisionDeprecation=Amortissements et provisions lima.table.voucher=Pièce comptable lima.title=Lutin Invoice Monitoring and Accounting lima.transaction=Transaction -lima.ui.dateFormat=dd/MM/yyy lima.treasury=Trésor Public lima.treasury.address=Adresse lima.treasury.address2=Adresse (suite) @@ -554,6 +551,7 @@ lima.treasury.serviceCode=Code service lima.treasury.sie=SIE lima.treasury.systemType=Régime lima.treasury.zipCode=Code Postal +lima.ui.dateFormat=dd/MM/yyy lima.update=Modifier lima.update.shortcut=Modifier (Ctrl+M) lima.validate=Valider -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm