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

Debug v15

Browse Source
This commit is contained in:
Laurent Destailleur 2021-11-18 21:37:33 +01:00
parent 2afe6ccb4b
commit 92b0fde4ca
4 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/salaries.lang
View File

@ -24,3 +24,4 @@ SalariesStatistics=Salary statistics
SalariesAndPayments=Salaries and payments SalariesAndPayments=Salaries and payments
ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ? ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
FillFieldFirst=Fill employee field first FillFieldFirst=Fill employee field first
UpdateAmountWithLastSalary=Set amount with last salary

8
htdocs/salaries/ajax/ajaxsalaries.php
View File

@ -47,8 +47,14 @@ require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
restrictedArea($user, 'salaries'); restrictedArea($user, 'salaries');
/*
* View
*/
$fk_user = GETPOST('fk_user', 'int'); $fk_user = GETPOST('fk_user', 'int');
$return_arr = array(); $return_arr = array();
if (!empty(GETPOST('fk_user', 'int'))) { if (!empty(GETPOST('fk_user', 'int'))) {
$sql = "SELECT s.amount, s.rowid FROM ".MAIN_DB_PREFIX."salary as s"; $sql = "SELECT s.amount, s.rowid FROM ".MAIN_DB_PREFIX."salary as s";
$sql .= " WHERE s.fk_user = ".((int) $fk_user); $sql .= " WHERE s.fk_user = ".((int) $fk_user);
@ -60,7 +66,7 @@ if (!empty(GETPOST('fk_user', 'int'))) {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$label = "Salary amount"; $label = "Salary amount";
$row_array['label'] = $label; $row_array['label'] = $label;
$row_array['value'] = $obj->amount; $row_array['value'] = price2num($obj->amount, 'MT');
$row_array['key'] = "Amount"; $row_array['key'] = "Amount";
array_push($return_arr, $row_array); array_push($return_arr, $row_array);

2
htdocs/salaries/card.php
View File

@ -668,7 +668,7 @@ if ($action == 'create') {
); );
} else { } else {
alert("'.$langs->trans("FillFieldFirst").'"); alert("'.dol_escape_js($langs->trans("FillFieldFirst")).'");
} }
}); });

30
htdocs/theme/md/style.css.php
View File

@ -657,6 +657,10 @@ input:-webkit-autofill {
-webkit-box-shadow: 0 0 0 50px #FBFFEA inset; -webkit-box-shadow: 0 0 0 50px #FBFFEA inset;
} }
input[type=checkbox], input[type=radio] {
margin: 0 3px 0 3px;
}
/* CSS for placeholder */ /* CSS for placeholder */
.placeholder { color: #ccc; } .placeholder { color: #ccc; }
::-webkit-input-placeholder { color:#ccc; } ::-webkit-input-placeholder { color:#ccc; }
@ -922,6 +926,19 @@ textarea.centpercent {
.marginright2 { .marginright2 {
margin-<?php print $right; ?>: 2px; margin-<?php print $right; ?>: 2px;
} }
.paddingtop {
padding-top: 4px;
}
.paddingtop2 {
padding-top: 2px;
}
.paddingbottom {
padding-bottom: 4px;
}
.paddingbottom2 {
padding-bottom: 2px;
}
.cursordefault { .cursordefault {
cursor: default; cursor: default;
} }
@ -3324,18 +3341,7 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
.smallpaddingimp { .smallpaddingimp {
padding: 4px !important; padding: 4px !important;
} }
.nopaddingleft {
padding-<?php print $left; ?>: 0px;
}
.nopaddingright {
padding-<?php print $right; ?>: 0px;
}
.nopaddingtopimp {
padding-top: 0px !important;
}
.nopaddingbottomimp {
padding-bottom: 0px !important;
}
.notopnoleft { .notopnoleft {
border-collapse: collapse; border-collapse: collapse;
border: 0px; border: 0px;