Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 02:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix phpunit

Browse Source
This commit is contained in:
Laurent Destailleur
2023-10-23 18:54:16 +02:00
parent f46482a72a
commit b7de0baedd
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/core/lib/functions.lib.php
View File

@@ -7494,12 +7494,14 @@ function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
$i = 0; $countline = 0; $lastaddediscontent = 1; $i = 0; $countline = 0; $lastaddediscontent = 1;
while ($countline < $nboflines && isset($a[$i])) { while ($countline < $nboflines && isset($a[$i])) {
if (preg_match('/<br[^>]*>/', $a[$i])) { if (preg_match('/<br[^>]*>/', $a[$i])) {
$firstline .= ($ishtml ? "<br>\n" : "\n"); if (array_key_exists($i+1, $a) && !empty($a[$i+1])) {
// Is it a br for a new line of after a printed line ? $firstline .= ($ishtml ? "<br>\n" : "\n");
if (!$lastaddediscontent) { // Is it a br for a new line of after a printed line ?
$countline++; if (!$lastaddediscontent) {
$countline++;
}
$lastaddediscontent = 0;
} }
$lastaddediscontent = 0;
} else { } else {
$firstline .= $a[$i]; $firstline .= $a[$i];
$lastaddediscontent = 1; $lastaddediscontent = 1;
@@ -7507,9 +7509,12 @@ function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
} }
$i++; $i++;
} }
$adddots = isset($a[$i]);
unset($a); $adddots = (isset($a[$i]) && (!preg_match('/<br[^>]*>/', $a[$i]) || (array_key_exists($i+1, $a) && !empty($a[$i+1]))));
return $firstline.($adddots ? '...' : ''); //unset($a);
$ret = $firstline.($adddots ? '...' : '');
//exit;
return $ret;
} }
} }

4
htdocs/product/class/product.class.php
View File

@@ -34,7 +34,7 @@
/** /**
* \file htdocs/product/class/product.class.php * \file htdocs/product/class/product.class.php
* \ingroup produit * \ingroup produit
* \brief File of class to manage predefined products or services * \brief File of class to manage the predefined products or services
*/ */
require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
@@ -5571,7 +5571,7 @@ class Product extends CommonObject
* @param int $origin_id Origin id of element * @param int $origin_id Origin id of element
* @param int $disablestockchangeforsubproduct Disable stock change for sub-products of kit (usefull only if product is a subproduct) * @param int $disablestockchangeforsubproduct Disable stock change for sub-products of kit (usefull only if product is a subproduct)
* @param Extrafields $extrafields Array of extrafields * @param Extrafields $extrafields Array of extrafields
* @param boolean $force_update_batch Force update batch * @param boolean $force_update_batch Force update batch
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
public function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $dlc = '', $dluo = '', $lot = '', $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0, $extrafields = null, $force_update_batch = false) public function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $dlc = '', $dluo = '', $lot = '', $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0, $extrafields = null, $force_update_batch = false)