Merge branch 'dev'

class/msModMedgeDataCourrier.php

@@ -69,7 +69,9 @@ public static function getCourrierDataCompleteModuleModele_modeleCourrierResumeV
       $obj->setToID($d['patientID']);
       if($liste=$obj->getListObjetsIdFromName('medGeCsVaccination')) {
         foreach($liste as $id=>$date) {
-          $tab = $obj->getObjetAndSons($id, 'name');
+          $obj2=new msObjet;
+          $obj2->setObjetID($id);
+          $tab = $obj2->getObjetAndSons('name');
           $date = new DateTime($date);
           $rd[]='<li>'.$date->format('d/m/Y').' : <strong>'.$tab['medGeCsDivVaccinationVaccin']['value'].'</strong> (lot : '.$tab['medGeCsDivVaccinationLot']['value'].')</li>';
         }

class/msModMedgeObjetPreview.php

@@ -26,7 +26,7 @@
  *
  *
  * @author Bertrand Boutillier <[email protected]>
-
+ *
  */
 
 class msModMedgeObjetPreview extends msModBaseObjetPreview
@@ -40,7 +40,8 @@ public function getPreviewMedGeCsVaccination() {
     global $p;
 
     $data = new msObjet();
-    $p['page']['dataVac'] = $data->getObjetAndSons($this->_objetID, 'name');
+    $data->setObjetID($this->_objetID);
+    $p['page']['dataVac'] = $data->getObjetAndSons('name');
 
     $html = new msGetHtml;
     $html->set_template('inc-ajax-medGeCsVaccination.html.twig');

upgrade/medge/sqlInstall.sql

@@ -732,4 +732,4 @@ INSERT IGNORE INTO `forms` (`module`, `internalName`, `name`, `description`, `da
 
 -- system
 INSERT IGNORE INTO `system` (`name`, `groupe`, `value`) VALUES
-('medge', 'module', 'v1.4.0');
+('medge', 'module', 'v1.5.0');

upgrade/medge/sqlUpgrade_v1.4.0_v1.5.0.sql

@@ -0,0 +1,2 @@
+-- upgrade n° de version
+UPDATE `system` SET `value`='v1.5.0' WHERE `name`='medge';

versionMedShakeEHR-medge.txt

@@ -1 +1 @@
-v1.4.0
+v1.5.0