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

add hook doactions on expensereport_rule

Browse Source
This commit is contained in:
jpb 2022-03-31 16:43:37 +02:00
parent bbcfc4b9f9
commit 5fe9a4404a
2 changed files with 274 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

199
htdocs/admin/expensereport_rules.php
View File

@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.php'; require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.php';
//var_dump($conf);
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("admin", "other", "trips", "errors", "dict")); $langs->loadLangs(array("admin", "other", "trips", "errors", "dict"));
@ -38,33 +38,43 @@ if (!$user->admin) {
accessforbidden(); accessforbidden();
} }
//Init error // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$error = false; $hookmanager->initHooks(array('admin', 'dictionaryadmin','expensereport_rules'));
$message = false;
$action = GETPOST('action', 'aZ09');
$id = GETPOST('id', 'int');
$apply_to = GETPOST('apply_to'); $parameters = array();
$fk_user = GETPOST('fk_user', 'int'); $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
$fk_usergroup = GETPOST('fk_usergroup', 'int'); if ($reshook < 0) {
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
}
$fk_c_type_fees = GETPOST('fk_c_type_fees'); if (empty($reshook)) {
$code_expense_rules_type = GETPOST('code_expense_rules_type'); //Init error
$dates = dol_mktime(12, 0, 0, GETPOST('startmonth'), GETPOST('startday'), GETPOST('startyear')); $error = false;
$datee = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear')); $message = false;
$amount = GETPOST('amount');
$object = new ExpenseReportRule($db); $action = GETPOST('action', 'aZ09');
if (!empty($id)) { $id = GETPOST('id', 'int');
$apply_to = GETPOST('apply_to');
$fk_user = GETPOST('fk_user', 'int');
$fk_usergroup = GETPOST('fk_usergroup', 'int');
$fk_c_type_fees = GETPOST('fk_c_type_fees');
$code_expense_rules_type = GETPOST('code_expense_rules_type');
$dates = dol_mktime(12, 0, 0, GETPOST('startmonth'), GETPOST('startday'), GETPOST('startyear'));
$datee = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
$amount = GETPOST('amount');
$object = new ExpenseReportRule($db);
if (!empty($id)) {
$result = $object->fetch($id); $result = $object->fetch($id);
if ($result < 0) { if ($result < 0) {
dol_print_error('', $object->error, $object->errors); dol_print_error('', $object->error, $object->errors);
} }
} }
// TODO do action // TODO do action
if ($action == 'save') { if ($action == 'save') {
$error = 0; $error = 0;
// check parameters // check parameters
@ -97,11 +107,11 @@ if ($action == 'save') {
$object->setValues($_POST); $object->setValues($_POST);
if ($apply_to == 'U') { if ($apply_to == 'U') {
$object->fk_user = (int) $fk_user; $object->fk_user = (int)$fk_user;
$object->fk_usergroup = 0; $object->fk_usergroup = 0;
$object->is_for_all = 0; $object->is_for_all = 0;
} elseif ($apply_to == 'G') { } elseif ($apply_to == 'G') {
$object->fk_usergroup = (int) $fk_usergroup; $object->fk_usergroup = (int)$fk_usergroup;
$object->fk_user = 0; $object->fk_user = 0;
$object->is_for_all = 0; $object->is_for_all = 0;
} elseif ($apply_to == 'A') { } elseif ($apply_to == 'A') {
@ -122,10 +132,10 @@ if ($action == 'save') {
dol_print_error($object->db); dol_print_error($object->db);
} }
header('Location: '.$_SERVER['PHP_SELF']); header('Location: ' . $_SERVER['PHP_SELF']);
exit; exit;
} }
} elseif ($action == 'delete') { } elseif ($action == 'delete') {
// TODO add confirm // TODO add confirm
$res = $object->delete($user); $res = $object->delete($user);
@ -133,118 +143,118 @@ if ($action == 'save') {
dol_print_error($object->db); dol_print_error($object->db);
} }
header('Location: '.$_SERVER['PHP_SELF']); header('Location: ' . $_SERVER['PHP_SELF']);
exit; exit;
} }
$rules = $object->getAllRule(); $rules = $object->getAllRule();
$tab_apply = array( $tab_apply = array(
'A' => $langs->trans('All'), 'A' => $langs->trans('All'),
'G' => $langs->trans('Group'), 'G' => $langs->trans('Group'),
'U' => $langs->trans('User') 'U' => $langs->trans('User')
); );
$tab_rules_type = array( $tab_rules_type = array(
'EX_DAY' => $langs->trans('Day'), 'EX_DAY' => $langs->trans('Day'),
'EX_MON' => $langs->trans('Month'), 'EX_MON' => $langs->trans('Month'),
'EX_YEA' => $langs->trans('Year'), 'EX_YEA' => $langs->trans('Year'),
'EX_EXP' => $langs->trans('OnExpense') 'EX_EXP' => $langs->trans('OnExpense')
); );
}
/* /*
* View * View
*/ */
llxHeader('', $langs->trans("ExpenseReportsSetup")); llxHeader('', $langs->trans("ExpenseReportsSetup"));
$form = new Form($db); $form = new Form($db);
$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>'; $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_setup'); print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_setup');
$head = expensereport_admin_prepare_head(); $head = expensereport_admin_prepare_head();
print dol_get_fiche_head($head, 'expenserules', $langs->trans("ExpenseReportsRules"), -1, 'trip'); print dol_get_fiche_head($head, 'expenserules', $langs->trans("ExpenseReportsRules"), -1, 'trip');
echo '<span class="opacitymedium">'.$langs->trans('ExpenseReportRulesDesc').'</span>'; echo '<span class="opacitymedium">' . $langs->trans('ExpenseReportRulesDesc') . '</span>';
print '<br><br>'; print '<br><br>';
if ($action != 'edit') { if ($action != 'edit') {
echo '<form action="'.$_SERVER['PHP_SELF'].'" method="post">'; echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
echo '<input type="hidden" name="token" value="'.newToken().'" />'; echo '<input type="hidden" name="token" value="' . newToken() . '" />';
echo '<input type="hidden" name="action" value="save" />'; echo '<input type="hidden" name="action" value="save" />';
echo '<table class="noborder centpercent">'; echo '<table class="noborder centpercent">';
echo '<tr class="liste_titre">'; echo '<tr class="liste_titre">';
echo '<th>'.$langs->trans('ExpenseReportApplyTo').'</th>'; echo '<th>' . $langs->trans('ExpenseReportApplyTo') . '</th>';
echo '<th>'.$langs->trans('Type').'</th>'; echo '<th>' . $langs->trans('Type') . '</th>';
echo '<th>'.$langs->trans('ExpenseReportLimitOn').'</th>'; echo '<th>' . $langs->trans('ExpenseReportLimitOn') . '</th>';
echo '<th>'.$langs->trans('ExpenseReportDateStart').'</th>'; echo '<th>' . $langs->trans('ExpenseReportDateStart') . '</th>';
echo '<th>'.$langs->trans('ExpenseReportDateEnd').'</th>'; echo '<th>' . $langs->trans('ExpenseReportDateEnd') . '</th>';
echo '<th>'.$langs->trans('ExpenseReportLimitAmount').'</th>'; echo '<th>' . $langs->trans('ExpenseReportLimitAmount') . '</th>';
echo '<th>'.$langs->trans('ExpenseReportRestrictive').'</th>'; echo '<th>' . $langs->trans('ExpenseReportRestrictive') . '</th>';
echo '<th>&nbsp;</th>'; echo '<th>&nbsp;</th>';
echo '</tr>'; echo '</tr>';
echo '<tr class="oddeven">'; echo '<tr class="oddeven">';
echo '<td>'; echo '<td>';
echo '<div class="float">'.$form->selectarray('apply_to', $tab_apply, '', 0).'</div>'; echo '<div class="float">' . $form->selectarray('apply_to', $tab_apply, '', 0) . '</div>';
echo '<div id="user" class="float">'.$form->select_dolusers('', 'fk_user').'</div>'; echo '<div id="user" class="float">' . $form->select_dolusers('', 'fk_user') . '</div>';
echo '<div id="group" class="float">'.$form->select_dolgroups('', 'fk_usergroup').'</div>'; echo '<div id="group" class="float">' . $form->select_dolgroups('', 'fk_usergroup') . '</div>';
echo '</td>'; echo '</td>';
echo '<td>'.$form->selectExpense('', 'fk_c_type_fees', 0, 1, 1).'</td>'; echo '<td>' . $form->selectExpense('', 'fk_c_type_fees', 0, 1, 1) . '</td>';
echo '<td>'.$form->selectarray('code_expense_rules_type', $tab_rules_type, '', 0).'</td>'; echo '<td>' . $form->selectarray('code_expense_rules_type', $tab_rules_type, '', 0) . '</td>';
echo '<td>'.$form->selectDate(strtotime(date('Y-m-01', dol_now())), 'start', '', '', 0, '', 1, 0).'</td>'; echo '<td>' . $form->selectDate(strtotime(date('Y-m-01', dol_now())), 'start', '', '', 0, '', 1, 0) . '</td>';
echo '<td>'.$form->selectDate(strtotime(date('Y-m-t', dol_now())), 'end', '', '', 0, '', 1, 0).'</td>'; echo '<td>' . $form->selectDate(strtotime(date('Y-m-t', dol_now())), 'end', '', '', 0, '', 1, 0) . '</td>';
echo '<td><input type="text" value="" class="maxwidth100" name="amount" class="amount" /> '.$conf->currency.'</td>'; echo '<td><input type="text" value="" class="maxwidth100" name="amount" class="amount" /> ' . $conf->currency . '</td>';
echo '<td>'.$form->selectyesno('restrictive', 0, 1).'</td>'; echo '<td>' . $form->selectyesno('restrictive', 0, 1) . '</td>';
echo '<td class="right"><input type="submit" class="button button-add" value="'.$langs->trans('Add').'" /></td>'; echo '<td class="right"><input type="submit" class="button button-add" value="' . $langs->trans('Add') . '" /></td>';
echo '</tr>'; echo '</tr>';
echo '</table>'; echo '</table>';
echo '</form>'; echo '</form>';
} }
echo '<form action="'.$_SERVER['PHP_SELF'].'" method="post">'; echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
echo '<input type="hidden" name="token" value="'.newToken().'" />'; echo '<input type="hidden" name="token" value="' . newToken() . '" />';
if ($action == 'edit') { if ($action == 'edit') {
echo '<input type="hidden" name="id" value="'.$object->id.'" />'; echo '<input type="hidden" name="id" value="' . $object->id . '" />';
echo '<input type="hidden" name="action" value="save" />'; echo '<input type="hidden" name="action" value="save" />';
} }
echo '<table class="noborder centpercent">'; echo '<table class="noborder centpercent">';
echo '<tr class="liste_titre">'; echo '<tr class="liste_titre">';
echo '<th>'.$langs->trans('ExpenseReportApplyTo').'</th>'; echo '<th>' . $langs->trans('ExpenseReportApplyTo') . '</th>';
echo '<th>'.$langs->trans('Type').'</th>'; echo '<th>' . $langs->trans('Type') . '</th>';
echo '<th>'.$langs->trans('ExpenseReportLimitOn').'</th>'; echo '<th>' . $langs->trans('ExpenseReportLimitOn') . '</th>';
echo '<th>'.$langs->trans('ExpenseReportDateStart').'</th>'; echo '<th>' . $langs->trans('ExpenseReportDateStart') . '</th>';
echo '<th>'.$langs->trans('ExpenseReportDateEnd').'</th>'; echo '<th>' . $langs->trans('ExpenseReportDateEnd') . '</th>';
echo '<th>'.$langs->trans('ExpenseReportLimitAmount').'</th>'; echo '<th>' . $langs->trans('ExpenseReportLimitAmount') . '</th>';
echo '<th>'.$langs->trans('ExpenseReportRestrictive').'</th>'; echo '<th>' . $langs->trans('ExpenseReportRestrictive') . '</th>';
echo '<th>&nbsp;</th>'; echo '<th>&nbsp;</th>';
echo '</tr>'; echo '</tr>';
foreach ($rules as $rule) { foreach ($rules as $rule) {
echo '<tr class="oddeven">'; echo '<tr class="oddeven">';
echo '<td>'; echo '<td>';
if ($action == 'edit' && $object->id == $rule->id) { if ($action == 'edit' && $object->id == $rule->id) {
$selected = ($object->is_for_all > 0) ? 'A' : ($object->fk_usergroup > 0 ? 'G' : 'U'); $selected = ($object->is_for_all > 0) ? 'A' : ($object->fk_usergroup > 0 ? 'G' : 'U');
echo '<div class="float">'.$form->selectarray('apply_to', $tab_apply, $selected, 0).'</div>'; echo '<div class="float">' . $form->selectarray('apply_to', $tab_apply, $selected, 0) . '</div>';
echo '<div id="user" class="float">'.$form->select_dolusers($object->fk_user, 'fk_user').'</div>'; echo '<div id="user" class="float">' . $form->select_dolusers($object->fk_user, 'fk_user') . '</div>';
echo '<div id="group" class="float">'.$form->select_dolgroups($object->fk_usergroup, 'fk_usergroup').'</div>'; echo '<div id="group" class="float">' . $form->select_dolgroups($object->fk_usergroup, 'fk_usergroup') . '</div>';
} else { } else {
if ($rule->is_for_all > 0) { if ($rule->is_for_all > 0) {
echo $tab_apply['A']; echo $tab_apply['A'];
} elseif ($rule->fk_usergroup > 0) { } elseif ($rule->fk_usergroup > 0) {
echo $tab_apply['G'].' ('.$rule->getGroupLabel().')'; echo $tab_apply['G'] . ' (' . $rule->getGroupLabel() . ')';
} elseif ($rule->fk_user > 0) { } elseif ($rule->fk_user > 0) {
echo $tab_apply['U'].' ('.$rule->getUserName().')'; echo $tab_apply['U'] . ' (' . $rule->getUserName() . ')';
} }
} }
echo '</td>'; echo '</td>';
@ -257,11 +267,11 @@ foreach ($rules as $rule) {
if ($rule->fk_c_type_fees == -1) { if ($rule->fk_c_type_fees == -1) {
echo $langs->trans('AllExpenseReport'); echo $langs->trans('AllExpenseReport');
} else { } else {
$key = getDictionaryValue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id'); $key = getDictionaryValue(MAIN_DB_PREFIX . 'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
if ($key && $key != $langs->trans($key)) { if ($key && $key != $langs->trans($key)) {
echo $langs->trans($key); echo $langs->trans($key);
} else { } else {
$value = getDictionaryValue(MAIN_DB_PREFIX.'c_type_fees', 'label', $rule->fk_c_type_fees, false, 'id'); $value = getDictionaryValue(MAIN_DB_PREFIX . 'c_type_fees', 'label', $rule->fk_c_type_fees, false, 'id');
echo $langs->trans($value ? $value : 'Undefined'); // TODO check to return trans of 'code' echo $langs->trans($value ? $value : 'Undefined'); // TODO check to return trans of 'code'
} }
} }
@ -298,7 +308,7 @@ foreach ($rules as $rule) {
echo '<td>'; echo '<td>';
if ($action == 'edit' && $object->id == $rule->id) { if ($action == 'edit' && $object->id == $rule->id) {
echo '<input type="text" value="'.price2num($object->amount).'" name="amount" class="amount" />'.$conf->currency; echo '<input type="text" value="' . price2num($object->amount) . '" name="amount" class="amount" />' . $conf->currency;
} else { } else {
echo price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency); echo price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency);
} }
@ -316,22 +326,22 @@ foreach ($rules as $rule) {
echo '<td class="center">'; echo '<td class="center">';
if ($object->id != $rule->id) { if ($object->id != $rule->id) {
echo '<a class="editfielda paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$rule->id.'">'.img_edit().'</a>&nbsp;'; echo '<a class="editfielda paddingright paddingleft" href="' . $_SERVER['PHP_SELF'] . '?action=edit&token=' . newToken() . '&id=' . $rule->id . '">' . img_edit() . '</a>&nbsp;';
echo '<a class="paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$rule->id.'">'.img_delete().'</a>'; echo '<a class="paddingright paddingleft" href="' . $_SERVER['PHP_SELF'] . '?action=delete&token=' . newToken() . '&id=' . $rule->id . '">' . img_delete() . '</a>';
} else { } else {
echo '<input type="submit" class="button button-edit" value="'.$langs->trans('Update').'" />&nbsp;'; echo '<input type="submit" class="button button-edit" value="' . $langs->trans('Update') . '" />&nbsp;';
echo '<a href="'.$_SERVER['PHP_SELF'].'" class="button button-cancel">'.$langs->trans("Cancel").'</a>'; echo '<a href="' . $_SERVER['PHP_SELF'] . '" class="button button-cancel">' . $langs->trans("Cancel") . '</a>';
} }
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
} }
echo '</table>'; echo '</table>';
echo '</form>'; echo '</form>';
echo '<script type="text/javascript"> $(function() { echo '<script type="text/javascript"> $(function() {
$("#apply_to").change(function() { $("#apply_to").change(function() {
var value = $(this).val(); var value = $(this).val();
if (value == "A") { if (value == "A") {
@ -349,6 +359,7 @@ echo '<script type="text/javascript"> $(function() {
}); </script>'; }); </script>';
print dol_get_fiche_end(); print dol_get_fiche_end();
// End of page // End of page

1
htdocs/core/lib/functions.lib.php
View File

@ -7909,7 +7909,6 @@ function dol_htmloutput_events($disabledoutputofmessages = 0)
} }
unset($_SESSION['dol_events']['mesgs']); unset($_SESSION['dol_events']['mesgs']);
} }
// Show errors // Show errors
if (isset($_SESSION['dol_events']['errors'])) { if (isset($_SESSION['dol_events']['errors'])) {
if (empty($disabledoutputofmessages)) { if (empty($disabledoutputofmessages)) {