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

Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7_bug3

Browse Source
This commit is contained in:
Regis Houssin 2015-07-04 05:46:41 +02:00
commit a9059247ca
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/modules/DolibarrModules.class.php
View File

@ -1412,7 +1412,6 @@ abstract class DolibarrModules
global $conf;
$error=0;
$entity=$conf->entity;
if (is_array($this->module_parts) && ! empty($this->module_parts))
{
@ -1420,6 +1419,7 @@ abstract class DolibarrModules
{
if (is_array($value) && count($value) == 0) continue; // Discard empty arrays
$entity=$conf->entity; // Reset the current entity
$newvalue = $value;
// Serialize array parameters
@ -1431,6 +1431,11 @@ abstract class DolibarrModules
$newvalue = json_encode($value['data']);
if (isset($value['entity'])) $entity = $value['entity'];
}
else if (isset($value['data']) && !is_array($value['data']))
{
$newvalue = $value['data'];
if (isset($value['entity'])) $entity = $value['entity'];
}
else
{
$newvalue = json_encode($value);

2
htdocs/paypal/lib/paypal.lib.php
View File

@ -311,7 +311,7 @@ function getPaypalPaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
}
// For multicompany
//$out.="&entity=".$conf->entity; // This should not be into link. Link contains already a ref of an object that allow to retreive entity
$out.="&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
return $out;
}