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

better fix

Browse Source
This commit is contained in:
florian HENRY 2018-03-09 19:37:39 +01:00
parent 42fed5981d
commit bb8525614c
4 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/expensereport.php
View File

@ -195,7 +195,7 @@ else if ($action == 'setoptions')
$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']); $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
llxHeader(); llxHeader('',$langs->trans("ExpenseReportsSetup"));
$form=new Form($db); $form=new Form($db);

2
htdocs/admin/expensereport_extrafields.php
View File

@ -67,7 +67,7 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
$textobject=$langs->transnoentitiesnoconv("expensereports"); $textobject=$langs->transnoentitiesnoconv("expensereports");
llxHeader('',$langs->trans("expensereportsSetup")); llxHeader('',$langs->trans("ExpenseReportsSetup"));
$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');

32
htdocs/admin/expensereport_ik.php
View File

@ -58,12 +58,12 @@ if ($action == 'updateik')
$result = $expIk->fetch($id); $result = $expIk->fetch($id);
if ($result < 0) dol_print_error('', $expIk->error, $expIk->errors); if ($result < 0) dol_print_error('', $expIk->error, $expIk->errors);
} }
$expIk->setValues($_POST); $expIk->setValues($_POST);
$result = $expIk->create($user); $result = $expIk->create($user);
if ($result > 0) setEventMessages('SetupSaved', null, 'mesgs'); if ($result > 0) setEventMessages('SetupSaved', null, 'mesgs');
header('Location: '.$_SERVER['PHP_SELF']); header('Location: '.$_SERVER['PHP_SELF']);
exit; exit;
} }
@ -74,11 +74,11 @@ elseif ($action == 'delete') // TODO add confirm
{ {
$result = $expIk->fetch($id); $result = $expIk->fetch($id);
if ($result < 0) dol_print_error('', $expIk->error, $expIk->errors); if ($result < 0) dol_print_error('', $expIk->error, $expIk->errors);
$expIk->delete($user); $expIk->delete($user);
} }
header('Location: '.$_SERVER['PHP_SELF']); header('Location: '.$_SERVER['PHP_SELF']);
exit; exit;
} }
@ -89,7 +89,7 @@ $rangesbycateg = ExpenseReportIk::getAllRanges();
* View * View
*/ */
llxHeader(); llxHeader('',$langs->trans("ExpenseReportsSetup"));
$form=new Form($db); $form=new Form($db);
@ -125,23 +125,23 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
echo '<td>'.$langs->trans('expenseReportTotalForFive').'</td>'; echo '<td>'.$langs->trans('expenseReportTotalForFive').'</td>';
echo '<td>&nbsp;</td>'; echo '<td>&nbsp;</td>';
echo '</tr>'; echo '</tr>';
if ($Tab['active'] == 0) continue; if ($Tab['active'] == 0) continue;
$tranche=1; $tranche=1;
$var = true; $var = true;
foreach ($Tab['ranges'] as $k => $range) foreach ($Tab['ranges'] as $k => $range)
{ {
if (isset($Tab['ranges'][$k+1])) $label = $langs->trans('expenseReportRangeFromTo', $range->range_ik, ($Tab['ranges'][$k+1]->range_ik-1)); if (isset($Tab['ranges'][$k+1])) $label = $langs->trans('expenseReportRangeFromTo', $range->range_ik, ($Tab['ranges'][$k+1]->range_ik-1));
else $label = $langs->trans('expenseReportRangeMoreThan', $range->range_ik); else $label = $langs->trans('expenseReportRangeMoreThan', $range->range_ik);
if ($range->range_active == 0) $label = $form->textwithpicto($label, $langs->trans('expenseReportRangeDisabled'), 1, 'help', '', 0, 3); if ($range->range_active == 0) $label = $form->textwithpicto($label, $langs->trans('expenseReportRangeDisabled'), 1, 'help', '', 0, 3);
echo '<tr '.$bc[$var].'>'; echo '<tr '.$bc[$var].'>';
// Label // Label
echo '<td width="20%"><b>['.$langs->trans('RangeNum', $tranche++).']</b> - '.$label.'</td>'; echo '<td width="20%"><b>['.$langs->trans('RangeNum', $tranche++).']</b> - '.$label.'</td>';
// Offset // Offset
echo '<td width="20%">'; echo '<td width="20%">';
if ($action == 'edit' && $range->ik->id == $id && $range->rowid == $fk_range && $range->fk_c_exp_tax_cat == $fk_c_exp_tax_cat) echo '<input type="text" name="offset" value="'.$range->ik->offset.'" />'; if ($action == 'edit' && $range->ik->id == $id && $range->rowid == $fk_range && $range->fk_c_exp_tax_cat == $fk_c_exp_tax_cat) echo '<input type="text" name="offset" value="'.$range->ik->offset.'" />';
@ -152,10 +152,10 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
if ($action == 'edit' && $range->ik->id == $id && $range->rowid == $fk_range && $range->fk_c_exp_tax_cat == $fk_c_exp_tax_cat) echo '<input type="text" name="coef" value="'.$range->ik->coef.'" />'; if ($action == 'edit' && $range->ik->id == $id && $range->rowid == $fk_range && $range->fk_c_exp_tax_cat == $fk_c_exp_tax_cat) echo '<input type="text" name="coef" value="'.$range->ik->coef.'" />';
else echo ($range->ik->id > 0 ? $range->ik->coef : $langs->trans('expenseReportCoefUndefined')); else echo ($range->ik->id > 0 ? $range->ik->coef : $langs->trans('expenseReportCoefUndefined'));
echo '</td>'; echo '</td>';
// Total for one // Total for one
echo '<td width="30%">'.$langs->trans('expenseReportPrintExample', price($range->ik->offset + 5 * $range->ik->coef)).'</td>'; echo '<td width="30%">'.$langs->trans('expenseReportPrintExample', price($range->ik->offset + 5 * $range->ik->coef)).'</td>';
// Action // Action
echo '<td align="right">'; echo '<td align="right">';
if ($range->range_active == 1) if ($range->range_active == 1)
@ -173,7 +173,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
} }
} }
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
$var=!$var; $var=!$var;
} }

