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

05/19: refs #1293 Correction d'une exception survenant si un nom de compte est saisie est que aucun compte ne correspond
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1293-addAccountViewerTab in repository lima. See http://git.chorem.org/lima.git commit da320f57171272aa349278907a6fefd680b40b89 Author: dcosse <cosse(a)codelutin.com> Date: Tue Sep 15 16:59:42 2015 +0200 refs #1293 Correction d'une exception survenant si un nom de compte est saisie est que aucun compte ne correspond --- .../src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java | 5 +---- .../main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java index 8392137..85f0b23 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java @@ -60,7 +60,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Comparator; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.SortedMap; @@ -210,9 +209,7 @@ public class AccountViewHandler implements ServiceListener { for (Account account : accounts) { // find parent DefaultMutableTreeTableNode parentNode = root; - Iterator<Map.Entry<String, DefaultMutableTreeTableNode>> itNodes = nodeCache.entrySet().iterator(); - while (itNodes.hasNext()) { - Map.Entry<String, DefaultMutableTreeTableNode> entry = itNodes.next(); + for (Map.Entry<String, DefaultMutableTreeTableNode> entry : nodeCache.entrySet()) { String accountNumber = entry.getKey(); if (account.getAccountNumber().startsWith(accountNumber)) { parentNode = entry.getValue(); 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 77db344..15f9759 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 @@ -500,7 +500,7 @@ public class LetteringViewHandler{ } public void accountComboBoxChange(PropertyChangeEvent event) { - if (event.getPropertyName().equals(AccountComboBox.PROPERTY_SELECTED_ITEM)) { + if (event.getPropertyName().equals(AccountComboBox.PROPERTY_SELECTED_ITEM) && event.getNewValue() instanceof Account) { setAccount((Account) event.getNewValue()); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

