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

Fix deprecated code

Browse Source
This commit is contained in:
Laurent Destailleur 2018-01-13 19:33:40 +01:00
parent 1f2d275ef2
commit 7a087327e1
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/extrafields.class.php
View File

@ -624,9 +624,10 @@ class ExtraFields
{
$this->db->begin();
if(is_array($param) && count($param) > 0)
if (is_array($param))
{
$param = $this->db->escape(serialize($param));
if (count($param) > 0) $param = $this->db->escape(serialize($param));
else $param='';
}
$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
@ -698,7 +699,6 @@ class ExtraFields
{
return 0;
}
}

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

@ -4685,14 +4685,16 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
{
global $conf;
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
// Note: possible values for tva_assuj are 0/1 or franchise/reel
$seller_use_vat=((is_numeric($thirdparty_seller->tva_assuj) && ! $thirdparty_seller->tva_assuj) || (! is_numeric($thirdparty_seller->tva_assuj) && $thirdparty_seller->tva_assuj=='franchise'))?0:1;
$seller_country_code=$thirdparty_seller->country_code;
$seller_in_cee=$thirdparty_seller->isInEEC();
$seller_country_code = $thirdparty_seller->country_code;
$seller_in_cee = isInEEC($thirdparty_seller);
$buyer_country_code=$thirdparty_buyer->country_code;
$buyer_in_cee=$thirdparty_buyer->isInEEC();
$buyer_country_code = $thirdparty_buyer->country_code;
$buyer_in_cee = isInEEC($thirdparty_buyer);
dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".$seller_in_cee.", buyer country=".$buyer_country_code.", buyer in cee=".$buyer_in_cee.", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(! empty($conf->global->SERVICES_ARE_ECOMMERCE_200238EC)?$conf->global->SERVICES_ARE_ECOMMERCE_200238EC:''));