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

Fix: State for turkey

Browse Source
This commit is contained in:
Laurent Destailleur
2013-07-02 09:58:09 +02:00
parent 443d6d4405
commit 1beb50e870
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -698,7 +698,7 @@ function dol_bc($var,$moreclass='')
function dol_format_address($object,$withcountry=0,$sep="\n") function dol_format_address($object,$withcountry=0,$sep="\n")
{ {
$ret=''; $ret='';
$countriesusingstate=array('AU','US','IN','GB','ES','UK'); $countriesusingstate=array('AU','US','IN','GB','ES','UK','TR');
// Address // Address
$ret .= $object->address; $ret .= $object->address;
@@ -721,7 +721,7 @@ function dol_format_address($object,$withcountry=0,$sep="\n")
} }
if ($object->zip) $ret .= ($ret ? $sep : '' ).$object->zip; if ($object->zip) $ret .= ($ret ? $sep : '' ).$object->zip;
} }
else if (in_array($object->country_code,array('ES'))) // ES: title firstname name \n address lines \n zip town \n state \n country else if (in_array($object->country_code,array('ES','TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
{ {
$ret .= ($ret ? $sep : '' ).$object->zip; $ret .= ($ret ? $sep : '' ).$object->zip;
$ret .= ' '.$object->town; $ret .= ' '.$object->town;
@@ -2812,9 +2812,9 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
} }
} }
if ($local == 2) if ($local == 2)
{ {
if ($thirdparty_seller->id==$mysoc->id) if ($thirdparty_seller->id==$mysoc->id)
{ {
if (! $thirdparty_buyer->localtax2_assuj) return 0; if (! $thirdparty_buyer->localtax2_assuj) return 0;