04/19: refs #1293 la validation des dates des date pickers est possible au Tab
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1293-addAccountViewerTab in repository lima. See http://git.chorem.org/lima.git commit df5f528d4e5658e8bcc3cfad5098985a59b4c9a7 Author: dcosse <cosse(a)codelutin.com> Date: Tue Sep 15 16:57:35 2015 +0200 refs #1293 la validation des dates des date pickers est possible au Tab --- .../org/chorem/lima/ui/accountViewer/AccountViewerView.jaxx | 4 ++-- .../lima/ui/accountViewer/AccountViewerViewHandler.java | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerView.jaxx index 75a86df..2a13c27 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerView.jaxx @@ -62,11 +62,11 @@ <JLabel id="beginPeriodLabel"/> <JAXXDatePicker id="beginPeriodPicker" - onActionPerformed="handler.setDateStart(beginPeriodPicker.getDate())"/> + onPropertyChange="handler.setDateStart(beginPeriodPicker.getDate())"/> <JLabel id="endPeriodLabel"/> <JAXXDatePicker id="endPeriodPicker" - onActionPerformed="handler.setDateEnd(endPeriodPicker.getDate())"/> + onPropertyChange="handler.setDateEnd(endPeriodPicker.getDate())"/> <JToolBar.Separator/> 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 7e9ceca..7cef851 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 @@ -450,13 +450,17 @@ public class AccountViewerViewHandler { } public void setDateStart(Date date) { - filter.setDateStart(date); - updateAllEntries(); + if (initializationComplete) { + filter.setDateStart(date); + updateAllEntries(); + } } public void setDateEnd(Date date) { - filter.setDateEnd(date); - updateAllEntries(); + if (initializationComplete) { + filter.setDateEnd(date); + updateAllEntries(); + } } public void setAccount(Account account) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/19: refs #1241 Ajout de la possibilité de choisir entre deux modes de sélection des entrées (Manuelle ou Balancée)
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1293-addAccountViewerTab in repository lima. See http://git.chorem.org/lima.git commit b5244af9b7826be056f755dc15a769b55b804f5a Author: dcosse <cosse(a)codelutin.com> Date: Tue Sep 15 15:56:35 2015 +0200 refs #1241 Ajout de la possibilité de choisir entre deux modes de sélection des entrées (Manuelle ou Balancée) --- .../src/main/java/org/chorem/lima/ui/MainView.css | 2 +- .../ui/accountViewer/AccountViewerEditModel.java | 40 +---- .../accountViewer/AccountViewerSelectionModel.java | 98 ++++++------ .../lima/ui/accountViewer/AccountViewerView.css | 9 ++ .../lima/ui/accountViewer/AccountViewerView.jaxx | 8 +- .../ui/accountViewer/AccountViewerViewHandler.java | 177 +++++++-------------- .../lima/ui/accountViewer/SelectionMode.java | 29 ++++ .../resources/i18n/lima-swing_en_GB.properties | 4 + .../resources/i18n/lima-swing_fr_FR.properties | 4 + .../main/resources/icons/action-account-viewer.png | Bin 0 -> 1062 bytes .../main/resources/icons/action-selection-mode.png | Bin 0 -> 1106 bytes 11 files changed, 165 insertions(+), 206 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css b/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css index 177cf8b..0053bbc 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css @@ -238,7 +238,7 @@ #accountViewer { text : "lima.entries.accountViewer"; - actionIcon : "lettering"; + actionIcon : "account-viewer"; } #help { diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerEditModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerEditModel.java index 5c4f64f..57accc3 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerEditModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerEditModel.java @@ -40,18 +40,10 @@ public class AccountViewerEditModel implements Serializable { public static final String PROPERTY_GLOBAL_SOLD = "globalSold"; - public static final String PROPERTY_LETTRED = "lettred"; - - public static final String PROPERTY_UNLETTRED = "unLettred"; - - public static final String PROPERTY_EQUALIZED = "equalized"; - protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); protected AccountViewerTableModel model; - protected boolean lettred; - protected boolean unLettred; - protected boolean equalized; + protected BigDecimal debit = BigDecimal.ZERO; protected BigDecimal credit = BigDecimal.ZERO; protected BigDecimal sold = BigDecimal.ZERO; @@ -62,36 +54,6 @@ public class AccountViewerEditModel implements Serializable { protected Date fiscalPeriodBeginDate; -// public boolean isEqualized() { -// return equalized; -// } - -// public void setEqualized(boolean equalized) { -// boolean oldEqualized = isEqualized(); -// this.equalized = equalized; -// firePropertyChange(PROPERTY_EQUALIZED, oldEqualized, this.equalized); -// } - -// public boolean isLettred() { -// return lettred; -// } - -// public void setLettred(boolean lettered) { -// boolean oldLetter = isLettred(); -// this.lettred = lettered && (BigDecimal.ZERO.equals(sold) || sold.doubleValue() == 0); -// firePropertyChange(PROPERTY_LETTRED, oldLetter, this.lettred); -// } - -// public boolean isUnLettred() { -// return unLettred; -// } - -// public void setUnLettred(boolean unLettred) { -// boolean oldDeleter = isUnLettred(); -// this.unLettred = unLettred; -// firePropertyChange(PROPERTY_UNLETTRED, oldDeleter, this.unLettred); -// } - public BigDecimal getDebit() { return debit; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerSelectionModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerSelectionModel.java index fa1fea5..5199a0b 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerSelectionModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerSelectionModel.java @@ -37,6 +37,8 @@ public class AccountViewerSelectionModel extends DefaultListSelectionModel{ protected AccountViewerTableModel letteringTableModel; protected Entry entry; protected int lineSelected; + + protected boolean balancedSelectionMode; protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); public AccountViewerSelectionModel(AccountViewerTableModel letteringTableModel){ @@ -50,43 +52,54 @@ public class AccountViewerSelectionModel extends DefaultListSelectionModel{ @Override public void setSelectionInterval(int row, int column) { - if (!letteringNotExist(row)) { - - //lettred entries - if ( isSelectionEmpty() || !isSelectedIndex(row)){ - clearSelection(); - lineSelected = row; - String currentLettring = getCurrentLettring(); - - //select entries with the same letter of the selected entry - for(Entry entry : getEntries()){ - if (StringUtils.isNotBlank(entry.getLettering())){ - if (entry.getLettering().equals(currentLettring)){ - int entryToSelect = letteringTableModel.indexOf(entry); - super.addSelectionInterval(entryToSelect, entryToSelect); + if (balancedSelectionMode) { + if (!letteringNotExist(row)) { + + //lettred entries + if ( isSelectionEmpty() || !isSelectedIndex(row)){ + clearSelection(); + lineSelected = row; + String currentLettring = getCurrentLettring(); + + //select entries with the same letter of the selected entry + for(Entry entry : getEntries()){ + if (StringUtils.isNotBlank(entry.getLettering())){ + if (entry.getLettering().equals(currentLettring)){ + int entryToSelect = letteringTableModel.indexOf(entry); + super.addSelectionInterval(entryToSelect, entryToSelect); + } } } } } - } - else { - - //unlettred entries - //To clear the selection when it changes from lettered entry to unlettered - for(Entry entry : getEntries()){ - if (!StringUtils.isBlank(entry.getLettering())) { - int entryToSelect = letteringTableModel.indexOf(entry); - super.removeSelectionInterval(entryToSelect, entryToSelect); + else { + + //unlettred entries + //To clear the selection when it changes from lettered entry to unlettered + for(Entry entry : getEntries()){ + if (!StringUtils.isBlank(entry.getLettering())) { + int entryToSelect = letteringTableModel.indexOf(entry); + super.removeSelectionInterval(entryToSelect, entryToSelect); + } } - } - if (isSelectionEmpty() || !isSelectedIndex(row)){ - super.addSelectionInterval(row, column); - }else { - super.removeSelectionInterval(row, column); - } + if (isSelectionEmpty() || !isSelectedIndex(row)){ + super.addSelectionInterval(row, column); + }else { + super.removeSelectionInterval(row, column); + } + } + } else { + super.addSelectionInterval(row, column); + //super.setSelectionInterval(row, column); } + + } + + @Override + public int getSelectionMode() { + return MULTIPLE_INTERVAL_SELECTION; } /**return true if lettering is null, or not null but empty @@ -113,24 +126,6 @@ public class AccountViewerSelectionModel extends DefaultListSelectionModel{ return letteringTableModel.get(lineSelected); } -// /**After rounding one of two entries, selection of its, and of the new entry, -// * resulting of rounding*/ -// public void selectRoundedAndNewEntries(int indexFirstRoundedEntry, int indexSecondRoundedEntry, Entry newResultRoundedEntry) { -// if (!isSelectedIndex(indexFirstRoundedEntry)) { -// addSelectionInterval(indexFirstRoundedEntry, indexFirstRoundedEntry); -// } -// if (!isSelectedIndex(indexSecondRoundedEntry)) { -// addSelectionInterval(indexSecondRoundedEntry, indexSecondRoundedEntry); -// } -// /*New entry*/ -// int newEntryIndex = letteringTableModel.indexOf(newResultRoundedEntry); -// addSelectionInterval(newEntryIndex, newEntryIndex); -// } - - @Override - public int getSelectionMode() { - return MULTIPLE_INTERVAL_SELECTION; - } public void addPropertyChangeListener(PropertyChangeListener listener) { pcs.addPropertyChangeListener(listener); @@ -155,4 +150,13 @@ public class AccountViewerSelectionModel extends DefaultListSelectionModel{ protected void firePropertyChange(String propertyName, Object newValue) { firePropertyChange(propertyName, null, newValue); } + + public void setBalancedSelectionMode(boolean balancedSelectionMode) { + this.balancedSelectionMode = balancedSelectionMode; + clearSelection(); + } + + public boolean getBalancedSelectionMode() { + return balancedSelectionMode; + } } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerView.css b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerView.css index f0bd618..25f34fe 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerView.css @@ -52,11 +52,20 @@ labelFor : {beginPeriodPicker}; } +#beginPeriodPicker { + patternLayout: {handler.DATE_FORMAT}; +} + #endPeriodLabel { text : "lima.lettering.period.end"; labelFor : {endPeriodPicker}; } +#endPeriodPicker { + patternLayout: {handler.DATE_FORMAT}; +} + + #refresh { toolTipText : "lima.lettering.refresh"; actionIcon : "refresh"; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerView.jaxx index 25a1066..75a86df 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerView.jaxx @@ -62,16 +62,20 @@ <JLabel id="beginPeriodLabel"/> <JAXXDatePicker id="beginPeriodPicker" - patternLayout="dd/MM/yyy" onActionPerformed="handler.setDateStart(beginPeriodPicker.getDate())"/> <JLabel id="endPeriodLabel"/> <JAXXDatePicker id="endPeriodPicker" - patternLayout="dd/MM/yyy" onActionPerformed="handler.setDateEnd(endPeriodPicker.getDate())"/> <JToolBar.Separator/> + <JLabel id='balancedSelectionModeLabel' actionIcon='selection-mode'/> + <EnumEditor id='balancedSelectionMode' + genericType='SelectionMode' + constructorParams='SelectionMode.class' + onItemStateChanged="handler.onSelectionModeChanged(balancedSelectionMode.getSelectedItem())" /> + <JButton id="refresh" onActionPerformed="handler.updateAllEntries()"/> 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 bf37cb0..7e9ceca 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 @@ -75,12 +75,11 @@ import static org.nuiton.i18n.I18n.t; public class AccountViewerViewHandler { // fixme Date format should be app parameters - protected static String DATE_FORMAT = "dd/MM/yyyy"; + protected static String DATE_FORMAT = t("lima.ui.dateFormat"); protected AccountViewerView view; protected AccountViewerTable table; - /** Transaction service. */ protected FiscalPeriodService fiscalPeriodService; protected FinancialPeriodService financialPeriodService; protected AccountService accountService; @@ -89,13 +88,11 @@ public class AccountViewerViewHandler { protected LetteringFilterImpl filter; - protected BigDecimal debit = BigDecimal.ZERO; - protected BigDecimal credit = BigDecimal.ZERO; protected AccountViewerEditModel editModel; protected ErrorHelper errorHelper; - protected enum ButtonMode {DELETTRED, LETTRED, EQUALIZED, ALL} + protected SelectionMode selectionMode = SelectionMode.BALANCED; protected SimpleDateFormat dateFormatter = new SimpleDateFormat(DATE_FORMAT); @@ -122,7 +119,6 @@ public class AccountViewerViewHandler { public void init() { filter = new LetteringFilterImpl(); editModel = view.getEditModel(); - //lettringSelectionModel = view.getLetteringSelectionModel(); loadComboAndRows(); editModel.addPropertyChangeListener(AccountViewerEditModel.PROPERTY_DEBIT, new PropertyChangeListener() { @@ -153,6 +149,8 @@ public class AccountViewerViewHandler { } }); + onSelectionModeChanged(selectionMode); + initializationComplete = true; updateAllEntries(); updateSoldStatus(); @@ -238,16 +236,20 @@ public class AccountViewerViewHandler { List<Entry> entries = financialTransactionService.getAllEntrieByDatesAndAccountAndLettering(filter); FiscalPeriod fiscalPeriod = fiscalPeriodService.getFiscalPeriodForDate(filter.getDateStart()); - LetteringFilter previousPeriodFilter = computePreviousPeriodFilter(fiscalPeriod); - LetteringFilter actualPeriodFilter = computeActualPeriodFilter(fiscalPeriod); - setPreviousSold(previousPeriodFilter); - setActualSold(fiscalPeriod, actualPeriodFilter); - - // no previous sold to add if selected starting date is same as fiscal period one - if (!DateUtils.isSameDay(filter.getDateStart(), previousPeriodFilter.getDateStart()) && CollectionUtils.isNotEmpty(entries)) { - entriesAndResume.add(getFirstLinePreviousSoldEntry(entries, previousPeriodFilter)); + if (CollectionUtils.isNotEmpty(entries)) { + // can be null if there are no fiscal period for the begin date + if (fiscalPeriod != null) { + LetteringFilter previousPeriodFilter = computePreviousPeriodFilter(fiscalPeriod); + LetteringFilter actualPeriodFilter = computeActualPeriodFilter(fiscalPeriod); + setPreviousSold(previousPeriodFilter); + setActualSold(fiscalPeriod, actualPeriodFilter); + + // no previous sold to add if selected starting date is same as fiscal period one + if (!DateUtils.isSameDay(filter.getDateStart(), previousPeriodFilter.getDateStart()) && CollectionUtils.isNotEmpty(entries)) { + entriesAndResume.add(getFirstLinePreviousSoldEntry(entries, previousPeriodFilter)); + } + } } - entriesAndResume.addAll(entries); view.getTableModel().setValues(entriesAndResume); } @@ -304,62 +306,10 @@ public class AccountViewerViewHandler { if (log.isDebugEnabled()) { log.debug("balanceAndActions"); } - if (view.getTable().getSelectedRows().length == 0) { - onButtonModeChanged(ButtonMode.ALL); - onBalanceChanged(null); - } else if (!letteringNotExist(view.getTable().getSelectedRow())) { - - //lettred entries - onBalanceChanged(null); + onBalanceChanged(null); + if (view.getTable().getSelectedRows().length > 0 && !letteringNotExist(view.getTable().getSelectedRow()) || + view.getTable().getSelectedRows().length > 0 && !view.getAccountViewerSelectionModel().isSelectionEmpty()) { setValuesForSelectedEntries(); - - //For U.I. buttons (Lettering and unlettering) - onButtonModeChanged(ButtonMode.DELETTRED); - } else { - if (log.isDebugEnabled()) { - log.debug("unlettred entries"); - } - int[] selectedRows = view.getTable().getSelectedRows(); - if (selectedRows.length == 2) { - if (log.isDebugEnabled()) { - log.debug("2 rows selected"); - } - /*Treatment only if one of values contains decimals*/ - AccountViewerTableModel tableModel = view.getTableModel(); - Entry firstSelectedEntry = tableModel.get(selectedRows[0]); - Entry secondSelectedEntry = tableModel.get(selectedRows[1]); - - /*Get decimals*/ - BigDecimal firstSelectedEntryAmount = firstSelectedEntry.getAmount(); - BigDecimal secondSelectedEntryAmount = secondSelectedEntry.getAmount(); - - if ( secondSelectedEntry.isDebit() != firstSelectedEntry.isDebit() - && (firstSelectedEntryAmount.subtract(secondSelectedEntryAmount).abs().compareTo(BigDecimal.ZERO) >0 - && firstSelectedEntryAmount.subtract(secondSelectedEntryAmount).abs().compareTo(BigDecimal.ONE) <0) ) { - onButtonModeChanged(ButtonMode.EQUALIZED); - } - }else { - if (log.isDebugEnabled()) { - log.debug("!2 rows selected"); - } - onButtonModeChanged(ButtonMode.ALL); - } - - //Unlettred entries - onBalanceChanged(null); - //treatment unuseful if no rows are selected - if (!view.getAccountViewerSelectionModel().isSelectionEmpty()) { - if (log.isDebugEnabled()) { - log.debug("Rows selected"); - } - setValuesForSelectedEntries(); - onButtonModeChanged(ButtonMode.LETTRED); - } else { - if (log.isDebugEnabled()) { - log.debug("No Rows selected"); - } - onButtonModeChanged(ButtonMode.ALL); - } } } @@ -377,27 +327,6 @@ public class AccountViewerViewHandler { return emptyOrNull; } - public void onButtonModeChanged(ButtonMode buttonMode) { - - switch (buttonMode) { - case DELETTRED : - editModel.setLettred(false); - editModel.setUnLettred(true); - break; - case LETTRED: - editModel.setUnLettred(false); - editModel.setLettred(true); - break; - case EQUALIZED: - editModel.setEqualized(true); - break; - default: - editModel.setLettred(false); - editModel.setUnLettred(false); - editModel.setEqualized(false); - } - } - public void setValuesForSelectedEntries() { Entry selectedEntry; AccountViewerTableModel tableModel = view.getTableModel(); @@ -520,7 +449,46 @@ public class AccountViewerViewHandler { view.getAccountViewerSelectionModel().clearSelection(); } - private class DebitCreditSold { + public void setDateStart(Date date) { + filter.setDateStart(date); + updateAllEntries(); + } + + public void setDateEnd(Date date) { + filter.setDateEnd(date); + updateAllEntries(); + } + + 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 onSelectionModeChanged(SelectionMode selectionMode) { + + switch (selectionMode) { + case BALANCED: + view.getAccountViewerSelectionModel().setBalancedSelectionMode(true); + break; + case MANUAL: + view.getAccountViewerSelectionModel().setBalancedSelectionMode(false); + break; + default: + view.getAccountViewerSelectionModel().setBalancedSelectionMode(true); + } + } + + protected class DebitCreditSold { private BigDecimal debit; private BigDecimal credit; private BigDecimal sold; @@ -560,29 +528,4 @@ public class AccountViewerViewHandler { } } - public void setDateStart(Date date) { - filter.setDateStart(date); - updateAllEntries(); - } - - public void setDateEnd(Date date) { - filter.setDateEnd(date); - updateAllEntries(); - } - - 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; - } - } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/SelectionMode.java b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/SelectionMode.java new file mode 100644 index 0000000..8d69868 --- /dev/null +++ b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/SelectionMode.java @@ -0,0 +1,29 @@ +package org.chorem.lima.ui.accountViewer; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created by davidcosse on 15/09/15. + */ +public enum SelectionMode { + + BALANCED, MANUAL; + + @Override + public String toString() { + + String result = ""; + + switch (this) { + case MANUAL: + result = t("lima.filter.condition.selectionMode.manual"); + break; + case BALANCED: + result = t("lima.filter.condition.selectionMode.balanced"); + break; + } + + return result; + + } +} 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 4de6b2d..2b0a17d 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 @@ -226,6 +226,9 @@ lima.filter=Filter lima.filter.account=Add account filter lima.filter.condition.all=Valid all criteria lima.filter.condition.one=Valid at least one criteria +lima.filter.condition.selectionMode=Balance entry selection +lima.filter.condition.selectionMode.balanced=Balanced +lima.filter.condition.selectionMode.manual=Manual lima.filter.credit=Add filter on credit lima.filter.date.interval=Filter on date range lima.filter.date.one=Filter for one date @@ -542,6 +545,7 @@ lima.treasury.sie=SIE lima.treasury.systemType=System Type lima.treasury.vatNumber=VAT number lima.treasury.zipCode=Zip Code +lima.ui.dateFormat=MM/dd/yyy lima.update=Modify lima.update.shortcut=Update (Ctrl+M) lima.validate=Validate 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 a9baa5b..2b17f4e 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 @@ -236,6 +236,9 @@ lima.filter.account=Ajouter un filtre sur les comptes lima.filter.condition.all=Valide toutes les conditions lima.filter.condition.delete=Supprimer la condition lima.filter.condition.one=Valide au moins une condition +lima.filter.condition.selectionMode=Sélection des écritures balancées +lima.filter.condition.selectionMode.balanced=Balancée +lima.filter.condition.selectionMode.manual=Manuelle lima.filter.credit=Ajouter un filtre sur les crédits lima.filter.date=Ajouter un filtre sur les dates lima.filter.date.interval=Ajouter un filtre sur un interval de dates @@ -547,6 +550,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 diff --git a/lima-swing/src/main/resources/icons/action-account-viewer.png b/lima-swing/src/main/resources/icons/action-account-viewer.png new file mode 100644 index 0000000..f6f840b Binary files /dev/null and b/lima-swing/src/main/resources/icons/action-account-viewer.png differ diff --git a/lima-swing/src/main/resources/icons/action-selection-mode.png b/lima-swing/src/main/resources/icons/action-selection-mode.png new file mode 100644 index 0000000..594d3a1 Binary files /dev/null and b/lima-swing/src/main/resources/icons/action-selection-mode.png differ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/19: refs #1241 Ajout de la possibilité de choisir entre deux modes de sélection des entrées (Manuelle ou Balancée) + Ajout d'icones
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1293-addAccountViewerTab in repository lima. See http://git.chorem.org/lima.git commit 67b47c26bb7f1ed3fe261f2a42610f2e10add33a Author: dcosse <cosse(a)codelutin.com> Date: Tue Sep 15 15:14:19 2015 +0200 refs #1241 Ajout de la possibilité de choisir entre deux modes de sélection des entrées (Manuelle ou Balancée) + Ajout d'icones --- .../ui/accountViewer/AccountViewerEditModel.java | 58 +++++++++++----------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerEditModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerEditModel.java index 0c9b98c..5c4f64f 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerEditModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerEditModel.java @@ -62,35 +62,35 @@ public class AccountViewerEditModel implements Serializable { protected Date fiscalPeriodBeginDate; - public boolean isEqualized() { - return equalized; - } - - public void setEqualized(boolean equalized) { - boolean oldEqualized = isEqualized(); - this.equalized = equalized; - firePropertyChange(PROPERTY_EQUALIZED, oldEqualized, this.equalized); - } - - public boolean isLettred() { - return lettred; - } - - public void setLettred(boolean lettered) { - boolean oldLetter = isLettred(); - this.lettred = lettered && (BigDecimal.ZERO.equals(sold) || sold.doubleValue() == 0); - firePropertyChange(PROPERTY_LETTRED, oldLetter, this.lettred); - } - - public boolean isUnLettred() { - return unLettred; - } - - public void setUnLettred(boolean unLettred) { - boolean oldDeleter = isUnLettred(); - this.unLettred = unLettred; - firePropertyChange(PROPERTY_UNLETTRED, oldDeleter, this.unLettred); - } +// public boolean isEqualized() { +// return equalized; +// } + +// public void setEqualized(boolean equalized) { +// boolean oldEqualized = isEqualized(); +// this.equalized = equalized; +// firePropertyChange(PROPERTY_EQUALIZED, oldEqualized, this.equalized); +// } + +// public boolean isLettred() { +// return lettred; +// } + +// public void setLettred(boolean lettered) { +// boolean oldLetter = isLettred(); +// this.lettred = lettered && (BigDecimal.ZERO.equals(sold) || sold.doubleValue() == 0); +// firePropertyChange(PROPERTY_LETTRED, oldLetter, this.lettred); +// } + +// public boolean isUnLettred() { +// return unLettred; +// } + +// public void setUnLettred(boolean unLettred) { +// boolean oldDeleter = isUnLettred(); +// this.unLettred = unLettred; +// firePropertyChange(PROPERTY_UNLETTRED, oldDeleter, this.unLettred); +// } public BigDecimal getDebit() { return debit; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/1293-addAccountViewerTabWithCloseColumnAndDTO updated (0eeda16 -> 423c0bc)
by chorem.org scm 30 Nov '15

