Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
This commit is contained in:
commit
aa6fd6de5a
4 changed files with 5 additions and 3 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -332,6 +332,7 @@ ErrorGeneratingBarcode=Error while generating the barcode (probably invalid code
|
|||
ErrorObjectNotFound = The object <b>%s</b> 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 <b>%s</b> already exist
|
||||
ErrorDictionaryNotFound=Dictionary <b>%s</b> 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.
|
||||
|
|
|
|||
|
|
@ -1743,7 +1743,7 @@ div.ticketpublicarealist>form>div.div-table-responsive {
|
|||
}
|
||||
|
||||
.flexcontainer {
|
||||
<?php if (in_array($conf->browser->name, array('chrome', 'firefox'))) {
|
||||
<?php if (in_array($conf->browser->name, array('chrome', 'firefox', 'safari'))) {
|
||||
echo 'display: inline-flex;'."\n";
|
||||
} ?>
|
||||
flex-flow: row wrap;
|
||||
|
|
|
|||
|
|
@ -1900,7 +1900,7 @@ div.ticketpublicarealist>form>div.div-table-responsive {
|
|||
}
|
||||
|
||||
.flexcontainer {
|
||||
<?php if (in_array($conf->browser->name, array('chrome', 'firefox'))) {
|
||||
<?php if (in_array($conf->browser->name, array('chrome', 'firefox', 'safari'))) {
|
||||
echo 'display: inline-flex;'."\n";
|
||||
} ?>
|
||||
flex-flow: row wrap;
|
||||
|
|
|
|||
Loading…
Reference in a new issue