October 2014 - Chorem-commits - mailman.cloud.codelutin.com

[chorem] branch develop updated (a4b614d -> 7508a6b)
by chorem.org scm Oct. 27, 2014

Oct. 27, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from a4b614d fixes #1129: Migrates to git new 7508a6b fixes #1129: Migrates to git 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 7508a6b6f62e347ba9e2e5dc28127cb7230f0b4d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Oct 27 20:01:42 2014 +0100 fixes #1129: Migrates to git Summary of changes: pom.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[chorem] branch develop updated (add8535 -> a4b614d)
by chorem.org scm Oct. 27, 2014

Oct. 27, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from add8535 include some hotfix from tag 0.3 new a4b614d fixes #1129: Migrates to git 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 a4b614de0fa008e8c74e51d80991b6cb0276b641 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Oct 27 19:44:24 2014 +0100 fixes #1129: Migrates to git Summary of changes: .gitignore | 14 + chorem-entities/pom.xml | 4 +- .../com/inamik/utils/AbstractTableFormatter.java | 2 - .../com/inamik/utils/SimpleTableFormatter.java | 2 - .../main/java/com/inamik/utils/TableFormatter.java | 2 - .../src/main/java/org/chorem/ChoremAction.java | 4 +- .../src/main/java/org/chorem/ChoremClient.java | 4 +- .../src/main/java/org/chorem/ChoremConfig.java | 4 +- .../main/java/org/chorem/ChoremConfigAction.java | 4 +- .../main/java/org/chorem/ChoremConfigOption.java | 4 +- .../src/main/java/org/chorem/ChoremMain.java | 4 +- .../main/java/org/chorem/ChoremQueryHelper.java | 4 +- .../src/main/java/org/chorem/ChoremQueryMaker.java | 4 +- .../src/main/java/org/chorem/ChoremUtil.java | 2 - .../main/java/org/chorem/ImportChoremTopia.java | 4 +- .../src/main/java/org/chorem/Saint.java | 4 +- .../org/chorem/entities/EmployeeMigration.java | 4 +- .../org/chorem/entities/ExpenseClaimStatus.java | 4 +- .../java/org/chorem/entities/InvoiceMigration.java | 4 +- .../java/org/chorem/entities/InvoiceStatus.java | 4 +- .../java/org/chorem/entities/InvoiceableUtil.java | 4 +- .../org/chorem/entities/Quotation18Migration.java | 2 - .../org/chorem/entities/QuotationMigration.java | 4 +- .../java/org/chorem/entities/QuotationStatus.java | 4 +- .../main/java/org/chorem/entities/TaskStatus.java | 4 +- .../org/chorem/entities/VacationMigration.java | 4 +- .../java/org/chorem/entities/VacationStatus.java | 4 +- .../java/org/chorem/project/AdcCalculation.java | 2 - .../main/java/org/chorem/project/Calculation.java | 2 - .../org/chorem/project/QuotationCalculation.java | 2 - .../java/org/chorem/project/TaskCalculation.java | 2 - .../chorem/project/TotalQuotationCalculation.java | 2 - .../src/main/resources/chorem.properties | 4 +- .../src/main/resources/log4j.properties | 5 +- .../src/main/xmi/chorem-model.properties | 4 +- chorem-entities/src/main/xmi/vacations.rst | 4 +- chorem-entities/src/site/rst/dataModel.rst | 4 +- chorem-entities/src/site/rst/gepeto.rst | 2 - .../src/site/site.xml | 35 +- .../src/test/java/org/chorem/ChoremUtilTest.java | 2 - .../org/chorem/entities/InvoiceableUtilTest.java | 4 +- chorem-webmotion/pom.xml | 9 +- chorem-webmotion/src/jetty/jetty-context.xml | 6 +- .../java/org/chorem/webmotion/ChoremDateUtil.java | 4 +- .../org/chorem/webmotion/ChoremWebMotionUtil.java | 4 +- .../java/org/chorem/webmotion/PaginatedResult.java | 2 - .../webmotion/actions/AdcDashboardAction.java | 2 - .../org/chorem/webmotion/actions/AdminAction.java | 4 +- .../org/chorem/webmotion/actions/BIAction.java | 2 - .../chorem/webmotion/actions/DashboardAction.java | 4 +- .../webmotion/actions/DashboardHRAction.java | 4 +- .../webmotion/actions/EmployeeEditAction.java | 2 - .../chorem/webmotion/actions/GenericAction.java | 4 +- .../org/chorem/webmotion/actions/HrAction.java | 6 +- .../chorem/webmotion/actions/MapWithDefault.java | 4 +- .../webmotion/actions/WikittyRestAction.java | 2 - .../webmotion/actions/crm/AccountAction.java | 2 - .../webmotion/actions/crm/ContactRowForExport.java | 2 - .../actions/crm/ContactRowForExportModel.java | 2 - .../chorem/webmotion/actions/crm/ExportAction.java | 2 - .../webmotion/actions/crm/QuotationAction.java | 2 - .../financial/AccountBillingReportAction.java | 2 - .../financial/BillingPerAccountReportAction.java | 2 - .../financial/BillingPerProjectReportAction.java | 2 - .../actions/financial/BillingReportAction.java | 2 - .../actions/financial/BillingReportHelper.java | 2 - .../actions/financial/ExpenseAccountAction.java | 2 - .../financial/ProjectBillingReportAction.java | 2 - .../actions/project/DashboardProjectAction.java | 2 - .../webmotion/actions/project/GanttAction.java | 2 - .../webmotion/actions/project/ProjectsAction.java | 2 - .../webmotion/actions/project/QuotationData.java | 2 - .../actions/project/QuotationStatusAction.java | 2 - .../chorem/webmotion/actions/project/TaskData.java | 2 - .../sales/AcceptedQuotationsReportAction.java | 2 - .../actions/sales/AccountSalesReportAction.java | 2 - .../webmotion/actions/sales/FunnelAction.java | 2 - .../actions/sales/ProjectSalesReportAction.java | 2 - .../webmotion/actions/sales/QuotationYearData.java | 2 - .../webmotion/actions/sales/SalesAction.java | 4 +- .../chorem/webmotion/actions/sales/SalesData.java | 2 - .../actions/sales/SalesPerAccountReportAction.java | 2 - .../actions/sales/SalesPerProjectReportAction.java | 2 - .../webmotion/actions/sales/SalesReportAction.java | 2 - .../webmotion/actions/sales/SalesReportHelper.java | 2 - .../actions/sales/SentQuotationsReportAction.java | 2 - .../bean/financial/ExpenseAccountBean.java | 2 - .../bean/financial/ExpenseAccountEntryBean.java | 2 - .../webmotion/filters/AuthenticationFilter.java | 4 +- .../webmotion/filters/ChoremClientFilter.java | 4 +- .../chorem/webmotion/filters/DecoratorFilter.java | 4 +- .../webmotion/injector/InjectorListener.java | 4 +- .../org/chorem/webmotion/render/RenderWikitty.java | 2 - .../chorem/webmotion/render/RenderWikittyJson.java | 2 - .../org/wikitty/web/jsptag/WikittyDisplay.java | 4 +- .../java/org/wikitty/web/jsptag/WikittyInput.java | 4 +- .../src/main/resources/log4j.properties | 4 +- .../main/webapp/WEB-INF/jsp/admin/importExport.jsp | 4 +- .../webapp/WEB-INF/jsp/bi/reportDefinition.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/contact.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/crm/account.jsp | 8 +- .../src/main/webapp/WEB-INF/jsp/crm/company.jsp | 2 - .../main/webapp/WEB-INF/jsp/crm/editQuotation.jsp | 8 +- .../src/main/webapp/WEB-INF/jsp/crm/project.jsp | 2 - .../src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp | 4 +- .../webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardBudget.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardEmployee.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardInvoice.jsp | 4 +- .../webapp/WEB-INF/jsp/dashboardMultiProject.jsp | 4 +- .../webapp/WEB-INF/jsp/dashboardProfitability.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardProject.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardQuotation.jsp | 4 +- .../WEB-INF/jsp/dashboardRequestVacation.jsp | 4 +- .../webapp/WEB-INF/jsp/dashboardSingleProject.jsp | 6 +- .../main/webapp/WEB-INF/jsp/dashboardSummary.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardVacation.jsp | 6 +- .../webapp/WEB-INF/jsp/dashboardVacationAsked.jsp | 4 +- .../WEB-INF/jsp/dashboardVacationByEmployee.jsp | 4 +- .../jsp/dashboardWorkingProjectDaysByEmployee.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/decorator.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/edit.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/editMulti.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/editRelated.jsp | 6 +- .../webapp/WEB-INF/jsp/editVacationRequest.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/employeeEdit.jsp | 4 +- .../WEB-INF/jsp/financial/expenseAccountView.jsp | 2 - .../WEB-INF/jsp/financial/expenseAccounts.jsp | 2 - .../jsp/financial/reports/accountBillingReport.jsp | 8 +- .../financial/reports/billingPerAccountReport.jsp | 8 +- .../financial/reports/billingPerProjectReport.jsp | 8 +- .../jsp/financial/reports/billingReport.jsp | 8 +- .../webapp/WEB-INF/jsp/financial/reports/menu.jsp | 4 +- .../jsp/financial/reports/projectBillingReport.jsp | 8 +- .../src/main/webapp/WEB-INF/jsp/hr.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/index.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/login.jsp | 6 +- .../webapp/WEB-INF/jsp/projects/editProject.html | 4 +- .../main/webapp/WEB-INF/jsp/projects/projects.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/report.jsp | 4 +- .../WEB-INF/jsp/salesReports/acceptedQuotation.jsp | 8 +- .../jsp/salesReports/accountSalesReport.jsp | 8 +- .../WEB-INF/jsp/salesReports/dialog-cancel.html | 4 +- .../jsp/salesReports/dialog-draftToSent.html | 4 +- .../jsp/salesReports/dialog-leadToDraft.html | 4 +- .../jsp/salesReports/dialog-sentToAccepted.html | 4 +- .../jsp/salesReports/dialog-sentToRejected.html | 4 +- .../main/webapp/WEB-INF/jsp/salesReports/menu.jsp | 4 +- .../jsp/salesReports/projectSalesReport.jsp | 8 +- .../main/webapp/WEB-INF/jsp/salesReports/sales.jsp | 8 +- .../WEB-INF/jsp/salesReports/salesFunnel.jsp | 8 +- .../jsp/salesReports/salesPerAccountReport.jsp | 8 +- .../jsp/salesReports/salesPerProjectReport.jsp | 8 +- .../WEB-INF/jsp/salesReports/salesReport.jsp | 8 +- .../WEB-INF/jsp/salesReports/sentQuotation.jsp | 8 +- .../src/main/webapp/WEB-INF/jsp/search.jsp | 4 +- .../main/webapp/WEB-INF/jsp/simpleWikiFields.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/vacationDiv.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/view.jsp | 4 +- .../main/webapp/WEB-INF/jsp/viewActionCompany.jsp | 4 +- .../main/webapp/WEB-INF/jsp/viewActionEmployee.jsp | 4 +- .../WEB-INF/jsp/viewActionFinancialTransaction.jsp | 8 +- .../main/webapp/WEB-INF/jsp/viewActionPerson.jsp | 4 +- .../main/webapp/WEB-INF/jsp/viewActionProject.jsp | 4 +- .../webapp/WEB-INF/jsp/viewActionQuotation.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/viewActionTask.jsp | 4 +- .../src/main/webapp/WEB-INF/nuiton-js.properties | 2 - chorem-webmotion/src/main/webapp/WEB-INF/web.xml | 4 +- chorem-webmotion/src/main/webapp/WEB-INF/wro.xml | 2 - chorem-webmotion/src/main/webapp/css/chorem-bi.css | 4 +- .../src/main/webapp/css/chorem-crm.css | 4 +- .../src/main/webapp/css/chorem-sales.css | 4 +- .../src/main/webapp/css/employeeEdit.css | 2 - .../main/webapp/css/jquery-ui-timepicker-addon.css | 4 +- .../src/main/webapp/css/jquery.fn.gantt.css | 2 - .../src/main/webapp/css/ng-grid.min.css | 4 +- .../src/main/webapp/css/select2/select2.css | 2 - .../src/main/webapp/css/vacationRequest.css | 4 +- chorem-webmotion/src/main/webapp/js/chorem.js | 6 +- .../src/main/webapp/js/dashboardAdc.js | 4 +- .../src/main/webapp/js/employeeEdit.js | 4 +- .../src/main/webapp/js/financial/expenseAccount.js | 2 +- .../webapp/js/financial/expenseAccountListCtrl.js | 2 +- .../src/main/webapp/js/jquery.fn.gantt.js | 2 - .../src/main/webapp/js/js-hypercube.min.js | 4 +- chorem-webmotion/src/main/webapp/js/less-1.3.3.js | 2 - .../src/main/webapp/js/ng-grid-2.0.7.debug.js | 4 +- .../src/main/webapp/js/ng-grid-2.0.7.min.js | 4 +- chorem-webmotion/src/main/webapp/js/ng-select2.js | 2 - chorem-webmotion/src/main/webapp/js/ng-wikitty.js | 2 - .../src/main/webapp/js/paginationTable.js | 4 +- .../src/main/webapp/js/projectPagination.js | 4 +- chorem-webmotion/src/main/webapp/js/salesFunnel.js | 4 +- chorem-webmotion/src/main/webapp/js/select2.min.js | 4 +- .../src/{jetty/jetty-context.xml => site/site.xml} | 35 +- .../src/test/resources/log4j.properties | 4 +- pom.xml | 452 +++++++++++---------- src/site/rst/calculations.rst | 2 - src/site/rst/chorem-cdc.rst | 4 +- src/site/rst/doc-devel.rst | 4 +- src/site/rst/index.rst | 6 +- src/site/rst/requisite.rst | 4 +- src/site/site.xml | 69 ++++ src/site/site_fr.xml | 113 ------ 205 files changed, 534 insertions(+), 950 deletions(-) create mode 100644 .gitignore copy chorem-webmotion/src/jetty/jetty-context.xml => chorem-entities/src/site/site.xml (54%) copy chorem-webmotion/src/{jetty/jetty-context.xml => site/site.xml} (54%) create mode 100644 src/site/site.xml delete mode 100644 src/site/site_fr.xml -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[chorem] branch master updated (add8535 -> d53a7a7)
by chorem.org scm Oct. 27, 2014

