Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 09:01:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur
2026-01-06 10:26:32 +01:00
parent 7f73d92dc8 c4ca165970
commit 76cebeca39
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/objectlink.class.php
View File

@@ -328,6 +328,12 @@ class ObjectLink extends CommonObject
$result = $newobject->fetch($objectid);
return $result;
}
if ($objecttype == 'invoice_supplier') {
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
$newobject = new FactureFournisseur($this->db);
$result = $newobject->fetch($objectid);
return $result;
}
if ($objecttype == 'propal') {
require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
$newobject = new Propal($this->db);

3
htdocs/projet/element.php
View File

@@ -968,6 +968,9 @@ foreach ($listofreferent as $key => $value) {
if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS') && $element->type == Facture::TYPE_DEPOSIT) {
$qualifiedfortotal = false; // If hidden option to use deposits as payment (deprecated, not recommended to use this), deposits are not included
}
if (getDolGlobalString('PROJECT_ONLY_PAYED_INVOICE_ON_PROFIT') && $element->status != Facture::STATUS_CLOSED) {
$qualifiedfortotal = false; // Only paid invoices qualify
}
}
if ($key == 'propal') {
if ($element->status != Propal::STATUS_SIGNED && $element->status != Propal::STATUS_BILLED) {

2
htdocs/user/class/user.class.php
View File

@@ -911,7 +911,7 @@ class User extends CommonObject
'fichinter' => 'ficheinter',
'inventory' => 'stock',
'invoice' => 'facture',
'invoice_supplier' => 'fournisseur',
'invoice_supplier' => 'facture@fournisseur',
'order_supplier' => 'fournisseur',
'knowledgerecord' => 'knowledgerecord@knowledgemanagement',
'skill@hrm' => 'all@hrm', // skill / job / position objects rights are for the moment grouped into right level "all"