diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 5151a0a39dc..27bb79a506e 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -9,7 +9,7 @@ * Copyright (C) 2008 Raphael Bertrand (Resultic) * Copyright (C) 2010-2018 Juanjo Menent * Copyright (C) 2013 Cédric Salvador - * Copyright (C) 2013-2017 Alexandre Spangaro + * Copyright (C) 2013-2021 Alexandre Spangaro * Copyright (C) 2014 Cédric GROSS * Copyright (C) 2014-2015 Marcos García * Copyright (C) 2015 Jean-François Ferry @@ -3537,7 +3537,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ 'object_salary', 'object_shipment', 'object_share-alt', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock', 'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member', 'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website', 'object_movement', - 'off', 'on', 'order', + 'off', 'on', 'order', 'copy', 'paiment', 'play', 'pdf', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'stock', 'resize', 'service', 'stats', 'trip', 'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench', 'github', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp', diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 42180dde04f..c6076e0e8dd 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -180,6 +180,12 @@ ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) ProfId5FR=Prof Id 5 (numéro EORI) ProfId6FR=- +ProfId1ShortFR=SIREN +ProfId2ShortFR=SIRET +ProfId3ShortFR=NAF +ProfId4ShortFR=RCS +ProfId5ShortFR=EORI +ProfId6ShortFR=- ProfId1GB=Registration Number ProfId2GB=- ProfId3GB=SIC diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index e27ec6d9c43..b1798aaf948 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -1060,6 +1060,7 @@ YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode Inventory=Inventory AnalyticCode=Analytic code TMenuMRP=MRP +ShowCompanyInfos=Show company infos ShowMoreInfos=Show More Infos NoFilesUploadedYet=Please upload a document first SeePrivateNote=See private note @@ -1127,3 +1128,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected CategTypeNotFound=No tag type found for type of records CopiedToClipboard=Copied to clipboard InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration. +HelpCopyToClipboardShort=Copier dans le presse-papier diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 94c90c226e1..7f543617534 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -12,8 +12,9 @@ * Copyright (C) 2014-2015 Marcos García * Copyright (C) 2015 Raphaël Doursenaud * Copyright (C) 2020 Demarest Maxime - * Copyright (C) 2020 Charlene Benke + * Copyright (C) 2020 Charlene Benke * Copyright (C) 2021 Frédéric France + * Copyright (C) 2021 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1981,6 +1982,20 @@ function top_menu_user($hideloginname = 0, $urllogout = '') } $dropdownBody = ''; + $dropdownBody .= ' '.$langs->trans("ShowCompanyInfos").''; + $dropdownBody .= '
'; + + if(!empty($conf->global->MAIN_INFO_SIREN)) $dropdownBody .= '
'.$langs->transcountry("ProfId1Short", $mysoc->country_code).': '.$conf->global->MAIN_INFO_SIREN.' '.img_picto($langs->trans("HelpCopyToClipboardShort"), 'copy').''; + if(!empty($conf->global->MAIN_INFO_SIRET)) $dropdownBody .= '
'.$langs->transcountry("ProfId2Short", $mysoc->country_code).': '.$conf->global->MAIN_INFO_SIRET.' '.img_picto($langs->trans("HelpCopyToClipboardShort"), 'copy').''; + if(!empty($conf->global->MAIN_INFO_APE)) $dropdownBody .= '
'.$langs->transcountry("ProfId3Short", $mysoc->country_code).': '.$conf->global->MAIN_INFO_APE.' '.img_picto($langs->trans("HelpCopyToClipboardShort"), 'copy').''; + if(!empty($conf->global->MAIN_INFO_RCS)) $dropdownBody .= '
'.$langs->transcountry("ProfId4Short", $mysoc->country_code).': '.$conf->global->MAIN_INFO_RCS.' '.img_picto($langs->trans("HelpCopyToClipboardShort"), 'copy').''; + if(!empty($conf->global->MAIN_INFO_PROFID5)) $dropdownBody .= '
'.$langs->transcountry("ProfId5Short", $mysoc->country_code).': '.$conf->global->MAIN_INFO_PROFID5.' '.img_picto($langs->trans("HelpCopyToClipboardShort"), 'copy').''; + if(!empty($conf->global->MAIN_INFO_PROFID6)) $dropdownBody .= '
'.$langs->transcountry("ProfId6Short", $mysoc->country_code).': '.$conf->global->MAIN_INFO_PROFID6.' '.img_picto($langs->trans("HelpCopyToClipboardShort"), 'copy').''; + if(!empty($conf->global->MAIN_INFO_TVAINTRA)) $dropdownBody .= '
'.$langs->trans("VATIntraShort").': '.$conf->global->MAIN_INFO_TVAINTRA.' '.img_picto($langs->trans("HelpCopyToClipboardShort"), 'copy').''; + + $dropdownBody .= '
'; + + $dropdownBody .= '
'; $dropdownBody .= ' '.$langs->trans("ShowMoreInfos").''; $dropdownBody .= '
'; @@ -2138,6 +2153,17 @@ function top_menu_user($hideloginname = 0, $urllogout = '') $("#topmenu-login-dropdown").toggleClass("open"); }); + $(".copyToClipboard").on("click", function() { + var dummyContent = $(this).prevAll("span:first").text(); + var dummy = $("").val(dummyContent).appendTo("body").select(); + document.execCommand("copy"); + document.getElementById("dummy").remove(); + }); + + $("#topmenulogincompanyinfo-btn").on("click", function() { + $("#topmenulogincompanyinfo").slideToggle(); + }); + $("#topmenuloginmoreinfo-btn").on("click", function() { $("#topmenuloginmoreinfo").slideToggle(); });'; diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php index 871ee5aa68c..e0976e0e1db 100644 --- a/htdocs/theme/eldy/dropdown.inc.php +++ b/htdocs/theme/eldy/dropdown.inc.php @@ -277,14 +277,14 @@ a.top-menu-dropdown-link { text-decoration: none; } -#topmenuloginmoreinfo-btn{ +#topmenuloginmoreinfo-btn, #topmenulogincompanyinfo-btn { display: block; text-aling: right; color:#666; cursor: pointer; } -#topmenuloginmoreinfo{ +#topmenuloginmoreinfo, #topmenulogincompanyinfo { display: none; clear: both; font-size: 0.95em; diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php index 9b96c9b061b..2627a727a23 100644 --- a/htdocs/theme/md/dropdown.inc.php +++ b/htdocs/theme/md/dropdown.inc.php @@ -283,14 +283,14 @@ a.top-menu-dropdown-link { text-decoration: none; } -#topmenuloginmoreinfo-btn{ +#topmenuloginmoreinfo-btn, #topmenulogincompanyinfo-btn { display: block; text-aling: right; color:#666; cursor: pointer; } -#topmenuloginmoreinfo{ +#topmenuloginmoreinfo, #topmenulogincompanyinfo { display: none; clear: both; font-size: 0.95em;