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 22.0

Browse Source
This commit is contained in:
ldestailleur
2025-09-26 01:23:02 +02:00
parent 66aa736629 369b9510e0
commit f65903d006
8 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/commande/list.php
View File

@@ -808,7 +808,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');

2
htdocs/core/boxes/box_graph_invoices_permonth.php
View File

@@ -132,7 +132,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
$HEIGHT = '192'; $HEIGHT = '192';
$stats = new FactureStats($this->db, $socid, $mode, 0); $stats = new FactureStats($this->db, $socid, $mode, 0);
$stats->where = "f.fk_statut > 0"; $stats->where = "f.entity IN (".getEntity('invoice').") AND f.fk_statut > 0";
$px1 = null; $px1 = null;
$px2 = null; $px2 = null;

2
htdocs/core/boxes/box_graph_invoices_peryear.php
View File

@@ -126,7 +126,7 @@ class box_graph_invoices_peryear extends ModeleBoxes
$HEIGHT = '192'; $HEIGHT = '192';
$stats = new FactureStats($this->db, $socid, $mode, 0); $stats = new FactureStats($this->db, $socid, $mode, 0);
$stats->where = "f.fk_statut > 0"; $stats->where = "f.entity IN (".getEntity('invoice').") AND f.fk_statut > 0";
// Build graphic amount of object. $data = array(array('Lib',val1,val2,val3),...) // Build graphic amount of object. $data = array(array('Lib',val1,val2,val3),...)
$data2 = $stats->getAmountByYear($numberyears); $data2 = $stats->getAmountByYear($numberyears);

2
htdocs/core/class/commonobject.class.php
View File

@@ -798,7 +798,7 @@ abstract class CommonObject
public $labelStatusShort = array(); public $labelStatusShort = array();
/** /**
* @var array<string,int|string> Array to store lists of tpl * @var array<string,int|float|string|null> Array to store lists of tpl
*/ */
public $tpl; public $tpl;

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

@@ -346,6 +346,8 @@ class Conf extends stdClass
* @var stdClass * @var stdClass
*/ */
public $productbatch; public $productbatch;
public $api;
/** /**
* @var ?stdClass * @var ?stdClass
* @deprecated Use project * @deprecated Use project
@@ -516,6 +518,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();
@@ -785,6 +788,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

@@ -1674,7 +1674,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

@@ -206,13 +206,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