Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ajax selectobject with commonobjectline objects (#29941)

Browse Source 
* Fix ajax selectobject with commonobjectline objects

* Clean code : put in another branch

* Parent element defined for CommonObjectLines

* Clean code

* Clean code

* Parent element defined for CommonObjectLines

* Parent element defined for CommonObjectLines

* Clean code

* getElementProperties for commonObjectLines

* Remove changes to split into multiple PRs

* fix mistake in previous commit

* fix mistakes (thanks pre-commit)

* fix mistakes (thanks again pre-commit)

* Update html.form.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
Mathieu Moulin
2024-10-26 17:03:34 +02:00
committed by GitHub
parent 3d49587253
commit 6ee1d83dff
3 changed files with 116 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/core/lib/security.lib.php
View File

@@ -398,6 +398,7 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
$parentfortableentity = '';
// Fix syntax of $features param to support non standard module names.
// @todo : use elseif ?
$originalfeatures = $features;
if ($features == 'agenda') {
$tableandshare = 'actioncomm&societe';
@@ -454,6 +455,24 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
$tableandshare = 'paiementcharge';
$parentfortableentity = 'fk_charge@chargesociales';
}
// if commonObjectLine : Using many2one related commonObject
// @see commonObjectLine::parentElement
if (in_array($features, ['commandedet', 'propaldet', 'facturedet', 'supplier_proposaldet', 'evaluationdet', 'skilldet', 'deliverydet', 'contratdet'])) {
$features = substr($features, 0, -3);
} elseif (in_array($features, ['stocktransferline', 'inventoryline', 'bomline', 'expensereport_det', 'facture_fourn_det'])) {
$features = substr($features, 0, -4);
} elseif ($features == 'commandefournisseurdispatch') {
$features = 'commandefournisseur';
} elseif ($features == 'invoice_supplier_det_rec') {
$features = 'invoice_supplier_rec';
}
// @todo check : project_task
// @todo possible ?
// elseif (substr($features, -3, 3) == 'det') {
// $features = substr($features, 0, -3);
// } elseif (substr($features, -4, 4) == '_det' || substr($features, -4, 4) == 'line') {
// $features = substr($features, 0, -4);
// }
//print $features.' - '.$tableandshare.' - '.$feature2.' - '.$dbt_select."\n";