diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 699b0e2418e..e545cbbe9af 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6535,7 +6535,7 @@ class Form
$TCurrency = array();
$sql = "SELECT code FROM " . $this->db->prefix() . "multicurrency";
- $sql .= " WHERE entity IN ('" . getEntity('mutlicurrency') . "')";
+ $sql .= " WHERE entity IN ('" . getEntity('multicurrency') . "')";
if ($filter) {
$sql .= " AND " . $filter;
}
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 2e18fb389b3..87490630f87 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -332,6 +332,7 @@ ErrorGeneratingBarcode=Error while generating the barcode (probably invalid code
ErrorObjectNotFound = The object %s is not found, please check your url
ErrorCountryCodeMustBe2Char=Country code must be a 2 character string
ErrorABatchShouldNotContainsSpaces=A lot or serial number should not contains spaces
+
ErrorTableExist=Table %s already exist
ErrorDictionaryNotFound=Dictionary %s not found
ErrorFailedToCreateSymLinkToMedias=Failed to create the symbolic link %s to point to %s
@@ -429,3 +430,4 @@ OperNotDefined=Payment method not defined
ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for this type.
ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
EmptyMessageNotAllowedError=Empty message is not allowed
+SomeShipmentExists=Error, there is some shipment linked to the order. Deletion refused.
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index f93c410bd73..97b70a7db20 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1743,7 +1743,7 @@ div.ticketpublicarealist>form>div.div-table-responsive {
}
.flexcontainer {
- browser->name, array('chrome', 'firefox'))) {
+ browser->name, array('chrome', 'firefox', 'safari'))) {
echo 'display: inline-flex;'."\n";
} ?>
flex-flow: row wrap;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 09de0954513..8635e592ed4 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1900,7 +1900,7 @@ div.ticketpublicarealist>form>div.div-table-responsive {
}
.flexcontainer {
- browser->name, array('chrome', 'firefox'))) {
+ browser->name, array('chrome', 'firefox', 'safari'))) {
echo 'display: inline-flex;'."\n";
} ?>
flex-flow: row wrap;