diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index dc8b49c775f..e2d36ab4695 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -2410,7 +2410,7 @@ function printDropdownQuickadd() "position" => 50, ), array( - "url" => "/compta/facture/card.php?action=create", + "url" => "/contrat/card.php?action=create", "title" => "NewContractSubscription@contracts", "name" => "Contract@contracts", "picto" => "object_contract", diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index a591465cb23..37ac9805374 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -1320,16 +1320,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { print ''; print ''; - // Parent company - if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY)) { - print ''; - print ''.$langs->trans('ParentCompany').''; - print ''; - print img_picto('', 'company', 'class="paddingrightonly"'); - print $form->select_thirdparty_list('', 'parent_company_id', '', $langs->trans("ThirdParty")); - print ''; - } - // Prospect/Customer print ''.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).''; print ''; @@ -1675,6 +1665,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { $parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3'); include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php'; + // Parent company + if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY)) { + print ''; + print ''.$langs->trans('ParentCompany').''; + print ''; + print img_picto('', 'company', 'class="paddingrightonly"'); + print $form->select_company(GETPOST('parent_company_id'), 'parent_company_id'); + print ''; + } + // Assign a sale representative print ''; print ''.$form->editfieldkey('AllocateCommercial', 'commercial_id', '', $object, 0).''; diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php index 242250c8835..2bb2f61375b 100644 --- a/htdocs/theme/eldy/dropdown.inc.php +++ b/htdocs/theme/eldy/dropdown.inc.php @@ -21,8 +21,8 @@ button.dropdown-item.global-search-item { } #topmenu-bookmark-dropdown .dropdown-menu { - min-width: 300px; - max-width: 360px; + min-width: 360px; + max-width: 400px; } @@ -499,4 +499,9 @@ div.quickaddblock:focus { margin-left: 5px; right: 0; } + + #topmenu-bookmark-dropdown .dropdown-menu { + min-width: 280px; + max-width: 360px; + } }