Prepare for the next release

Author: hainguyen

.gitignore

@@ -35,3 +35,4 @@ WebResourceGenerator.java
 ThemeMobileCompiler.java
 README.html
 mycollab-services-community/.mycollab/.app.properties
+mycollab-app-community/.mycollab/.app.properties

mycollab-app-community/src/main/installer-resources/README.md

@@ -56,6 +56,8 @@ Version 5.4.9
 
 **Bug Fixes**
 
+* Display the wrong total opportunities value
+* Several text areas don't support the line-end character
 
 
 Version 5.4.8

mycollab-mobile/src/main/java/com/mycollab/mobile/module/crm/view/activity/RelatedActivityNavigatorButton.java

@@ -24,6 +24,7 @@
 import com.mycollab.module.crm.i18n.CrmCommonI18nEnum;
 import com.mycollab.module.crm.service.EventService;
 import com.mycollab.spring.AppContextUtil;
+import com.mycollab.vaadin.MyCollabUI;
 import com.mycollab.vaadin.UserUIContext;
 import com.vaadin.addon.touchkit.ui.NavigationButton;
 
@@ -53,6 +54,7 @@ void displayTotalActivities(ActivitySearchCriteria criteria) {
 
     public void displayRelatedByAccount(Integer accountId) {
         ActivitySearchCriteria searchCriteria = new ActivitySearchCriteria();
+        searchCriteria.setSaccountid(NumberSearchField.equal(MyCollabUI.getAccountId()));
         searchCriteria.setType(StringSearchField.and(CrmTypeConstants.ACCOUNT));
         searchCriteria.setTypeid(NumberSearchField.equal(accountId));
         displayTotalActivities(searchCriteria);

mycollab-mobile/src/main/java/com/mycollab/mobile/module/crm/view/cases/RelatedCaseNavigatorButton.java

@@ -22,6 +22,7 @@
 import com.mycollab.module.crm.i18n.CaseI18nEnum;
 import com.mycollab.module.crm.service.CaseService;
 import com.mycollab.spring.AppContextUtil;
+import com.mycollab.vaadin.MyCollabUI;
 import com.mycollab.vaadin.UserUIContext;
 import com.vaadin.addon.touchkit.ui.NavigationButton;
 
@@ -51,6 +52,7 @@ void displayTotalCases(CaseSearchCriteria criteria) {
 
     public void displayRelatedByAccount(Integer accountId) {
         CaseSearchCriteria searchCriteria = new CaseSearchCriteria();
+        searchCriteria.setSaccountid(NumberSearchField.equal(MyCollabUI.getAccountId()));
         searchCriteria.setAccountId(NumberSearchField.equal(accountId));
         displayTotalCases(searchCriteria);
     }

mycollab-mobile/src/main/java/com/mycollab/mobile/module/crm/view/contact/RelatedContactNavigatorButton.java

@@ -38,6 +38,7 @@
 import com.mycollab.module.crm.i18n.ContactI18nEnum;
 import com.mycollab.module.crm.service.ContactService;
 import com.mycollab.spring.AppContextUtil;
+import com.mycollab.vaadin.MyCollabUI;
 import com.mycollab.vaadin.UserUIContext;
 import com.vaadin.addon.touchkit.ui.NavigationButton;
 
@@ -67,6 +68,7 @@ void displayTotalContacts(ContactSearchCriteria criteria) {
 
     public void displayRelatedByAccount(Integer accountId) {
         ContactSearchCriteria searchCriteria = new ContactSearchCriteria();
+        searchCriteria.setSaccountid(NumberSearchField.equal(MyCollabUI.getAccountId()));
         searchCriteria.setAccountId(NumberSearchField.equal(accountId));
         displayTotalContacts(searchCriteria);
     }

mycollab-mobile/src/main/java/com/mycollab/mobile/module/crm/view/lead/RelatedLeadNavigatorButton.java

@@ -38,6 +38,7 @@
 import com.mycollab.module.crm.i18n.LeadI18nEnum;
 import com.mycollab.module.crm.service.LeadService;
 import com.mycollab.spring.AppContextUtil;
+import com.mycollab.vaadin.MyCollabUI;
 import com.mycollab.vaadin.UserUIContext;
 import com.vaadin.addon.touchkit.ui.NavigationButton;
 
@@ -67,6 +68,7 @@ void displayTotalLeads(LeadSearchCriteria criteria) {
 
     public void displayRelatedByAccount(Integer accountId) {
         LeadSearchCriteria searchCriteria = new LeadSearchCriteria();
+        searchCriteria.setSaccountid(NumberSearchField.equal(MyCollabUI.getAccountId()));
         searchCriteria.setAccountId(NumberSearchField.equal(accountId));
         displayTotalLeads(searchCriteria);
     }

mycollab-mobile/src/main/java/com/mycollab/mobile/module/crm/view/opportunity/RelatedOpportunityNavigationButton.java

@@ -22,6 +22,7 @@
 import com.mycollab.module.crm.i18n.OpportunityI18nEnum;
 import com.mycollab.module.crm.service.OpportunityService;
 import com.mycollab.spring.AppContextUtil;
+import com.mycollab.vaadin.MyCollabUI;
 import com.mycollab.vaadin.UserUIContext;
 import com.vaadin.addon.touchkit.ui.NavigationButton;
 
@@ -51,6 +52,7 @@ void displayTotalOpportunities(OpportunitySearchCriteria criteria) {
 
     public void displayRelatedByAccount(Integer accountId) {
         OpportunitySearchCriteria searchCriteria = new OpportunitySearchCriteria();
+        searchCriteria.setSaccountid(NumberSearchField.equal(MyCollabUI.getAccountId()));
         searchCriteria.setAccountId(NumberSearchField.equal(accountId));
         displayTotalOpportunities(searchCriteria);
     }

mycollab-services/src/main/resources/sqlMap/crm/OpportunityMapperExt.xml

@@ -25,7 +25,7 @@
         
         #ifnotnull($searchCriteria.contactId)
              ${searchCriteria.contactId.operation} 
-                EXISTS (SELECT COUNT(*)
+                EXISTS (SELECT 1
                     FROM m_crm_contacts_opportunities, m_crm_contact 
                     WHERE m_crm_contact.id=@{searchCriteria.contactId.value, jdbcType=NUMERIC} 
                         AND m_crm_opportunity.id= m_crm_contacts_opportunities.opportunityId
@@ -83,7 +83,7 @@
         
         #ifnotnull($searchCriteria.accountId)
             ${searchCriteria.accountId.operation}
-                EXISTS (SELECT COUNT(*)
+                EXISTS (SELECT 1
                 FROM m_crm_account 
                 WHERE m_crm_opportunity.accountid = m_crm_account.id 
                     AND m_crm_account.id = @{searchCriteria.accountId.value,jdbcType=NUMERIC}

mycollab-web/src/main/resources/VAADIN/themes/mycollab_20170210/styles.css

@@ -995,7 +995,7 @@
  */
 
 .v-vaadin-version:after {
-	content: "7.7.3";
+	content: "7.7.9";
 }
 
 .v-widget {
@@ -5197,6 +5197,8 @@ a.v-disabled {
 }
 
 .v-grid-body {
+	-ms-touch-action: none;
+	touch-action: none;
 	z-index: 0;
 	top: 0;
 }
@@ -5482,6 +5484,21 @@ a.v-disabled {
 	user-select: none;
 }
 
+.v-grid-column-resize-simple-indicator {
+	position: absolute;
+	width: 3px;
+	top: 0px;
+	left: 15px;
+	z-index: 9001;
+	background: #fff;
+	box-shadow: 0px 0px 5px #000;
+	-webkit-user-select: none;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+
 .v-grid-footer td {
 	background-color: #fafafa;
 	font-size: 12px;
@@ -13896,7 +13913,7 @@ h1.no-margin, .v-label-h1.no-margin, h2.no-margin, .v-label-h2.no-margin, h3.no-
 	transition: all 300ms;
 }
 
-.valo-menu-responsive[width-range~="0-800px"] .valo-menu-visible .valo-menuitems {
+.valo-menu-responsive[width-range~="0-800px"] .valo-menu-visible .valo-menuitems, .valo-menu-responsive[width-range~="0-800px"] .valo-menu-hover:hover .valo-menuitems {
 	-webkit-transform: translatex(0%);
 	-moz-transform: translatex(0%);
 	-ms-transform: translatex(0%);