Oct. 27, 2014

This is an automated email from the git hooks/post-receive script. New change to branch master in repository chorem. See http://git.chorem.org/chorem.git omits add8535 include some hotfix from tag 0.3 omits f4b948a release was done, go on 0.4-SNAPSHOT version omits 522de28 [maven-release-plugin] prepare release chorem-0.3 omits c54e924 [maven-release-plugin] rollback the release of chorem-0.3 omits 6cfb39a [maven-release-plugin] prepare for next development iteration omits 319f863 [maven-release-plugin] prepare release chorem-0.3 omits 1eb3e54 force version 3.3 of site plugin omits 8fc3460 [maven-release-plugin] rollback the release of chorem-0.3 omits 81d2581 [maven-release-plugin] prepare for next development iteration adds e2fb495 [maven-release-plugin] copy for tag chorem-0.3 adds 5dcc4c6 [maven-release-plugin] copy for tag chorem-0.3 adds d53a7a7 fix release 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 (add8535) \ N -- N -- N refs/heads/master (d53a7a7) 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. No new revisions were added by this update. Summary of changes: chorem-entities/pom.xml | 2 +- chorem-webmotion/pom.xml | 2 +- pom.xml | 8 +++----- LICENSE.txt => trunk/LICENSE.txt | 0 README.txt => trunk/README.txt | 0 changelog.txt => trunk/changelog.txt | 0 LICENSE.txt => trunk/chorem-entities/LICENSE.txt | 0 README.txt => trunk/chorem-entities/README.txt | 0 changelog.txt => trunk/chorem-entities/changelog.txt | 0 {chorem-entities => trunk/chorem-entities}/pom.xml | 2 +- .../chorem-entities}/src/license/THIRD-PARTY.properties | 0 .../main/java/com/inamik/utils/AbstractTableFormatter.java | 0 .../main/java/com/inamik/utils/SimpleTableFormatter.java | 0 .../src/main/java/com/inamik/utils/TableFormatter.java | 0 .../src/main/java/org/chorem/ChoremAction.java | 0 .../src/main/java/org/chorem/ChoremClient.java | 0 .../src/main/java/org/chorem/ChoremConfig.java | 0 .../src/main/java/org/chorem/ChoremConfigAction.java | 0 .../src/main/java/org/chorem/ChoremConfigOption.java | 0 .../src/main/java/org/chorem/ChoremMain.java | 0 .../src/main/java/org/chorem/ChoremQueryHelper.java | 0 .../src/main/java/org/chorem/ChoremQueryMaker.java | 0 .../src/main/java/org/chorem/ChoremUtil.java | 0 .../src/main/java/org/chorem/ImportChoremTopia.java | 0 .../chorem-entities}/src/main/java/org/chorem/Saint.java | 0 .../main/java/org/chorem/entities/EmployeeMigration.java | 0 .../main/java/org/chorem/entities/ExpenseClaimStatus.java | 0 .../src/main/java/org/chorem/entities/InvoiceMigration.java | 0 .../src/main/java/org/chorem/entities/InvoiceStatus.java | 0 .../src/main/java/org/chorem/entities/InvoiceableUtil.java | 0 .../main/java/org/chorem/entities/Quotation18Migration.java | 0 .../main/java/org/chorem/entities/QuotationMigration.java | 0 .../src/main/java/org/chorem/entities/QuotationStatus.java | 0 .../src/main/java/org/chorem/entities/TaskStatus.java | 0 .../main/java/org/chorem/entities/VacationMigration.java | 0 .../src/main/java/org/chorem/entities/VacationStatus.java | 0 .../src/main/java/org/chorem/project/AdcCalculation.java | 0 .../src/main/java/org/chorem/project/Calculation.java | 0 .../main/java/org/chorem/project/QuotationCalculation.java | 0 .../src/main/java/org/chorem/project/TaskCalculation.java | 0 .../java/org/chorem/project/TotalQuotationCalculation.java | 0 .../chorem-entities}/src/main/resources/chorem.properties | 0 .../chorem-entities}/src/main/resources/log4j.properties | 0 .../chorem-entities}/src/main/xmi/chorem-model.properties | 0 .../chorem-entities}/src/main/xmi/chorem-model.zargo | Bin .../chorem-entities}/src/main/xmi/vacations.rst | 0 .../chorem-entities}/src/site/rst/chorem-entities-base.png | Bin .../chorem-entities}/src/site/rst/chorem-entities-billy.png | Bin .../src/site/rst/chorem-entities-bonzoms.png | Bin .../src/site/rst/chorem-entities-gepeto.png | Bin .../chorem-entities}/src/site/rst/dataModel.rst | 0 .../chorem-entities}/src/site/rst/gepeto.rst | 0 .../src/test/java/org/chorem/ChoremUtilTest.java | 0 .../test/java/org/chorem/entities/InvoiceableUtilTest.java | 0 {chorem-web => trunk/chorem-web}/LICENSE.txt | 0 README.txt => trunk/chorem-web/README.txt | 0 changelog.txt => trunk/chorem-web/changelog.txt | 0 {chorem-web => trunk/chorem-web}/pom.xml | 0 {chorem-web => trunk/chorem-web}/src/main/i18n/jsp.rules | 0 .../chorem-web}/src/main/java/org/chorem/ChoremSession.java | 0 .../chorem-web}/src/main/java/org/chorem/ChoremUtil.java | 0 .../src/main/java/org/chorem/ContactDetailsConstants.java | 0 .../chorem-web}/src/main/java/org/chorem/JspUtils.java | 0 .../src/main/java/org/chorem/action/ChoremBaseAction.java | 0 .../main/java/org/chorem/action/EntitySearchJsonAction.java | 0 .../src/main/java/org/chorem/action/HomeAction.java | 0 .../org/chorem/action/SelectWikittyComponentAction.java | 0 .../main/java/org/chorem/billy/action/QuotationAction.java | 0 .../src/main/java/org/chorem/gepeto/ProjectOrderFull.java | 0 .../main/java/org/chorem/gepeto/action/ProjectAction.java | 0 .../java/org/chorem/gepeto/action/ProjectOrderAction.java | 0 .../src/main/java/org/chorem/gepeto/action/TaskAction.java | 0 .../chorem-web}/src/main/resources/freemarker.properties | 0 .../src/main/resources/i18n/chorem-web_en_GB.properties | 0 .../src/main/resources/i18n/chorem-web_fr_FR.properties | 0 .../action/QuotationAction-addQuotation-validation.xml | 0 .../action/QuotationAction-modifyQuotation-validation.xml | 0 .../gepeto/action/ProjectAction-addProject-validation.xml | 0 .../action/ProjectAction-modifyProject-validation.xml | 0 .../ProjectOrderAction-addProjectOrder-validation.xml | 0 .../chorem/gepeto/action/TaskAction-addTask-validation.xml | 0 .../chorem-web}/src/main/resources/struts.properties | 0 .../chorem-web}/src/main/resources/struts.xml | 0 .../chorem-web}/src/main/webapp/WEB-INF/decorators.xml | 0 .../src/main/webapp/WEB-INF/decorators/billy.jsp | 0 .../src/main/webapp/WEB-INF/decorators/bonzoms.jsp | 0 .../chorem-web}/src/main/webapp/WEB-INF/decorators/cash.jsp | 0 .../src/main/webapp/WEB-INF/decorators/gepeto.jsp | 0 .../chorem-web}/src/main/webapp/WEB-INF/decorators/main.jsp | 0 .../src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp | 0 .../chorem-web}/src/main/webapp/WEB-INF/jsp/billy/home.jsp | 0 .../chorem-web}/src/main/webapp/WEB-INF/jsp/billy/menu.jsp | 0 .../src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp | 0 .../src/main/webapp/WEB-INF/jsp/bonzoms/companies.jsp | 0 .../src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp | 0 .../src/main/webapp/WEB-INF/jsp/bonzoms/persons.jsp | 0 .../src/main/webapp/WEB-INF/jsp/common/inc/footer.jsp | 0 .../src/main/webapp/WEB-INF/jsp/common/inc/header.jsp | 0 .../webapp/WEB-INF/jsp/common/selectWikittyComponent.jsp | 0 .../src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp | 0 .../src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp | 0 .../src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp | 0 .../chorem-web}/src/main/webapp/WEB-INF/jsp/gepeto/menu.jsp | 0 .../src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp | 0 .../main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp | 0 .../src/main/webapp/WEB-INF/jsp/gepeto/projects.jsp | 0 .../src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp | 0 .../webapp/WEB-INF/jsp/gepeto/projectsWithoutQuotation.jsp | 0 .../src/main/webapp/WEB-INF/jsp/gepeto/results.jsp | 0 .../chorem-web}/src/main/webapp/WEB-INF/jsp/home.jsp | 0 .../chorem-web}/src/main/webapp/WEB-INF/sitemesh.xml | 0 .../chorem-web}/src/main/webapp/WEB-INF/web.xml | 0 .../chorem-web}/src/main/webapp/css/style.css | 0 .../chorem-web}/src/main/webapp/js/chorem.js | 0 .../chorem-web}/src/main/webapp/template/simple/a-close.ftl | 0 .../src/main/webapp/template/simple/form-common.ftl | 0 .../src/main/webapp/template/xhtml/controlheader-core.ftl | 0 .../chorem-web}/src/main/webapp/template/xhtml/file.ftl | 0 .../src/main/webapp/template/xhtml/form-close.ftl | 0 .../chorem-web}/src/main/webapp/template/xhtml/form.ftl | 0 .../chorem-web}/src/main/webapp/template/xhtml/password.ftl | 0 .../src/main/webapp/template/xhtml/submit-close.ftl | 0 .../chorem-web}/src/main/webapp/template/xhtml/submit.ftl | 0 .../chorem-web}/src/main/webapp/template/xhtml/text.ftl | 0 .../chorem-web}/src/main/webapp/template/xhtml/textarea.ftl | 0 LICENSE.txt => trunk/chorem-webmotion/LICENSE.txt | 0 README.txt => trunk/chorem-webmotion/README.txt | 0 changelog.txt => trunk/chorem-webmotion/changelog.txt | 0 {chorem-webmotion => trunk/chorem-webmotion}/pom.xml | 2 +- .../chorem-webmotion}/src/doc/REST_API_Timer.txt | 0 .../chorem-webmotion}/src/jetty/jetty-context.xml | 0 .../chorem-webmotion}/src/license/THIRD-PARTY.properties | 0 .../chorem-webmotion}/src/main/i18n/jsp.rules | 0 .../src/main/java/org/chorem/webmotion/ChoremDateUtil.java | 0 .../main/java/org/chorem/webmotion/ChoremWebMotionUtil.java | 0 .../src/main/java/org/chorem/webmotion/PaginatedResult.java | 0 .../org/chorem/webmotion/actions/AdcDashboardAction.java | 0 .../main/java/org/chorem/webmotion/actions/AdminAction.java | 0 .../main/java/org/chorem/webmotion/actions/BIAction.java | 0 .../java/org/chorem/webmotion/actions/DashboardAction.java | 0 .../org/chorem/webmotion/actions/DashboardHRAction.java | 0 .../org/chorem/webmotion/actions/EmployeeEditAction.java | 0 .../java/org/chorem/webmotion/actions/GenericAction.java | 0 .../main/java/org/chorem/webmotion/actions/HrAction.java | 0 .../java/org/chorem/webmotion/actions/MapWithDefault.java | 0 .../org/chorem/webmotion/actions/WikittyRestAction.java | 0 .../org/chorem/webmotion/actions/crm/AccountAction.java | 0 .../chorem/webmotion/actions/crm/ContactRowForExport.java | 0 .../webmotion/actions/crm/ContactRowForExportModel.java | 0 .../java/org/chorem/webmotion/actions/crm/ExportAction.java | 0 .../org/chorem/webmotion/actions/crm/QuotationAction.java | 0 .../actions/financial/AccountBillingReportAction.java | 0 .../actions/financial/BillingPerAccountReportAction.java | 0 .../actions/financial/BillingPerProjectReportAction.java | 0 .../webmotion/actions/financial/BillingReportAction.java | 0 .../webmotion/actions/financial/BillingReportHelper.java | 0 .../webmotion/actions/financial/ExpenseAccountAction.java | 0 .../actions/financial/ProjectBillingReportAction.java | 0 .../webmotion/actions/project/DashboardProjectAction.java | 0 .../org/chorem/webmotion/actions/project/GanttAction.java | 0 .../chorem/webmotion/actions/project/ProjectsAction.java | 0 .../org/chorem/webmotion/actions/project/QuotationData.java | 0 .../webmotion/actions/project/QuotationStatusAction.java | 0 .../java/org/chorem/webmotion/actions/project/TaskData.java | 0 .../actions/sales/AcceptedQuotationsReportAction.java | 0 .../webmotion/actions/sales/AccountSalesReportAction.java | 0 .../org/chorem/webmotion/actions/sales/FunnelAction.java | 0 .../webmotion/actions/sales/ProjectSalesReportAction.java | 0 .../chorem/webmotion/actions/sales/QuotationYearData.java | 0 .../org/chorem/webmotion/actions/sales/SalesAction.java | 0 .../java/org/chorem/webmotion/actions/sales/SalesData.java | 0 .../actions/sales/SalesPerAccountReportAction.java | 0 .../actions/sales/SalesPerProjectReportAction.java | 0 .../chorem/webmotion/actions/sales/SalesReportAction.java | 0 .../chorem/webmotion/actions/sales/SalesReportHelper.java | 0 .../webmotion/actions/sales/SentQuotationsReportAction.java | 0 .../chorem/webmotion/bean/financial/ExpenseAccountBean.java | 0 .../webmotion/bean/financial/ExpenseAccountEntryBean.java | 0 .../java/org/chorem/webmotion/converters/JsonConverter.java | 0 .../java/org/chorem/webmotion/converters/JsonHelper.java | 0 .../org/chorem/webmotion/filters/AuthenticationFilter.java | 0 .../org/chorem/webmotion/filters/ChoremClientFilter.java | 0 .../java/org/chorem/webmotion/filters/DecoratorFilter.java | 0 .../org/chorem/webmotion/injector/InjectorListener.java | 0 .../java/org/chorem/webmotion/render/RenderWikitty.java | 0 .../java/org/chorem/webmotion/render/RenderWikittyJson.java | 0 .../main/java/org/wikitty/web/jsptag/WikittyDisplay.java | 0 .../src/main/java/org/wikitty/web/jsptag/WikittyInput.java | 0 .../main/resources/i18n/chorem-webmotion_en_GB.properties | 0 .../main/resources/i18n/chorem-webmotion_fr_FR.properties | 0 .../chorem-webmotion}/src/main/resources/log4j.properties | 0 .../chorem-webmotion}/src/main/resources/mapping | 0 .../src/main/webapp/WEB-INF/jsp/admin/importExport.jsp | 0 .../src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp | 0 .../src/main/webapp/WEB-INF/jsp/contact.jsp | 0 .../src/main/webapp/WEB-INF/jsp/crm/account.jsp | 0 .../src/main/webapp/WEB-INF/jsp/crm/company.jsp | 0 .../src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp | 0 .../src/main/webapp/WEB-INF/jsp/crm/project.jsp | 0 .../src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp | 0 .../src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp | 0 .../src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp | 0 .../src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp | 0 .../src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp | 0 .../src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp | 0 .../src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp | 0 .../src/main/webapp/WEB-INF/jsp/dashboardProject.jsp | 0 .../src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp | 0 .../main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp | 0 .../src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp | 0 .../src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp | 0 .../src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp | 0 .../src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp | 0 .../src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp | 0 .../main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp | 0 .../WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp | 0 .../src/main/webapp/WEB-INF/jsp/decorator.jsp | 0 .../chorem-webmotion}/src/main/webapp/WEB-INF/jsp/edit.jsp | 0 .../src/main/webapp/WEB-INF/jsp/editMulti.jsp | 0 .../src/main/webapp/WEB-INF/jsp/editRelated.jsp | 0 .../src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp | 0 .../src/main/webapp/WEB-INF/jsp/employeeEdit.jsp | 0 .../WEB-INF/jsp/financial/expenseAccountEntryEdit.html | 0 .../webapp/WEB-INF/jsp/financial/expenseAccountView.jsp | 0 .../main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp | 0 .../WEB-INF/jsp/financial/reports/accountBillingReport.jsp | 0 .../jsp/financial/reports/billingPerAccountReport.jsp | 0 .../jsp/financial/reports/billingPerProjectReport.jsp | 0 .../webapp/WEB-INF/jsp/financial/reports/billingReport.jsp | 0 .../src/main/webapp/WEB-INF/jsp/financial/reports/menu.jsp | 0 .../WEB-INF/jsp/financial/reports/projectBillingReport.jsp | 0 .../chorem-webmotion}/src/main/webapp/WEB-INF/jsp/hr.jsp | 0 .../chorem-webmotion}/src/main/webapp/WEB-INF/jsp/index.jsp | 0 .../chorem-webmotion}/src/main/webapp/WEB-INF/jsp/login.jsp | 0 .../src/main/webapp/WEB-INF/jsp/projects/editProject.html | 0 .../src/main/webapp/WEB-INF/jsp/projects/projects.jsp | 0 .../src/main/webapp/WEB-INF/jsp/report.jsp | 0 .../webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp | 0 .../webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp | 0 .../main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html | 0 .../webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html | 0 .../webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html | 0 .../WEB-INF/jsp/salesReports/dialog-sentToAccepted.html | 0 .../WEB-INF/jsp/salesReports/dialog-sentToRejected.html | 0 .../src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp | 0 .../webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp | 0 .../src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp | 0 .../main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp | 0 .../WEB-INF/jsp/salesReports/salesPerAccountReport.jsp | 0 .../WEB-INF/jsp/salesReports/salesPerProjectReport.jsp | 0 .../main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp | 0 .../main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp | 0 .../src/main/webapp/WEB-INF/jsp/search.jsp | 0 .../src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp | 0 .../src/main/webapp/WEB-INF/jsp/vacationDiv.jsp | 0 .../chorem-webmotion}/src/main/webapp/WEB-INF/jsp/view.jsp | 0 .../src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp | 0 .../src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp | 0 .../webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp | 0 .../src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp | 0 .../src/main/webapp/WEB-INF/jsp/viewActionProject.jsp | 0 .../src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp | 0 .../src/main/webapp/WEB-INF/jsp/viewActionTask.jsp | 0 .../src/main/webapp/WEB-INF/nuiton-js.properties | 0 .../chorem-webmotion}/src/main/webapp/WEB-INF/web.xml | 0 .../chorem-webmotion}/src/main/webapp/WEB-INF/wikitty.tld | 0 .../chorem-webmotion}/src/main/webapp/WEB-INF/wro.xml | 0 .../chorem-webmotion}/src/main/webapp/css/chorem-bi.css | 0 .../chorem-webmotion}/src/main/webapp/css/chorem-crm.css | 0 .../chorem-webmotion}/src/main/webapp/css/chorem-sales.css | 0 .../chorem-webmotion}/src/main/webapp/css/chorem.less | 0 .../chorem-webmotion}/src/main/webapp/css/employeeEdit.css | 0 .../src/main/webapp/css/jquery-ui-timepicker-addon.css | 0 .../src/main/webapp/css/jquery.fn.gantt.css | 0 .../chorem-webmotion}/src/main/webapp/css/ng-grid.min.css | 0 .../src/main/webapp/css/select2/select2-spinner.gif | Bin .../src/main/webapp/css/select2/select2.css | 0 .../src/main/webapp/css/select2/select2.png | Bin .../src/main/webapp/css/select2/select2x2.png | Bin .../src/main/webapp/css/vacationRequest.css | 0 .../chorem-webmotion}/src/main/webapp/img/ajax-loader.gif | Bin .../src/main/webapp/img/glyphicons-halflings-white.png | Bin .../src/main/webapp/img/glyphicons-halflings.png | Bin .../src/main/webapp/img/jquery.fn.gantt/grid.png | Bin .../src/main/webapp/img/jquery.fn.gantt/icon_sprite.png | Bin .../src/main/webapp/img/jquery.fn.gantt/loader_bg.png | Bin .../src/main/webapp/img/jquery.fn.gantt/slider_handle.png | Bin .../src/main/webapp/js/angular-ui-bootstrap-tpls-0.11.0.js | 0 .../chorem-webmotion}/src/main/webapp/js/chorem.js | 0 .../chorem-webmotion}/src/main/webapp/js/dashboardAdc.js | 0 .../chorem-webmotion}/src/main/webapp/js/employeeEdit.js | 0 .../src/main/webapp/js/financial/expenseAccount.js | 0 .../src/main/webapp/js/financial/expenseAccountListCtrl.js | 0 .../src/main/webapp/js/jquery-ui-timepicker-addon.js | 0 .../src/main/webapp/js/jquery-ui-timepicker-fr.js | 0 .../chorem-webmotion}/src/main/webapp/js/jquery.fn.gantt.js | 0 .../src/main/webapp/js/jquery.maskedinput-1.3-1.js | 0 .../src/main/webapp/js/js-hypercube.min.js | 0 .../chorem-webmotion}/src/main/webapp/js/less-1.3.3.js | 0 .../src/main/webapp/js/ng-grid-2.0.7.debug.js | 0 .../src/main/webapp/js/ng-grid-2.0.7.min.js | 0 .../chorem-webmotion}/src/main/webapp/js/ng-select2.js | 0 .../chorem-webmotion}/src/main/webapp/js/ng-wikitty.js | 0 .../chorem-webmotion}/src/main/webapp/js/paginationTable.js | 0 .../src/main/webapp/js/projectPagination.js | 0 .../chorem-webmotion}/src/main/webapp/js/salesFunnel.js | 0 .../chorem-webmotion}/src/main/webapp/js/select2.min.js | 0 .../org/chorem/webmotion/converters/JsonConverterTest.java | 0 .../chorem-webmotion}/src/test/resources/log4j.properties | 0 pom.xml => trunk/pom.xml | 12 ++++++------ .../src}/site/resources/images/logos/argouml-logo.png | Bin .../src}/site/resources/images/logos/jrst-logo.png | Bin .../site/resources/images/logos/restructuredtext-logo.png | Bin {src => trunk/src}/site/rst/calculations.rst | 0 {src => trunk/src}/site/rst/chorem-cdc.rst | 0 {src => trunk/src}/site/rst/doc-devel.rst | 0 {src => trunk/src}/site/rst/index.rst | 0 {src => trunk/src}/site/rst/requisite.rst | 0 {src => trunk/src}/site/site_fr.xml | 0 319 files changed, 13 insertions(+), 15 deletions(-) copy LICENSE.txt => trunk/LICENSE.txt (100%) copy README.txt => trunk/README.txt (100%) copy changelog.txt => trunk/changelog.txt (100%) copy LICENSE.txt => trunk/chorem-entities/LICENSE.txt (100%) copy README.txt => trunk/chorem-entities/README.txt (100%) copy changelog.txt => trunk/chorem-entities/changelog.txt (100%) copy {chorem-entities => trunk/chorem-entities}/pom.xml (99%) copy {chorem-entities => trunk/chorem-entities}/src/license/THIRD-PARTY.properties (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/com/inamik/utils/AbstractTableFormatter.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/com/inamik/utils/SimpleTableFormatter.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/com/inamik/utils/TableFormatter.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremAction.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremClient.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremConfig.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremConfigAction.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremConfigOption.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremMain.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremQueryHelper.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremQueryMaker.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremUtil.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ImportChoremTopia.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/Saint.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/EmployeeMigration.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/ExpenseClaimStatus.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/InvoiceMigration.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/InvoiceStatus.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/InvoiceableUtil.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/Quotation18Migration.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/QuotationMigration.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/QuotationStatus.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/TaskStatus.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/VacationMigration.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/VacationStatus.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/project/AdcCalculation.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/project/Calculation.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/project/QuotationCalculation.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/project/TaskCalculation.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/project/TotalQuotationCalculation.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/resources/chorem.properties (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/resources/log4j.properties (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/xmi/chorem-model.properties (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/xmi/chorem-model.zargo (100%) copy {chorem-entities => trunk/chorem-entities}/src/main/xmi/vacations.rst (100%) copy {chorem-entities => trunk/chorem-entities}/src/site/rst/chorem-entities-base.png (100%) copy {chorem-entities => trunk/chorem-entities}/src/site/rst/chorem-entities-billy.png (100%) copy {chorem-entities => trunk/chorem-entities}/src/site/rst/chorem-entities-bonzoms.png (100%) copy {chorem-entities => trunk/chorem-entities}/src/site/rst/chorem-entities-gepeto.png (100%) copy {chorem-entities => trunk/chorem-entities}/src/site/rst/dataModel.rst (100%) copy {chorem-entities => trunk/chorem-entities}/src/site/rst/gepeto.rst (100%) copy {chorem-entities => trunk/chorem-entities}/src/test/java/org/chorem/ChoremUtilTest.java (100%) copy {chorem-entities => trunk/chorem-entities}/src/test/java/org/chorem/entities/InvoiceableUtilTest.java (100%) copy {chorem-web => trunk/chorem-web}/LICENSE.txt (100%) copy README.txt => trunk/chorem-web/README.txt (100%) copy changelog.txt => trunk/chorem-web/changelog.txt (100%) copy {chorem-web => trunk/chorem-web}/pom.xml (100%) copy {chorem-web => trunk/chorem-web}/src/main/i18n/jsp.rules (100%) copy {chorem-web => trunk/chorem-web}/src/main/java/org/chorem/ChoremSession.java (100%) copy {chorem-web => trunk/chorem-web}/src/main/java/org/chorem/ChoremUtil.java (100%) copy {chorem-web => trunk/chorem-web}/src/main/java/org/chorem/ContactDetailsConstants.java (100%) copy {chorem-web => trunk/chorem-web}/src/main/java/org/chorem/JspUtils.java (100%) copy {chorem-web => trunk/chorem-web}/src/main/java/org/chorem/action/ChoremBaseAction.java (100%) copy {chorem-web => trunk/chorem-web}/src/main/java/org/chorem/action/EntitySearchJsonAction.java (100%) copy {chorem-web => trunk/chorem-web}/src/main/java/org/chorem/action/HomeAction.java (100%) copy {chorem-web => trunk/chorem-web}/src/main/java/org/chorem/action/SelectWikittyComponentAction.java (100%) copy {chorem-web => trunk/chorem-web}/src/main/java/org/chorem/billy/action/QuotationAction.java (100%) copy {chorem-web => trunk/chorem-web}/src/main/java/org/chorem/gepeto/ProjectOrderFull.java (100%) copy {chorem-web => trunk/chorem-web}/src/main/java/org/chorem/gepeto/action/ProjectAction.java (100%) copy {chorem-web => trunk/chorem-web}/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java (100%) copy {chorem-web => trunk/chorem-web}/src/main/java/org/chorem/gepeto/action/TaskAction.java (100%) copy {chorem-web => trunk/chorem-web}/src/main/resources/freemarker.properties (100%) copy {chorem-web => trunk/chorem-web}/src/main/resources/i18n/chorem-web_en_GB.properties (100%) copy {chorem-web => trunk/chorem-web}/src/main/resources/i18n/chorem-web_fr_FR.properties (100%) copy {chorem-web => trunk/chorem-web}/src/main/resources/org/chorem/billy/action/QuotationAction-addQuotation-validation.xml (100%) copy {chorem-web => trunk/chorem-web}/src/main/resources/org/chorem/billy/action/QuotationAction-modifyQuotation-validation.xml (100%) copy {chorem-web => trunk/chorem-web}/src/main/resources/org/chorem/gepeto/action/ProjectAction-addProject-validation.xml (100%) copy {chorem-web => trunk/chorem-web}/src/main/resources/org/chorem/gepeto/action/ProjectAction-modifyProject-validation.xml (100%) copy {chorem-web => trunk/chorem-web}/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml (100%) copy {chorem-web => trunk/chorem-web}/src/main/resources/org/chorem/gepeto/action/TaskAction-addTask-validation.xml (100%) copy {chorem-web => trunk/chorem-web}/src/main/resources/struts.properties (100%) copy {chorem-web => trunk/chorem-web}/src/main/resources/struts.xml (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/decorators.xml (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/decorators/billy.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/decorators/bonzoms.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/decorators/cash.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/decorators/gepeto.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/decorators/main.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/billy/home.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/billy/menu.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/bonzoms/companies.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/bonzoms/persons.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/common/inc/footer.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/common/inc/header.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/common/selectWikittyComponent.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/gepeto/menu.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/gepeto/projects.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/gepeto/projectsWithoutQuotation.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/gepeto/results.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/jsp/home.jsp (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/sitemesh.xml (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/WEB-INF/web.xml (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/css/style.css (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/js/chorem.js (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/template/simple/a-close.ftl (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/template/simple/form-common.ftl (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/template/xhtml/controlheader-core.ftl (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/template/xhtml/file.ftl (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/template/xhtml/form-close.ftl (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/template/xhtml/form.ftl (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/template/xhtml/password.ftl (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/template/xhtml/submit-close.ftl (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/template/xhtml/submit.ftl (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/template/xhtml/text.ftl (100%) copy {chorem-web => trunk/chorem-web}/src/main/webapp/template/xhtml/textarea.ftl (100%) copy LICENSE.txt => trunk/chorem-webmotion/LICENSE.txt (100%) copy README.txt => trunk/chorem-webmotion/README.txt (100%) copy changelog.txt => trunk/chorem-webmotion/changelog.txt (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/pom.xml (99%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/doc/REST_API_Timer.txt (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/jetty/jetty-context.xml (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/license/THIRD-PARTY.properties (100%) copy {chorem-web => trunk/chorem-webmotion}/src/main/i18n/jsp.rules (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/ChoremDateUtil.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/PaginatedResult.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/AdminAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/BIAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/DashboardAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/GenericAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/HrAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/WikittyRestAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/financial/AccountBillingReportAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/financial/BillingPerAccountReportAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/financial/BillingPerProjectReportAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/financial/BillingReportAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/financial/BillingReportHelper.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/financial/ProjectBillingReportAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/project/TaskData.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/converters/JsonConverter.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/converters/JsonHelper.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/injector/InjectorListener.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/render/RenderWikitty.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/wikitty/web/jsptag/WikittyInput.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/resources/i18n/chorem-webmotion_en_GB.properties (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/resources/i18n/chorem-webmotion_fr_FR.properties (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/resources/log4j.properties (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/resources/mapping (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/contact.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/crm/account.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/crm/company.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/crm/project.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/decorator.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/edit.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/editMulti.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/editRelated.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/expenseAccountEntryEdit.html (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/reports/accountBillingReport.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerAccountReport.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerProjectReport.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/reports/billingReport.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/reports/menu.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/reports/projectBillingReport.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/hr.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/index.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/login.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/projects/editProject.html (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/projects/projects.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/report.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/search.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/view.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/nuiton-js.properties (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/web.xml (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/wikitty.tld (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/wro.xml (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/chorem-bi.css (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/chorem-crm.css (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/chorem-sales.css (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/chorem.less (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/employeeEdit.css (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/jquery-ui-timepicker-addon.css (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/jquery.fn.gantt.css (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/ng-grid.min.css (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/select2/select2-spinner.gif (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/select2/select2.css (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/select2/select2.png (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/select2/select2x2.png (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/vacationRequest.css (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/img/ajax-loader.gif (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/img/glyphicons-halflings-white.png (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/img/glyphicons-halflings.png (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/img/jquery.fn.gantt/grid.png (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/img/jquery.fn.gantt/icon_sprite.png (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/img/jquery.fn.gantt/loader_bg.png (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/img/jquery.fn.gantt/slider_handle.png (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/angular-ui-bootstrap-tpls-0.11.0.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/chorem.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/dashboardAdc.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/employeeEdit.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/financial/expenseAccount.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/financial/expenseAccountListCtrl.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/jquery-ui-timepicker-addon.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/jquery-ui-timepicker-fr.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/jquery.fn.gantt.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/jquery.maskedinput-1.3-1.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/js-hypercube.min.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/less-1.3.3.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/ng-grid-2.0.7.debug.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/ng-grid-2.0.7.min.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/ng-select2.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/ng-wikitty.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/paginationTable.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/projectPagination.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/salesFunnel.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/select2.min.js (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/test/java/org/chorem/webmotion/converters/JsonConverterTest.java (100%) copy {chorem-webmotion => trunk/chorem-webmotion}/src/test/resources/log4j.properties (100%) copy pom.xml => trunk/pom.xml (97%) copy {src => trunk/src}/site/resources/images/logos/argouml-logo.png (100%) copy {src => trunk/src}/site/resources/images/logos/jrst-logo.png (100%) copy {src => trunk/src}/site/resources/images/logos/restructuredtext-logo.png (100%) copy {src => trunk/src}/site/rst/calculations.rst (100%) copy {src => trunk/src}/site/rst/chorem-cdc.rst (100%) copy {src => trunk/src}/site/rst/doc-devel.rst (100%) copy {src => trunk/src}/site/rst/index.rst (100%) copy {src => trunk/src}/site/rst/requisite.rst (100%) copy {src => trunk/src}/site/site_fr.xml (100%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[chorem] branch develop created (now add8535)
by chorem.org scm Oct. 27, 2014