30 Nov '15

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(a)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(a)chorem.org>.

1 1

branch feature/1293-addAccountViewerTabWithCloseColumnAndDTO updated (71ed649 -> 0eeda16)
by chorem.org scm 30 Nov '15

30 Nov '15

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 discards 71ed649 refs #1293 Ajout d'une colone Clos, est utilisation d'un DTO à la place de Entry discards ed78c68 refs #1293 Traduction des dates pickers discards 9031da6 refs #1293 Correction sur les dates pickers et la recherche de compte appliquée égallement à l'onglet Lettering discards 0c85b1a refs #1293 Correction d'une exception survenant si un nom de compte est saisie est que aucun compte ne correspond discards 447fbd0 refs #1293 la validation des dates des date pickers est possible au Tab discards e3a30fd refs #1241 Ajout de la possibilité de choisir entre deux modes de sélection des entrées (Manuelle ou Balancée) discards 47dd7c3 refs #1241 Ajout de la possibilité de choisir entre deux modes de sélection des entrées (Manuelle ou Balancée) + Ajout d'icones discards 47945fb refs #1241 Ajout d'un oglet consultation de compte, travail en cours 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 adds 9fd0c2f refs #1297correction pour ne pas remonter les entitées ayant une date > à celle indiquée dans la période adds bde8128 refs #1298 corrige NPE dans le cas ou aucune donnée existe adds e3d95f9 refs #1242 ordre des traductions revu adds d9b4a7d Merge branch 'feature/1298-FixNPE' into develop adds 959bbc3 refs #1268 l'interface de saisie d'un plan de TVA est de nouveau fonctionnelle adds 6b2e99c refs #1268 utilisation de JXTreeTable à la place de VatChartTreeTable adds 73a9813 refs #1268 déplacement du ListSelectionModel dans le handler adds b44dada Merge branch 'feature/1268-vat-statement-usable' into develop adds 635828d refs #1242 correction sur refactoring adds a0857b1 Mise à jour de la déclaration de licences adds d5f467a refs #1295 Le tableau de la saisie des écritures n'est pas éditable si la période est cloturé pour le journal sélectionné adds 4a1b1d5 refs #1158 Ajout de commentaires + désactivation du boutton de création d'une transaction adds 253998b refs #1158 Sur l'onglet lettrage il n'est pas possible de modifier une selection comportant une entrée vérouillée. Ajout d'une colonne 'clos' indiquant les entrées vérouillées. adds 9957610 Merge branch 'feature/1158-NotEditableTableForClose' into develop adds b4b645f refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. adds b119160 import manquant adds 7cd3ef3 correction suite au merge adds fd35125 Merge branch 'feature/1158' into develop adds f0e4f29 refs #1241 gérération des rapport de compte avec Jasper adds 03e84c6 refs #1241 gérération des rapport de compte avec Jasper adds 4c16fcb refs #1241 ne pas afficher les lignes ne comportant aucun montant de renseigné adds e9c8126 refs #1241 modification de l'affichage des infos adds ce734ff refs #1241 factorisation du code source Jasper, utilisation de style adds 643e3a5 refs #1241 correction sur nom de police adds 9afd18d refs #1241 refactoring adds b019126 refs #1241 refactoring général sur les rapports, renommage variable, utilisation de style dans les rapports adds 8b18d5e refs #1241 réactivation de l'impression de la TVA, avec mise à jour des données adds dedb5b9 refs #1241 mise à jour du plan de TVA adds 9a297ab refs #1268 permet la saisie des informations concernant le trésor public et affichage de ses infos lors de l'export TVA adds f56fee1 refs #1241 placement correcte des champs dans la fenêtre de saisie de l'identité adds cfd3f21 refs #1241 correction sur le formulaire concernant le trésor public. Renommage du boutton OK en Valider adds 797522f refs #1241 pas de changement dans l'interface de configuration du premier lancement adds 9c2a471 refs #1241 modificaction des écans de 1er configuration afin de prendre en compte les changements sur l'identité. adds 6c63783 refs #1241 ajout de l'icon de sauvegarde présente sur le 1er écran au 1er lancement de lima adds 7cc39ee refs #1241 progression sur internationalisation des rapports, ajout de l'entête avec l'identité sur tous les rapports adds b4373cd refs #1241mise à jour du plan de tva adds 21cbf77 refs #1241 minor adds e8e622e refs #1241 internationalisation sur le rapport de compte adds 5a144b5 refs #1241 internationalisation sur le rapport de compte adds 887373c refs #1241 ajout possibilité de créer des rapports de balance globale ou générale (le dernier par défaut centralise les comptes 401 avec ses sous comptes idem pour 411) adds b8a6ceb refs #1241 monté de version je Jasper report adds 6f487bf refs #1241 refactoring de code adds 1179c09 refs #1241 modification sur en tête du rapport et correction pour appeler la bonne méthode. adds 4e94d24 refs #1241 modification sur en tête du rapport et correction pour appeler la bonne méthode. adds 0919fa5 refs #1241 Ajout de traductions adds 7f54c9e refs #1298 corrige la génération de rapport pour les comptes si aucun compte n'existe adds 5655683 correction suite au merge adds 3d5a336 Merge branch 'feature/1241-account-report' into develop adds a200c71 refs #1287 ajout du montant total pour à l'onglet Lettrage adds 746e8ce refs #1287 import manquant adds 07988ba Merge branch 'feature/1287-compute-summary-on-lettering' into develop adds 1977c6c refs #686 Redémarrage complet de lima pour que l'internationalisation soit complète adds a47f485 refs #1182 Ajout de traductions adds 98ca966 refs #1182 Traduction des dates pickers adds e9ea36e refs #1182 rétablit le fonctionnement des datepicker sur interval adds 25b8310 Merge branch 'feature/1182-translation' into develop new bf20017 refs #1241 Ajout d'un oglet consultation de compte, travail en cours new a1f129f refs #1241 Ajout de la possibilité de choisir entre deux modes de sélection des entrées (Manuelle ou Balancée) + Ajout d'icones new 683a07f refs #1241 Ajout de la possibilité de choisir entre deux modes de sélection des entrées (Manuelle ou Balancée) new da346ae refs #1293 la validation des dates des date pickers est possible au Tab new 52dd5bc refs #1293 Correction d'une exception survenant si un nom de compte est saisie est que aucun compte ne correspond new 80ba3fc refs #1293 Correction sur les dates pickers et la recherche de compte appliquée égallement à l'onglet Lettering new 4e8479a refs #1293 Traduction des dates pickers new 0eeda16 refs #1293 Ajout d'une colone Clos, est utilisation d'un DTO à la place de Entry 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 (71ed649) \ N -- N -- N refs/heads/feature/1293-addAccountViewerTabWithCloseColumnAndDTO (0eeda16) 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 8 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 0eeda163f72109f06c459c2adf9d77ef45a6bde9 Author: dcosse <cosse(a)codelutin.com> Date: Thu Sep 17 19:03:11 2015 +0200 refs #1293 Ajout d'une colone Clos, est utilisation d'un DTO à la place de Entry commit 4e8479a339cb48650cfda64fd51c8ff9a3e37056 Author: dcosse <cosse(a)codelutin.com> Date: Wed Sep 16 22:11:13 2015 +0200 refs #1293 Traduction des dates pickers commit 80ba3fccdcc3f207c6071fd32c6c2b581bde0c07 Author: dcosse <cosse(a)codelutin.com> Date: Tue Sep 15 17:18:09 2015 +0200 refs #1293 Correction sur les dates pickers et la recherche de compte appliquée égallement à l'onglet Lettering commit 52dd5bc051e9cc25cbeae81dcd00ebb3cf93e0b5 Author: dcosse <cosse(a)codelutin.com> Date: Tue Sep 15 16:59:42 2015 +0200 refs #1293 Correction d'une exception survenant si un nom de compte est saisie est que aucun compte ne correspond commit da346aef9256d5bba016a507c13971c6279e2c73 Author: dcosse <cosse(a)codelutin.com> Date: Tue Sep 15 16:57:35 2015 +0200 refs #1293 la validation des dates des date pickers est possible au Tab commit 683a07fccd1843dd9d16bf87fd13725cd80b4639 Author: dcosse <cosse(a)codelutin.com> Date: Tue Sep 15 15:56:35 2015 +0200 refs #1241 Ajout de la possibilité de choisir entre deux modes de sélection des entrées (Manuelle ou Balancée) commit a1f129fad9f499f08bbe6435a9087f93375df5ac Author: dcosse <cosse(a)codelutin.com> Date: Tue Sep 15 15:14:19 2015 +0200 refs #1241 Ajout de la possibilité de choisir entre deux modes de sélection des entrées (Manuelle ou Balancée) + Ajout d'icones commit bf200178fba154769bc81b73da6ed3dfe94ce623 Author: dcosse <cosse(a)codelutin.com> Date: Mon Sep 14 18:30:15 2015 +0200 refs #1241 Ajout d'un oglet consultation de compte, travail en cours Summary of changes: .../org/chorem/lima/business/ServiceListener.java | 2 +- .../chorem/lima/business/api/AccountService.java | 6 + .../api/ClosedPeriodicEntryBookService.java | 3 + .../chorem/lima/business/api/EntryBookService.java | 6 + .../business/api/FinancialTransactionService.java | 7 + .../chorem/lima/business/api/ImportService.java | 11 + .../chorem/lima/business/api/OptionsService.java | 3 + .../chorem/lima/business/api/TreasuryService.java | 13 + .../lima/business/api/VatStatementService.java | 5 +- ...eportService.java => AccountReportService.java} | 14 +- .../business/api/report/BalanceReportService.java | 19 +- ...on.java => AlreadyAffectedVatBoxException.java} | 14 +- ...lException.java => RequiredFieldException.java} | 14 +- .../chorem/lima/business/LimaBusinessConfig.java | 22 +- .../lima/business/ejb/AccountServiceImpl.java | 16 +- .../ejb/ClosedPeriodicEntryBookServiceImpl.java | 11 + .../lima/business/ejb/EntryBookServiceImpl.java | 7 + .../ejb/FinancialTransactionServiceImpl.java | 12 + .../lima/business/ejb/ImportServiceImpl.java | 34 +- .../lima/business/ejb/OptionsServiceImpl.java | 6 + .../lima/business/ejb/TreasuryServiceImpl.java | 69 +++ .../lima/business/ejb/VatStatementServiceImpl.java | 74 +++- .../business/ejb/csv/FiscalControlExportModel.java | 2 +- .../lima/business/ejb/csv/IdentityModel.java | 4 +- .../ejb/report/AccountReportServiceImpl.java | 125 ++++++ .../ejb/report/BalanceReportServiceImpl.java | 325 ++++++++++---- .../business/ejb/report/CommonsDocumentReport.java | 57 +++ .../report/GeneralEntryBookReportServiceImpl.java | 43 +- .../ejb/report/LedgerReportServiceImpl.java | 41 +- .../ProvisionalEntryBookReportServiceImpl.java | 64 +-- .../entity/ClosedPeriodicEntryBookTopiaDao.java | 23 + .../java/org/chorem/lima/entity/EntryTopiaDao.java | 44 +- .../resources/i18n/lima-business_en_GB.properties | 56 +++ .../resources/i18n/lima-business_fr_FR.properties | 56 +++ .../org/chorem/lima/beans/BalanceAccountImpl.java | 23 +- ...ql => V0_8_6_0__1241_create_table_TREASURY.sql} | 52 ++- .../src/main/xmi/lima-callao-model.properties | 2 +- lima-callao/src/main/xmi/lima-callao-model.zargo | Bin 57316 -> 61665 bytes lima-report/pom.xml | 10 +- .../chorem/lima/report/DocumentReportTypes.java | 1 + .../java/org/chorem/lima/report/DocumentsEnum.java | 4 +- .../org/chorem/lima/report/LimaReportConfig.java | 60 ++- .../lima/report/service/DocumentService.java | 321 ++++++-------- .../chorem/lima/report/service/JasperReports.java | 10 + .../AccountEntry.jrxml} | 170 ++++---- .../jasperreports/account/DocumentReport.jrxml | 266 ++++++++++++ .../balance/BalanceReportAccountReport.jrxml | 18 +- .../balance/BalanceSubAccountsReport.jrxml | 54 ++- .../jasperreports/balance/DocumentReport.jrxml | 387 ++++++++++------- .../jasperreports/entryBook/DocumentReport.jrxml | 394 ++++++++--------- .../jasperreports/entryBook/EntryBookReport.jrxml | 77 +--- .../entryBook/FinancialPeriodReport.jrxml | 191 ++------ .../entryBook/TransactionReport.jrxml | 222 +++------- .../generalEntryBook/DocumentReport.jrxml | 478 ++++++++++----------- .../generalEntryBook/EntryBookPeriodReport.jrxml | 54 +-- .../GeneralEntryBookEntryReport.jrxml | 11 +- .../generalLedger/DocumentReport.jrxml | 406 +++++++++-------- .../generalLedger/GeneralLedgerEntryReport.jrxml | 204 +++------ .../generalLedger/GeneralLedgerReport.jrxml | 113 ++--- .../src/main/resources/reports/vat_form_fr.pdf | Bin 222623 -> 244238 bytes .../org/chorem/lima/report/action/ReportTest.java | 2 +- .../org/chorem/lima/server/HttpServerService.java | 41 +- lima-swing/src/license/THIRD-PARTY.properties | 1 + .../main/java/org/chorem/lima/LimaSwingConfig.java | 1 + .../chorem/lima/enums/VatStatementsChartEnum.java | 5 +- .../AccountCondition/AccountConditionHandler.java | 6 +- .../Filter/dateCondition/DateConditionHandler.java | 19 +- .../ui/Filter/dateCondition/DateConditionView.jaxx | 3 +- .../DateIntervalConditionHandler.java | 19 +- .../DateIntervalConditionView.jaxx | 13 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 28 +- .../chorem/lima/ui/account/AccountViewHandler.java | 3 +- .../lima/ui/celleditor/AccountTableCellEditor.java | 28 +- .../ui/celleditor/DateLimaTableCellRenderer.java | 4 +- .../lima/ui/celleditor/DateTableCellEditor.java | 154 ------- .../lima/ui/celleditor/DayTableCellEditor.java | 30 +- .../lima/ui/combobox/EntryBookComboBoxModel.java | 4 +- .../ui/combobox/FiscalPeriodComboBoxModel.java | 4 +- .../chorem/lima/ui/common/AbstractLimaTable.java | 2 - .../ui/common/FinancialTransactionTableModel.java | 111 ++++- .../lima/ui/entrybook/EntryBookViewHandler.java | 8 +- .../ui/financialtransaction/AccountColumn.java | 48 ++- .../ui/financialtransaction/BalanceColumn.java | 35 +- .../lima/ui/financialtransaction/DayColumn.java | 6 +- .../FinancialTransactionView.css | 15 +- .../FinancialTransactionView.jaxx | 2 +- .../FinancialTransactionViewHandler.java | 109 +++-- .../FinancialTransactionSearchTableModel.java | 12 +- .../FiscalControlExportViewHandler.java | 2 +- .../ui/fiscalperiod/FiscalPeriodViewHandler.java | 4 +- .../java/org/chorem/lima/ui/home/AccountsPane.java | 6 +- .../org/chorem/lima/ui/home/EntryBooksPane.java | 8 +- .../lima/ui/home/FinancialTransactionsPane.java | 6 +- .../org/chorem/lima/ui/home/FiscalYearsPane.java | 10 +- .../org/chorem/lima/ui/identity/IdentityForm.css | 161 +++++-- .../org/chorem/lima/ui/identity/IdentityForm.jaxx | 281 +++++++----- .../chorem/lima/ui/identity/IdentityHandler.java | 45 +- .../chorem/lima/ui/importexport/ImportExport.java | 8 + .../lima/ui/lettering/LetteringEditModel.java | 96 +++-- ...tionModel.java => LetteringSelectionModel.java} | 31 +- .../lima/ui/lettering/LetteringTableModel.java | 38 ++ .../org/chorem/lima/ui/lettering/LetteringView.css | 6 +- .../chorem/lima/ui/lettering/LetteringView.jaxx | 11 +- .../lima/ui/lettering/LetteringViewHandler.java | 186 +++++--- .../BackupPanel.css} | 10 +- ...{CreateEntryBookPanel.jaxx => BackupPanel.jaxx} | 8 +- .../{OpeningView.css => BackupPanelHandler.java} | 42 +- .../chorem/lima/ui/opening/CreateIdentityPanel.css | 10 +- .../lima/ui/opening/CreateIdentityPanel.jaxx | 64 ++- .../ui/opening/CreateIdentityPanelHandler.java | 1 - .../org/chorem/lima/ui/opening/OpeningView.css | 11 +- .../org/chorem/lima/ui/opening/OpeningView.jaxx | 28 +- .../chorem/lima/ui/opening/OpeningViewHandler.java | 195 ++++++--- .../lima/ui/vatchart/VatChartMovementForm.css | 2 + .../lima/ui/vatchart/VatChartMovementForm.jaxx | 19 +- .../chorem/lima/ui/vatchart/VatChartTreeTable.java | 134 ------ .../lima/ui/vatchart/VatChartTreeTableModel.java | 226 ---------- .../org/chorem/lima/ui/vatchart/VatChartView.jaxx | 26 +- .../lima/ui/vatchart/VatChartViewHandler.java | 401 ++++++++++------- .../chorem/lima/ui/vatchart/VatChartViewModel.java | 191 ++++++++ .../resources/i18n/lima-swing_en_GB.properties | 70 ++- .../resources/i18n/lima-swing_fr_FR.properties | 53 ++- lima-swing/src/main/resources/icons/backup.png | Bin 0 -> 4803 bytes lima-swing/src/main/resources/import/vat_base.csv | 114 ++--- .../src/main/resources/import/vat_default.csv | 111 ++--- .../src/main/resources/import/vat_developed.csv | 56 --- .../src/main/resources/import/vat_shortened.csv | 56 --- lima-swing/src/main/resources/log4j.properties | 2 +- pom.xml | 10 +- 129 files changed, 4622 insertions(+), 3566 deletions(-) create mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/api/TreasuryService.java copy lima-business-api/src/main/java/org/chorem/lima/business/api/report/{BalanceReportService.java => AccountReportService.java} (63%) copy lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{NotAllowedLabelException.java => AlreadyAffectedVatBoxException.java} (74%) copy lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{NotAllowedLabelException.java => RequiredFieldException.java} (74%) create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/TreasuryServiceImpl.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/report/CommonsDocumentReport.java copy lima-callao/src/main/resources/db/migration/{V0_6_0_0__migration2.sql => V0_8_6_0__1241_create_table_TREASURY.sql} (50%) copy lima-report/src/main/resources/jasperreports/{generalLedger/GeneralLedgerEntryReport.jrxml => account/AccountEntry.jrxml} (69%) create mode 100644 lima-report/src/main/resources/jasperreports/account/DocumentReport.jrxml delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 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%) rename lima-swing/src/main/java/org/chorem/lima/ui/lettering/{LettringSelectionModel.java => LetteringSelectionModel.java} (82%) copy lima-swing/src/main/java/org/chorem/lima/ui/{fiscalperiod/RetainedEarningsWait.css => opening/BackupPanel.css} (88%) copy lima-swing/src/main/java/org/chorem/lima/ui/opening/{CreateEntryBookPanel.jaxx => BackupPanel.jaxx} (80%) copy lima-swing/src/main/java/org/chorem/lima/ui/opening/{OpeningView.css => BackupPanelHandler.java} (61%) delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewModel.java create mode 100644 lima-swing/src/main/resources/icons/backup.png delete mode 100644 lima-swing/src/main/resources/import/vat_developed.csv delete mode 100644 lima-swing/src/main/resources/import/vat_shortened.csv -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 8

