This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository chorem. See http://git.chorem.org/chorem.git 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 pom.xml | 2 +- trunk/LICENSE.txt | 661 +++ trunk/README.txt | 0 trunk/changelog.txt | 0 trunk/chorem-entities/LICENSE.txt | 661 +++ trunk/chorem-entities/README.txt | 0 trunk/chorem-entities/changelog.txt | 0 trunk/chorem-entities/pom.xml | 169 + .../src/license/THIRD-PARTY.properties | 32 + .../com/inamik/utils/AbstractTableFormatter.java | 478 +++ .../com/inamik/utils/SimpleTableFormatter.java | 266 ++ .../main/java/com/inamik/utils/TableFormatter.java | 63 + .../src/main/java/org/chorem/ChoremAction.java | 120 + .../src/main/java/org/chorem/ChoremClient.java | 469 +++ .../src/main/java/org/chorem/ChoremConfig.java | 101 + .../main/java/org/chorem/ChoremConfigAction.java | 76 + .../main/java/org/chorem/ChoremConfigOption.java | 128 + .../src/main/java/org/chorem/ChoremMain.java | 56 + .../main/java/org/chorem/ChoremQueryHelper.java | 71 + .../src/main/java/org/chorem/ChoremQueryMaker.java | 119 + .../src/main/java/org/chorem/ChoremUtil.java | 116 + .../main/java/org/chorem/ImportChoremTopia.java | 709 ++++ .../src/main/java/org/chorem/Saint.java | 70 + .../org/chorem/entities/EmployeeMigration.java | 108 + .../org/chorem/entities/ExpenseClaimStatus.java | 39 + .../java/org/chorem/entities/InvoiceMigration.java | 119 + .../java/org/chorem/entities/InvoiceStatus.java | 38 + .../java/org/chorem/entities/InvoiceableUtil.java | 72 + .../org/chorem/entities/Quotation18Migration.java | 307 ++ .../org/chorem/entities/QuotationMigration.java | 74 + .../java/org/chorem/entities/QuotationStatus.java | 59 + .../main/java/org/chorem/entities/TaskStatus.java | 40 + .../org/chorem/entities/VacationMigration.java | 75 + .../java/org/chorem/entities/VacationStatus.java | 40 + .../java/org/chorem/project/AdcCalculation.java | 370 ++ .../main/java/org/chorem/project/Calculation.java | 293 ++ .../org/chorem/project/QuotationCalculation.java | 121 + .../java/org/chorem/project/TaskCalculation.java | 119 + .../chorem/project/TotalQuotationCalculation.java | 171 + .../src/main/resources/chorem.properties | 52 + .../src/main/resources/log4j.properties | 36 + .../src/main/xmi/chorem-model.properties | 445 ++ .../src/main/xmi/chorem-model.zargo | Bin 0 -> 40130 bytes trunk/chorem-entities/src/main/xmi/vacations.rst | 68 + .../src/site/rst/chorem-entities-base.png | Bin 0 -> 4116 bytes .../src/site/rst/chorem-entities-billy.png | Bin 0 -> 11043 bytes .../src/site/rst/chorem-entities-bonzoms.png | Bin 0 -> 19418 bytes .../src/site/rst/chorem-entities-gepeto.png | Bin 0 -> 18109 bytes trunk/chorem-entities/src/site/rst/dataModel.rst | 145 + trunk/chorem-entities/src/site/rst/gepeto.rst | 200 + .../src/test/java/org/chorem/ChoremUtilTest.java | 53 + .../org/chorem/entities/InvoiceableUtilTest.java | 78 + trunk/chorem-web/LICENSE.txt | 0 trunk/chorem-web/README.txt | 0 trunk/chorem-web/changelog.txt | 0 trunk/chorem-web/pom.xml | 243 ++ trunk/chorem-web/src/main/i18n/jsp.rules | 10 + .../src/main/java/org/chorem/ChoremSession.java | 104 + .../src/main/java/org/chorem/ChoremUtil.java | 33 + .../java/org/chorem/ContactDetailsConstants.java | 13 + .../src/main/java/org/chorem/JspUtils.java | 25 + .../java/org/chorem/action/ChoremBaseAction.java | 57 + .../org/chorem/action/EntitySearchJsonAction.java | 531 +++ .../main/java/org/chorem/action/HomeAction.java | 275 ++ .../action/SelectWikittyComponentAction.java | 131 + .../org/chorem/billy/action/QuotationAction.java | 530 +++ .../java/org/chorem/gepeto/ProjectOrderFull.java | 72 + .../org/chorem/gepeto/action/ProjectAction.java | 537 +++ .../chorem/gepeto/action/ProjectOrderAction.java | 479 +++ .../java/org/chorem/gepeto/action/TaskAction.java | 247 ++ .../src/main/resources/freemarker.properties | 24 + .../resources/i18n/chorem-web_en_GB.properties | 150 + .../resources/i18n/chorem-web_fr_FR.properties | 154 + .../QuotationAction-addQuotation-validation.xml | 43 + .../QuotationAction-modifyQuotation-validation.xml | 38 + .../action/ProjectAction-addProject-validation.xml | 19 + .../ProjectAction-modifyProject-validation.xml | 14 + ...ojectOrderAction-addProjectOrder-validation.xml | 39 + .../action/TaskAction-addTask-validation.xml | 52 + .../src/main/resources/struts.properties | 52 + trunk/chorem-web/src/main/resources/struts.xml | 206 + .../src/main/webapp/WEB-INF/decorators.xml | 29 + .../src/main/webapp/WEB-INF/decorators/billy.jsp | 29 + .../src/main/webapp/WEB-INF/decorators/bonzoms.jsp | 29 + .../src/main/webapp/WEB-INF/decorators/cash.jsp | 29 + .../src/main/webapp/WEB-INF/decorators/gepeto.jsp | 29 + .../src/main/webapp/WEB-INF/decorators/main.jsp | 28 + .../main/webapp/WEB-INF/jsp/billy/addQuotation.jsp | 73 + .../src/main/webapp/WEB-INF/jsp/billy/home.jsp | 12 + .../src/main/webapp/WEB-INF/jsp/billy/menu.jsp | 12 + .../webapp/WEB-INF/jsp/billy/quotationDetails.jsp | 108 + .../main/webapp/WEB-INF/jsp/bonzoms/companies.jsp | 255 ++ .../src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp | 8 + .../main/webapp/WEB-INF/jsp/bonzoms/persons.jsp | 118 + .../main/webapp/WEB-INF/jsp/common/inc/footer.jsp | 14 + .../main/webapp/WEB-INF/jsp/common/inc/header.jsp | 8 + .../WEB-INF/jsp/common/selectWikittyComponent.jsp | 7 + .../main/webapp/WEB-INF/jsp/gepeto/addProject.jsp | 29 + .../webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp | 49 + .../src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp | 51 + .../src/main/webapp/WEB-INF/jsp/gepeto/menu.jsp | 13 + .../webapp/WEB-INF/jsp/gepeto/projectDetails.jsp | 129 + .../WEB-INF/jsp/gepeto/projectOrderDetails.jsp | 89 + .../main/webapp/WEB-INF/jsp/gepeto/projects.jsp | 254 ++ .../webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp | 100 + .../jsp/gepeto/projectsWithoutQuotation.jsp | 31 + .../src/main/webapp/WEB-INF/jsp/gepeto/results.jsp | 12 + .../src/main/webapp/WEB-INF/jsp/home.jsp | 68 + .../src/main/webapp/WEB-INF/sitemesh.xml | 48 + trunk/chorem-web/src/main/webapp/WEB-INF/web.xml | 70 + trunk/chorem-web/src/main/webapp/css/style.css | 30 + trunk/chorem-web/src/main/webapp/js/chorem.js | 18 + .../src/main/webapp/template/simple/a-close.ftl | 49 + .../main/webapp/template/simple/form-common.ftl | 65 + .../webapp/template/xhtml/controlheader-core.ftl | 70 + .../src/main/webapp/template/xhtml/file.ftl | 28 + .../src/main/webapp/template/xhtml/form-close.ftl | 35 + .../src/main/webapp/template/xhtml/form.ftl | 33 + .../src/main/webapp/template/xhtml/password.ftl | 28 + .../main/webapp/template/xhtml/submit-close.ftl | 3 + .../src/main/webapp/template/xhtml/submit.ftl | 24 + .../src/main/webapp/template/xhtml/text.ftl | 28 + .../src/main/webapp/template/xhtml/textarea.ftl | 28 + trunk/chorem-webmotion/LICENSE.txt | 661 +++ trunk/chorem-webmotion/README.txt | 0 trunk/chorem-webmotion/changelog.txt | 0 trunk/chorem-webmotion/pom.xml | 294 ++ trunk/chorem-webmotion/src/doc/REST_API_Timer.txt | 53 + trunk/chorem-webmotion/src/jetty/jetty-context.xml | 33 + .../src/license/THIRD-PARTY.properties | 52 + trunk/chorem-webmotion/src/main/i18n/jsp.rules | 10 + .../java/org/chorem/webmotion/ChoremDateUtil.java | 65 + .../org/chorem/webmotion/ChoremWebMotionUtil.java | 100 + .../java/org/chorem/webmotion/PaginatedResult.java | 97 + .../webmotion/actions/AdcDashboardAction.java | 232 + .../org/chorem/webmotion/actions/AdminAction.java | 96 + .../org/chorem/webmotion/actions/BIAction.java | 71 + .../chorem/webmotion/actions/DashboardAction.java | 1568 +++++++ .../webmotion/actions/DashboardHRAction.java | 106 + .../webmotion/actions/EmployeeEditAction.java | 452 ++ .../chorem/webmotion/actions/GenericAction.java | 718 ++++ .../org/chorem/webmotion/actions/HrAction.java | 257 ++ .../chorem/webmotion/actions/MapWithDefault.java | 171 + .../webmotion/actions/WikittyRestAction.java | 163 + .../webmotion/actions/crm/AccountAction.java | 109 + .../webmotion/actions/crm/ContactRowForExport.java | 100 + .../actions/crm/ContactRowForExportModel.java | 70 + .../chorem/webmotion/actions/crm/ExportAction.java | 148 + .../webmotion/actions/crm/QuotationAction.java | 72 + .../financial/AccountBillingReportAction.java | 118 + .../financial/BillingPerAccountReportAction.java | 121 + .../financial/BillingPerProjectReportAction.java | 123 + .../actions/financial/BillingReportAction.java | 141 + .../actions/financial/BillingReportHelper.java | 134 + .../actions/financial/ExpenseAccountAction.java | 289 ++ .../financial/ProjectBillingReportAction.java | 118 + .../actions/project/DashboardProjectAction.java | 441 ++ .../webmotion/actions/project/GanttAction.java | 198 + .../webmotion/actions/project/ProjectsAction.java | 108 + .../webmotion/actions/project/QuotationData.java | 131 + .../actions/project/QuotationStatusAction.java | 105 + .../chorem/webmotion/actions/project/TaskData.java | 63 + .../sales/AcceptedQuotationsReportAction.java | 158 + .../actions/sales/AccountSalesReportAction.java | 116 + .../webmotion/actions/sales/FunnelAction.java | 114 + .../actions/sales/ProjectSalesReportAction.java | 116 + .../webmotion/actions/sales/QuotationYearData.java | 62 + .../webmotion/actions/sales/SalesAction.java | 128 + .../chorem/webmotion/actions/sales/SalesData.java | 71 + .../actions/sales/SalesPerAccountReportAction.java | 122 + .../actions/sales/SalesPerProjectReportAction.java | 121 + .../webmotion/actions/sales/SalesReportAction.java | 138 + .../webmotion/actions/sales/SalesReportHelper.java | 135 + .../actions/sales/SentQuotationsReportAction.java | 166 + .../bean/financial/ExpenseAccountBean.java | 116 + .../bean/financial/ExpenseAccountEntryBean.java | 154 + .../chorem/webmotion/converters/JsonConverter.java | 75 + .../chorem/webmotion/converters/JsonHelper.java | 109 + .../webmotion/filters/AuthenticationFilter.java | 112 + .../webmotion/filters/ChoremClientFilter.java | 57 + .../chorem/webmotion/filters/DecoratorFilter.java | 76 + .../webmotion/injector/InjectorListener.java | 124 + .../org/chorem/webmotion/render/RenderWikitty.java | 203 + .../chorem/webmotion/render/RenderWikittyJson.java | 109 + .../org/wikitty/web/jsptag/WikittyDisplay.java | 400 ++ .../java/org/wikitty/web/jsptag/WikittyInput.java | 425 ++ .../i18n/chorem-webmotion_en_GB.properties | 0 .../i18n/chorem-webmotion_fr_FR.properties | 0 .../src/main/resources/log4j.properties | 44 + trunk/chorem-webmotion/src/main/resources/mapping | 213 + .../main/webapp/WEB-INF/jsp/admin/importExport.jsp | 37 + .../webapp/WEB-INF/jsp/bi/reportDefinition.jsp | 229 + .../src/main/webapp/WEB-INF/jsp/contact.jsp | 26 + .../src/main/webapp/WEB-INF/jsp/crm/account.jsp | 114 + .../src/main/webapp/WEB-INF/jsp/crm/company.jsp | 22 + .../main/webapp/WEB-INF/jsp/crm/editQuotation.jsp | 40 + .../src/main/webapp/WEB-INF/jsp/crm/project.jsp | 22 + .../src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp | 92 + .../webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp | 81 + .../main/webapp/WEB-INF/jsp/dashboardBudget.jsp | 135 + .../main/webapp/WEB-INF/jsp/dashboardEmployee.jsp | 99 + .../main/webapp/WEB-INF/jsp/dashboardInvoice.jsp | 68 + .../webapp/WEB-INF/jsp/dashboardMultiProject.jsp | 127 + .../webapp/WEB-INF/jsp/dashboardProfitability.jsp | 72 + .../main/webapp/WEB-INF/jsp/dashboardProject.jsp | 72 + .../main/webapp/WEB-INF/jsp/dashboardQuotation.jsp | 69 + .../WEB-INF/jsp/dashboardRequestVacation.jsp | 73 + .../webapp/WEB-INF/jsp/dashboardSingleProject.jsp | 249 ++ .../main/webapp/WEB-INF/jsp/dashboardSummary.jsp | 309 ++ .../src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp | 67 + .../main/webapp/WEB-INF/jsp/dashboardVacation.jsp | 55 + .../webapp/WEB-INF/jsp/dashboardVacationAsked.jsp | 53 + .../WEB-INF/jsp/dashboardVacationByEmployee.jsp | 35 + .../jsp/dashboardWorkingProjectDaysByEmployee.jsp | 33 + .../src/main/webapp/WEB-INF/jsp/decorator.jsp | 288 ++ .../src/main/webapp/WEB-INF/jsp/edit.jsp | 51 + .../src/main/webapp/WEB-INF/jsp/editMulti.jsp | 64 + .../src/main/webapp/WEB-INF/jsp/editRelated.jsp | 50 + .../webapp/WEB-INF/jsp/editVacationRequest.jsp | 106 + .../src/main/webapp/WEB-INF/jsp/employeeEdit.jsp | 137 + .../jsp/financial/expenseAccountEntryEdit.html | 38 + .../WEB-INF/jsp/financial/expenseAccountView.jsp | 110 + .../WEB-INF/jsp/financial/expenseAccounts.jsp | 74 + .../jsp/financial/reports/accountBillingReport.jsp | 122 + .../financial/reports/billingPerAccountReport.jsp | 106 + .../financial/reports/billingPerProjectReport.jsp | 106 + .../jsp/financial/reports/billingReport.jsp | 124 + .../webapp/WEB-INF/jsp/financial/reports/menu.jsp | 31 + .../jsp/financial/reports/projectBillingReport.jsp | 122 + .../src/main/webapp/WEB-INF/jsp/hr.jsp | 35 + .../src/main/webapp/WEB-INF/jsp/index.jsp | 29 + .../src/main/webapp/WEB-INF/jsp/login.jsp | 34 + .../webapp/WEB-INF/jsp/projects/editProject.html | 34 + .../main/webapp/WEB-INF/jsp/projects/projects.jsp | 63 + .../src/main/webapp/WEB-INF/jsp/report.jsp | 41 + .../WEB-INF/jsp/salesReports/acceptedQuotation.jsp | 124 + .../jsp/salesReports/accountSalesReport.jsp | 122 + .../WEB-INF/jsp/salesReports/dialog-cancel.html | 47 + .../jsp/salesReports/dialog-draftToSent.html | 42 + .../jsp/salesReports/dialog-leadToDraft.html | 49 + .../jsp/salesReports/dialog-sentToAccepted.html | 42 + .../jsp/salesReports/dialog-sentToRejected.html | 42 + .../main/webapp/WEB-INF/jsp/salesReports/menu.jsp | 32 + .../jsp/salesReports/projectSalesReport.jsp | 122 + .../main/webapp/WEB-INF/jsp/salesReports/sales.jsp | 29 + .../WEB-INF/jsp/salesReports/salesFunnel.jsp | 140 + .../jsp/salesReports/salesPerAccountReport.jsp | 106 + .../jsp/salesReports/salesPerProjectReport.jsp | 106 + .../WEB-INF/jsp/salesReports/salesReport.jsp | 124 + .../WEB-INF/jsp/salesReports/sentQuotation.jsp | 124 + .../src/main/webapp/WEB-INF/jsp/search.jsp | 47 + .../main/webapp/WEB-INF/jsp/simpleWikiFields.jsp | 49 + .../src/main/webapp/WEB-INF/jsp/vacationDiv.jsp | 72 + .../src/main/webapp/WEB-INF/jsp/view.jsp | 60 + .../main/webapp/WEB-INF/jsp/viewActionCompany.jsp | 27 + .../main/webapp/WEB-INF/jsp/viewActionEmployee.jsp | 26 + .../WEB-INF/jsp/viewActionFinancialTransaction.jsp | 26 + .../main/webapp/WEB-INF/jsp/viewActionPerson.jsp | 27 + .../main/webapp/WEB-INF/jsp/viewActionProject.jsp | 26 + .../webapp/WEB-INF/jsp/viewActionQuotation.jsp | 26 + .../src/main/webapp/WEB-INF/jsp/viewActionTask.jsp | 27 + .../src/main/webapp/WEB-INF/nuiton-js.properties | 23 + .../src/main/webapp/WEB-INF/web.xml | 33 + .../src/main/webapp/WEB-INF/wikitty.tld | 104 + .../src/main/webapp/WEB-INF/wro.xml | 52 + .../src/main/webapp/css/chorem-bi.css | 31 + .../src/main/webapp/css/chorem-crm.css | 51 + .../src/main/webapp/css/chorem-sales.css | 45 + .../src/main/webapp/css/chorem.less | 161 + .../src/main/webapp/css/employeeEdit.css | 26 + .../main/webapp/css/jquery-ui-timepicker-addon.css | 28 + .../src/main/webapp/css/jquery.fn.gantt.css | 467 +++ .../src/main/webapp/css/ng-grid.min.css | 23 + .../main/webapp/css/select2/select2-spinner.gif | Bin 0 -> 1849 bytes .../src/main/webapp/css/select2/select2.css | 702 ++++ .../src/main/webapp/css/select2/select2.png | Bin 0 -> 613 bytes .../src/main/webapp/css/select2/select2x2.png | Bin 0 -> 845 bytes .../src/main/webapp/css/vacationRequest.css | 35 + .../src/main/webapp/img/ajax-loader.gif | Bin 0 -> 673 bytes .../main/webapp/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes .../src/main/webapp/img/glyphicons-halflings.png | Bin 0 -> 13826 bytes .../src/main/webapp/img/jquery.fn.gantt/grid.png | Bin 0 -> 1016 bytes .../webapp/img/jquery.fn.gantt/icon_sprite.png | Bin 0 -> 1910 bytes .../main/webapp/img/jquery.fn.gantt/loader_bg.png | Bin 0 -> 22324 bytes .../webapp/img/jquery.fn.gantt/slider_handle.png | Bin 0 -> 1670 bytes .../webapp/js/angular-ui-bootstrap-tpls-0.11.0.js | 4136 ++++++++++++++++++ .../chorem-webmotion/src/main/webapp/js/chorem.js | 355 ++ .../src/main/webapp/js/dashboardAdc.js | 69 + .../src/main/webapp/js/employeeEdit.js | 278 ++ .../src/main/webapp/js/financial/expenseAccount.js | 125 + .../webapp/js/financial/expenseAccountListCtrl.js | 60 + .../main/webapp/js/jquery-ui-timepicker-addon.js | 1331 ++++++ .../src/main/webapp/js/jquery-ui-timepicker-fr.js | 24 + .../src/main/webapp/js/jquery.fn.gantt.js | 1929 +++++++++ .../src/main/webapp/js/jquery.maskedinput-1.3-1.js | 381 ++ .../src/main/webapp/js/js-hypercube.min.js | 23 + .../src/main/webapp/js/less-1.3.3.js | 4435 ++++++++++++++++++++ .../src/main/webapp/js/ng-grid-2.0.7.debug.js | 3610 ++++++++++++++++ .../src/main/webapp/js/ng-grid-2.0.7.min.js | 24 + .../src/main/webapp/js/ng-select2.js | 182 + .../src/main/webapp/js/ng-wikitty.js | 317 ++ .../src/main/webapp/js/paginationTable.js | 64 + .../src/main/webapp/js/projectPagination.js | 87 + .../src/main/webapp/js/salesFunnel.js | 266 ++ .../src/main/webapp/js/select2.min.js | 44 + .../webmotion/converters/JsonConverterTest.java | 71 + .../src/test/resources/log4j.properties | 36 + trunk/pom.xml | 425 ++ .../site/resources/images/logos/argouml-logo.png | Bin 0 -> 955 bytes .../src/site/resources/images/logos/jrst-logo.png | Bin 0 -> 608 bytes .../images/logos/restructuredtext-logo.png | Bin 0 -> 1334 bytes trunk/src/site/rst/calculations.rst | 227 + trunk/src/site/rst/chorem-cdc.rst | 128 + trunk/src/site/rst/doc-devel.rst | 39 + trunk/src/site/rst/index.rst | 26 + trunk/src/site/rst/requisite.rst | 28 + trunk/src/site/site_fr.xml | 113 + 317 files changed, 51410 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.