Oct. 27, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git at add8535 include some hotfix from tag 0.3 No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

r462 - trunk
by ymartel＠users.chorem.org Oct. 23, 2014

Oct. 23, 2014

Author: ymartel Date: 2014-10-23 11:29:24 +0200 (Thu, 23 Oct 2014) New Revision: 462 Url: http://forge.chorem.org/projects/chorem/repository/revisions/462 Log: include some hotfix from tag 0.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-23 09:23:06 UTC (rev 461) +++ trunk/pom.xml 2014-10-23 09:29:24 UTC (rev 462) @@ -15,7 +15,7 @@ <name>Chorem</name> <description>Project management</description> - <url>http://maven-site.chorem.org/chorem</url> + <url>http://chorem.chorem.org/chorem</url> <inceptionYear>2011</inceptionYear> <licenses> <license> @@ -29,7 +29,7 @@ <developer> <id>ymartel</id> <name>Yannick Martel</name> - <email>martel at codelutin.com</email> + <email>martel(a)codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -40,7 +40,7 @@ <developer> <id>tchemit</id> <name>Tony Chemit</name> - <email>chemit at codelutin.com</email> + <email>chemit(a)codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -51,7 +51,7 @@ <developer> <id>bpoussin</id> <name>Benjamin Poussin</name> - <email>poussin at codelutin.com</email> + <email>poussin(a)codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -63,7 +63,7 @@ <developer> <id>jcouteau</id> <name>Jean Couteau</name> - <email>couteau at codelutin.com</email> + <email>couteau(a)codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone>

