From 539f4355c394af0b7d2fc9e16cb8d87a1097f4ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Oct 2019 20:48:44 +0200
Subject: [PATCH] Try to fix stickler

---
 dev/namespacemig/aaa.class.php            | 10 +++++++++-
 dev/namespacemig/bbb.class.php            | 12 +++++++++---
 htdocs/core/modules/modSyslog.class.php   |  6 +++++-
 htdocs/core/tpl/objectline_create.tpl.php |  6 +++++-
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/dev/namespacemig/aaa.class.php b/dev/namespacemig/aaa.class.php
index 7b165349472..d7578b78e40 100644
--- a/dev/namespacemig/aaa.class.php
+++ b/dev/namespacemig/aaa.class.php
@@ -2,10 +2,14 @@
 
 namespace Dolibarr;
 
-
 global $globalaaa;
 $globalaaa = 'globalaaa';
 
+/**
+ * faaa
+ *
+ * @return string
+ */
 function faaa()
 {
 	return 'faaa';
@@ -15,6 +19,10 @@ class Aaa
 {
 	const AAA='aaa';
 
+	/**
+	 * do
+	 * @return void
+	 */
 	public function do()
 	{
 		echo 'doaaa'."\n";
diff --git a/dev/namespacemig/bbb.class.php b/dev/namespacemig/bbb.class.php
index 0fb6fd3d7ae..f68b3b2f36c 100644
--- a/dev/namespacemig/bbb.class.php
+++ b/dev/namespacemig/bbb.class.php
@@ -1,11 +1,12 @@
 <?php
 
-
-
-
 global $globalbbb;
 $globalbbb = 'globalbbb';
 
+/**
+ * fbbb
+ * @return string
+ */
 function fbbb()
 {
 	return 'fbbb';
@@ -14,6 +15,11 @@ function fbbb()
 class Bbb
 {
 	const BBB='bbb';
+
+	/**
+	 * do
+	 * @return void
+	 */
 	public function do()
 	{
 		global $globalaaa, $globalbbb;
diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index bd45e21fc9e..16dbec8313c 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -84,6 +84,10 @@ class modSyslog extends DolibarrModules
 		$this->rights_class = 'syslog';
 
 		// Cronjobs
+		$comment = 'Compress and archive log files. The number of versions to keep is defined into the setup of module. ';
+		$comment.= 'Warning: Main application cron script must be run with same account than your web server to avoid to get log files with different owner than required by web server.';
+		$comment.= 'Another solution is to set web server Operating System group as the group of directory documents and set GROUP permission "rws" on this directory so log files will always have the group and permissions of the web server Operating System group.';
+
 		$this->cronjobs = array(
 			0 => array(
 				'label' => 'CompressSyslogs',
@@ -92,7 +96,7 @@ class modSyslog extends DolibarrModules
 				'objectname' => 'Utils',
 				'method' => 'compressSyslogs',
 				'parameters' => '',
-				'comment' => 'Compress and archive log files. The number of versions to keep is defined into the setup of module. Warning: Main application cron script must be run with same account than your web server to avoid to get log files with different owner than required by web server. Another solution is to set web server Operating System group as the group of directory documents and set GROUP permission "rws" on this directory so log files will always have the group and permissions of the web server Operating System group',
+				'comment' => $comment,
 				'frequency' => 1,
 				'unitfrequency' => 3600 * 24,
 				'priority' => 50,
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 462af9173c1..876863432be 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -853,9 +853,13 @@ function setforpredef() {
 	jQuery("#prod_entry_mode_predef").prop('checked',true).change();
 	<?php if (empty($conf->global->MAIN_EDIT_PREDEF_PRICEHT)) { ?>
 		jQuery("#price_ht").val('').hide();
+		jQuery("#multicurrency_price_ht").val('').hide();
+	<?php } else { ?>
+		jQuery("#price_ht").val('').show();
+		jQuery("#multicurrency_price_ht").val('').show();
 	<?php } ?>
 	jQuery("#price_ht").val('');
-	jQuery("#price_ht, #multicurrency_price_ht, #price_ttc, #fourn_ref, #tva_tx, #title_vat, #title_up_ht, #title_up_ht_currency, #title_up_ttc, #title_up_ttc_currency").hide();
+	jQuery("#price_ttc, #fourn_ref, #tva_tx, #title_vat, #title_up_ht, #title_up_ht_currency, #title_up_ttc, #title_up_ttc_currency").hide();
 	jQuery("#np_marginRate, #np_markRate, .np_marginRate, .np_markRate, #units, #title_units").hide();
 	jQuery("#buying_price").show();
 	jQuery('#trlinefordates, .divlinefordates').show();