lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7850 from hregis/develop_member

Browse Source 
NEW add possibility to remove address field
This commit is contained in:
Laurent Destailleur 2017-11-22 11:15:23 +01:00 committed by GitHub
commit fd07d15423
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1539,14 +1539,15 @@ function dol_bc($var,$moreclass='')
/**
* Return a formated address (part address/zip/town/state) according to country rules
*
* @param Object $object A company or contact object
* @param int $withcountry 1=Add country into address string
* @param string $sep Separator to use to build string
* @param Translate $outputlangs Object lang that contains language for text translation.
* @return string Formated string
* @param Object $object A company or contact object
* @param int $withcountry 1=Add country into address string
* @param string $sep Separator to use to build string
* @param Translate $outputlangs Object lang that contains language for text translation.
* @param int $mode 0=Standard output, 1=Remove address
* @return string Formated string
* @see dol_print_address
*/
function dol_format_address($object,$withcountry=0,$sep="\n",$outputlangs='')
function dol_format_address($object, $withcountry=0, $sep="\n", $outputlangs='', $mode=0)
{
global $conf,$langs;
@ -1554,7 +1555,9 @@ 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
// Address
$ret .= $object->address;
if (empty($mode)) {
$ret .= $object->address;
}
// Zip/Town/State
if (in_array($object->country_code,array('AU', 'CA', 'US')) || ! empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) // US: title firstname name \n address lines \n town, state, zip \n country
{