60
htdocs/admin/expensereport_rules.php
View File

@ -57,17 +57,17 @@ $amount = GETPOST('amount');
$restrictive = GETPOST('restrictive'); $restrictive = GETPOST('restrictive');
$object = new ExpenseReportRule($db); $object = new ExpenseReportRule($db);
if (!empty($id)) if (!empty($id))
{ {
$result = $object->fetch($id); $result = $object->fetch($id);
if ($result < 0) dol_print_error('', $object->error, $object->errors); if ($result < 0) 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
if (empty($apply_to)) { if (empty($apply_to)) {
$error++; $error++;
@ -93,11 +93,11 @@ if ($action == 'save')
$error++; $error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportLimitAmount")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportLimitAmount")), null, 'errors');
} }
if (empty($error)) if (empty($error))
{ {
$object->setValues($_POST); $object->setValues($_POST);
if($apply_to=='U'){ if($apply_to=='U'){
$object->fk_user=$fk_user; $object->fk_user=$fk_user;
$object->fk_usergroup=0; $object->fk_usergroup=0;
@ -114,13 +114,13 @@ if ($action == 'save')
$object->dates = $dates; $object->dates = $dates;
$object->datee = $datee; $object->datee = $datee;
$object->entity = $conf->entity; $object->entity = $conf->entity;
$res = $object->create($user); $res = $object->create($user);
if ($res > 0) setEventMessages($langs->trans('ExpenseReportRuleSave'), null); if ($res > 0) setEventMessages($langs->trans('ExpenseReportRuleSave'), null);
else dol_print_error($object->db); else dol_print_error($object->db);
header('Location: '.$_SERVER['PHP_SELF']); header('Location: '.$_SERVER['PHP_SELF']);
exit; exit;
} }
@ -129,7 +129,7 @@ elseif ($action == 'delete')
{ {
// TODO add confirm // TODO add confirm
$res = $object->delete($user); $res = $object->delete($user);
if ($res < 0) dol_print_error($object->db); if ($res < 0) dol_print_error($object->db);
header('Location: '.$_SERVER['PHP_SELF']); header('Location: '.$_SERVER['PHP_SELF']);
@ -145,7 +145,7 @@ $tab_rules_type = array('EX_DAY' => $langs->trans('Day'), 'EX_MON' => $langs->tr
* View * View
*/ */
llxHeader(); llxHeader('',$langs->trans("ExpenseReportsSetup"));
$form=new Form($db); $form=new Form($db);
@ -194,7 +194,7 @@ if ($action != 'edit')
echo '</tr>'; echo '</tr>';
echo '</table>'; echo '</table>';
echo '</form>'; echo '</form>';
} }
@ -224,7 +224,7 @@ $var=true;
foreach ($rules as $rule) foreach ($rules as $rule)
{ {
echo '<tr '.$bc[$var].'>'; echo '<tr '.$bc[$var].'>';
echo '<td>'; echo '<td>';
if ($action == 'edit' && $object->id == $rule->id) if ($action == 'edit' && $object->id == $rule->id)
{ {
@ -240,8 +240,8 @@ foreach ($rules as $rule)
elseif ($rule->fk_user > 0) echo $tab_apply['U'].' ('.$rule->getUserName().')'; elseif ($rule->fk_user > 0) echo $tab_apply['U'].' ('.$rule->getUserName().')';
} }
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
if ($action == 'edit' && $object->id == $rule->id) if ($action == 'edit' && $object->id == $rule->id)
{ {
@ -250,7 +250,7 @@ foreach ($rules as $rule)
else else
{ {
if ($rule->fk_c_type_fees == -1) echo $langs->trans('AllExpenseReport'); if ($rule->fk_c_type_fees == -1) echo $langs->trans('AllExpenseReport');
else else
{ {
$key = getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id'); $key = getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
if ($key != $langs->trans($key)) echo $langs->trans($key); if ($key != $langs->trans($key)) echo $langs->trans($key);
@ -258,9 +258,9 @@ foreach ($rules as $rule)
} }
} }
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
if ($action == 'edit' && $object->id == $rule->id) if ($action == 'edit' && $object->id == $rule->id)
{ {
@ -271,8 +271,8 @@ foreach ($rules as $rule)
echo $tab_rules_type[$rule->code_expense_rules_type]; echo $tab_rules_type[$rule->code_expense_rules_type];
} }
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
if ($action == 'edit' && $object->id == $rule->id) if ($action == 'edit' && $object->id == $rule->id)
{ {
@ -283,8 +283,8 @@ foreach ($rules as $rule)
echo dol_print_date($rule->dates, 'day'); echo dol_print_date($rule->dates, 'day');
} }
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
if ($action == 'edit' && $object->id == $rule->id) if ($action == 'edit' && $object->id == $rule->id)
{ {
@ -295,8 +295,8 @@ foreach ($rules as $rule)
echo dol_print_date($rule->datee, 'day'); echo dol_print_date($rule->datee, 'day');
} }
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
if ($action == 'edit' && $object->id == $rule->id) if ($action == 'edit' && $object->id == $rule->id)
{ {
@ -307,8 +307,8 @@ foreach ($rules as $rule)
echo price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency); echo price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency);
} }
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
if ($action == 'edit' && $object->id == $rule->id) if ($action == 'edit' && $object->id == $rule->id)
{ {
@ -319,8 +319,8 @@ foreach ($rules as $rule)
echo yn($rule->restrictive, 1, 1); echo yn($rule->restrictive, 1, 1);
} }
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
if ($object->id != $rule->id) if ($object->id != $rule->id)
{ {
@ -333,7 +333,7 @@ foreach ($rules as $rule)
echo '<a href="'.$_SERVER['PHP_SELF'].'" class="button">'.$langs->trans('Cancel').'</a>'; echo '<a href="'.$_SERVER['PHP_SELF'].'" class="button">'.$langs->trans('Cancel').'</a>';
} }
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
$var=!$var; $var=!$var;
} }
@ -355,9 +355,9 @@ echo '<script type="text/javascript"> $(function() {
$("#user").hide(); $("#user").hide();
} }
}); });
$("#apply_to").change(); $("#apply_to").change();
}); </script>'; }); </script>';
dol_fiche_end(); dol_fiche_end();