diff --git a/SHA256SUMS b/SHA256SUMS index 0f1c8371..345d25a3 100644 --- a/SHA256SUMS +++ b/SHA256SUMS @@ -1 +1 @@ -b3a127929889cdb0dc315c0cec0e6b1d705c0139ecf4b482491ea651000495e0 \ No newline at end of file +15c662f9c3241ae21b32d780643571b85f9ab43563fe9f5191aa2d370aeb0fe2 \ No newline at end of file diff --git a/class/msCourrier.php b/class/msCourrier.php index 99c104c5..82dbeea8 100644 --- a/class/msCourrier.php +++ b/class/msCourrier.php @@ -311,12 +311,11 @@ public function getReglementData() $sqlImplode = msSQL::sqlGetTagsForWhereIn($porteursReglementIds, 'posteursReg'); $marqueurs = array_merge($marqueurs, $sqlImplode['execute']); - if($factureID = msSQL::sqlUniqueChamp("select count(id) from objets_data - where typeID in (" .$sqlImplode['in']. ") and DATE(creationDate) = DATE( :creationDate ) and id <= :objetID and fromID = :fromID ", $marqueurs)) { - $factureID=str_pad($factureID, 3, "0", STR_PAD_LEFT); - $tabRetour['factureID']=$factureID; + if ($factureID = msSQL::sqlUniqueChamp("SELECT COUNT(id) FROM objets_data WHERE typeID IN (" . $sqlImplode['in'] . ") AND DATE(creationDate) = DATE(:creationDate) AND TIME(creationDate) <= TIME(:creationDate) AND fromID = :fromID AND deleted != 'y'", $marqueurs)) { + $factureID = str_pad($factureID, 3, "0", STR_PAD_LEFT); + $tabRetour['factureID'] = $factureID; $dateF = DateTime::createFromFormat('Y-m-d H:i:s', $this->_objetData['creationDate']); - $tabRetour['factureNumero']=$dateF->format('Ymd').$factureID; + $tabRetour['factureNumero'] = $dateF->format('Ymd') . $factureID; } //règlement data diff --git a/upgrade/base/sqlInstall.sql b/upgrade/base/sqlInstall.sql index 009b18a0..968031c0 100644 --- a/upgrade/base/sqlInstall.sql +++ b/upgrade/base/sqlInstall.sql @@ -1270,7 +1270,7 @@ INSERT IGNORE INTO `prescriptions` (`cat`, `label`, `description`, `fromID`, `to -- system INSERT IGNORE INTO `system` (`name`, `groupe`, `value`) VALUES -('base', 'module', 'v8.1.0'), +('base', 'module', 'v8.1.1'), ('state', 'system', 'normal'); -- univtags_type diff --git a/upgrade/base/sqlUpgrade_v8.1.0_v8.1.1.sql b/upgrade/base/sqlUpgrade_v8.1.0_v8.1.1.sql new file mode 100644 index 00000000..3a2bae51 --- /dev/null +++ b/upgrade/base/sqlUpgrade_v8.1.0_v8.1.1.sql @@ -0,0 +1,2 @@ +-- Mise à jour n° de version +UPDATE `system` SET `value`='v8.1.1' WHERE `name`='base' and `groupe`='module'; \ No newline at end of file diff --git a/versionMedShakeEHR-base.txt b/versionMedShakeEHR-base.txt index 74cccb32..3cb432e9 100644 --- a/versionMedShakeEHR-base.txt +++ b/versionMedShakeEHR-base.txt @@ -1 +1 @@ -v8.1.0 +v8.1.1