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

Fix phpcs

Browse Source
This commit is contained in:
Laurent Destailleur 2021-03-04 17:57:08 +01:00
parent 59f205596e
commit b5def91b46
5 changed files with 73 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/eventorganization/class/conferenceorbooth.class.php
View File

@ -190,6 +190,8 @@ class ConferenceOrBooth extends ActionComm
/** /**
* Set Percentage from status * Set Percentage from status
*
* @return void
*/ */
public function setPercentageFromStatus() public function setPercentageFromStatus()
{ {

36
htdocs/salaries/card.php
View File

@ -195,7 +195,6 @@ if ($action == 'add' && empty($cancel)) {
} }
if (!$error) { if (!$error) {
$ret = $object->create($user); $ret = $object->create($user);
if ($ret < 0) $error++; if ($ret < 0) $error++;
if (!empty($auto_create_paiement) && !$error) { if (!empty($auto_create_paiement) && !$error) {
@ -257,18 +256,15 @@ if ($action == 'confirm_delete') {
$db->begin(); $db->begin();
$ret = $object->delete($user); $ret = $object->delete($user);
if ($ret > 0) if ($ret > 0) {
{
$db->commit(); $db->commit();
header("Location: ".DOL_URL_ROOT.'/salaries/list.php'); header("Location: ".DOL_URL_ROOT.'/salaries/list.php');
exit; exit;
} } else {
else {
$db->rollback(); $db->rollback();
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} } else {
else {
setEventMessages($langs->trans('DisabledBecausePayments'), null, 'errors'); setEventMessages($langs->trans('DisabledBecausePayments'), null, 'errors');
} }
} }
@ -280,8 +276,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->salaries->write)
if (empty($amount)) { if (empty($amount)) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
$action = 'edit'; $action = 'edit';
} } elseif (!is_numeric($amount)) {
elseif (!is_numeric($amount)) {
setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors');
$action = 'create'; $action = 'create';
} else { } else {
@ -307,15 +302,13 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->salaries-
$object->fetch($id); $object->fetch($id);
if ($object->id > 0) if ($object->id > 0) {
{
$object->paye = 0; $object->paye = 0;
$object->id = $object->ref = null; $object->id = $object->ref = null;
if (GETPOST('clone_label', 'alphanohtml')) { if (GETPOST('clone_label', 'alphanohtml')) {
$object->label = GETPOST('clone_label', 'alphanohtml'); $object->label = GETPOST('clone_label', 'alphanohtml');
} } else {
else {
$object->label = $langs->trans("CopyOf").' '.$object->label; $object->label = $langs->trans("CopyOf").' '.$object->label;
} }
@ -325,25 +318,20 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->salaries-
if ($newdatestart) $object->datesp = $newdatestart; if ($newdatestart) $object->datesp = $newdatestart;
if ($newdateend) $object->dateep = $newdateend; if ($newdateend) $object->dateep = $newdateend;
//if ($object->check()) {
$id = $object->create($user); $id = $object->create($user);
if ($id > 0) if ($id > 0) {
{
$db->commit(); $db->commit();
$db->close(); $db->close();
header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
exit; exit;
} } else {
else {
$id = $originalId; $id = $originalId;
$db->rollback(); $db->rollback();
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
//} } else {
}
else {
$db->rollback(); $db->rollback();
dol_print_error($db, $object->error); dol_print_error($db, $object->error);
} }
@ -712,8 +700,9 @@ if ($id) {
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">'; print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
print $langs->trans('BankAccount'); print $langs->trans('BankAccount');
print '<td>'; print '<td>';
if ($action != 'editbankaccount' && $user->rights->salaries->write) if ($action != 'editbankaccount' && $user->rights->salaries->write) {
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>'; print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
}
print '</tr></table>'; print '</tr></table>';
print '</td><td>'; print '</td><td>';
if ($action == 'editbankaccount') { if ($action == 'editbankaccount') {
@ -892,8 +881,7 @@ if ($id) {
if (!empty($user->rights->salaries->delete) && empty($totalpaye)) { if (!empty($user->rights->salaries->delete) && empty($totalpaye)) {
print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>'; print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
} } else {
else {
print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("DisabledBecausePayments"))).'">'.$langs->trans("Delete").'</a></div>'; print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("DisabledBecausePayments"))).'">'.$langs->trans("Delete").'</a></div>';
} }
} }

1
htdocs/salaries/list.php
View File

@ -645,7 +645,6 @@ print '</div>'."\n";
print '</form>'."\n"; print '</form>'."\n";
// End of page // End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

3
htdocs/salaries/payment_salary/card.php
View File

@ -90,7 +90,8 @@ $head[$h][1] = $langs->trans("SalaryPayment");
$hselected = $h; $hselected = $h;
$h++; $h++;
/*$head[$h][0] = DOL_URL_ROOT.'/compta/payment_sc/info.php?id='.$id; /*
$head[$h][0] = DOL_URL_ROOT.'/compta/payment_sc/info.php?id='.$id;
$head[$h][1] = $langs->trans("Info"); $head[$h][1] = $langs->trans("Info");
$h++; $h++;
*/ */