This is an automated email from the git hooks/post-receive script. New change to branch feature/1221 in repository lima. See http://git.chorem.org/lima.git discards 67c379a refs #1221: Erreur à l'annulation des import/export 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 new 3c0f684 refs #1221: Erreur à l'annulation des import/export 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 (67c379a) \ N -- N -- N refs/heads/feature/1221 (3c0f684) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3c0f684fdaff23aad6a0ff320dc40997b59daf73 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 8 09:30:34 2015 +0200 refs #1221: Erreur à l'annulation des import/export Summary of changes: .../org/chorem/lima/FinancialStatementWayEnum.java | 42 +--- .../resources/i18n/lima-callao_en_GB.properties | 6 +- .../resources/i18n/lima-callao_fr_FR.properties | 6 +- .../src/main/java/org/chorem/lima/LimaMain.java | 1 + .../org/chorem/lima/enums/AccountsChartEnum.java | 24 +- .../lima/enums/FinancialStatementsChartEnum.java | 22 +- .../chorem/lima/enums/VatStatementsChartEnum.java | 26 +- .../java/org/chorem/lima/ui/ClosableTabHeader.css | 14 +- .../java/org/chorem/lima/ui/ClosableTabHeader.jaxx | 6 +- .../src/main/java/org/chorem/lima/ui/MainView.css | 275 +++++++++++++++++---- .../java/org/chorem/lima/ui/MainViewHandler.java | 1 + .../org/chorem/lima/ui/account/AccountForm.css | 2 + .../org/chorem/lima/ui/account/AccountForm.jaxx | 20 +- .../chorem/lima/ui/account/AccountImportForm.css | 39 +-- .../chorem/lima/ui/account/AccountImportForm.jaxx | 61 ++--- .../chorem/lima/ui/account/AccountViewHandler.java | 2 +- .../chorem/lima/ui/account/UpdateAccountForm.css | 2 + .../chorem/lima/ui/account/UpdateAccountForm.jaxx | 17 +- .../org/chorem/lima/ui/entrybook/EntryBookForm.css | 2 + .../chorem/lima/ui/entrybook/EntryBookForm.jaxx | 20 +- .../lima/ui/entrybook/EntryBookImportForm.css | 2 + .../lima/ui/entrybook/EntryBookImportForm.jaxx | 26 +- .../FinancialStatementChartViewHandler.java | 8 +- .../FinancialStatementHeaderForm.css | 25 +- .../FinancialStatementHeaderForm.jaxx | 65 ++--- .../FinancialStatementImportForm.css | 41 ++- .../FinancialStatementImportForm.jaxx | 84 +++---- .../FinancialStatementMovementForm.css | 16 +- .../FinancialStatementMovementForm.jaxx | 63 +++-- .../FinancialTransactionSearchView.css | 6 +- .../FinancialTransactionSearchView.jaxx | 7 +- .../FinancialTransactionSearchViewHandler.java | 13 +- .../org/chorem/lima/ui/fiscalperiod/AddPeriod.css | 6 +- .../org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx | 28 +-- .../ui/fiscalperiod/FiscalPeriodViewHandler.java | 70 ++++-- .../fiscalperiod/RetainedEarningsEntryBookForm.css | 33 ++- .../RetainedEarningsEntryBookForm.jaxx | 85 ++----- .../org/chorem/lima/ui/identity/IdentityForm.css | 18 +- .../org/chorem/lima/ui/identity/IdentityForm.jaxx | 130 +++++----- .../chorem/lima/ui/vatchart/VatChartImportForm.css | 35 +-- .../lima/ui/vatchart/VatChartImportForm.jaxx | 84 +++---- .../lima/ui/vatchart/VatChartMovementForm.css | 29 ++- .../lima/ui/vatchart/VatChartMovementForm.jaxx | 59 +++-- .../lima/ui/vatchart/VatChartViewHandler.java | 7 +- .../java/org/chorem/lima/util/ReportDialogView.css | 5 +- .../org/chorem/lima/util/ReportDialogView.jaxx | 2 +- .../resources/i18n/lima-swing_en_GB.properties | 13 +- .../resources/i18n/lima-swing_fr_FR.properties | 49 ++-- .../src/main/resources/icons/action-cancel.png | Bin 0 -> 587 bytes ...{action-account-remove.png => action-close.png} | Bin .../src/main/resources/icons/action-closeTab.png | Bin 3140 -> 0 bytes lima-swing/src/main/resources/icons/action-ok.png | Bin 0 -> 537 bytes 52 files changed, 858 insertions(+), 739 deletions(-) create mode 100644 lima-swing/src/main/resources/icons/action-cancel.png copy lima-swing/src/main/resources/icons/{action-account-remove.png => action-close.png} (100%) delete mode 100644 lima-swing/src/main/resources/icons/action-closeTab.png create mode 100644 lima-swing/src/main/resources/icons/action-ok.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.