Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2023-02-16 02:27:44 +01:00
parent 162f296237 a3377113ae
commit 27552f6706
5 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/core/class/commonobject.class.php
View File

@@ -911,8 +911,11 @@ abstract class CommonObject
$out .= img_picto($langs->trans("Address"), 'map-marker-alt');
$out .= '</a> ';
}
$out .= dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', ');
$outdone++;
$address = dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', ');
if ($address) {
$out .= $address;
$outdone++;
}
$outdone++;
// List of extra languages
@@ -938,6 +941,7 @@ abstract class CommonObject
// If there is extra languages
foreach ($arrayoflangcode as $extralangcode) {
$s = picto_from_langcode($extralangcode, 'class="pictoforlang paddingright"');
// This also call dol_format_address()
$coords = $this->getFullAddress(1, ', ', $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT, $extralangcode);
$htmltext .= $s.dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', ');
}
@@ -946,7 +950,8 @@ abstract class CommonObject
}
}
if (!in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS) // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
// If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
if (!in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)
&& empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state) {
if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
$out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state;
@@ -956,6 +961,10 @@ abstract class CommonObject
$outdone++;
}
if ($outdone) {
$out = '<div class="address inline-block">'.$out.'</div>';
}
if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) {
$out .= ($outdone ? '<br>' : '');
}

4
htdocs/core/class/smtps.class.php
View File

@@ -231,7 +231,7 @@ class SMTPs
private $_errorsTo = '';
private $_deliveryReceipt = 0;
private $_trackId = '';
private $_moreInHeader = '';
private $_moreinheader = '';
/**
* An array of options for stream_context_create()
@@ -1267,7 +1267,7 @@ class SMTPs
$_RCPT_list = array();
// walk down Recipients array and pull just email addresses
foreach ($this->_msgRecipients as $_host => $_list) {
if ($this->_msgRecipients[$_host][$_which]) {
if (!empty($this->_msgRecipients[$_host][$_which])) {
foreach ($this->_msgRecipients[$_host][$_which] as $_addr => $_realName) {
if ($_realName) { // @CHANGE LDR
$_realName = '"'.$_realName.'"';

2
htdocs/core/lib/functions.lib.php
View File

@@ -2354,7 +2354,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
if (method_exists($object, 'getBannerAddress') && !in_array($object->element, array('product', 'bookmark', 'ecm_directories', 'ecm_files'))) {
$moreaddress = $object->getBannerAddress('refaddress', $object);
if ($moreaddress) {
$morehtmlref .= '<div class="refidno">';
$morehtmlref .= '<div class="refidno refaddress">';
$morehtmlref .= $moreaddress;
$morehtmlref .= '</div>';
}

4
htdocs/theme/eldy/global.inc.php
View File

@@ -3983,6 +3983,10 @@ div.refidno {
font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize ?>;
line-height: 1.4em;
}
div.refaddress div.address {
line-height: 1.2em;
font-size: 0.95em;
}
div.refidno form {
display: inline-block;
}

8
htdocs/theme/md/style.css.php
View File

@@ -4062,7 +4062,7 @@ div.refidpadding {
div.refid {
font-weight: bold;
color: var(--colortexttitlenotab);
font-size: 160%;
font-size: 120%;
}
a.refid {
color: var(--colortexttitlenotab) !important;
@@ -4072,11 +4072,15 @@ div.refidno {
font-weight: normal;
color: var(--refidnocolor);
font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize ?>;
line-height: 21px;
line-height: 1.3em;
}
div.refidno form {
display: inline-block;
}
div.refaddress div.address {
line-height: 1.2em;
font-size: 0.9em;
}
div.pagination {
float: right;