1 0

r461 - in trunk: . chorem-entities chorem-webmotion
by ymartel＠users.chorem.org Oct. 23, 2014

Oct. 23, 2014

Author: ymartel Date: 2014-10-23 11:23:06 +0200 (Thu, 23 Oct 2014) New Revision: 461 Url: http://forge.chorem.org/projects/chorem/repository/revisions/461 Log: release was done, go on 0.4-SNAPSHOT version Modified: trunk/chorem-entities/pom.xml trunk/chorem-webmotion/pom.xml trunk/pom.xml Modified: trunk/chorem-entities/pom.xml =================================================================== --- trunk/chorem-entities/pom.xml 2014-10-23 08:58:09 UTC (rev 460) +++ trunk/chorem-entities/pom.xml 2014-10-23 09:23:06 UTC (rev 461) @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>org.chorem.chorem</groupId> Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2014-10-23 08:58:09 UTC (rev 460) +++ trunk/chorem-webmotion/pom.xml 2014-10-23 09:23:06 UTC (rev 461) @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>org.chorem.chorem</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-23 08:58:09 UTC (rev 460) +++ trunk/pom.xml 2014-10-23 09:23:06 UTC (rev 461) @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Chorem</name>

1 0

[ANN] - Chorem 0.3 released
by chorem.org Release Notification Oct. 23, 2014

