diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index e4f6ffc397a..4ad7a74bcb9 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -366,7 +366,7 @@ if ($action == 'edit') { $mainstmpid=(! empty($conf->global->MAIN_MAIL_SMTPS_ID)?$conf->global->MAIN_MAIL_SMTPS_ID:''); - print ''.$langs->trans("MAIN_MAIL_SMTPS_ID").''; + print ''.$langs->trans("MAIN_MAIL_SMTPS_ID").''; // SuperAdministrator access only if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) { @@ -386,7 +386,7 @@ if ($action == 'edit') { $mainsmtppw=(! empty($conf->global->MAIN_MAIL_SMTPS_PW)?$conf->global->MAIN_MAIL_SMTPS_PW:''); - print ''.$langs->trans("MAIN_MAIL_SMTPS_PW").''; + print ''.$langs->trans("MAIN_MAIL_SMTPS_PW").''; // SuperAdministrator access only if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) { diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index b36159f9340..dbedf2be1ce 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -66,7 +66,7 @@ $domData .= ' data-product_type="'.$line->product_type.'"'; ?> - > + > global->MAIN_VIEW_LINE_NUMBER)) { ?> @@ -321,7 +321,7 @@ $domData .= ' data-product_type="'.$line->product_type.'"'; //Line extrafield if (!empty($extrafieldsline)) { - print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bcdd[$var],'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1); + print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="drag drop oddeven"','colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1); } ?> diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php index 6debdb737d0..f9420919e91 100644 --- a/htdocs/variants/list.php +++ b/htdocs/variants/list.php @@ -50,7 +50,6 @@ if ($action == 'up') { $langs->load('products'); -$var = false; $title = $langs->trans($langs->trans('ProductAttributes')); $variants = $object->fetchAll(); @@ -122,7 +121,7 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1; $attribute): ?> - > + ref) ?> label) ?> countChildValues() ?> @@ -143,7 +142,6 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;