\n";
if (!empty($conf->global->DISPLAY_MARK_RATES))
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index 6c75ec0dddb..d585815e805 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -47,10 +47,10 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
public $emetteur;
/**
- * @var array Minimum version of PHP required by module.
- * e.g.: PHP ≥ 5.5 = array(5, 5)
- */
- public $phpmin = array(5, 5);
+ * @var array Minimum version of PHP required by module.
+ * e.g.: PHP ≥ 5.6 = array(5, 6)
+ */
+ public $phpmin = array(5, 6);
/**
* @var string Dolibarr version of the loaded document
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index 0d108e5bdec..e3a3699f445 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -70,9 +70,9 @@ class pdf_standard_myobject extends ModelePDFMyObject
/**
* @var array Minimum version of PHP required by module.
- * e.g.: PHP ≥ 5.5 = array(5, 5)
+ * e.g.: PHP ≥ 5.6 = array(5, 6)
*/
- public $phpmin = array(5, 5);
+ public $phpmin = array(5, 6);
/**
* Dolibarr version of the loaded document
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 9b714ec647b..1f4bbf870f3 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -866,7 +866,7 @@ class Products extends DolibarrApi
$product_fourn_list = $product_fourn->list_product_fournisseur_price($this->product->id, '', '', 0, 0);
}
- foreach($product_fourn_list as $tmpobj) {
+ foreach ($product_fourn_list as $tmpobj) {
$this->_cleanObjectDatas($tmpobj);
}
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index ab14bbb6e9a..bc7949f5a1b 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -1,5 +1,5 @@
+/* Copyright (C) 2013-2020 Laurent Destaileur
* Copyright (C) 2014 Regis Houssin
*
* This program is free software: you can redistribute it and/or modify
@@ -122,7 +122,7 @@ if ($action == 'addline')
}
// TODO Check qty is ok for stock move. Note qty may not be enough yet, but we make a check now to report a warning.
- // What is important is to have qty when doing action 'createmovements'
+ // What is more important is to have qty when doing action 'createmovements'
if (!$error)
{
// Warning, don't forget lines already added into the $_SESSION['massstockmove']
@@ -139,9 +139,10 @@ if ($action == 'addline')
$listofdata[$id] = array('id'=>$id, 'id_product'=>$id_product, 'qty'=>$qty, 'id_sw'=>$id_sw, 'id_tw'=>$id_tw, 'batch'=>$batch);
$_SESSION['massstockmove'] = json_encode($listofdata);
- unset($id_product);
//unset($id_sw);
//unset($id_tw);
+ unset($id_product);
+ unset($batch);
unset($qty);
}
}
@@ -338,18 +339,26 @@ print '