Oct. 23, 2014

The Chorem team is pleased to announce the chorem-0.3 release! Project management Documentation of the project can be found here: http://chorem.chorem.org Changes ------- Changes in this version include: New features: o Add a way to cancel quotations Issue: 931. Thanks to Jean Couteau. Resolved by jcouteau. o [Facture] Aller directement au tableau de budget depuis la visualisation d'une facture Issue: 937. Thanks to Jean Couteau. Resolved by jcouteau. o [Tableau de budget] Changement des dates par défaut Issue: 936. Thanks to Jean Couteau. Resolved by jcouteau. o Ajouter le CA TTC sur la page d'accueil Issue: 951. Thanks to Jean Couteau. Resolved by jcouteau. o Ajouter les évolutions sur la page d'accueil Issue: 952. Thanks to Jean Couteau. Resolved by jcouteau. o [Tableau de budget] Rajouter un moyen visuel pour voir les factures prévisionnelles Issue: 938. Thanks to Jean Couteau. Resolved by jcouteau. o Export contact base as CSV Issue: 836. Thanks to Jean Couteau. Resolved by jcouteau. o Introduce a sales module Issue: 862. Thanks to Jean Couteau. Resolved by jcouteau. o Remove Invoiceable extension and replace it by FinancialTransaction Issue: 884. Thanks to Benjamin Poussin. Resolved by bpoussin. o [Financial] Reporting Issue: 944. Thanks to Jean Couteau. Resolved by jcouteau. o Track status change on quotation Issue: 732. Thanks to Jean Couteau. Resolved by jcouteau. Fixed Bugs: o the late invoice report gives us too many invoices Issue: 825. Thanks to Jean Couteau. Resolved by mble. o Bad computation in Budget report Issue: 883. Thanks to Benjamin Poussin. Resolved by bpoussin. o Spelling mistake on quotation attributes Issue: 670. Thanks to Jean Couteau. Resolved by mble. Changes: o Configure pom to add application at release time Issue: 793. Thanks to Tony Chemit. Resolved by tchemit. o Configure pom to auto-deploy to demo Issue: 792. Thanks to Tony Chemit. Resolved by tchemit. o Deploy instance with data to test in real live Issue: 888. Thanks to Benjamin Poussin. Resolved by bpoussin. Downloads --------- For a manual installation, you can download files here: http://forge.chorem.org/projects/chorem/files * chorem-webmotion-0.3.war - http://forge.chorem.org/attachments/download/185 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Chorem team

