This is an automated email from the git hooks/post-receive script. New change to branch feature/newReportBuilder in repository lima. See http://git.chorem.org/lima.git from 5007fb8 refs #769 add general ledger report adds 612498a apply topia evolution adds 6df0048 fix #1121 : Lettrage - afficher le journal adds 1cd1b3b fixes #1120 #1117 : fucus sur la transaction + création d'une transaction avec un seul ligne adds f852cfd fixes #1104 : déplacement du bandeau "BETA" new 5c96a75 Merge branch 'develop' into feature/newReportBuilder 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 5c96a75a8e2df5e61828f18753660520b75b8bac Merge: 5007fb8 f852cfd Author: dcosse <japbiw74> Date: Fri Feb 6 17:18:52 2015 +0100 Merge branch 'develop' into feature/newReportBuilder Conflicts: lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java lima-swing/src/main/java/org/chorem/lima/ui/BetaLayerUI.java solve conflict Summary of changes: .../org/chorem/lima/ui/celleditor/EntryBookTableCellRender.java | 6 +++++- .../chorem/lima/ui/common/FinancialTransactionTableModel.java | 5 ----- .../ui/financialtransaction/FinancialTransactionViewHandler.java | 5 +++++ .../java/org/chorem/lima/ui/lettering/LetteringTableModel.java | 9 +++++++++ 4 files changed, 19 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.