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

This commit is contained in:
Laurent Destailleur 2025-10-27 15:21:59 +01:00
commit c625ef121a

View file

@ -952,13 +952,6 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
$('#tva_tx option[value="'+stringforvatrateselection+'"]').prop('selected', true);
<?php
// Price by customer
if ((getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && !empty($object->socid)) {
?>
$("#remise_percent").val(data.discount);
<?php
}
if (getDolGlobalInt('PRODUIT_AUTOFILL_DESC') == 1) {
if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) { ?>
var proddesc = data.desc_trans;