Merge pull request #1698 from civicrm/staging

Sync master with staging
compucorp · Apr 7, 2017 · 349570a · 349570a
2 parents a1fcd48 + 9ec539f
commit 349570a
Show file tree

Hide file tree

Showing 436 changed files with 6,882 additions and 60,667 deletions.
diff --git a/bin/drush-install.sh b/bin/drush-install.sh
@@ -32,8 +32,9 @@ org.civicrm.hrim,\
 org.civicrm.hrrecruitment,\
 org.civicrm.reqangular,\
 org.civicrm.contactsummary,\
-org.civicrm.bootstrapcivicrm,\
-org.civicrm.bootstrapcivihr
+org.civicrm.shoreditch,\
+org.civicrm.bootstrapcivihr,\
+org.civicrm.styleguide
 
 ##
 # Set Default localisation settings
@@ -62,7 +63,7 @@ function set_default_localisation_settings() {
 function set_resource_urls() {
   # Set Custom CSS URL
   drush cvapi Setting.create \
-  customCSSURL="[civicrm.root]/tools/extensions/civihr/org.civicrm.bootstrapcivicrm/css/custom-civicrm.css"
+  customCSSURL="[civicrm.root]/tools/extensions/org.civicrm.shoreditch/css/custom-civicrm.css"
 }
 
 ##################################

diff --git a/com.civicrm.hrjobroles/CRM/Hrjobroles/Import/Form/MapField.php b/com.civicrm.hrjobroles/CRM/Hrjobroles/Import/Form/MapField.php
@@ -166,7 +166,7 @@ public function buildQuickForm() {
 
             $js .= "{$formName}['mapper[$i][3]'].style.display = 'none';\n";
             $defaults["mapper[$i]"] = array(
-              $mappingHeader[0],
+              isset($mappingHeader[0]) ? $mappingHeader[0] : "",
               (isset($locationId)) ? $locationId : "",
               (isset($phoneType)) ? $phoneType : "",
             );

diff --git a/com.civicrm.hrjobroles/CRM/Hrjobroles/Import/Parser/HrJobRoles.php b/com.civicrm.hrjobroles/CRM/Hrjobroles/Import/Parser/HrJobRoles.php
@@ -323,10 +323,9 @@ function summary(&$values) {
         unset($params['hrjc_role_percent_pay_funder']);
       }
 
-      // check if job role start and end dates if exist matches or within contract start and end dates
-
-      $contractStartDate = CRM_Utils_Date::formatDate($contractDetails->period_start_date, $dateType);
-      $contractEndDate = CRM_Utils_Date::formatDate($contractDetails->period_end_date, $dateType);
+      // use contract dates as fallback if job role dates not set
+      $contractStartDate = CRM_Utils_Date::formatDate($contractDetails->period_start_date, 1);
+      $contractEndDate = CRM_Utils_Date::formatDate($contractDetails->period_end_date, 1);
 
       if (!empty($params['hrjc_role_start_date'])) {
         $roleStartDate = CRM_Utils_Date::formatDate($params['hrjc_role_start_date'], $dateType);