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

Fixed: [ bug #1756 ] PHP error while removing an import profile

Browse Source
This commit is contained in:
Laurent Destailleur 2014-12-23 12:25:21 +01:00
parent e6d2bc0bff
commit e8addcb8ba
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/tpl/extrafields_view.tpl.php
View File

@ -47,7 +47,8 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
{ {
print '<tr><td>'; print '<tr><td>';
print '<table width="100%" class="nobordernopadding"><tr><td'; print '<table width="100%" class="nobordernopadding"><tr><td';
if (! empty($extrafields->attribute_required [$key])) print ' class="fieldrequired"'; //var_dump($action);exit;
if ((! empty($action) && $action != 'view') && ! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
print '>' . $label . '</td>'; print '>' . $label . '</td>';
//TODO Improve element and rights detection //TODO Improve element and rights detection

5
htdocs/imports/class/import.class.php
View File

@ -22,8 +22,7 @@
*/ */
/** /**
* \class Import * Class to manage imports
* \brief Class to manage imports
*/ */
class Import class Import
{ {
@ -313,10 +312,12 @@ class Import
{ {
if (! $notrigger) if (! $notrigger)
{ {
/* Not used. This is not a business object. To convert it we must herit from CommonObject
// Call trigger // Call trigger
$result=$this->call_trigger('IMPORT_DELETE',$user); $result=$this->call_trigger('IMPORT_DELETE',$user);
if ($result < 0) $error++; if ($result < 0) $error++;
// End call triggers // End call triggers
*/
} }
} }