From 9a5743187984a948a7bc2fba664e7cede7035e60 Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Sat, 16 Mar 2013 00:28:45 +0100
Subject: [PATCH] Show extrafield separator on thirdparty and contact

---
 htdocs/contact/fiche.php | 47 ++++++++++++++------
 htdocs/societe/soc.php   | 95 ++++++++++++++++++++++++----------------
 2 files changed, 91 insertions(+), 51 deletions(-)

diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 2f1f061374031..885711bb526ed 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -521,11 +521,18 @@
             	foreach($extrafields->attribute_label as $key=>$label)
             	{
             		$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:(isset($object->array_options["options_".$key])?$object->array_options["options_".$key]:''));
-            		print '<tr><td';
-            		if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
-            		print '>'.$label.'</td><td colspan="3">';
-            		print $extrafields->showInputField($key,$value);
-            		print '</td></tr>'."\n";
+            		if ($extrafields->attribute_type[$key] == 'separate')
+            		{
+            			print $extrafields->showSeparator($key);
+            		}
+            		else
+            		{
+	            		print '<tr><td';
+	            		if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
+	            		print '>'.$label.'</td><td colspan="3">';
+	            		print $extrafields->showInputField($key,$value);
+	            		print '</td></tr>'."\n";
+            		}
             	}
             }
 
@@ -736,11 +743,18 @@
             	foreach($extrafields->attribute_label as $key=>$label)
             	{
             		$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
-            		print '<tr><td';
-            		if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
-            		print '>'.$label.'</td><td colspan="3">';
-            		print $extrafields->showInputField($key,$value);
-            		print "</td></tr>\n";
+            		if ($extrafields->attribute_type[$key] == 'separate')
+            		{
+            			print $extrafields->showSeparator($key);
+            		}
+            		else
+            		{
+	            		print '<tr><td';
+	            		if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
+	            		print '>'.$label.'</td><td colspan="3">';
+	            		print $extrafields->showInputField($key,$value);
+	            		print "</td></tr>\n";
+            		}
             	}
             }
 
@@ -948,9 +962,16 @@
         	foreach($extrafields->attribute_label as $key=>$label)
         	{
         		$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:(isset($object->array_options['options_'.$key])?$object->array_options['options_'.$key]:''));
-        		print '<tr><td>'.$label.'</td><td colspan="3">';
-        		print $extrafields->showOutputField($key,$value);
-        		print "</td></tr>\n";
+        		if ($extrafields->attribute_type[$key] == 'separate')
+        		{
+        			print $extrafields->showSeparator($key);
+        		}
+        		else
+        		{
+	        		print '<tr><td>'.$label.'</td><td colspan="3">';
+	        		print $extrafields->showOutputField($key,$value);
+	        		print "</td></tr>\n";
+        		}
         	}
         }
 
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index b45bf5a8e59b0..80de6ec7146a9 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -985,20 +985,27 @@
             {
             	$colspan='3';
                 $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:(isset($object->array_options["options_".$key])?$object->array_options["options_".$key]:''));
-                if (($e % 2) == 0)
+                if ($extrafields->attribute_type[$key] == 'separate')
                 {
-                	print '<tr>';
-                	$colspan='0';
-                }           		
-           		print '<td';
-           		if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
-           		print '>'.$label.'</td>';
-           		print '<td colspan="'.$colspan.'">';
-                print $extrafields->showInputField($key,$value);
-                print '</td>';
-                
-                if (($e % 2) == 1) print '</tr>'."\n";
-                $e++;
+                	print $extrafields->showSeparator($key);
+                }
+                else
+                {
+	                if (($e % 2) == 0)
+	                {
+	                	print '<tr>';
+	                	$colspan='0';
+	                }           		
+	           		print '<td';
+	           		if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
+	           		print '>'.$label.'</td>';
+	           		print '<td colspan="'.$colspan.'">';
+	                print $extrafields->showInputField($key,$value);
+	                print '</td>';
+	                
+	                if (($e % 2) == 1) print '</tr>'."\n";
+	                $e++;
+                }
             }
         }
 
@@ -1414,25 +1421,30 @@
                 {
 	                $colspan = '3';
                     $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
-                    
-                    if (($e % 2) == 0)
+                    if ($extrafields->attribute_type[$key] == 'separate')
                     {
-                    	print '<tr>'."\n";
-                    	$colspan = '0';
+                    	print $extrafields->showSeparator($key);
                     }
-            		print '<td';
-            		if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
-            		print '>'.$label.'</td>'."\n";
-            		print '<td colspan="'.$colspan.'">';
-                    print $extrafields->showInputField($key,$value);
-                    print "</td>"."\n";
-                    
-                    if (($e % 2) == 1 )
+                    else
                     {
-                    	print "</tr>\n";
+	                    if (($e % 2) == 0)
+	                    {
+	                    	print '<tr>'."\n";
+	                    	$colspan = '0';
+	                    }
+	            		print '<td';
+	            		if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
+	            		print '>'.$label.'</td>'."\n";
+	            		print '<td colspan="'.$colspan.'">';
+	                    print $extrafields->showInputField($key,$value);
+	                    print "</td>"."\n";
+	                    
+	                    if (($e % 2) == 1 )
+	                    {
+	                    	print "</tr>\n";
+	                    }
+	                    $e++;
                     }
-                    $old_pos = $extrafields->attribute_pos[$key];
-                    $e++;
                 }
             }
             // Logo
@@ -1753,18 +1765,25 @@
             {
             	$colspan='3';
                 $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:(isset($object->array_options['options_'.$key])?$object->array_options['options_'.$key]:''));
-                if (($e % 2) == 0) 
+                if ($extrafields->attribute_type[$key] == 'separate')
+                {
+                	print $extrafields->showSeparator($key);
+                }
+                else
                 {
-                	print '<tr>';
-                	$colspan='0';
+	                if (($e % 2) == 0) 
+	                {
+	                	print '<tr>';
+	                	$colspan='0';
+	                }
+	                print '<td>'.$label.'</td>';
+	                print '<td colspan="'.$colspan.'">';
+	                print $extrafields->showOutputField($key,$value);
+	                print "</td>";
+	                
+	                if (($e % 2) == 1) print '</tr>';
+	                $e++;
                 }
-                print '<td>'.$label.'</td>';
-                print '<td colspan="'.$colspan.'">';
-                print $extrafields->showOutputField($key,$value);
-                print "</td>";
-                
-                if (($e % 2) == 1) print '</tr>';
-                $e++;
             }
         }