lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2022-05-31 14:31:20 +02:00
commit 72b36b5a69
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/accountancy/class/accountingaccount.class.php
View File

@ -732,11 +732,11 @@ class AccountingAccount extends CommonObject
global $hookmanager; global $hookmanager;
// Instantiate hooks for external modules // Instantiate hooks for external modules
$hookmanager->initHooks(array('accoutancyBindingCalculation')); $hookmanager->initHooks(array('accountancyBindingCalculation'));
// Execute hook accoutancyBindingCalculation // Execute hook accountancyBindingCalculation
$parameters = array('buyer' => $buyer, 'seller' => $seller, 'product' => $product, 'facture' => $facture, 'factureDet' => $factureDet ,'accountingAccount'=>$accountingAccount, $type); $parameters = array('buyer' => $buyer, 'seller' => $seller, 'product' => $product, 'facture' => $facture, 'factureDet' => $factureDet ,'accountingAccount'=>$accountingAccount, $type);
$reshook = $hookmanager->executeHooks('accoutancyBindingCalculation', $parameters); // Note that $action and $object may have been modified by some hooks $reshook = $hookmanager->executeHooks('accountancyBindingCalculation', $parameters); // Note that $action and $object may have been modified by some hooks
if (empty($reshook)) { if (empty($reshook)) {
if ($type == 'customer') { if ($type == 'customer') {

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

@ -10051,9 +10051,11 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
// Js Confirm button // Js Confirm button
if ($userRight && !empty($params['confirm'])) { if ($userRight && !empty($params['confirm'])) {
if (!is_array($params['confirm'])) { if (!is_array($params['confirm'])) {
$params['confirm'] = array( $params['confirm'] = array();
'url' => $url . (strpos($url, '?') > 0 ? '&' : '?') . 'confirm=yes' }
);
if (empty($params['confirm']['url'])) {
$params['confirm']['url'] = $url . (strpos($url, '?') > 0 ? '&' : '?') . 'confirm=yes';
} }
// for js desabled compatibility set $url as call to confirm action and $params['confirm']['url'] to confirmed action // for js desabled compatibility set $url as call to confirm action and $params['confirm']['url'] to confirmed action

8
htdocs/langs/en_US/errors.lang
View File

@ -313,8 +313,6 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here. WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
WarningPaypalPaymentNotCompatibleWithStrict=The value 'Strict' makes the online payment features not working correctly. Use 'Lax' instead. WarningPaypalPaymentNotCompatibleWithStrict=The value 'Strict' makes the online payment features not working correctly. Use 'Lax' instead.
<<<<<<< HEAD
<<<<<<< HEAD
# Validate # Validate
RequireValidValue = Value not valid RequireValidValue = Value not valid
RequireAtLeastXString = Requires at least %s character(s) RequireAtLeastXString = Requires at least %s character(s)
@ -335,9 +333,3 @@ BadSetupOfField = Error bad setup of field
BadSetupOfFieldClassNotFoundForValidation = Error bad setup of field : Class not found for validation BadSetupOfFieldClassNotFoundForValidation = Error bad setup of field : Class not found for validation
BadSetupOfFieldFileNotFound = Error bad setup of field : File not found for inclusion BadSetupOfFieldFileNotFound = Error bad setup of field : File not found for inclusion
BadSetupOfFieldFetchNotCallable = Error bad setup of field : Fetch not callable on class BadSetupOfFieldFetchNotCallable = Error bad setup of field : Fetch not callable on class
=======
=======
>>>>>>> branch '13.0' of git@github.com:Dolibarr/dolibarr.git
>>>>>>> branch '14.0' of git@github.com:Dolibarr/dolibarr.git
=======
>>>>>>> branch '14.0' of git@github.com:Dolibarr/dolibarr.git