Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 11:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update functions.lib.php

Browse Source
This commit is contained in:
Laurent Destailleur
2017-11-22 11:14:52 +01:00
committed by GitHub
parent 848a27283b
commit c3d8ef2104
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1543,11 +1543,11 @@ function dol_bc($var,$moreclass='')
* @param int $withcountry 1=Add country into address string * @param int $withcountry 1=Add country into address string
* @param string $sep Separator to use to build string * @param string $sep Separator to use to build string
* @param Translate $outputlangs Object lang that contains language for text translation. * @param Translate $outputlangs Object lang that contains language for text translation.
* @param boolean $withoutaddress Possibility to remove address * @param int $mode 0=Standard output, 1=Remove address
* @return string Formated string * @return string Formated string
* @see dol_print_address * @see dol_print_address
*/ */
function dol_format_address($object, $withcountry=0, $sep="\n", $outputlangs='', $withoutaddress=false) function dol_format_address($object, $withcountry=0, $sep="\n", $outputlangs='', $mode=0)
{ {
global $conf,$langs; global $conf,$langs;
@@ -1555,7 +1555,7 @@ function dol_format_address($object, $withcountry=0, $sep="\n", $outputlangs='',
$countriesusingstate=array('AU','CA','US','IN','GB','ES','UK','TR'); // See also MAIN_FORCE_STATE_INTO_ADDRESS $countriesusingstate=array('AU','CA','US','IN','GB','ES','UK','TR'); // See also MAIN_FORCE_STATE_INTO_ADDRESS
// Address // Address
if (empty($withoutaddress)) { if (empty($mode)) {
$ret .= $object->address; $ret .= $object->address;
} }
// Zip/Town/State // Zip/Town/State