@@ -29,9 +29,9 @@ |
||
29 | 29 | |
30 | 30 | // Load Dolibarr environment |
31 | 31 | require '../../main.inc.php'; |
32 | -require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php'; |
|
33 | -require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php'; |
|
34 | -require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.class.php'; |
|
32 | +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; |
|
33 | +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; |
|
34 | +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; |
|
35 | 35 | |
36 | 36 | |
37 | 37 | // Load translation files required by the page |
@@ -65,7 +65,7 @@ |
||
65 | 65 | |
66 | 66 | $startdate = $enddate = ''; |
67 | 67 | if (GETPOST('startdatemonth')) { |
68 | - $startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'), GETPOST('startdateday', 'int'), GETPOST('startdateyear', 'int')); |
|
68 | + $startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'), GETPOST('startdateday', 'int'), GETPOST('startdateyear', 'int')); |
|
69 | 69 | } |
70 | 70 | if (GETPOST('enddatemonth')) { |
71 | 71 | $enddate = dol_mktime(23, 59, 59, GETPOST('enddatemonth', 'int'), GETPOST('enddateday', 'int'), GETPOST('enddateyear')); |
@@ -40,7 +40,7 @@ |
||
40 | 40 | //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule'); // Force authentication handler |
41 | 41 | //if (! defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET |
42 | 42 | //if (! defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1'); // Disable browser notification |
43 | -if (!defined('NOSESSION')) define('NOSESSION', '1'); // On CLI mode, no need to use web sessions |
|
43 | +if (!defined('NOSESSION')) define('NOSESSION', '1'); // On CLI mode, no need to use web sessions |
|
44 | 44 | |
45 | 45 | |
46 | 46 | $sapi_type = php_sapi_name(); |
@@ -40,7 +40,10 @@ |
||
40 | 40 | //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule'); // Force authentication handler |
41 | 41 | //if (! defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET |
42 | 42 | //if (! defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1'); // Disable browser notification |
43 | -if (!defined('NOSESSION')) define('NOSESSION', '1'); // On CLI mode, no need to use web sessions |
|
43 | +if (!defined('NOSESSION')) { |
|
44 | + define('NOSESSION', '1'); |
|
45 | +} |
|
46 | +// On CLI mode, no need to use web sessions |
|
44 | 47 | |
45 | 48 | |
46 | 49 | $sapi_type = php_sapi_name(); |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | $maxfilesizearray = getMaxFileSizeArray(); |
188 | 188 | $maxmin = $maxfilesizearray['maxmin']; |
189 | 189 | if ($maxmin > 0) { |
190 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
190 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
191 | 191 | } |
192 | 192 | $texte .= ' <input type="file" name="uploadfile">'; |
193 | 193 | $texte .= '<input type="hidden" value="MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
283 | 283 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
284 | 284 | |
285 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
285 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
286 | 286 | //$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt'; |
287 | 287 | |
288 | 288 | // Get extension (ods or odt) |
@@ -292,11 +292,11 @@ discard block |
||
292 | 292 | if ($format == '1') { |
293 | 293 | $format = '%Y%m%d%H%M%S'; |
294 | 294 | } |
295 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
295 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
296 | 296 | } else { |
297 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
297 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
298 | 298 | } |
299 | - $file = $dir . '/' . $filename; |
|
299 | + $file = $dir.'/'.$filename; |
|
300 | 300 | //print "newdir=".$dir; |
301 | 301 | //print "newfile=".$newfile; |
302 | 302 | //print "file=".$file; |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | dol_mkdir($conf->mymodule->dir_temp); |
306 | 306 | if (!is_writable($conf->mymodule->dir_temp)) { |
307 | 307 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->mymodule->dir_temp); |
308 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
308 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
309 | 309 | return -1; |
310 | 310 | } |
311 | 311 |
@@ -149,7 +149,9 @@ |
||
149 | 149 | if (!isModEnabled("mymodule")) { |
150 | 150 | accessforbidden(); |
151 | 151 | } |
152 | -if (!$permissiontoread) accessforbidden(); |
|
152 | +if (!$permissiontoread) { |
|
153 | + accessforbidden(); |
|
154 | +} |
|
153 | 155 | |
154 | 156 | |
155 | 157 | /* |
@@ -192,7 +192,9 @@ discard block |
||
192 | 192 | } |
193 | 193 | |
194 | 194 | // Security check (enable the most restrictive one) |
195 | -if ($user->socid > 0) accessforbidden(); |
|
195 | +if ($user->socid > 0) { |
|
196 | + accessforbidden(); |
|
197 | +} |
|
196 | 198 | //if ($user->socid > 0) accessforbidden(); |
197 | 199 | //$socid = 0; if ($user->socid > 0) $socid = $user->socid; |
198 | 200 | //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0); |
@@ -200,7 +202,9 @@ discard block |
||
200 | 202 | if (!isModEnabled("mymodule")) { |
201 | 203 | accessforbidden('Module mymodule not enabled'); |
202 | 204 | } |
203 | -if (!$permissiontoread) accessforbidden(); |
|
205 | +if (!$permissiontoread) { |
|
206 | + accessforbidden(); |
|
207 | +} |
|
204 | 208 | |
205 | 209 | |
206 | 210 | /* |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $object = new MyObject($db); |
119 | 119 | $extrafields = new ExtraFields($db); |
120 | 120 | $diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id; |
121 | -$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
121 | +$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
122 | 122 | |
123 | 123 | // Fetch optionals attributes and labels |
124 | 124 | $extrafields->fetch_name_optionals_label($object->table_element); |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | |
129 | 129 | // Default sort order (if not yet defined by previous GETPOST) |
130 | 130 | if (!$sortfield) { |
131 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
131 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
132 | 132 | $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition. |
133 | 133 | } |
134 | 134 | if (!$sortorder) { |
@@ -422,7 +422,7 @@ discard block |
||
422 | 422 | // Output page |
423 | 423 | // -------------------------------------------------------------------- |
424 | 424 | |
425 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
425 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
426 | 426 | |
427 | 427 | // Example : Adding jquery code |
428 | 428 | // print '<script type="text/javascript"> |
@@ -646,7 +646,7 @@ discard block |
||
646 | 646 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
647 | 647 | $cssforfield .= ($cssforfield ? ' ' : '').'right'; |
648 | 648 | } |
649 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
649 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
650 | 650 | if (!empty($arrayfields['t.'.$key]['checked'])) { |
651 | 651 | print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n"; |
652 | 652 | $totalarray['nbfield']++; |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit; |
47 | 47 | $sortfield = GETPOST('sortfield', 'aZ09comma'); |
48 | 48 | $sortorder = GETPOST('sortorder', 'aZ09comma'); |
49 | -$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
49 | +$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
50 | 50 | $confirm = GETPOST('confirm', 'alpha'); |
51 | 51 | |
52 | 52 | $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); |
@@ -254,12 +254,12 @@ discard block |
||
254 | 254 | foreach ($typeleaves as $key => $val) { |
255 | 255 | $labeltypes[$val['id']] = ($langs->trans($val['code']) != $val['code']) ? $langs->trans($val['code']) : $langs->trans($val['label']); |
256 | 256 | } |
257 | - $formquestion [] = array( 'type' => 'other', |
|
257 | + $formquestion [] = array('type' => 'other', |
|
258 | 258 | 'name' => 'typeofholiday', |
259 | 259 | 'label' => $langs->trans("Type"), |
260 | 260 | 'value' => $form->selectarray('typeholiday', $labeltypes, GETPOST('typeholiday', 'alpha'), 1) |
261 | 261 | ); |
262 | - $formquestion [] = array( 'type' => 'other', |
|
262 | + $formquestion [] = array('type' => 'other', |
|
263 | 263 | 'name' => 'nbdaysholydays', |
264 | 264 | 'label' => $langs->trans("NumberDayAddMass"), |
265 | 265 | 'value' => '<input name="nbdaysholidays" class="maxwidth75" id="nbdaysholidays" value="'.GETPOST('nbdaysholidays', 'int').'">' |
@@ -197,9 +197,10 @@ discard block |
||
197 | 197 | if ($action == 'setmode' && $user->rights->salaries->write) { |
198 | 198 | $object->fetch($id); |
199 | 199 | $result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int')); |
200 | - if ($result < 0) |
|
201 | - setEventMessages($object->error, $object->errors, 'errors'); |
|
202 | -} |
|
200 | + if ($result < 0) { |
|
201 | + setEventMessages($object->error, $object->errors, 'errors'); |
|
202 | + } |
|
203 | + } |
|
203 | 204 | |
204 | 205 | // bank account |
205 | 206 | if ($action == 'setbankaccount' && $user->rights->salaries->write) { |
@@ -213,7 +214,9 @@ discard block |
||
213 | 214 | if ($action == 'add' && empty($cancel)) { |
214 | 215 | $error = 0; |
215 | 216 | |
216 | - if (empty($datev)) $datev = $datep; |
|
217 | + if (empty($datev)) { |
|
218 | + $datev = $datep; |
|
219 | + } |
|
217 | 220 | |
218 | 221 | $type_payment = GETPOST("paymenttype", 'alpha'); |
219 | 222 | $amount = price2num(GETPOST("amount", 'alpha'), 'MT', 2); |
@@ -390,8 +393,12 @@ discard block |
||
390 | 393 | $newdatestart = dol_mktime(0, 0, 0, GETPOST('clone_date_startmonth', 'int'), GETPOST('clone_date_startday', 'int'), GETPOST('clone_date_startyear', 'int')); |
391 | 394 | $newdateend = dol_mktime(0, 0, 0, GETPOST('clone_date_endmonth', 'int'), GETPOST('clone_date_endday', 'int'), GETPOST('clone_date_endyear', 'int')); |
392 | 395 | |
393 | - if ($newdatestart) $object->datesp = $newdatestart; |
|
394 | - if ($newdateend) $object->dateep = $newdateend; |
|
396 | + if ($newdatestart) { |
|
397 | + $object->datesp = $newdatestart; |
|
398 | + } |
|
399 | + if ($newdateend) { |
|
400 | + $object->dateep = $newdateend; |
|
401 | + } |
|
395 | 402 | |
396 | 403 | $id = $object->create($user); |
397 | 404 | if ($id > 0) { |
@@ -443,7 +450,9 @@ discard block |
||
443 | 450 | |
444 | 451 | $form = new Form($db); |
445 | 452 | $formfile = new FormFile($db); |
446 | -if (isModEnabled('project')) $formproject = new FormProjets($db); |
|
453 | +if (isModEnabled('project')) { |
|
454 | + $formproject = new FormProjets($db); |
|
455 | +} |
|
447 | 456 | |
448 | 457 | $title = $langs->trans('Salary')." - ".$object->ref; |
449 | 458 | $help_url = ""; |
@@ -870,8 +879,9 @@ discard block |
||
870 | 879 | print '<table class="nobordernopadding" width="100%"><tr><td>'; |
871 | 880 | print $langs->trans('DefaultPaymentMode'); |
872 | 881 | print '</td>'; |
873 | - if ($action != 'editmode') |
|
874 | - print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>'; |
|
882 | + if ($action != 'editmode') { |
|
883 | + print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>'; |
|
884 | + } |
|
875 | 885 | print '</tr></table>'; |
876 | 886 | print '</td><td>'; |
877 | 887 | |
@@ -978,8 +988,9 @@ discard block |
||
978 | 988 | } |
979 | 989 | |
980 | 990 | print '<td class="right">'; |
981 | - if ($bankaccountstatic->id) |
|
982 | - print $bankaccountstatic->getNomUrl(1, 'transactions'); |
|
991 | + if ($bankaccountstatic->id) { |
|
992 | + print $bankaccountstatic->getNomUrl(1, 'transactions'); |
|
993 | + } |
|
983 | 994 | print '</td>'; |
984 | 995 | } |
985 | 996 | print '<td class="right nowrap amountcard">'.price($objp->amount)."</td>\n"; |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | $paiement = new PaymentSalary($db); |
297 | 297 | $paiement->chid = $object->id; |
298 | 298 | $paiement->datepaye = $datep; |
299 | - $paiement->datev = $datev; |
|
299 | + $paiement->datev = $datev; |
|
300 | 300 | $paiement->amounts = array($object->id=>$amount); // Tableau de montant |
301 | 301 | $paiement->paiementtype = $type_payment; |
302 | 302 | $paiement->num_payment = GETPOST("num_payment", 'alphanohtml'); |
@@ -325,10 +325,10 @@ discard block |
||
325 | 325 | |
326 | 326 | if (GETPOST('saveandnew', 'alpha')) { |
327 | 327 | setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); |
328 | - header("Location: card.php?action=create&fk_project=" . urlencode($projectid) . "&accountid=" . urlencode($accountid) . '&paymenttype=' . urlencode(GETPOST('paymenttype', 'az09')) . '&datepday=' . GETPOST("datepday", 'int') . '&datepmonth=' . GETPOST("datepmonth", 'int') . '&datepyear=' . GETPOST("datepyear", 'int')); |
|
328 | + header("Location: card.php?action=create&fk_project=".urlencode($projectid)."&accountid=".urlencode($accountid).'&paymenttype='.urlencode(GETPOST('paymenttype', 'az09')).'&datepday='.GETPOST("datepday", 'int').'&datepmonth='.GETPOST("datepmonth", 'int').'&datepyear='.GETPOST("datepyear", 'int')); |
|
329 | 329 | exit; |
330 | 330 | } else { |
331 | - header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $object->id); |
|
331 | + header("Location: ".$_SERVER['PHP_SELF'].'?id='.$object->id); |
|
332 | 332 | exit; |
333 | 333 | } |
334 | 334 | } else { |
@@ -604,7 +604,7 @@ discard block |
||
604 | 604 | |
605 | 605 | // Auto create payment |
606 | 606 | print '<tr><td><label for="auto_create_paiement">'.$langs->trans('AutomaticCreationPayment').'</label></td>'; |
607 | - print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_paiement) ? '' : 'checked="checked"') . ' value="1"></td></tr>'."\n"; // Date payment |
|
607 | + print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" '.(empty($auto_create_paiement) ? '' : 'checked="checked"').' value="1"></td></tr>'."\n"; // Date payment |
|
608 | 608 | |
609 | 609 | // Bank |
610 | 610 | if (isModEnabled("banque")) { |
@@ -794,10 +794,10 @@ discard block |
||
794 | 794 | $userstatic = new User($db); |
795 | 795 | $result = $userstatic->fetch($object->fk_user); |
796 | 796 | if ($result > 0) { |
797 | - $morehtmlref .= '<br>' .$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1); |
|
797 | + $morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1); |
|
798 | 798 | } |
799 | 799 | } else { |
800 | - $morehtmlref .= '<br>' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1); |
|
800 | + $morehtmlref .= '<br>'.$form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1); |
|
801 | 801 | |
802 | 802 | if (!empty($object->fk_user)) { |
803 | 803 | $userstatic = new User($db); |
@@ -863,7 +863,7 @@ discard block |
||
863 | 863 | print "</td></tr>"; |
864 | 864 | } else { |
865 | 865 | print "<tr>"; |
866 | - print '<td class="titlefield">' . $langs->trans("DateStartPeriod") . '</td><td>'; |
|
866 | + print '<td class="titlefield">'.$langs->trans("DateStartPeriod").'</td><td>'; |
|
867 | 867 | print dol_print_date($object->datesp, 'day'); |
868 | 868 | print '</td></tr>'; |
869 | 869 | } |
@@ -874,7 +874,7 @@ discard block |
||
874 | 874 | print "</td></tr>"; |
875 | 875 | } else { |
876 | 876 | print "<tr>"; |
877 | - print '<td>' . $langs->trans("DateEndPeriod") . '</td><td>'; |
|
877 | + print '<td>'.$langs->trans("DateEndPeriod").'</td><td>'; |
|
878 | 878 | print dol_print_date($object->dateep, 'day'); |
879 | 879 | print '</td></tr>'; |
880 | 880 | } |
@@ -889,9 +889,9 @@ discard block |
||
889 | 889 | print '</td></tr>';*/ |
890 | 890 | |
891 | 891 | if ($action == 'edit') { |
892 | - print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . price($object->amount) . '"></td></tr>'; |
|
892 | + print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.price($object->amount).'"></td></tr>'; |
|
893 | 893 | } else { |
894 | - print '<tr><td>' . $langs->trans("Amount") . '</td><td><span class="amount">' . price($object->amount, 0, $langs, 1, -1, -1, $conf->currency) . '</span></td></tr>'; |
|
894 | + print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span></td></tr>'; |
|
895 | 895 | } |
896 | 896 | |
897 | 897 | // Default mode of payment |
@@ -1067,7 +1067,7 @@ discard block |
||
1067 | 1067 | if (empty($user->socid)) { |
1068 | 1068 | $canSendMail = true; |
1069 | 1069 | |
1070 | - print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=presend&token='.newToken().'&mode=init#formmailbeforetitle', '', $canSendMail); |
|
1070 | + print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle', '', $canSendMail); |
|
1071 | 1071 | } |
1072 | 1072 | } |
1073 | 1073 | |
@@ -1083,7 +1083,7 @@ discard block |
||
1083 | 1083 | |
1084 | 1084 | // Emit payment |
1085 | 1085 | if ($object->paye == 0 && ((price2num($object->amount) < 0 && $resteapayer < 0) || (price2num($object->amount) > 0 && $resteapayer > 0)) && $user->rights->salaries->write) { |
1086 | - print dolGetButtonAction('', $langs->trans('DoPayment'), 'default', DOL_URL_ROOT.'/salaries/paiement_salary.php?action=create&token='.newToken().'&id='. $object->id, ''); |
|
1086 | + print dolGetButtonAction('', $langs->trans('DoPayment'), 'default', DOL_URL_ROOT.'/salaries/paiement_salary.php?action=create&token='.newToken().'&id='.$object->id, ''); |
|
1087 | 1087 | } |
1088 | 1088 | |
1089 | 1089 | // Classify 'paid' |
@@ -1100,7 +1100,7 @@ discard block |
||
1100 | 1100 | if (!empty($user->rights->salaries->delete) && empty($totalpaid)) { |
1101 | 1101 | print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id, ''); |
1102 | 1102 | } else { |
1103 | - print dolGetButtonAction($langs->trans('DisabledBecausePayments'), $langs->trans('Delete'), 'default', $_SERVER['PHP_SELF'].'#', '', false); |
|
1103 | + print dolGetButtonAction($langs->trans('DisabledBecausePayments'), $langs->trans('Delete'), 'default', $_SERVER['PHP_SELF'].'#', '', false); |
|
1104 | 1104 | } |
1105 | 1105 | } |
1106 | 1106 | print "</div>"; |
@@ -201,7 +201,7 @@ |
||
201 | 201 | $tmplotstatic->eatby = $objp->eatby; |
202 | 202 | |
203 | 203 | print '<tr class="oddeven">'; |
204 | - print '<td class="nowraponall">'.img_picto($langs->trans("Ref").' '.$objp->mid, 'movement', 'class="pictofixedwidth"').dol_print_date($db->jdate($objp->datem), 'dayhour').'</td>'; |
|
204 | + print '<td class="nowraponall">'.img_picto($langs->trans("Ref").' '.$objp->mid, 'movement', 'class="pictofixedwidth"').dol_print_date($db->jdate($objp->datem), 'dayhour').'</td>'; |
|
205 | 205 | print '<td class="tdoverflowmax150">'; |
206 | 206 | print $producttmp->getNomUrl(1); |
207 | 207 | print "</td>\n"; |