From 57c8797459b4b439452ece54adf3c4cab3a97109 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 May 2012 22:09:36 +0200
Subject: [PATCH] Fix: Subscription must use company name when type is "moral"

---
 htdocs/public/paybox/newpayment.php | 5 ++++-
 htdocs/public/paypal/newpayment.php | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 8f2c4c55d76..6e85774afde 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -672,7 +672,10 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	// Debitor
 	$var=!$var;
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$member->getFullName($langs).'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
+	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
+	else print $member->getFullName($langs);
+	print '</b>';
 
 	// Object
 	$var=!$var;
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 636af99bd30..89d4b339bd9 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -828,7 +828,10 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	// Debitor
 	$var=!$var;
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$member->getFullName($langs).'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
+	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
+	else print $member->getFullName($langs);
+	print '</b>';
 
 	// Object
 	$var=!$var;