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

Merge pull request #21249 from fboitel/fboitel-dev-scrutinizer-007

Browse Source 
BUG FIX Class Salary does not contain attribute salary but amount instead
This commit is contained in:
Laurent Destailleur 2022-06-17 15:19:01 +02:00 committed by GitHub
commit 6fb75f3268
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/recruitment/recruitmentcandidature_list.php
View File

@ -461,7 +461,7 @@ if ($jobposition->id > 0 && (empty($action) || ($action != 'edit' && $action !=
$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
$morehtmlref .= '</form>';
} else {
$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, -1, $object->fk_project, 'none', 0, 0, 0, 1);
$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
}
} else {
if (!empty($object->fk_project)) {

3
htdocs/salaries/class/salary.class.php
View File

@ -56,8 +56,9 @@ class Salary extends CommonObject
public $datep;
public $datev;
public $amount;
public $salary;
public $amount;
/**
* @var int ID
*/