diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 3b38ccb3fd0..5c78415d686 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2590,7 +2590,7 @@ class Facture extends CommonInvoice /** * Return if an invoice can be deleted * Rule is: - * If hidden option FACTURE_CAN_BE_REMOVED is on, we can + * If hidden option INVOICE_CAN_ALWAYS_BE_REMOVED is on, we can * If invoice has a definitive ref, is last, without payment and not dipatched into accountancy -> yes end of rule * If invoice is draft and ha a temporary ref -> yes * @@ -2600,7 +2600,8 @@ class Facture extends CommonInvoice { global $conf; - if (! empty($conf->global->FACTURE_CAN_BE_REMOVED)) return 1; + if (! empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) return 1; + if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) return 1; // on verifie si la facture est en numerotation provisoire $facref = substr($this->ref, 1, 4); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index db31a7f917f..bf87c6cb0e0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -356,7 +356,7 @@ td.showDragHandle { /* ============================================================================== */ div.fiche { - margin-: global->MAIN_MENU_USE_JQUERY_LAYOUT))?(empty($conf->browser->phone)?'20':'4'):'24')); ?>px; + margin-: global->MAIN_MENU_USE_JQUERY_LAYOUT))?((empty($_SESSION['dol_hide_leftmenu']) && ! GETPOST('dol_hide_leftmenu')) ?'20':'4'):'24')); ?>px; margin-: browser->phone)?'12':'6')); ?>px; }