This is an automated email from the git hooks/post-receive script. New change to branch feature/1224 in repository lima. See http://git.chorem.org/lima.git discards 0336a0b fixes #1224 : Ajout la date et le journal de la transaction ainssi qu'un id permettant de distinguer les transactions 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 new 7c15303 fixes #1224 : Ajout la date et le journal de la transaction ainssi qu'un id permettant de distinguer les transactions 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 (0336a0b) \ N -- N -- N refs/heads/feature/1224 (7c15303) 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 7c1530304a5b5d416a729490a3ded024fd297006 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 19 11:22:48 2015 +0200 fixes #1224 : Ajout la date et le journal de la transaction ainssi qu'un id permettant de distinguer les transactions Summary of changes: .../chorem/lima/business/api/ExportService.java | 9 + .../lima/business/ejb/ExportServiceImpl.java | 46 ++ .../business/ejb/csv/FiscalControlExportModel.java | 153 ++++ .../java/org/chorem/lima/entity/EntryTopiaDao.java | 18 + lima-swing/pom.xml | 1 + .../org/chorem/lima/enums/AccountsChartEnum.java | 9 +- .../AccountCondition/AccountConditionHandler.java | 8 + .../AccountCondition/AccountConditionView.css | 8 +- .../AccountCondition/AccountConditionView.jaxx | 11 +- .../src/main/java/org/chorem/lima/ui/MainView.css | 9 +- .../src/main/java/org/chorem/lima/ui/MainView.jaxx | 2 + .../java/org/chorem/lima/ui/MainViewHandler.java | 9 + .../chorem/lima/ui/account/AccountViewHandler.java | 10 +- .../lima/ui/celleditor/AccountTableCellEditor.java | 70 +- .../chorem/lima/ui/combobox/AccountComboBox.java | 70 ++ .../lima/ui/combobox/AccountComboBoxModel.java | 98 --- .../lima/ui/common/AccountComboBoxModel.java | 54 -- .../ui/common/FinancialPeriodListRenderer.java | 14 +- .../lima/ui/common/FiscalPeriodListRenderer.java | 21 +- .../FinancialTransactionView.css | 13 +- .../FinancialTransactionView.jaxx | 5 +- .../FinancialTransactionViewHandler.java | 22 +- .../FiscalControlExportView.css | 40 + .../FiscalControlExportView.jaxx | 85 +++ .../FiscalControlExportViewHandler.java | 205 +++++ .../chorem/lima/ui/importexport/ImportExport.java | 21 +- .../org/chorem/lima/ui/lettering/LetteringView.css | 4 +- .../chorem/lima/ui/lettering/LetteringView.jaxx | 12 +- .../lima/ui/lettering/LetteringViewHandler.java | 64 +- .../org/chorem/lima/util/WrapToolBarLayout.java | 107 +++ .../resources/i18n/lima-swing_en_GB.properties | 26 + .../resources/i18n/lima-swing_fr_FR.properties | 22 +- .../resources/icons/action-fiscalControlExport.png | Bin 0 -> 1244 bytes lima-swing/src/main/resources/icons/warning.png | Bin 0 -> 965 bytes .../src/main/resources/import/pcg_developed.csv | 831 ++++++++++++++++++++- pom.xml | 2 +- 36 files changed, 1780 insertions(+), 299 deletions(-) create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalControlExportModel.java create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBox.java 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 create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/fiscalControlExport/FiscalControlExportView.css 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 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/warning.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.