1 0

r460 - in trunk: . chorem-entities chorem-webmotion
by maven-release＠users.chorem.org Oct. 23, 2014

Oct. 23, 2014

Author: maven-release Date: 2014-10-23 10:58:09 +0200 (Thu, 23 Oct 2014) New Revision: 460 Url: http://forge.chorem.org/projects/chorem/repository/revisions/460 Log: [maven-release-plugin] prepare release chorem-0.3 Modified: trunk/chorem-entities/pom.xml trunk/chorem-webmotion/pom.xml trunk/pom.xml Modified: trunk/chorem-entities/pom.xml =================================================================== --- trunk/chorem-entities/pom.xml 2014-10-23 08:55:31 UTC (rev 459) +++ trunk/chorem-entities/pom.xml 2014-10-23 08:58:09 UTC (rev 460) @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>org.chorem.chorem</groupId> Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2014-10-23 08:55:31 UTC (rev 459) +++ trunk/chorem-webmotion/pom.xml 2014-10-23 08:58:09 UTC (rev 460) @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>org.chorem.chorem</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-23 08:55:31 UTC (rev 459) +++ trunk/pom.xml 2014-10-23 08:58:09 UTC (rev 460) @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> <packaging>pom</packaging> <name>Chorem</name> @@ -79,11 +79,11 @@ </modules> <scm> - <connection>scm:svn:http://svn.chorem.org/chorem/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/chorem/tags/chorem-0.3</connection> <developerConnection> - scm:svn:http://svn.chorem.org/chorem/trunk + scm:svn:http://svn.chorem.org/chorem/tags/chorem-0.3 </developerConnection> - <url>http://www.chorem.org/repositories/browse/chorem/trunk</url> + <url>http://www.chorem.org/repositories/browse/chorem/tags/chorem-0.3</url> </scm> <distributionManagement> <site>

