diff --git a/htdocs/admin/paybox.php b/htdocs/admin/paybox.php
index 25b9e8418e3..a972468c3b7 100644
--- a/htdocs/admin/paybox.php
+++ b/htdocs/admin/paybox.php
@@ -38,9 +38,10 @@ if (!$user->admin)
 if ($_POST["action"] == 'setvalue' && $user->admin)
 {
 	//$result=dolibarr_set_const($db, "PAYBOX_IBS_DEVISE",$_POST["PAYBOX_IBS_DEVISE"]);
+	$result=dolibarr_set_const($db, "PAYBOX_CSS_URL",$_POST["PAYBOX_CSS_URL"]);
+	$result=dolibarr_set_const($db, "PAYBOX_CREDITOR",$_POST["PAYBOX_CREDITOR"]);
 	$result=dolibarr_set_const($db, "PAYBOX_CGI_URL_V1",$_POST["PAYBOX_CGI_URL_V1"]);
 	$result=dolibarr_set_const($db, "PAYBOX_CGI_URL_V2",$_POST["PAYBOX_CGI_URL_V2"]);
-	$result=dolibarr_set_const($db, "PAYBOX_CSS_URL",$_POST["PAYBOX_CSS_URL"]);
 	$result=dolibarr_set_const($db, "PAYBOX_IBS_SITE",$_POST["PAYBOX_IBS_SITE"]);
 	$result=dolibarr_set_const($db, "PAYBOX_IBS_RANG",$_POST["PAYBOX_IBS_RANG"]);
 	$result=dolibarr_set_const($db, "PAYBOX_PBX_IDENTIFIANT",$_POST["PAYBOX_PBX_IDENTIFIANT"]);
@@ -105,38 +106,48 @@ print '<input size="64" type="text" name="PAYBOX_CSS_URL" value="'.$conf->global
 print '<br>'.$langs->trans("Example").': http://mysite/mycss.css';
 print '</td></tr>';
 
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("PAYBOX_CREDITOR").'</td><td>';
+print '<input size="64" type="text" name="PAYBOX_CREDITOR" value="'.$conf->global->PAYBOX_CREDITOR.'">';
+print '<br>'.$langs->trans("Example").': '.$mysoc->nom;
+print '</td></tr>';
+
+/*
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("PAYBOX_CGI_URL_V1").'</td><td>';
 print '<input size="64" type="text" name="PAYBOX_CGI_URL_V1" value="'.$conf->global->PAYBOX_CGI_URL_V1.'">';
 print '<br>'.$langs->trans("Example").': http://mysite/cgi-bin/module_linux.cgi';
 print '</td></tr>';
+*/
 
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("PAYBOX_CGI_URL_V2").'</td><td>';
+print $langs->trans("PAYBOX_CGI_URL_V2").'*</td><td>';
 print '<input size="64" type="text" name="PAYBOX_CGI_URL_V2" value="'.$conf->global->PAYBOX_CGI_URL_V2.'">';
 print '<br>'.$langs->trans("Example").': http://mysite/cgi-bin/modulev2_redhat72.cgi';
 print '</td></tr>';
 
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("PAYBOX_IBS_SITE").'</td><td>';
+print $langs->trans("PAYBOX_PBX_SITE").'*</td><td>';
 print '<input size="32" type="text" name="PAYBOX_IBS_SITE" value="'.$conf->global->PAYBOX_IBS_SITE.'">';
 print '<br>'.$langs->trans("Example").': 1999888 ('.$langs->trans("Test").')';
 print '</td></tr>';
 
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("PAYBOX_IBS_RANG").'</td><td>';
+print $langs->trans("PAYBOX_PBX_RANG").'*</td><td>';
 print '<input size="32" type="text" name="PAYBOX_IBS_RANG" value="'.$conf->global->PAYBOX_IBS_RANG.'">';
 print '<br>'.$langs->trans("Example").': 99 ('.$langs->trans("Test").')';
 print '</td></tr>';
 
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("PAYBOX_PBX_IDENTIFIANT").'</td><td>';
+print $langs->trans("PAYBOX_PBX_IDENTIFIANT").'*</td><td>';
 print '<input size="32" type="text" name="PAYBOX_PBX_IDENTIFIANT" value="'.$conf->global->PAYBOX_PBX_IDENTIFIANT.'">';
+print '<br>'.$langs->trans("Example").': 2 ('.$langs->trans("Test").')';
 print '</td></tr>';
 
 
diff --git a/htdocs/paybox/paybox.lib.php b/htdocs/paybox/paybox.lib.php
index 312928c66c4..6a1c597174c 100644
--- a/htdocs/paybox/paybox.lib.php
+++ b/htdocs/paybox/paybox.lib.php
@@ -75,17 +75,19 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
 	dol_syslog("Paypal.lib::print_paybox_redirect", LOG_DEBUG);
 
 	// Clean parameters
+	$PBX_IDENTIFIANT="2";	# Identifiant pour v2 test
+	if ($conf->global->PAYBOX_PBX_IDENTIFIANT) $PBX_IDENTIFIANT=$conf->global->PAYBOX_PBX_IDENTIFIANT;
 	$IBS_SITE="1999888";    # Site test
 	if ($conf->global->PAYBOX_IBS_SITE) $IBS_SITE=$conf->global->PAYBOX_IBS_SITE;
 	$IBS_RANG="99";         # Rang test
 	if ($conf->global->PAYBOX_IBS_RANG) $IBS_RANG=$conf->global->PAYBOX_IBS_RANG;
-	$IBS_DEVISE="";			# Currency
+	$IBS_DEVISE="840";			# Currency (Dollar US by default)
 	if ($CURRENCY == 'EUR') $IBS_DEVISE="978";
-
+	if ($CURRENCY == 'USD') $IBS_DEVISE="840";
 
 	$URLPAYBOX="";
 	if ($conf->global->PAYBOX_CGI_URL_V1) $URLPAYBOX=$conf->global->PAYBOX_CGI_URL_V1;
-	//if ($conf->global->PAYBOX_CGI_URL_V2) $URLPAYBOX=$conf->global->PAYBOX_CGI_URL_V2;
+	if ($conf->global->PAYBOX_CGI_URL_V2) $URLPAYBOX=$conf->global->PAYBOX_CGI_URL_V2;
 
 	if (empty($IBS_DEVISE))
 	{
@@ -123,12 +125,16 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
     $IBS_REFUSE=$urlko;
     $IBS_BKGD="#FFFFFF";
     $IBS_WAIT="2000";
-	$IBS_LANG="GBR"; 	// FRA, GBR, ESP, ITA et DEU
+	$IBS_LANG="GBR"; 	// By default GBR=english (FRA, GBR, ESP, ITA et DEU...)
 	if (eregi('^FR',$langs->defaultlang)) $IBS_LANG="FRA";
 	if (eregi('^ES',$langs->defaultlang)) $IBS_LANG="ESP";
 	if (eregi('^IT',$langs->defaultlang)) $IBS_LANG="ITA";
 	if (eregi('^DE',$langs->defaultlang)) $IBS_LANG="DEU";
+	if (eregi('^NL',$langs->defaultlang)) $IBS_LANG="NLD";
+	if (eregi('^SE',$langs->defaultlang)) $IBS_LANG="SWE";
 	$IBS_OUTPUT='E';
+	$PBX_SOURCE='HTML';
+	$PBX_TYPEPAIEMENT='CARTE';
 
     dol_syslog("Soumission Paybox", LOG_DEBUG);
     dol_syslog("IBS_MODE: $IBS_MODE", LOG_DEBUG);
@@ -146,6 +152,9 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
     dol_syslog("IBS_WAIT: $IBS_WAIT", LOG_DEBUG);
     dol_syslog("IBS_LANG: $IBS_LANG", LOG_DEBUG);
     dol_syslog("IBS_OUTPUT: $IBS_OUTPUT", LOG_DEBUG);
+    dol_syslog("PBX_IDENTIFIANT: $PBX_IDENTITIANT", LOG_DEBUG);
+    dol_syslog("PBX_SOURCE: $PBX_SOURCE", LOG_DEBUG);
+    dol_syslog("PBX_TYPEPAIEMENT: $PBX_TYPEPAIEMENT", LOG_DEBUG);
 
     header("Content-type: text/html; charset=".$conf->character_set_client);
 
@@ -156,8 +165,12 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
     print '<body>'."\n";
     print "\n";
 
-    // Formulaire pour module Paybox v1 (IBS_xxx)
+    // Formulaire pour module Paybox
     print '<form action="'.$URLPAYBOX.'" NAME="Submit" method="POST">'."\n";
+
+    // For Paybox V1 (IBS_xxx)
+    /*
+    print '<!-- Param for Paybox v1 -->'."\n";
     print '<input type="hidden" name="IBS_MODE" value="'.$IBS_MODE.'">'."\n";
     print '<input type="hidden" name="IBS_SITE" value="'.$IBS_SITE.'">'."\n";
     print '<input type="hidden" name="IBS_RANG" value="'.$IBS_RANG.'">'."\n";
@@ -173,6 +186,31 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
     print '<input type="hidden" name="IBS_BKGD" value="'.$IBS_BKGD.'">'."\n";
     print '<input type="hidden" name="IBS_WAIT" value="'.$IBS_WAIT.'">'."\n";
     print '<input type="hidden" name="IBS_LANG" value="'.$IBS_LANG.'">'."\n";
+    print '<input type="hidden" name="IBS_OUTPUT" value="'.$IBS_OUTPUT.'">'."\n";
+	*/
+
+    // For Paybox V2 (PBX_xxx)
+    print '<!-- Param for Paybox v2 -->'."\n";
+    print '<input type="hidden" name="PBX_IDENTIFIANT" value="'.$PBX_IDENTIFIANT.'">'."\n";
+    print '<input type="hidden" name="PBX_MODE" value="'.$IBS_MODE.'">'."\n";
+    print '<input type="hidden" name="PBX_SITE" value="'.$IBS_SITE.'">'."\n";
+    print '<input type="hidden" name="PBX_RANG" value="'.$IBS_RANG.'">'."\n";
+    print '<input type="hidden" name="PBX_TOTAL" value="'.$IBS_TOTAL.'">'."\n";
+    print '<input type="hidden" name="PBX_DEVISE" value="'.$IBS_DEVISE.'">'."\n";
+    print '<input type="hidden" name="PBX_CMD" value="'.$IBS_CMD.'">'."\n";
+    print '<input type="hidden" name="PBX_PORTEUR" value="'.$IBS_PORTEUR.'">'."\n";
+    print '<input type="hidden" name="PBX_RETOUR" value="'.$IBS_RETOUR.'">'."\n";
+    print '<input type="hidden" name="PBX_EFFECTUE" value="'.$IBS_EFFECTUE.'">'."\n";
+    print '<input type="hidden" name="PBX_ANNULE" value="'.$IBS_ANNULE.'">'."\n";
+    print '<input type="hidden" name="PBX_REFUSE" value="'.$IBS_REFUSE.'">'."\n";
+    print '<input type="hidden" name="PBX_TXT" value="'.$IBS_TXT.'">'."\n";
+    print '<input type="hidden" name="PBX_BKGD" value="'.$IBS_BKGD.'">'."\n";
+    print '<input type="hidden" name="PBX_WAIT" value="'.$IBS_WAIT.'">'."\n";
+    print '<input type="hidden" name="PBX_LANG" value="'.$IBS_LANG.'">'."\n";
+    print '<input type="hidden" name="PBX_OUTPUT" value="'.$IBS_OUTPUT.'">'."\n";
+    print '<input type="hidden" name="PBX_SOURCE" value="'.$PBX_SOURCE.'">'."\n";
+    print '<input type="hidden" name="PBX_TYPEPAIEMENT" value="'.$PBX_TYPEPAIEMENT.'">'."\n";
+
     print '</form>'."\n";
 
     // Formulaire pour module Paybox v2 (PBX_xxx)
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index fdf79f17bd0..7832432bd15 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -102,6 +102,11 @@ if ($_REQUEST["action"] == 'dopayment')
 llxHeaderPayBox($langs->trans("PaymentForm"));
 
 
+// Common variables
+$creditor=$mysoc->nom;
+if (! empty($conf->global->PAYBOX_CREDITOR)) $creditor=$conf->global->PAYBOX_CREDITOR;
+
+
 print '<center>';
 print '<form name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="action" value="dopayment">';
@@ -134,7 +139,7 @@ if ($urllogo)
 
 print '<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
 
-print '<tr><td align="center"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$mysoc->nom).'<br><br></td></tr>'."\n";
+print '<tr><td align="center"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
 
 print '<tr><td align="center">';
 print '<table with="100%">';
@@ -143,6 +148,7 @@ print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("Thi
 $found=false;
 $var=false;
 
+
 // Payment on customer order
 if ($_REQUEST["amount"] == 'order')
 {
@@ -171,7 +177,7 @@ if ($_REQUEST["amount"] == 'order')
 	// Creditor
 	$var=!$var;
 	print '<tr><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$mysoc->nom.'</b></td></tr>'."\n";
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b></td></tr>'."\n";
 
 	// Debitor
 	$var=!$var;
@@ -244,7 +250,7 @@ if ($_REQUEST["amount"] == 'invoice')
 	// Creditor
 	$var=!$var;
 	print '<tr><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$mysoc->nom.'</b></td></tr>'."\n";
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b></td></tr>'."\n";
 
 	// Debitor
 	$var=!$var;
@@ -361,7 +367,7 @@ if ($_REQUEST["amount"] == 'contractline')
 	// Creditor
 	$var=!$var;
 	print '<tr><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$mysoc->nom.'</b></td></tr>'."\n";
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b></td></tr>'."\n";
 
 	// Debitor
 	$var=!$var;
@@ -460,7 +466,7 @@ if (is_numeric($_REQUEST["amount"]))
 	// Creditor
 	$var=!$var;
 	print '<tr><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$mysoc->nom.'</b></td></tr>'."\n";
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b></td></tr>'."\n";
 
 	// Amount
 	$var=!$var;