lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show extrafield separator on thirdparty and contact

Browse Source
This commit is contained in:
jfefe 2013-03-16 00:28:45 +01:00
parent f16c9dd3ac
commit 9a57431879
2 changed files with 91 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
htdocs/contact/fiche.php
View File

@ -521,11 +521,18 @@ else
foreach($extrafields->attribute_label as $key=>$label) 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]:'')); $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:(isset($object->array_options["options_".$key])?$object->array_options["options_".$key]:''));
print '<tr><td'; if ($extrafields->attribute_type[$key] == 'separate')
if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"'; {
print '>'.$label.'</td><td colspan="3">'; print $extrafields->showSeparator($key);
print $extrafields->showInputField($key,$value); }
print '</td></tr>'."\n"; 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 @@ else
foreach($extrafields->attribute_label as $key=>$label) foreach($extrafields->attribute_label as $key=>$label)
{ {
$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]); $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
print '<tr><td'; if ($extrafields->attribute_type[$key] == 'separate')
if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"'; {
print '>'.$label.'</td><td colspan="3">'; print $extrafields->showSeparator($key);
print $extrafields->showInputField($key,$value); }
print "</td></tr>\n"; 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 @@ else
foreach($extrafields->attribute_label as $key=>$label) 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]:'')); $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">'; if ($extrafields->attribute_type[$key] == 'separate')
print $extrafields->showOutputField($key,$value); {
print "</td></tr>\n"; print $extrafields->showSeparator($key);
}
else
{
print '<tr><td>'.$label.'</td><td colspan="3">';
print $extrafields->showOutputField($key,$value);
print "</td></tr>\n";
}
} }
} }

95
htdocs/societe/soc.php
View File

@ -985,20 +985,27 @@ else
{ {
$colspan='3'; $colspan='3';
$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:(isset($object->array_options["options_".$key])?$object->array_options["options_".$key]:'')); $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>'; print $extrafields->showSeparator($key);
$colspan='0'; }
} else
print '<td'; {
if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"'; if (($e % 2) == 0)
print '>'.$label.'</td>'; {
print '<td colspan="'.$colspan.'">'; print '<tr>';
print $extrafields->showInputField($key,$value); $colspan='0';
print '</td>'; }
print '<td';
if (($e % 2) == 1) print '</tr>'."\n"; if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
$e++; 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 @@ else
{ {
$colspan = '3'; $colspan = '3';
$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]); $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
if ($extrafields->attribute_type[$key] == 'separate')
if (($e % 2) == 0)
{ {
print '<tr>'."\n"; print $extrafields->showSeparator($key);
$colspan = '0';
} }
print '<td'; else
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"; 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 // Logo
@ -1753,18 +1765,25 @@ else
{ {
$colspan='3'; $colspan='3';
$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:(isset($object->array_options['options_'.$key])?$object->array_options['options_'.$key]:'')); $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>'; print $extrafields->showSeparator($key);
$colspan='0'; }
else
{
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++;
} }
} }