vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse source
This commit is contained in:
Laurent Destailleur 2026-02-26 15:47:36 +01:00
commit b7e2749312
3 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dev/setup/phpunit/setup_conf.sh
View file

@ -47,7 +47,7 @@ function save_db_cache() (
# Get the target version from the version.inc.php file
target_version=$(sed -n "s/.*define('DOL_\\(MAJOR_\\)\\?VERSION',[[:space:]]*'\\([0-9.]*\\).*/\\2/p" ../version.inc.php) ; echo $target_version
# Default in case that failed
target_version=${target_version:=22.0.0}
target_version=${target_version:=23.0.0}
# Sequence of versions for upgrade process (to be completed)
VERSIONS=("3.5.0" "3.6.0" "3.7.0" "3.8.0" "3.9.0")

6
htdocs/comm/propal/card.php
View file

@ -1970,12 +1970,6 @@ if (empty($reshook)) {
$res = $product->fetch($productid);
$type = $product->type;
$price_base_type = $product->price_base_type;
// If base type TTc, we change pu value to define the TTC one
if ($price_base_type == 'TTC' && !empty($pu_ttc)) {
$pu = $pu_ttc;
}
$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');

7
htdocs/filefunc.inc.php
View file

@ -33,13 +33,6 @@
*/
if (!defined('DOL_APPLICATION_TITLE')) {
define('DOL_APPLICATION_TITLE', 'Dolibarr');
}
if (!defined('DOL_VERSION')) {
define('DOL_VERSION', '23.0.0'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
}
require_once 'version.inc.php'; // Define the DOL_VERSION