From 4d8bd95722b120c9a3dbb8c94e6c9b2c3c65e187 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 16 Sep 2011 22:44:18 +0000
Subject: [PATCH] Fix: label if id not defined for country

---
 htdocs/admin/pdf.php | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index a9fdcea608a..c83b8714bbe 100755
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -113,25 +113,33 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')	// Edit
 
     // Show prof id 1 in address into pdf
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$langs->transcountry("ProfId1",$mysoc->pays_code).'</td><td>';
+    $pid1=$langs->transcountry("ProfId1",$mysoc->pays_code);
+    if ($pid1 == '-') $pid1=$langs->transcountry("ProfId1");
+    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid1.'</td><td>';
 	print $html->selectyesno('MAIN_PROFID1_IN_ADDRESS',isset($conf->global->MAIN_PROFID1_IN_ADDRESS)?$conf->global->MAIN_PROFID1_IN_ADDRESS:0,1);
     print '</td></tr>';
 
     // Show prof id 2 in address into pdf
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$langs->transcountry("ProfId2",$mysoc->pays_code).'</td><td>';
+    $pid2=$langs->transcountry("ProfId2",$mysoc->pays_code);
+    if ($pid2 == '-') $pid2=$langs->transcountry("ProfId2");
+    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid2.'</td><td>';
 	print $html->selectyesno('MAIN_PROFID2_IN_ADDRESS',isset($conf->global->MAIN_PROFID2_IN_ADDRESS)?$conf->global->MAIN_PROFID2_IN_ADDRESS:0,1);
     print '</td></tr>';
 
     // Show prof id 3 in address into pdf
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$langs->transcountry("ProfId3",$mysoc->pays_code).'</td><td>';
+    $pid3=$langs->transcountry("ProfId3",$mysoc->pays_code);
+    if ($pid3 == '-') $pid3=$langs->transcountry("ProfId3");
+    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid3.'</td><td>';
 	print $html->selectyesno('MAIN_PROFID3_IN_ADDRESS',isset($conf->global->MAIN_PROFID3_IN_ADDRESS)?$conf->global->MAIN_PROFID3_IN_ADDRESS:0,1);
     print '</td></tr>';
 
     // Show prof id 4 in address into pdf
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$langs->transcountry("ProfId4",$mysoc->pays_code).'</td><td>';
+    $pid4=$langs->transcountry("ProfId4",$mysoc->pays_code);
+    if ($pid4 == '-') $pid4=$langs->transcountry("ProfId4");
+    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid4.'</td><td>';
 	print $html->selectyesno('MAIN_PROFID4_IN_ADDRESS',isset($conf->global->MAIN_PROFID4_IN_ADDRESS)?$conf->global->MAIN_PROFID4_IN_ADDRESS:0,1);
     print '</td></tr>';
 
@@ -199,25 +207,33 @@ else	// Show
 
     // Show prof id 1 in address into pdf
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$langs->transcountry("ProfId1",$mysoc->pays_code).'</td><td>';
+    $pid1=$langs->transcountry("ProfId1",$mysoc->pays_code);
+    if ($pid1 == '-') $pid1=$langs->transcountry("ProfId1");
+    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid1.'</td><td>';
     print yn($conf->global->MAIN_PROFID1_IN_ADDRESS,1);
     print '</td></tr>';
 
     // Show prof id 2 in address into pdf
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$langs->transcountry("ProfId2",$mysoc->pays_code).'</td><td>';
+    $pid2=$langs->transcountry("ProfId2",$mysoc->pays_code);
+    if ($pid2 == '-') $pid2=$langs->transcountry("ProfId2");
+    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid2.'</td><td>';
     print yn($conf->global->MAIN_PROFID2_IN_ADDRESS,1);
     print '</td></tr>';
 
     // Show prof id 3 in address into pdf
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$langs->transcountry("ProfId3",$mysoc->pays_code).'</td><td>';
+    $pid3=$langs->transcountry("ProfId3",$mysoc->pays_code);
+    if ($pid3 == '-') $pid3=$langs->transcountry("ProfId3");
+    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid3.'</td><td>';
     print yn($conf->global->MAIN_PROFID3_IN_ADDRESS,1);
     print '</td></tr>';
 
     // Show prof id 4 in address into pdf
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$langs->transcountry("ProfId4",$mysoc->pays_code).'</td><td>';
+    $pid4=$langs->transcountry("ProfId4",$mysoc->pays_code);
+    if ($pid4 == '-') $pid4=$langs->transcountry("ProfId4");
+    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid4.'</td><td>';
     print yn($conf->global->MAIN_PROFID4_IN_ADDRESS,1);
     print '</td></tr>';