1 0

r459 - tags/chorem-0.3
by tchemit＠users.chorem.org Oct. 23, 2014

Oct. 23, 2014

Author: tchemit Date: 2014-10-23 10:55:31 +0200 (Thu, 23 Oct 2014) New Revision: 459 Url: http://forge.chorem.org/projects/chorem/repository/revisions/459 Log: fix release Modified: tags/chorem-0.3/pom.xml Modified: tags/chorem-0.3/pom.xml =================================================================== --- tags/chorem-0.3/pom.xml 2014-10-23 08:46:23 UTC (rev 458) +++ tags/chorem-0.3/pom.xml 2014-10-23 08:55:31 UTC (rev 459) @@ -15,7 +15,7 @@ <name>Chorem</name> <description>Project management</description> - <url>http://maven-site.chorem.org/chorem</url> + <url>http://chorem.chorem.org</url> <inceptionYear>2011</inceptionYear> <licenses> <license> @@ -29,7 +29,7 @@ <developer> <id>ymartel</id> <name>Yannick Martel</name> - <email>martel at codelutin.com</email> + <email>martel(a)codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -40,7 +40,7 @@ <developer> <id>tchemit</id> <name>Tony Chemit</name> - <email>chemit at codelutin.com</email> + <email>chemit(a)codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -51,7 +51,7 @@ <developer> <id>bpoussin</id> <name>Benjamin Poussin</name> - <email>poussin at codelutin.com</email> + <email>poussin(a)codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -63,7 +63,7 @@ <developer> <id>jcouteau</id> <name>Jean Couteau</name> - <email>couteau at codelutin.com</email> + <email>couteau(a)codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -108,7 +108,7 @@ <webmotionVersion>2.4</webmotionVersion> <processPluginVersion>1.1</processPluginVersion> <eugenePluginVersion>2.7.4</eugenePluginVersion> - + <sitePluginVersion>3.3</sitePluginVersion> <nuitonCsvVersion>3.0-rc-4</nuitonCsvVersion> <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion>

1 0

r458 - in trunk: . chorem-entities chorem-webmotion
by maven-release＠users.chorem.org Oct. 23, 2014

Oct. 23, 2014

Author: maven-release Date: 2014-10-23 10:46:23 +0200 (Thu, 23 Oct 2014) New Revision: 458 Url: http://forge.chorem.org/projects/chorem/repository/revisions/458 Log: [maven-release-plugin] rollback the release of chorem-0.3 Modified: trunk/chorem-entities/pom.xml trunk/chorem-webmotion/pom.xml trunk/pom.xml Modified: trunk/chorem-entities/pom.xml =================================================================== --- trunk/chorem-entities/pom.xml 2014-10-23 08:44:06 UTC (rev 457) +++ trunk/chorem-entities/pom.xml 2014-10-23 08:46:23 UTC (rev 458) @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>org.chorem.chorem</groupId> Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2014-10-23 08:44:06 UTC (rev 457) +++ trunk/chorem-webmotion/pom.xml 2014-10-23 08:46:23 UTC (rev 458) @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>org.chorem.chorem</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-23 08:44:06 UTC (rev 457) +++ trunk/pom.xml 2014-10-23 08:46:23 UTC (rev 458) @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Chorem</name>

1 0