diff --git a/.github/scripts/get_changed_php.sh b/.github/scripts/get_changed_php.sh index 57a95f969a4..d01bd532322 100755 --- a/.github/scripts/get_changed_php.sh +++ b/.github/scripts/get_changed_php.sh @@ -1,4 +1,4 @@ -#!/bin/bash +b!/bin/bash # Copyright (C) 2025 MDW set -euo pipefail @@ -34,7 +34,6 @@ if [[ "$pr_number" == "null" ]]; then exit 0 fi -# Split repository into owner and repo name # Split repository into owner and repo name using Bash parameter expansion owner="${GITHUB_REPOSITORY%%/*}" # Extract text before the first '/' repo="${GITHUB_REPOSITORY##*/}" # Extract text after the last '/' @@ -73,11 +72,12 @@ all_changed_files=$(IFS=" " ; echo "${changed_php_files[*]}") all_changed_lang=$(IFS=" " ; echo "${changed_lang_files[*]}") +forbidden_files="" #forbidden_files=$(echo "$all_changed_lang" | grep -E 'htdocs/langs/([^/]+)/.*\.lang$' | grep -v 'htdocs/langs/en_US/') #if [ -n "$forbidden_files" ]; then # echo "You tried to modify one or more language files that are not allowed to be modified in Pull requests." # echo "$forbidden_files" -# echo "To modify translation that are not the source language (en_US), you must modify them from transifex.com" +# echo "To modify translations that are not the source language (en_US), you must modify them from transifex.com" # exit 10 #fi diff --git a/dev/build/makepack-dolibarrmodule.pl b/dev/build/makepack-dolibarrmodule.pl index 856bedc6126..93d6d0d2181 100755 --- a/dev/build/makepack-dolibarrmodule.pl +++ b/dev/build/makepack-dolibarrmodule.pl @@ -157,7 +157,7 @@ foreach my $PROJECT (@PROJECTLIST) { . ucfirst($PROJECT) . ".class.php" ); - $custom = 0; + $custom = 1; if ( !$result ) { $result = open( $IN, @@ -180,7 +180,7 @@ foreach my $PROJECT (@PROJECTLIST) { } } else { - $custom = 1; + $custom = 0; } while (<$IN>) { if ( $_ =~ /this->version\s*=\s*'([\d\.]+)'/ ) { diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index 635f9e540cb..47014ab2ffa 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -580,13 +580,29 @@ if (!empty($conf->use_javascript_ajax)) { print "\n" . ''; + $ajaxoptions['update'] = array($labelhtmlname => 'label_name'); } + // Hidden input + jQuery UI autocomplete JS + $out .= ajax_autocompleter($selectid, $htmlname, DOL_URL_ROOT.'/core/ajax/auxaccount.php', $urloption, $minLength, 0, $ajaxoptions); + return $out; } @@ -637,15 +628,14 @@ class FormAccounting extends Form } // Build native select — select2 is automatically activated by Form::selectarray() with $useajax=1 - $out .= Form::selectarray($htmlname, $aux_account, $selectid, ($showempty ? (is_numeric($showempty) ? 1 : $showempty) : 0), 0, 0, '', 0, 0, 0, '', $morecss, 1); + $out .= Form::selectarray($htmlname, $aux_account, $selectid, $placeholder, 0, 0, '', 0, 0, 0, '', $morecss, 1); - // Autofill subledger label on select2 selection event + // Autofill subledger label on select2 selection event (mode 1 only) if (!empty($conf->use_javascript_ajax) && !empty($labelhtmlname)) { $out .= '