From a078951a94cd45a705ab61ffb95a1f38cb1603e7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 21 Sep 2018 11:12:08 +0200 Subject: [PATCH] Add an help for user to avoid bad configuration --- htdocs/admin/dict.php | 8 +++++++- htdocs/langs/en_US/admin.lang | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 0c25f3a5bd817..b31a1972dd146 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -951,7 +951,6 @@ print $langs->trans("DictionaryDesc"); print " ".$langs->trans("OnlyActiveElementsAreShown")."
\n"; } -print "
\n"; $param = '&id='.urlencode($id); @@ -1016,6 +1015,13 @@ print ''; print ''; + if ($id == 10 && empty($conf->global->FACTURE_TVAOPTION)) + { + print info_admin($langs->trans("VATIsUsedIsOff", $langs->transnoentities("Setup"), $langs->transnoentities("CompanyFoundation"))); + } + + print "
\n"; + // Form to add a new line if ($tabname[$id]) { diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 01d73f6c04b46..89af1ebbbc1b4 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1806,6 +1806,7 @@ YouCanDeleteFileOnServerWith=You can delete this file on server with Command Lin ChartLoaded=Chart of account loaded SocialNetworkSetup=Setup of module Social Networks EnableFeatureFor=Enable features for %s +VATIsUsedIsOff=Note: The option to use sales Tax or VAT has been set to Off in the menu %s - %s, so Sale tax or Vat used will always be 0 for sales. ##### Resource #### ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).