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

Merge pull request #24248 from jyhere/jyhere/patch-margins

Browse Source 
FIX : fatal error when margin enable, User::hasRight() when checking a margin right
This commit is contained in:
Laurent Destailleur 2023-03-17 16:25:06 +01:00 committed by GitHub
commit 7541a2932f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.formmargin.class.php
View File

@ -98,7 +98,7 @@ class FormMargin
}
$pv = $line->total_ht;
$pa_ht = (($pv < 0 || ($pv == 0 && $object->type == $object::TYPE_CREDIT_NOTE)) ? -$line->pa_ht : $line->pa_ht); // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
$pa_ht = (($pv < 0 || ($pv == 0 && $object->element == 'facture' && $object->type == $object::TYPE_CREDIT_NOTE)) ? -$line->pa_ht : $line->pa_ht); // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
if (getDolGlobalInt('INVOICE_USE_SITUATION') == 1) { // Special case for old situation mode
if (($object->element == 'facture' && $object->type == $object::TYPE_SITUATION)
|| ($object->element == 'facture' && $object->type == $object::TYPE_CREDIT_NOTE && getDolGlobalInt('INVOICE_USE_SITUATION_CREDIT_NOTE') && $object->situation_counter > 0)) {

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

@ -715,7 +715,8 @@ class User extends CommonObject
'skill@hrm' => 'all@hrm', // skill / job / position objects rights are for the moment grouped into right level "all"
'job@hrm' => 'all@hrm', // skill / job / position objects rights are for the moment grouped into right level "all"
'position@hrm' => 'all@hrm', // skill / job / position objects rights are for the moment grouped into right level "all"
'facturerec' => 'facture'
'facturerec' => 'facture',
'margins' => 'margin',
);
if (!empty($moduletomoduletouse[$module])) {