Merge remote-tracking branch 'upstream/develop' into develop

2013-04-08 14:24:25 +02:00 · 2013-04-08 14:24:25 +02:00 · 9099fe9461
commit 9099fe9461
parent 40f11206de cea2f047a2
1 changed files with 4 additions and 0 deletions
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@ -309,6 +309,10 @@ function getPaypalPaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
            }
        }
    }
+    
+    // For multicompany
+    $out.="&entity=".$conf->entity;
+    
    return $out;
 }