[Chorem-commits] branch develop updated (a9caf06 -> 4e47cc6)

19 Dec 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  a9caf06   [jgitflow-maven-plugin]updating poms for 0.4-SNAPSHOT development
       new  ee89c24   [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts
      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
      adds  c9d2cd5   [jgitflow-maven-plugin]updating poms for branch '0.3.1' with snapshot versions
       new  8b6fa96   [jgitflow-maven-plugin]updating poms for branch'release/0.3.1' with non-snapshot versions
       new  8d27e63   Merge branch 'release/0.3.1'
       new  a097986   Merge branch 'master' into develop
       new  4e47cc6   [jgitflow-maven-plugin]Updating develop poms back to pre merge state

The 5 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 4e47cc6d650882af3fa161b771ec454b3da4eb07
Author: kootox <jean.couteau@gmail.com>
Date:   Fri Dec 19 17:39:47 2014 +0100

    [jgitflow-maven-plugin]Updating develop poms back to pre merge state

commit a0979862064a5cd894f52ccb6fb090fba562ac6d
Merge: ee89c24 8d27e63
Author: kootox <jean.couteau@gmail.com>
Date:   Fri Dec 19 17:39:46 2014 +0100

    Merge branch 'master' into develop

commit ee89c2472952f7cb2b27027537959e3611786bb2
Author: kootox <jean.couteau@gmail.com>
Date:   Fri Dec 19 17:39:46 2014 +0100

    [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts

commit 8d27e63ce20425fb2856153666b8094423ca5d87
Merge: d53a7a7 8b6fa96
Author: kootox <jean.couteau@gmail.com>
Date:   Fri Dec 19 17:39:44 2014 +0100

    Merge branch 'release/0.3.1'

commit 8b6fa96c8e78cdd9d3ab13be7b2058466c658142
Author: kootox <jean.couteau@gmail.com>
Date:   Fri Dec 19 15:55:28 2014 +0100

    [jgitflow-maven-plugin]updating poms for branch'release/0.3.1' with non-snapshot versions

Summary of changes:
 pom.xml                                            |   2 +-
 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
 .../chorem-entities/changelog.txt                  |   0
 {chorem-entities => trunk/chorem-entities}/pom.xml |   3 +-
 .../src/license/THIRD-PARTY.properties             |   0
 .../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 +-
 .../src/main/xmi/chorem-model.zargo                | Bin
 .../chorem-entities}/src/main/xmi/vacations.rst    |   4 +-
 .../src/site/rst/chorem-entities-base.png          | Bin
 .../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    |   4 +-
 .../chorem-entities}/src/site/rst/gepeto.rst       |   2 +
 .../src/test/java/org/chorem/ChoremUtilTest.java   |   2 +
 .../org/chorem/entities/InvoiceableUtilTest.java   |   4 +-
 {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}/src/main/i18n/jsp.rules            |   0
 .../src/main/java/org/chorem/ChoremSession.java    |   0
 .../src/main/java/org/chorem/ChoremUtil.java       |   0
 .../java/org/chorem/ContactDetailsConstants.java   |   0
 .../src/main/java/org/chorem/JspUtils.java         |   0
 .../java/org/chorem/action/ChoremBaseAction.java   |   0
 .../org/chorem/action/EntitySearchJsonAction.java  |   0
 .../main/java/org/chorem/action/HomeAction.java    |   0
 .../action/SelectWikittyComponentAction.java       |   0
 .../org/chorem/billy/action/QuotationAction.java   |   0
 .../java/org/chorem/gepeto/ProjectOrderFull.java   |   0
 .../org/chorem/gepeto/action/ProjectAction.java    |   0
 .../chorem/gepeto/action/ProjectOrderAction.java   |   0
 .../java/org/chorem/gepeto/action/TaskAction.java  |   0
 .../src/main/resources/freemarker.properties       |   0
 .../resources/i18n/chorem-web_en_GB.properties     |   0
 .../resources/i18n/chorem-web_fr_FR.properties     |   0
 .../QuotationAction-addQuotation-validation.xml    |   0
 .../QuotationAction-modifyQuotation-validation.xml |   0
 .../action/ProjectAction-addProject-validation.xml |   0
 .../ProjectAction-modifyProject-validation.xml     |   0
 ...ojectOrderAction-addProjectOrder-validation.xml |   0
 .../action/TaskAction-addTask-validation.xml       |   0
 .../src/main/resources/struts.properties           |   0
 .../chorem-web}/src/main/resources/struts.xml      |   0
 .../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
 .../src/main/webapp/WEB-INF/decorators/cash.jsp    |   0
 .../src/main/webapp/WEB-INF/decorators/gepeto.jsp  |   0
 .../src/main/webapp/WEB-INF/decorators/main.jsp    |   0
 .../main/webapp/WEB-INF/jsp/billy/addQuotation.jsp |   0
 .../src/main/webapp/WEB-INF/jsp/billy/home.jsp     |   0
 .../src/main/webapp/WEB-INF/jsp/billy/menu.jsp     |   0
 .../webapp/WEB-INF/jsp/billy/quotationDetails.jsp  |   0
 .../main/webapp/WEB-INF/jsp/bonzoms/companies.jsp  |   0
 .../src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp   |   0
 .../main/webapp/WEB-INF/jsp/bonzoms/persons.jsp    |   0
 .../main/webapp/WEB-INF/jsp/common/inc/footer.jsp  |   0
 .../main/webapp/WEB-INF/jsp/common/inc/header.jsp  |   0
 .../WEB-INF/jsp/common/selectWikittyComponent.jsp  |   0
 .../main/webapp/WEB-INF/jsp/gepeto/addProject.jsp  |   0
 .../webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp  |   0
 .../src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp |   0
 .../src/main/webapp/WEB-INF/jsp/gepeto/menu.jsp    |   0
 .../webapp/WEB-INF/jsp/gepeto/projectDetails.jsp   |   0
 .../WEB-INF/jsp/gepeto/projectOrderDetails.jsp     |   0
 .../main/webapp/WEB-INF/jsp/gepeto/projects.jsp    |   0
 .../webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp   |   0
 .../jsp/gepeto/projectsWithoutQuotation.jsp        |   0
 .../src/main/webapp/WEB-INF/jsp/gepeto/results.jsp |   0
 .../src/main/webapp/WEB-INF/jsp/home.jsp           |   0
 .../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
 .../src/main/webapp/template/simple/a-close.ftl    |   0
 .../main/webapp/template/simple/form-common.ftl    |   0
 .../webapp/template/xhtml/controlheader-core.ftl   |   0
 .../src/main/webapp/template/xhtml/file.ftl        |   0
 .../src/main/webapp/template/xhtml/form-close.ftl  |   0
 .../src/main/webapp/template/xhtml/form.ftl        |   0
 .../src/main/webapp/template/xhtml/password.ftl    |   0
 .../main/webapp/template/xhtml/submit-close.ftl    |   0
 .../src/main/webapp/template/xhtml/submit.ftl      |   0
 .../src/main/webapp/template/xhtml/text.ftl        |   0
 .../src/main/webapp/template/xhtml/textarea.ftl    |   0
 LICENSE.txt => trunk/chorem-webmotion/LICENSE.txt  |   0
 README.txt => trunk/chorem-webmotion/README.txt    |   0
 .../chorem-webmotion/changelog.txt                 |   0
 .../chorem-webmotion}/pom.xml                      |   8 +-
 .../chorem-webmotion}/src/doc/REST_API_Timer.txt   |   0
 .../chorem-webmotion}/src/jetty/jetty-context.xml  |   6 +-
 .../src/license/THIRD-PARTY.properties             |   0
 .../chorem-webmotion}/src/main/i18n/jsp.rules      |   0
 .../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 |  91 +++--
 .../webmotion/actions/crm/QuotationAction.java     |   2 +
 .../financial/AccountBillingReportAction.java      |   2 +
 .../financial/BillingPerAccountReportAction.java   |   2 +
 .../financial/BillingPerProjectReportAction.java   |  14 +-
 .../actions/financial/BillingReportAction.java     |  33 +-
 .../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 +
 .../chorem/webmotion/converters/JsonConverter.java |   0
 .../chorem/webmotion/converters/JsonHelper.java    |   0
 .../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 +-
 .../i18n/chorem-webmotion_en_GB.properties         |   0
 .../i18n/chorem-webmotion_fr_FR.properties         |   0
 .../src/main/resources/log4j.properties            |   4 +-
 .../chorem-webmotion}/src/main/resources/mapping   |   0
 .../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 +-
 .../jsp/financial/expenseAccountEntryEdit.html     |   0
 .../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       |  32 +-
 .../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 +
 .../src/main/webapp/WEB-INF/web.xml                |   4 +-
 .../src/main/webapp/WEB-INF/wikitty.tld            |   0
 .../src/main/webapp/WEB-INF/wro.xml                |   2 +
 .../src/main/webapp/css/chorem-bi.css              |   4 +-
 .../src/main/webapp/css/chorem-crm.css             |   4 +-
 .../src/main/webapp/css/chorem-sales.css           |   6 +-
 .../src/main/webapp/css/chorem.less                |   0
 .../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 +-
 .../main/webapp/css/select2/select2-spinner.gif    | Bin
 .../src/main/webapp/css/select2/select2.css        |   2 +
 .../src/main/webapp/css/select2/select2.png        | Bin
 .../src/main/webapp/css/select2/select2x2.png      | Bin
 .../src/main/webapp/css/vacationRequest.css        |   4 +-
 .../src/main/webapp/img/ajax-loader.gif            | Bin
 .../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
 .../webapp/img/jquery.fn.gantt/icon_sprite.png     | Bin
 .../main/webapp/img/jquery.fn.gantt/loader_bg.png  | Bin
 .../webapp/img/jquery.fn.gantt/slider_handle.png   | Bin
 .../webapp/js/angular-ui-bootstrap-tpls-0.11.0.js  |   0
 .../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 +-
 .../main/webapp/js/jquery-ui-timepicker-addon.js   |   0
 .../src/main/webapp/js/jquery-ui-timepicker-fr.js  |   0
 .../src/main/webapp/js/jquery.fn.gantt.js          |   2 +
 .../src/main/webapp/js/jquery.maskedinput-1.3-1.js |   0
 .../src/main/webapp/js/js-hypercube.min.js         |   4 +-
 .../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 +-
 .../src/main/webapp/js/ng-select2.js               |   2 +
 .../src/main/webapp/js/ng-wikitty.js               |   2 +
 .../src/main/webapp/js/paginationTable.js          |   4 +-
 .../src/main/webapp/js/projectPagination.js        |   4 +-
 .../src/main/webapp/js/salesFunnel.js              |  36 +-
 .../src/main/webapp/js/select2.min.js              |   4 +-
 .../webmotion/converters/JsonConverterTest.java    |   0
 .../src/test/resources/log4j.properties            |   4 +-
 trunk/pom.xml                                      | 425 +++++++++++++++++++++
 .../site/resources/images/logos/argouml-logo.png   | Bin
 .../src}/site/resources/images/logos/jrst-logo.png | Bin
 .../images/logos/restructuredtext-logo.png         | Bin
 {src => trunk/src}/site/rst/calculations.rst       |   2 +
 {src => trunk/src}/site/rst/chorem-cdc.rst         |   4 +-
 {src => trunk/src}/site/rst/doc-devel.rst          |   4 +-
 {src => trunk/src}/site/rst/index.rst              |   6 +-
 {src => trunk/src}/site/rst/requisite.rst          |   4 +-
 trunk/src/site/site_fr.xml                         | 113 ++++++
 317 files changed, 1204 insertions(+), 290 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 (98%)
 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 (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/com/inamik/utils/SimpleTableFormatter.java (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/com/inamik/utils/TableFormatter.java (98%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremAction.java (98%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremClient.java (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremConfig.java (98%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremConfigAction.java (98%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremConfigOption.java (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremMain.java (98%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremQueryHelper.java (98%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremQueryMaker.java (98%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ChoremUtil.java (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/ImportChoremTopia.java (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/Saint.java (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/EmployeeMigration.java (98%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/ExpenseClaimStatus.java (96%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/InvoiceMigration.java (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/InvoiceStatus.java (96%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/InvoiceableUtil.java (98%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/Quotation18Migration.java (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/QuotationMigration.java (98%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/QuotationStatus.java (97%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/TaskStatus.java (96%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/VacationMigration.java (98%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/entities/VacationStatus.java (96%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/project/AdcCalculation.java (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/project/Calculation.java (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/project/QuotationCalculation.java (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/project/TaskCalculation.java (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/java/org/chorem/project/TotalQuotationCalculation.java (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/resources/chorem.properties (98%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/resources/log4j.properties (97%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/xmi/chorem-model.properties (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/xmi/chorem-model.zargo (100%)
 copy {chorem-entities => trunk/chorem-entities}/src/main/xmi/vacations.rst (98%)
 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 (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/site/rst/gepeto.rst (99%)
 copy {chorem-entities => trunk/chorem-entities}/src/test/java/org/chorem/ChoremUtilTest.java (98%)
 copy {chorem-entities => trunk/chorem-entities}/src/test/java/org/chorem/entities/InvoiceableUtilTest.java (98%)
 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 (95%)
 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 (97%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/PaginatedResult.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/AdminAction.java (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/BIAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/DashboardAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/GenericAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/HrAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/WikittyRestAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java (56%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/financial/AccountBillingReportAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/financial/BillingPerAccountReportAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/financial/BillingPerProjectReportAction.java (89%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/financial/BillingReportAction.java (75%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/financial/BillingReportHelper.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/financial/ProjectBillingReportAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/project/TaskData.java (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java (99%)
 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 (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java (97%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/injector/InjectorListener.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/render/RenderWikitty.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/java/org/wikitty/web/jsptag/WikittyInput.java (99%)
 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 (97%)
 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 (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/contact.jsp (95%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/crm/account.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/crm/company.jsp (97%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp (96%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/crm/project.jsp (97%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp (97%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp (96%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp (96%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/decorator.jsp (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/edit.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/editMulti.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/editRelated.jsp (97%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp (99%)
 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 (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/reports/accountBillingReport.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerAccountReport.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerProjectReport.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/reports/billingReport.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/reports/menu.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/financial/reports/projectBillingReport.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/hr.jsp (96%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/index.jsp (95%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/login.jsp (96%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/projects/editProject.html (97%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/projects/projects.jsp (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/report.jsp (97%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp (91%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp (66%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp (97%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp (97%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/search.jsp (97%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp (97%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/view.jsp (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp (96%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp (96%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp (90%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp (96%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp (96%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp (96%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp (96%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/nuiton-js.properties (97%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/WEB-INF/web.xml (96%)
 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 (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/chorem-bi.css (97%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/chorem-crm.css (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/chorem-sales.css (96%)
 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 (97%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/jquery-ui-timepicker-addon.css (96%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/jquery.fn.gantt.css (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/css/ng-grid.min.css (99%)
 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 (99%)
 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 (95%)
 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 (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/dashboardAdc.js (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/employeeEdit.js (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/financial/expenseAccount.js (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/financial/expenseAccountListCtrl.js (99%)
 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 (99%)
 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 (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/less-1.3.3.js (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/ng-grid-2.0.7.debug.js (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/ng-grid-2.0.7.min.js (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/ng-select2.js (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/ng-wikitty.js (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/paginationTable.js (98%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/projectPagination.js (99%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/salesFunnel.js (87%)
 copy {chorem-webmotion => trunk/chorem-webmotion}/src/main/webapp/js/select2.min.js (99%)
 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 (86%)
 create mode 100644 trunk/pom.xml
 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 (99%)
 copy {src => trunk/src}/site/rst/chorem-cdc.rst (99%)
 copy {src => trunk/src}/site/rst/doc-devel.rst (97%)
 copy {src => trunk/src}/site/rst/index.rst (93%)
 copy {src => trunk/src}/site/rst/requisite.rst (96%)
 create mode 100644 trunk/src/site/site_fr.xml

-- 
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm@chorem.org>.

[Chorem-commits] branch develop updated (a9caf06 -> 4e47cc6)

chorem.org scm