branch feature/1176 updated (21150b3 -> 8994081)
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1176 in repository lima. See http://git.chorem.org/lima.git discards 21150b3 refs #1176 Ajout d'un mention concernant l'export FEC sur la page d'acceuil discards cb6e521 refs #1176 quelques modifications discards 04d8eb1 refs #1176 correction problème affichage discards 12c9649 refs #1176 mise à jour de la documentation concernant la configuration client/serveur discards eefe2fc refs #1176 mise à jour de la documentation concernant la configuration client/serveur discards 1a14575 correction de la javadoc discards 3462358 [jgitflow-maven-plugin]Updating develop poms back to pre merge state discards 5ddfac7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts discards 62d44cb [jgitflow-maven-plugin]updating poms for 0.8.5-SNAPSHOT development discards f17ef3e [jgitflow-maven-plugin]Updating develop poms back to pre merge state discards ff30173 [jgitflow-maven-plugin]updating poms for branch'release/0.8.3' with non-snapshot versions discards 5dc4b0d remove licences fron thirdparty discards b3ea0fe [jgitflow-maven-plugin]updating poms for branch '0.8.3' with snapshot versions discards ea929a6 [jgitflow-maven-plugin]updating poms for 0.8.4-SNAPSHOT development discards 2d3c9fc refs #1210 allow to configure defferent address for Ejb than Http discards 56d6a40 rebase to develop (refs #1207) discards a39b7a6 refs #1207 corrections d'erreurs majeures discards 885063f refs #1207 corrections d'erreurs majeures discards 939759a refs #1207 : correction d'erreurs criticals discards c34e2e8 refs #1223: l'onglet lettrage est peu réactif discards 10b5355 refs #1218: Plan BCR : exception à la deuxième modification d'un regrouppement discards a8f2dee refs #1209: A l'ajout automatique d'une écriture le focus ne correspond pas à la cellule éditée discards 4347f89 refs #1222: Le lettrage ne fonctionne plus discards 94b81e0 refs #1221: Erreur à l'annulation des import/export discards f44b3da refs #1187 : identitiy popups discards b7d0508 refs #1187 : Vat chart popups discards 993fe91 refs #1187 : inancial statement popups discards aedc005 refs #1187 : fiscal period popups discards 290c02e refs #1187 : entry book popups discards 762104f refs #1187 : account popups discards a3280ab change remove icon on tab discards 7874dd6 refs #1210 rétablissement du fonctionnement des rapports en mode client/serveur discards 9b1e86c utilisation css discards 56cfe4a refs #1176 : mise a jour de la documentation discards 1bc0d5c fixes #1193 La zone des critères de recherche apparait réduite, les critères de recherche ne sont donc pas visibles, il faudrait définir une taille minimale discards 3d4c252 Hide close tab button if you cannot close the tab adds f8d81c6 refs #1226 Hide close tab button if you cannot close the tab adds 2184fc7 fixes #1226 Hide close tab button if you cannot close the tab Merge branch 'feature/1226' into develop adds e06ef0c fixes #1193 La zone des critères de recherche apparait réduite, les critères de recherche ne sont donc pas visibles, il faudrait définir une taille minimale adds 2581c20 refs #1226 Hide close tab button if you cannot close the tab adds a9d9110 utilisation css adds e8a9357 fixes #1193: La zone des critères de recherche apparait réduite, les critères de recherche ne sont donc pas visibles, il faudrait définir une taille minimale Merge branch 'feature/1193' into develop adds 9243835 change remove icon on tab adds 47dacdc refs #1187 : account popups adds 0e30c25 refs #1187 : entry book popups adds 4ac2c21 refs #1187 : fiscal period popups adds ece040e refs #1187 : inancial statement popups adds 1f5f807 refs #1187 : Vat chart popups adds 37937e4 refs #1187 : identitiy popups adds 964faf1 fixes #1187: Améliorer l'apparence des Popup Merge branch 'feature/1187' into develop adds 3c0f684 refs #1221: Erreur à l'annulation des import/export adds 80adf13 fixes #1221 Erreur à l'annulation des import/export Merge branch 'feature/1221' into develop adds 9aa89d0 refs #1222: Le lettrage ne fonctionne plus adds cc2841b fixes #1222 Le lettrage ne fonctionne plus Merge branch 'feature/1222' into develop adds 8da87c9 refs #1209: A l'ajout automatique d'une écriture le focus ne correspond pas à la cellule éditée adds 275821d fixes #1209 A l'ajout automatique d'une écriture le focus ne correspond pas à la cellule éditée Merge branch 'feature/1209' into develop adds 89caf6e refs #1218: Plan BCR : exception à la deuxième modification d'un regrouppement adds 3e445d8 fixes #1218 Plan BCR : exception à la deuxième modification d'un regrouppement Merge branch 'feature/1218' into develop adds c771213 refs #1223: l'onglet lettrage est peu réactif adds c6e0e9a fixes #1223: l'onglet lettrage est peu réactif Merge branch 'feature/1223' into develop adds ead303a refs #1207 : correction d'erreurs criticals adds a0b7cbf refs #1207 corrections d'erreurs majeures adds 78602e6 refs #1207 corrections d'erreurs majeures adds 248ce54 rebase to develop (refs #1207) adds b7877b3 Merge branch 'feature/1207' into develop adds 1e13def refs #1210 rétablissement du fonctionnement des rapports en mode client/serveur adds d2dd63f refs #1210 allow to configure defferent address for Ejb than Http adds 0047b54 Merge branch 'feature/1210-client-server-params' into develop adds 951e181 [jgitflow-maven-plugin]updating poms for 0.8.4-SNAPSHOT development adds a2addde [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds ccbe508 [jgitflow-maven-plugin]updating poms for branch '0.8.3' with snapshot versions adds 21b81ce remove licences fron thirdparty adds 556fc85 [jgitflow-maven-plugin]updating poms for branch'release/0.8.3' with non-snapshot versions adds 10b0c67 Merge branch 'release/0.8.3' adds 24b6f47 Merge branch 'master' into develop adds 750c191 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 8021dbe [jgitflow-maven-plugin]updating poms for 0.8.5-SNAPSHOT development adds c016677 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds adf3308 [jgitflow-maven-plugin]updating poms for branch'release/0.8.4' with non-snapshot versions adds c95d5a1 Merge branch 'release/0.8.4' adds 5464ca5 Merge branch 'master' into develop adds f2a70f9 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 9a1e21c correction de la javadoc adds bf21713 refs #1199 : ajout de l'export du fichier des écritures comptables adds fbab021 fixes #1228 : correction import comptes. adds 10e2882 Merge branch 'feature/1228' into develop adds a1679da fixes #1119 : changement du layout pour les toolbar possiblement trop large adds f5f01d4 Merge branch 'feature/1119' into develop adds 565f06b fixes #1208 : ajouter le moi en toutes lettres + afficher la période dans la bar de statut adds f60f3ab fixes #1225 : si l'exercice est sur deux années afficher les deux années (ex : "2015 - 2016") adds b557829 refs #1208 : correction de la marge a droite de la balance. adds 5d95df9 refs #1199 : ajout de l'export du fichier des écritures comptables adds 12ce7b8 fixes #1228 : correction import comptes. adds 449120d fixes #1119 : changement du layout pour les toolbar possiblement trop large adds 1c0d6fb fixes #1208 : ajouter le moi en toutes lettres + afficher la période dans la bar de statut adds 99faafa refs #1208 : correction de la marge a droite de la balance. adds 807085c Merge branch 'feature/1208' into develop adds 931a9e6 fixes #1229 : recherche d'un compt sur tout ou partie du code ou de la désignation adds d0e4e99 refs #1229 : suppression d'une variable non utilisé. adds acf87ab Merge branch 'feature/1229' into develop adds 7c15303 fixes #1224 : Ajout la date et le journal de la transaction ainssi qu'un id permettant de distinguer les transactions adds 33d60db fixes #1231 : déplacement débit, crédit et solde. adds 6291377 refs #1186 : text d'a propos adds 66e4193 refs #1186 : correction text adds b6a5de8 refs #1186 : rendre dynamique l'année du copyright adds 8f3b127 refs #1186 : correction du text d'à propos et de la traduction. adds 5486747 Merge branch 'feature/1186' into develop adds 28e0454 refs #1199 : corrextion d'un index hors limites, ey précision d'un label. adds 1d60b71 fixes #1232 : ne pas clôturer un exercice avec des transactions en erreur adds cd3af52 refs #1233 : test du service des comptes + retructuration des initialiseur de test adds 391ae16 refs #1233 : test du service des journaux adds 89b999b refs #1233 : test du service des périodes fiscales (suppresion des fonctions de service non utilisé) adds d54b68d refs #1233 : test du service des transaction + correction et amélioration du code adds 47e387f refs #1233 : test du service des exercices adds 56d8305 Merge branch 'feature/1233' into develop adds 43a92d4 refs #1233 : test du service des exercices adds 4fa9916 refs #1233 : fix test and update log adds 30a62a3 fixes #1235 : fix import plan BCR (and journaux) adds b33247a fixes #1236 : afficher les exceptions métier adds 9c806ea fixes #1237 : fix id menu item adds f9c60c6 change Datepiker pattern adn fix account combobox dimension adds 96c285b refs #1176 : mise a jours des impressions d'écrans. et correction adds 6565524 refs #1176 : mise a jour d'un imprime écran et du tableau des fichierd CSV adds e93d950 Merge branch 'feature/1176-2' into develop adds 372bc24 mise à jour du pom parents adds 2f4f28c [jgitflow-maven-plugin]updating poms for 0.8.6-SNAPSHOT development adds 26817eb [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e57c000 fixes releases : add headers adds 6b45377 [jgitflow-maven-plugin]updating poms for branch'release/0.8.5' with non-snapshot versions adds 5062bb3 [jgitflow-maven-plugin]merging 'release/0.8.5' into 'master' adds 4024d64 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 19a980d [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 34f7074 refs #1240 ajout de controles 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 adds 9fd0c2f refs #1297correction pour ne pas remonter les entitées ayant une date > à celle indiquée dans la période adds bde8128 refs #1298 corrige NPE dans le cas ou aucune donnée existe adds e3d95f9 refs #1242 ordre des traductions revu adds d9b4a7d Merge branch 'feature/1298-FixNPE' into develop adds 959bbc3 refs #1268 l'interface de saisie d'un plan de TVA est de nouveau fonctionnelle adds 6b2e99c refs #1268 utilisation de JXTreeTable à la place de VatChartTreeTable adds 73a9813 refs #1268 déplacement du ListSelectionModel dans le handler adds b44dada Merge branch 'feature/1268-vat-statement-usable' into develop adds 635828d refs #1242 correction sur refactoring adds a0857b1 Mise à jour de la déclaration de licences adds d5f467a refs #1295 Le tableau de la saisie des écritures n'est pas éditable si la période est cloturé pour le journal sélectionné adds 4a1b1d5 refs #1158 Ajout de commentaires + désactivation du boutton de création d'une transaction adds 253998b refs #1158 Sur l'onglet lettrage il n'est pas possible de modifier une selection comportant une entrée vérouillée. Ajout d'une colonne 'clos' indiquant les entrées vérouillées. adds 9957610 Merge branch 'feature/1158-NotEditableTableForClose' into develop adds b4b645f refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. adds b119160 import manquant adds 7cd3ef3 correction suite au merge adds fd35125 Merge branch 'feature/1158' into develop adds f0e4f29 refs #1241 gérération des rapport de compte avec Jasper adds 03e84c6 refs #1241 gérération des rapport de compte avec Jasper adds 4c16fcb refs #1241 ne pas afficher les lignes ne comportant aucun montant de renseigné adds e9c8126 refs #1241 modification de l'affichage des infos adds ce734ff refs #1241 factorisation du code source Jasper, utilisation de style adds 643e3a5 refs #1241 correction sur nom de police adds 9afd18d refs #1241 refactoring adds b019126 refs #1241 refactoring général sur les rapports, renommage variable, utilisation de style dans les rapports adds 8b18d5e refs #1241 réactivation de l'impression de la TVA, avec mise à jour des données adds dedb5b9 refs #1241 mise à jour du plan de TVA adds 9a297ab refs #1268 permet la saisie des informations concernant le trésor public et affichage de ses infos lors de l'export TVA adds f56fee1 refs #1241 placement correcte des champs dans la fenêtre de saisie de l'identité adds cfd3f21 refs #1241 correction sur le formulaire concernant le trésor public. Renommage du boutton OK en Valider adds 797522f refs #1241 pas de changement dans l'interface de configuration du premier lancement adds 9c2a471 refs #1241 modificaction des écans de 1er configuration afin de prendre en compte les changements sur l'identité. adds 6c63783 refs #1241 ajout de l'icon de sauvegarde présente sur le 1er écran au 1er lancement de lima adds 7cc39ee refs #1241 progression sur internationalisation des rapports, ajout de l'entête avec l'identité sur tous les rapports adds b4373cd refs #1241mise à jour du plan de tva adds 21cbf77 refs #1241 minor adds e8e622e refs #1241 internationalisation sur le rapport de compte adds 5a144b5 refs #1241 internationalisation sur le rapport de compte adds 887373c refs #1241 ajout possibilité de créer des rapports de balance globale ou générale (le dernier par défaut centralise les comptes 401 avec ses sous comptes idem pour 411) adds b8a6ceb refs #1241 monté de version je Jasper report adds 6f487bf refs #1241 refactoring de code adds 1179c09 refs #1241 modification sur en tête du rapport et correction pour appeler la bonne méthode. adds 4e94d24 refs #1241 modification sur en tête du rapport et correction pour appeler la bonne méthode. adds 0919fa5 refs #1241 Ajout de traductions adds 7f54c9e refs #1298 corrige la génération de rapport pour les comptes si aucun compte n'existe adds 5655683 correction suite au merge adds 3d5a336 Merge branch 'feature/1241-account-report' into develop adds a200c71 refs #1287 ajout du montant total pour à l'onglet Lettrage adds 746e8ce refs #1287 import manquant adds 07988ba Merge branch 'feature/1287-compute-summary-on-lettering' into develop adds 1977c6c refs #686 Redémarrage complet de lima pour que l'internationalisation soit complète adds a47f485 refs #1182 Ajout de traductions adds 98ca966 refs #1182 Traduction des dates pickers adds e9ea36e refs #1182 rétablit le fonctionnement des datepicker sur interval adds 25b8310 Merge branch 'feature/1182-translation' into develop new 5022685 refs #1176 : mise a jour de la documentation new 2c14332 refs #1176 mise à jour de la documentation concernant la configuration client/serveur new f467ce3 refs #1176 mise à jour de la documentation concernant la configuration client/serveur new e1f8fc0 refs #1176 correction problème affichage new fc30fe0 refs #1176 quelques modifications new 8994081 refs #1176 Ajout d'un mention concernant l'export FEC sur la page d'acceuil 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 (21150b3) \ N -- N -- N refs/heads/feature/1176 (8994081) 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 6 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 899408184350051e0a5d45118fd9acc5fd8d80fa Author: dcosse <cosse(a)codelutin.com> Date: Fri Jun 26 15:52:23 2015 +0200 refs #1176 Ajout d'un mention concernant l'export FEC sur la page d'acceuil commit fc30fe04039ec1615da821cd7eebe4c5f0967262 Author: dcosse <cosse(a)codelutin.com> Date: Fri Jun 26 12:19:45 2015 +0200 refs #1176 quelques modifications commit e1f8fc09f67a56ca39ee8fc1c85dbf37c740cb1e Author: dcosse <cosse(a)codelutin.com> Date: Fri Jun 26 11:32:45 2015 +0200 refs #1176 correction problème affichage commit f467ce3399d175b60411674ccc04a3ca370b8110 Author: dcosse <cosse(a)codelutin.com> Date: Fri Jun 26 11:12:49 2015 +0200 refs #1176 mise à jour de la documentation concernant la configuration client/serveur commit 2c143323d03a49aed7646680f345d5aac5a579ae Author: dcosse <cosse(a)codelutin.com> Date: Wed Jun 24 20:54:05 2015 +0200 refs #1176 mise à jour de la documentation concernant la configuration client/serveur commit 50226857bd57408ba3479f0410d0d658abb4650f Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu May 7 12:09:32 2015 +0200 refs #1176 : mise a jour de la documentation Summary of changes: lima-business-api/pom.xml | 2 +- .../org/chorem/lima/business/ServiceListener.java | 2 +- .../chorem/lima/business/api/AccountService.java | 11 +- .../api/ClosedPeriodicEntryBookService.java | 3 + .../chorem/lima/business/api/EntryBookService.java | 6 + .../chorem/lima/business/api/ExportService.java | 9 + .../lima/business/api/FinancialPeriodService.java | 4 - .../business/api/FinancialTransactionService.java | 13 +- .../lima/business/api/FiscalPeriodService.java | 38 +- .../chorem/lima/business/api/ImportService.java | 11 + .../chorem/lima/business/api/OptionsService.java | 3 + .../chorem/lima/business/api/TreasuryService.java | 13 + .../lima/business/api/VatStatementService.java | 5 +- ...eportService.java => AccountReportService.java} | 14 +- .../business/api/report/BalanceReportService.java | 19 +- ...on.java => AlreadyAffectedVatBoxException.java} | 14 +- ...lException.java => RequiredFieldException.java} | 14 +- lima-business/pom.xml | 2 +- .../org/chorem/lima/business/AccountingRules.java | 35 +- .../chorem/lima/business/LimaBusinessConfig.java | 22 +- .../accountingrules/DefaultAccountingRules.java | 190 +++-- .../accountingrules/FranceAccountingRules.java | 10 +- .../lima/business/ejb/AccountServiceImpl.java | 23 +- .../ejb/ClosedPeriodicEntryBookServiceImpl.java | 11 + .../lima/business/ejb/EntryBookServiceImpl.java | 7 + .../lima/business/ejb/ExportServiceImpl.java | 50 +- .../business/ejb/FinancialPeriodServiceImpl.java | 18 - .../ejb/FinancialTransactionServiceImpl.java | 33 +- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 62 +- .../lima/business/ejb/ImportServiceImpl.java | 106 ++- .../lima/business/ejb/OptionsServiceImpl.java | 6 + .../lima/business/ejb/TreasuryServiceImpl.java | 69 ++ .../lima/business/ejb/VatStatementServiceImpl.java | 74 +- .../chorem/lima/business/ejb/csv/EntryModel.java | 98 ++- .../business/ejb/csv/FiscalControlExportModel.java | 153 ++++ .../lima/business/ejb/csv/IdentityModel.java | 4 +- .../ejb/report/AccountReportServiceImpl.java | 125 ++++ .../ejb/report/BalanceReportServiceImpl.java | 325 ++++++-- .../business/ejb/report/CommonsDocumentReport.java | 57 ++ .../report/GeneralEntryBookReportServiceImpl.java | 43 +- .../ejb/report/LedgerReportServiceImpl.java | 41 +- .../ProvisionalEntryBookReportServiceImpl.java | 64 +- .../entity/ClosedPeriodicEntryBookTopiaDao.java | 29 +- .../java/org/chorem/lima/entity/EntryTopiaDao.java | 78 +- .../lima/entity/FinancialPeriodTopiaDao.java | 14 - .../lima/entity/FinancialTransactionTopiaDao.java | 1 - .../chorem/lima/entity/FiscalPeriodTopiaDao.java | 24 - .../resources/i18n/lima-business_en_GB.properties | 56 ++ .../resources/i18n/lima-business_fr_FR.properties | 56 ++ .../org/chorem/lima/business/AbstractLimaTest.java | 575 ++------------ .../lima/business/AccountServiceImplTest.java | 332 +++++--- .../lima/business/EntryBookServiceImplTest.java | 148 +++- .../business/FinancialPeriodServiceImplTest.java | 260 ++++++- .../FinancialTransactionServiceImplTest.java | 638 +++++++++++++++- .../lima/business/FiscalPeriodServiceImplTest.java | 640 +++++++++++++--- .../lima/business/ImportExportServiceTest.java | 45 +- .../lima/business/ReportServiceImplTest.java | 5 +- .../lima/entity/FinancialTransactionDAOTest.java | 5 +- lima-business/src/test/resources/log4j.properties | 4 +- lima-callao/pom.xml | 2 +- .../org/chorem/lima/beans/BalanceAccountImpl.java | 23 +- ...ql => V0_8_6_0__1241_create_table_TREASURY.sql} | 52 +- .../src/main/xmi/lima-callao-model.properties | 2 +- lima-callao/src/main/xmi/lima-callao-model.zargo | Bin 57316 -> 61665 bytes lima-report/pom.xml | 12 +- .../chorem/lima/report/DocumentReportTypes.java | 1 + .../java/org/chorem/lima/report/DocumentsEnum.java | 4 +- .../org/chorem/lima/report/LimaReportConfig.java | 60 +- .../lima/report/service/DocumentService.java | 321 ++++---- .../chorem/lima/report/service/JasperReports.java | 10 + .../AccountEntry.jrxml} | 170 ++--- .../jasperreports/account/DocumentReport.jrxml | 266 +++++++ .../balance/BalanceReportAccountReport.jrxml | 18 +- .../balance/BalanceSubAccountsReport.jrxml | 54 +- .../jasperreports/balance/DocumentReport.jrxml | 387 ++++++---- .../jasperreports/entryBook/DocumentReport.jrxml | 394 +++++----- .../jasperreports/entryBook/EntryBookReport.jrxml | 77 +- .../entryBook/FinancialPeriodReport.jrxml | 191 +---- .../entryBook/TransactionReport.jrxml | 222 ++---- .../generalEntryBook/DocumentReport.jrxml | 478 ++++++------ .../generalEntryBook/EntryBookPeriodReport.jrxml | 54 +- .../GeneralEntryBookEntryReport.jrxml | 11 +- .../generalLedger/DocumentReport.jrxml | 406 +++++----- .../generalLedger/GeneralLedgerEntryReport.jrxml | 204 ++--- .../generalLedger/GeneralLedgerReport.jrxml | 113 +-- .../src/main/resources/reports/vat_form_fr.pdf | Bin 222623 -> 244238 bytes .../org/chorem/lima/report/action/ReportTest.java | 2 +- lima-server/pom.xml | 2 +- .../org/chorem/lima/server/HttpServerService.java | 41 +- lima-swing/pom.xml | 6 +- lima-swing/src/license/THIRD-PARTY.properties | 1 + .../main/java/org/chorem/lima/LimaSwingConfig.java | 3 +- .../org/chorem/lima/enums/AccountsChartEnum.java | 9 +- .../chorem/lima/enums/VatStatementsChartEnum.java | 5 +- .../AccountCondition/AccountConditionHandler.java | 12 + .../AccountCondition/AccountConditionView.css | 8 +- .../AccountCondition/AccountConditionView.jaxx | 11 +- .../Filter/dateCondition/DateConditionHandler.java | 19 +- .../ui/Filter/dateCondition/DateConditionView.jaxx | 3 +- .../DateIntervalConditionHandler.java | 19 +- .../DateIntervalConditionView.jaxx | 13 +- .../src/main/java/org/chorem/lima/ui/MainView.css | 11 +- .../src/main/java/org/chorem/lima/ui/MainView.jaxx | 4 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 39 +- .../chorem/lima/ui/account/AccountViewHandler.java | 25 +- .../lima/ui/celleditor/AccountTableCellEditor.java | 86 +-- .../ui/celleditor/DateLimaTableCellRenderer.java | 4 +- .../lima/ui/celleditor/DateTableCellEditor.java | 154 ---- .../lima/ui/celleditor/DayTableCellEditor.java | 30 +- ...ountComboBoxModel.java => AccountComboBox.java} | 66 +- .../lima/ui/combobox/AccountComboBoxModel.java | 98 --- .../lima/ui/combobox/EntryBookComboBoxModel.java | 4 +- .../ui/combobox/FiscalPeriodComboBoxModel.java | 4 +- .../chorem/lima/ui/common/AbstractLimaTable.java | 2 - .../lima/ui/common/AccountComboBoxModel.java | 54 -- .../ui/common/FinancialPeriodListRenderer.java | 14 +- .../ui/common/FinancialTransactionTableModel.java | 117 ++- .../lima/ui/common/FiscalPeriodListRenderer.java | 21 +- .../lima/ui/entrybook/EntryBookViewHandler.java | 14 +- .../FinancialStatementChartViewHandler.java | 2 +- .../ui/financialtransaction/AccountColumn.java | 55 +- .../ui/financialtransaction/BalanceColumn.java | 35 +- .../lima/ui/financialtransaction/DayColumn.java | 6 +- .../FinancialTransactionView.css | 28 +- .../FinancialTransactionView.jaxx | 7 +- .../FinancialTransactionViewHandler.java | 144 +++- .../FinancialTransactionSearchTableModel.java | 12 +- .../FiscalControlExportView.css} | 58 +- .../FiscalControlExportView.jaxx | 85 +++ .../FiscalControlExportViewHandler.java | 229 ++++++ .../ui/fiscalperiod/FiscalPeriodViewHandler.java | 88 ++- .../java/org/chorem/lima/ui/home/AccountsPane.java | 6 +- .../org/chorem/lima/ui/home/EntryBooksPane.java | 8 +- .../lima/ui/home/FinancialTransactionsPane.java | 6 +- .../org/chorem/lima/ui/home/FiscalYearsPane.java | 10 +- .../org/chorem/lima/ui/identity/IdentityForm.css | 161 +++- .../org/chorem/lima/ui/identity/IdentityForm.jaxx | 281 ++++--- .../chorem/lima/ui/identity/IdentityHandler.java | 45 +- .../chorem/lima/ui/importexport/ImportExport.java | 37 +- .../lima/ui/lettering/LetteringEditModel.java | 105 ++- ...tionModel.java => LetteringSelectionModel.java} | 31 +- .../lima/ui/lettering/LetteringTableModel.java | 38 + .../org/chorem/lima/ui/lettering/LetteringView.css | 47 +- .../chorem/lima/ui/lettering/LetteringView.jaxx | 68 +- .../lima/ui/lettering/LetteringViewHandler.java | 220 ++++-- .../BackupPanel.css} | 10 +- ...{CreateEntryBookPanel.jaxx => BackupPanel.jaxx} | 8 +- .../{OpeningView.css => BackupPanelHandler.java} | 42 +- .../chorem/lima/ui/opening/CreateIdentityPanel.css | 10 +- .../lima/ui/opening/CreateIdentityPanel.jaxx | 64 +- .../ui/opening/CreateIdentityPanelHandler.java | 1 - .../org/chorem/lima/ui/opening/OpeningView.css | 11 +- .../org/chorem/lima/ui/opening/OpeningView.jaxx | 28 +- .../chorem/lima/ui/opening/OpeningViewHandler.java | 195 +++-- .../lima/ui/vatchart/VatChartMovementForm.css | 2 + .../lima/ui/vatchart/VatChartMovementForm.jaxx | 19 +- .../chorem/lima/ui/vatchart/VatChartTreeTable.java | 134 ---- .../lima/ui/vatchart/VatChartTreeTableModel.java | 226 ------ .../org/chorem/lima/ui/vatchart/VatChartView.jaxx | 26 +- .../lima/ui/vatchart/VatChartViewHandler.java | 401 ++++++---- .../chorem/lima/ui/vatchart/VatChartViewModel.java | 191 +++++ .../org/chorem/lima/util/WrapToolBarLayout.java | 129 ++++ .../resources/i18n/lima-swing_en_GB.properties | 106 ++- .../resources/i18n/lima-swing_fr_FR.properties | 94 ++- .../icons/action-financialPeriod-close.png | Bin 715 -> 452 bytes .../resources/icons/action-fiscalControlExport.png | Bin 0 -> 1244 bytes lima-swing/src/main/resources/icons/backup.png | Bin 0 -> 4803 bytes lima-swing/src/main/resources/icons/warning.png | Bin 0 -> 965 bytes .../src/main/resources/import/pcg_developed.csv | 831 ++++++++++++++++++++- lima-swing/src/main/resources/import/vat_base.csv | 114 +-- .../src/main/resources/import/vat_default.csv | 111 +-- .../src/main/resources/import/vat_developed.csv | 56 -- .../src/main/resources/import/vat_shortened.csv | 56 -- lima-swing/src/main/resources/lima-swing.config | 1 + lima-swing/src/main/resources/log4j.properties | 2 +- pom.xml | 14 +- src/site/procedure.txt | 15 + src/site/resources/screens/export_ebp_1.png | Bin 114103 -> 94362 bytes src/site/resources/screens/export_ebp_2.png | Bin 17856 -> 8139 bytes src/site/resources/screens/export_ebp_3.png | Bin 71482 -> 54392 bytes src/site/resources/screens/export_ebp_4.png | Bin 24204 -> 14348 bytes src/site/resources/screens/export_ebp_5.png | Bin 30588 -> 14741 bytes src/site/resources/screens/export_ebp_6.png | Bin 26990 -> 11937 bytes src/site/resources/screens/export_ebp_7.png | Bin 17221 -> 6030 bytes src/site/resources/screens/lima_import_charset.png | Bin 56032 -> 42025 bytes src/site/resources/screens/lima_import_limaall.png | Bin 64072 -> 46841 bytes src/site/resources/screens/lima_open_account.png | Bin 39308 -> 26602 bytes src/site/resources/screens/lima_open_entrybook.png | Bin 31108 -> 21208 bytes .../resources/screens/lima_open_fiscalperiod.png | Bin 28827 -> 19797 bytes src/site/resources/screens/lima_open_identity.png | Bin 31849 -> 27903 bytes src/site/resources/screens/lima_open_welcome.png | Bin 35463 -> 24208 bytes .../resources/screens/lima_reports_entrybooks.png | Bin 61887 -> 0 bytes .../screens/lima_reports_financialstatement.png | Bin 57424 -> 0 bytes src/site/resources/screens/lima_reports_ledger.png | Bin 57008 -> 0 bytes .../resources/screens/lima_searchtransaction.png | Bin 93053 -> 0 bytes src/site/rst/importexport.rst | 40 +- 196 files changed, 8824 insertions(+), 5077 deletions(-) create mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/api/TreasuryService.java copy lima-business-api/src/main/java/org/chorem/lima/business/api/report/{BalanceReportService.java => AccountReportService.java} (63%) copy lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{NotAllowedLabelException.java => AlreadyAffectedVatBoxException.java} (74%) copy lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{NotAllowedLabelException.java => RequiredFieldException.java} (74%) create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/TreasuryServiceImpl.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalControlExportModel.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/report/CommonsDocumentReport.java copy lima-callao/src/main/resources/db/migration/{V0_6_0_0__migration2.sql => V0_8_6_0__1241_create_table_TREASURY.sql} (50%) copy lima-report/src/main/resources/jasperreports/{generalLedger/GeneralLedgerEntryReport.jrxml => account/AccountEntry.jrxml} (69%) create mode 100644 lima-report/src/main/resources/jasperreports/account/DocumentReport.jrxml delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 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%) copy lima-swing/src/main/java/org/chorem/lima/ui/combobox/{LeafAccountComboBoxModel.java => AccountComboBox.java} (57%) delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/common/AccountComboBoxModel.java copy lima-swing/src/main/java/org/chorem/lima/ui/{financialtransactionunbalanced/FinancialTransactionUnbalancedView.css => fiscalControlExport/FiscalControlExportView.css} (51%) create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/fiscalControlExport/FiscalControlExportView.jaxx create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/fiscalControlExport/FiscalControlExportViewHandler.java rename lima-swing/src/main/java/org/chorem/lima/ui/lettering/{LettringSelectionModel.java => LetteringSelectionModel.java} (82%) copy lima-swing/src/main/java/org/chorem/lima/ui/{fiscalperiod/RetainedEarningsWait.css => opening/BackupPanel.css} (88%) copy lima-swing/src/main/java/org/chorem/lima/ui/opening/{CreateEntryBookPanel.jaxx => BackupPanel.jaxx} (80%) copy lima-swing/src/main/java/org/chorem/lima/ui/opening/{OpeningView.css => BackupPanelHandler.java} (61%) delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewModel.java create mode 100644 lima-swing/src/main/java/org/chorem/lima/util/WrapToolBarLayout.java create mode 100644 lima-swing/src/main/resources/icons/action-fiscalControlExport.png create mode 100644 lima-swing/src/main/resources/icons/backup.png create mode 100644 lima-swing/src/main/resources/icons/warning.png delete mode 100644 lima-swing/src/main/resources/import/vat_developed.csv delete mode 100644 lima-swing/src/main/resources/import/vat_shortened.csv create mode 100644 src/site/procedure.txt delete mode 100644 src/site/resources/screens/lima_reports_entrybooks.png delete mode 100644 src/site/resources/screens/lima_reports_financialstatement.png delete mode 100644 src/site/resources/screens/lima_reports_ledger.png delete mode 100644 src/site/resources/screens/lima_searchtransaction.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 6

