From e455ed14ef8f6d0c287578fc3a58d66f7f2da57d Mon Sep 17 00:00:00 2001
From: Sof <virtualsof@yahoo.fr>
Date: Fri, 24 Jul 2015 11:27:40 +0200
Subject: [PATCH 1/4] FIX : Move "<script>" code inside "body"

---
 htdocs/margin/tabs/productMargins.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index d3c53eb9e2e..b82fc64aa75 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -259,14 +259,16 @@ if ($id > 0 || ! empty($ref))
     dol_print_error();
 }
 
+print '
+    <script type="text/javascript">
+    $(document).ready(function() {
+        $("#totalMargin").html("'. price($totalMargin, null, null, null, null, $rounding).'");
+        $("#marginRate").html("'.(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%").'");
+        $("#markRate").html("'.(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%").'");
+    });
+    </script>
+';
 
 llxFooter();
 $db->close();
 ?>
-<script type="text/javascript">
-$(document).ready(function() {
-	$("#totalMargin").html("<?php echo price($totalMargin, null, null, null, null, $rounding); ?>");
-	$("#marginRate").html("<?php echo (($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%"); ?>");
-	$("#markRate").html("<?php echo (($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%"); ?>");
-});
-</script>

From 17f7b1528ac616fda093f326f921f82fc8968b00 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Jul 2015 10:05:48 +0200
Subject: [PATCH 2/4] Fix not compatible not supported option

---
 htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 6d45efa9052..00bbfeceb2f 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -164,6 +164,8 @@ UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 A
 UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_SMTPS_PW";
 UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_EMAIL_TLS";
 
+-- This option with this value is not compatible with 3.8. Value must be set to 'mutiselect', 'select2'...
+DELETE from llx_const where name = 'MAIN_USE_JQUERY_MULTISELECT' and value = '1';
 
 create table llx_bank_account_extrafields
 (

From bdd9a6e59e371d8cec813cd6316d0083013a374f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Jul 2015 18:14:15 +0200
Subject: [PATCH 3/4] Fix bad position of translation key

---
 htdocs/langs/en_US/holiday.lang | 1 -
 htdocs/langs/en_US/main.lang    | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index bb337c6c67e..9bf90c3d01c 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -130,7 +130,6 @@ nbJours=Number days
 TitleAdminCP=Configuration of Leaves
 NoticePeriod=Notice period
 #Messages
-Hello=Hello
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index d410d3a20ef..f0e7fdd9687 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -712,6 +712,8 @@ Genderman=Man
 Genderwoman=Woman
 ViewList=List view
 Mandatory=Mandatory
+Hello=Hello
+Sincerely=Sincerely
 # Week day
 Monday=Monday
 Tuesday=Tuesday

From fff86c076992614d0a5d4a6253968704cc4ec36f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Jul 2015 18:33:43 +0200
Subject: [PATCH 4/4] Fix PHPCS

---
 htdocs/margin/tabs/productMargins.php    |  1 -
 htdocs/margin/tabs/thirdpartyMargins.php | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index b82fc64aa75..934be1f5a41 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -271,4 +271,3 @@ print '
 
 llxFooter();
 $db->close();
-?>
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index e29422259e7..d5c86016862 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -250,13 +250,15 @@ else
 }
 
 
+print '
+    <script type="text/javascript">
+    $(document).ready(function() {
+        $("#totalMargin").html("'. price($totalMargin, null, null, null, null, $rounding).'");
+        $("#marginRate").html("'.(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%").'");
+        $("#markRate").html("'.(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%").'");
+    });
+    </script>
+';
+
 llxFooter();
 $db->close();
-?>
-<script type="text/javascript">
-$(document).ready(function() {
-	$("#totalMargin").html("<?php echo price($totalMargin, null, null, null, null, $rounding); ?>");
-	$("#marginRate").html("<?php echo (($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%"); ?>");
-	$("#markRate").html("<?php echo (($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%"); ?>");
-});
-</script>