Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ldestailleur
2025-09-26 01:27:00 +02:00
parent debdeb071d f65903d006
commit a43bf46a75
6 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/class/actioncomm.class.php
View File

@@ -2403,7 +2403,7 @@ class ActionComm extends CommonObject
$assignedUserArray[$key] = $assignedUser; $assignedUserArray[$key] = $assignedUser;
} }
if ($filters['module'] != 'project@eventorganization') { if (!empty($filters['module']) && $filters['module'] != 'project@eventorganization') {
$event['assignedUsers'] = $assignedUserArray; $event['assignedUsers'] = $assignedUserArray;
} }

2
htdocs/commande/list.php
View File

@@ -839,7 +839,7 @@ if ($action == 'validate' && $permissiontoadd && $objectclass !== null) {
} else { } else {
$idwarehouse = 0; $idwarehouse = 0;
} }
if ($objecttmp->valid($user, $idwarehouse)) { if ($objecttmp->valid($user, $idwarehouse) > 0) {
setEventMessages($langs->trans('hasBeenValidated', $objecttmp->ref), null, 'mesgs'); setEventMessages($langs->trans('hasBeenValidated', $objecttmp->ref), null, 'mesgs');
} else { } else {
setEventMessages($objecttmp->error, $objecttmp->errors, 'errors'); setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');

5
htdocs/core/class/conf.class.php
View File

@@ -522,6 +522,7 @@ class Conf extends stdClass
$this->notification = new stdClass(); $this->notification = new stdClass();
$this->expensereport = new stdClass(); $this->expensereport = new stdClass();
$this->productbatch = new stdClass(); $this->productbatch = new stdClass();
$this->api = new stdClass();
// Common arrays // Common arrays
$this->cache = array(); $this->cache = array();
@@ -791,6 +792,10 @@ class Conf extends stdClass
$this->admin->dir_output = $rootfordata.'/admin'; $this->admin->dir_output = $rootfordata.'/admin';
$this->admin->dir_temp = $rootfortemp.'/admin/temp'; $this->admin->dir_temp = $rootfortemp.'/admin/temp';
// For api storage
$this->api->dir_output = $rootfordata.'/api';
$this->api->dir_temp = $rootfortemp.'/api/temp';
// For user storage // For user storage
$this->user->multidir_output = array($this->entity => $rootfordata."/users"); $this->user->multidir_output = array($this->entity => $rootfordata."/users");
$this->user->multidir_temp = array($this->entity => $rootfortemp."/users/temp"); $this->user->multidir_temp = array($this->entity => $rootfortemp."/users/temp");

2
htdocs/core/lib/company.lib.php
View File

@@ -1683,7 +1683,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
// Address - Phone - Email // Address - Phone - Email
if (!empty($arrayfields['t.address']['checked'])) { if (!empty($arrayfields['t.address']['checked'])) {
$addresstoshow = $contactstatic->getBannerAddress('contact', $object); $addresstoshow = $contactstatic->getBannerAddress('contact', $object);
print '<td class="tdoverflowmax150" title="' . dolPrintHTMLForAttribute($addresstoshow) . '">'; print '<td class="tdoverflowmax150 classfortooltip" title="'.dolPrintHTMLForAttribute($addresstoshow).'">';
print $addresstoshow; print $addresstoshow;
print '</td>'; print '</td>';
} }

2
htdocs/fourn/class/fournisseur.product.class.php
View File

@@ -1399,7 +1399,7 @@ class ProductFournisseur extends Product
$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyExportCode').':</b> '.length_accountg($this->accountancy_code_buy_export); $label .= '<br><b>'.$langs->trans('ProductAccountancyBuyExportCode').':</b> '.length_accountg($this->accountancy_code_buy_export);
} }
$logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id, 'pfpl.datec', 'DESC'); // set sort order here $logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id, 'pfpl.datec', 'DESC', getDolGlobalInt('MAIN_TOOLTIP_PRICELOG_HISTORY_LIMIT', 10)); // set sort order here
if (is_array($logPrices) && count($logPrices) > 0) { if (is_array($logPrices) && count($logPrices) > 0) {
$label .= '<br><br>'; $label .= '<br><br>';
$label .= '<u>'.$langs->trans("History").'</u>'; $label .= '<u>'.$langs->trans("History").'</u>';

6
htdocs/modulebuilder/template/core/modules/modMyModule.class.php
View File

@@ -207,13 +207,13 @@ class modMyModule extends DolibarrModules
// 'group' to add a tab in group view // 'group' to add a tab in group view
// 'intervention' to add a tab in intervention view // 'intervention' to add a tab in intervention view
// 'invoice' to add a tab in customer invoice view // 'invoice' to add a tab in customer invoice view
// 'invoice_supplier' to add a tab in supplier invoice view // 'supplier_invoice' to add a tab in supplier invoice view
// 'member' to add a tab in foundation member view // 'member' to add a tab in foundation member view
// 'opensurveypoll' to add a tab in opensurvey poll view // 'opensurveypoll' to add a tab in opensurvey poll view
// 'order' to add a tab in sale order view // 'order' to add a tab in sale order view
// 'order_supplier' to add a tab in supplier order view // 'supplier_order' to add a tab in supplier order view
// 'payment' to add a tab in payment view // 'payment' to add a tab in payment view
// 'payment_supplier' to add a tab in supplier payment view // 'supplier_payment' to add a tab in supplier payment view
// 'product' to add a tab in product view // 'product' to add a tab in product view
// 'propal' to add a tab in propal view // 'propal' to add a tab in propal view
// 'project' to add a tab in project view // 'project' to add a tab in project view