branch develop updated (1977c6c -> 25b8310)
by chorem.org scm 30 Nov '15

30 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 1977c6c refs #686 Redémarrage complet de lima pour que l'internationalisation soit complète new a47f485 refs #1182 Ajout de traductions new 98ca966 refs #1182 Traduction des dates pickers new e9ea36e refs #1182 rétablit le fonctionnement des datepicker sur interval new 25b8310 Merge branch 'feature/1182-translation' 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 25b83105f51965159a02e759e85a7de335884843 Merge: 1977c6c e9ea36e Author: dcosse <cosse(a)codelutin.com> Date: Mon Nov 30 14:40:28 2015 +0100 Merge branch 'feature/1182-translation' into develop commit e9ea36e80018a8ae8800c6f32fcb5a7be2a2103e Author: dcosse <cosse(a)codelutin.com> Date: Mon Nov 30 14:39:50 2015 +0100 refs #1182 rétablit le fonctionnement des datepicker sur interval commit 98ca966ad5b67da03225bf9e495590e410c5faec Author: dcosse <cosse(a)codelutin.com> Date: Wed Sep 16 21:57:35 2015 +0200 refs #1182 Traduction des dates pickers commit a47f485086c2bb8b83edb61018601a5c12bf8917 Author: dcosse <cosse(a)codelutin.com> Date: Fri Sep 11 16:26:12 2015 +0200 refs #1182 Ajout de traductions Summary of changes: .../Filter/dateCondition/DateConditionHandler.java | 19 ++- .../ui/Filter/dateCondition/DateConditionView.jaxx | 5 +- .../DateIntervalConditionHandler.java | 19 ++- .../DateIntervalConditionView.jaxx | 6 +- .../ui/celleditor/DateLimaTableCellRenderer.java | 4 +- .../lima/ui/celleditor/DateTableCellEditor.java | 154 --------------------- .../chorem/lima/ui/common/AbstractLimaTable.java | 2 - .../chorem/lima/ui/lettering/LetteringView.jaxx | 7 +- .../lima/ui/lettering/LetteringViewHandler.java | 12 ++ .../resources/i18n/lima-swing_en_GB.properties | 2 +- 10 files changed, 54 insertions(+), 176 deletions(-) delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 4

branch feature/1182-translation deleted (was e9ea36e)
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1182-translation in repository lima. See http://git.chorem.org/lima.git was e9ea36e refs #1182 rétablit le fonctionnement des datepicker sur interval This change permanently discards the following revisions: discards e9ea36e refs #1182 rétablit le fonctionnement des datepicker sur interval discards 98ca966 refs #1182 Traduction des dates pickers discards a47f485 refs #1182 Ajout de traductions -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/1182-translation updated (98ca966 -> e9ea36e)
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1182-translation in repository lima. See http://git.chorem.org/lima.git from 98ca966 refs #1182 Traduction des dates pickers new e9ea36e refs #1182 rétablit le fonctionnement des datepicker sur interval 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 e9ea36e80018a8ae8800c6f32fcb5a7be2a2103e Author: dcosse <cosse(a)codelutin.com> Date: Mon Nov 30 14:39:50 2015 +0100 refs #1182 rétablit le fonctionnement des datepicker sur interval Summary of changes: .../lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1