@@ -434,7 +434,7 @@ |
||
434 | 434 | $invoicecredits[] = $facavoir->getNomUrl(1); |
435 | 435 | } |
436 | 436 | print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir"); |
437 | - print ' '. (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits); |
|
437 | + print ' '.(count($invoicecredits) ? ' ' : '').implode(',', $invoicecredits); |
|
438 | 438 | print '</span>'; |
439 | 439 | } |
440 | 440 | /* |
@@ -99,8 +99,8 @@ discard block |
||
99 | 99 | $month_current = dol_print_date(dol_now(), '%m'); |
100 | 100 | $year_start = $year; |
101 | 101 | } |
102 | -$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
103 | -$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
102 | +$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
103 | +$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
104 | 104 | // Quarter |
105 | 105 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
106 | 106 | $q = GETPOST("q", "int") ?GETPOST("q", "int") : 0; |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | $headerparams = array_merge($commonparams, $headerparams); |
180 | 180 | $tableparams = array_merge($commonparams, $tableparams); |
181 | 181 | |
182 | -$paramslink=""; |
|
182 | +$paramslink = ""; |
|
183 | 183 | foreach ($allparams as $key => $value) { |
184 | 184 | $paramslink .= '&'.$key.'='.$value; |
185 | 185 | } |
@@ -203,8 +203,8 @@ discard block |
||
203 | 203 | $modecompta = "RECETTES-DEPENSES"; |
204 | 204 | } |
205 | 205 | |
206 | -$exportlink=""; |
|
207 | -$namelink=""; |
|
206 | +$exportlink = ""; |
|
207 | +$namelink = ""; |
|
208 | 208 | |
209 | 209 | // Show report header |
210 | 210 | if ($modecompta == "CREANCES-DETTES") { |
@@ -394,7 +394,7 @@ |
||
394 | 394 | print '<tr class="oddeven" height="24">'; |
395 | 395 | print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>'; |
396 | 396 | print '<td class="right">'.$val['nb'].'</td>'; |
397 | - print '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']): "0").'%</td>'; |
|
397 | + print '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']) : "0").'%</td>'; |
|
398 | 398 | print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>'; |
399 | 399 | print '<td class="right opacitylow" style="'.((!isset($val['total_diff']) || $val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['total_diff']) ? round($val['total_diff']) : "0").'%</td>'; |
400 | 400 | print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>'; |
@@ -66,26 +66,26 @@ |
||
66 | 66 | $rep = new stdClass(); |
67 | 67 | $rep->response_status = 0; |
68 | 68 | $rep->data = null; |
69 | -$rep->error = '';//@todo deprecated use error_message instead |
|
69 | +$rep->error = ''; //@todo deprecated use error_message instead |
|
70 | 70 | $rep->errorMessage = ''; |
71 | 71 | |
72 | 72 | |
73 | 73 | if (empty($fk_expense) || $fk_expense < 0) { |
74 | - $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense'); |
|
74 | + $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense'); |
|
75 | 75 | } elseif (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) { |
76 | - $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat'); |
|
76 | + $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat'); |
|
77 | 77 | |
78 | 78 | $rep->response_status = 'error'; |
79 | 79 | } else { |
80 | 80 | // @see ndfp.class.php:3576 (method: compute_total_km) |
81 | 81 | $expense = new ExpenseReport($db); |
82 | 82 | if ($expense->fetch($fk_expense) <= 0) { |
83 | - $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound'); |
|
83 | + $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound'); |
|
84 | 84 | $rep->response_status = 'error'; |
85 | 85 | } else { |
86 | 86 | $userauthor = new User($db); |
87 | 87 | if ($userauthor->fetch($expense->fk_user_author) <= 0) { |
88 | - $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound'); |
|
88 | + $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound'); |
|
89 | 89 | $rep->response_status = 'error'; |
90 | 90 | } else { |
91 | 91 | $expense = new ExpenseReport($db); |
@@ -113,7 +113,7 @@ |
||
113 | 113 | $out .= '>'.$langs->trans("AutoDetectLang").'</option>'; |
114 | 114 | } |
115 | 115 | |
116 | - asort($langs_available); // array('XX' => 'Language (Country)', ...) |
|
116 | + asort($langs_available); // array('XX' => 'Language (Country)', ...) |
|
117 | 117 | |
118 | 118 | foreach ($langs_available as $key => $value) { |
119 | 119 | $valuetoshow = $value; |
@@ -88,21 +88,21 @@ discard block |
||
88 | 88 | $error = 0; |
89 | 89 | |
90 | 90 | $codecontact = dol_getIdFromCode($db, $typeid, 'c_type_contact', 'rowid', 'code'); |
91 | - if ($codecontact=='SUPPORTTEC') { |
|
91 | + if ($codecontact == 'SUPPORTTEC') { |
|
92 | 92 | $internal_contacts = $object->listeContact(-1, 'internal', 0, 'SUPPORTTEC'); |
93 | 93 | foreach ($internal_contacts as $key => $contact) { |
94 | 94 | if ($contact['id'] !== $contactid) { |
95 | 95 | //print "user à effacer : ".$useroriginassign; |
96 | 96 | $result = $object->delete_contact($contact['rowid']); |
97 | - if ($result<0) { |
|
98 | - $error ++; |
|
97 | + if ($result < 0) { |
|
98 | + $error++; |
|
99 | 99 | setEventMessages($object->error, $object->errors, 'errors'); |
100 | 100 | } |
101 | 101 | } |
102 | 102 | } |
103 | 103 | $ret = $object->assignUser($user, $contactid); |
104 | 104 | if ($ret < 0) { |
105 | - $error ++; |
|
105 | + $error++; |
|
106 | 106 | setEventMessages($object->error, $object->errors, 'errors'); |
107 | 107 | } |
108 | 108 | } |
@@ -139,10 +139,10 @@ discard block |
||
139 | 139 | if ($object->fetch($id, '', $track_id)) { |
140 | 140 | $internal_contacts = $object->listeContact(-1, 'internal', 0, 'SUPPORTTEC'); |
141 | 141 | foreach ($internal_contacts as $key => $contact) { |
142 | - if ($contact['rowid'] == $lineid && $object->fk_user_assign==$contact['id']) { |
|
142 | + if ($contact['rowid'] == $lineid && $object->fk_user_assign == $contact['id']) { |
|
143 | 143 | $ret = $object->assignUser($user, null); |
144 | 144 | if ($ret < 0) { |
145 | - $error ++; |
|
145 | + $error++; |
|
146 | 146 | setEventMessages($object->error, $object->errors, 'errors'); |
147 | 147 | } |
148 | 148 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | * \brief Class file used to generate the dispatch slips for the Eagle model |
28 | 28 | */ |
29 | 29 | |
30 | -require_once DOL_DOCUMENT_ROOT . '/core/modules/stocktransfer/modules_stocktransfer.php'; |
|
30 | +require_once DOL_DOCUMENT_ROOT.'/core/modules/stocktransfer/modules_stocktransfer.php'; |
|
31 | 31 | require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; |
32 | 32 | require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; |
33 | 33 | require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; |
@@ -415,7 +415,7 @@ discard block |
||
415 | 415 | $curY = $tab_top + 7; |
416 | 416 | $nexY = $tab_top + 7; |
417 | 417 | |
418 | - $TCacheEntrepots=array(); |
|
418 | + $TCacheEntrepots = array(); |
|
419 | 419 | // Loop on each lines |
420 | 420 | for ($i = 0; $i < $nblines; $i++) { |
421 | 421 | $curY = $nexY; |
@@ -720,7 +720,7 @@ discard block |
||
720 | 720 | $totalQty = 0; |
721 | 721 | if (!empty($object->lines)) |
722 | 722 | foreach ($object->lines as $line) { |
723 | - $totalQty+=$line->qty; |
|
723 | + $totalQty += $line->qty; |
|
724 | 724 | } |
725 | 725 | // Set trueVolume and volume_units not currently stored into database |
726 | 726 | if ($object->trueWidth && $object->trueHeight && $object->trueDepth) { |
@@ -844,8 +844,8 @@ discard block |
||
844 | 844 | |
845 | 845 | $pdf->line($this->posxwarehousedestination - 1, $tab_top, $this->posxwarehousedestination - 1, $tab_top + $tab_height); |
846 | 846 | if (empty($hidetop)) { |
847 | - $pdf->SetXY($this->posxwarehousedestination-2.5, $tab_top + 1); |
|
848 | - $pdf->MultiCell(($this->posxpuht - $this->posxwarehousedestination+4), 2, $outputlangs->transnoentities("WarehouseTarget"), '', 'C'); |
|
847 | + $pdf->SetXY($this->posxwarehousedestination - 2.5, $tab_top + 1); |
|
848 | + $pdf->MultiCell(($this->posxpuht - $this->posxwarehousedestination + 4), 2, $outputlangs->transnoentities("WarehouseTarget"), '', 'C'); |
|
849 | 849 | } |
850 | 850 | |
851 | 851 | /*if (!empty($conf->global->STOCKTRANSFER_PDF_DISPLAY_AMOUNT_HT)) { |
@@ -615,7 +615,7 @@ |
||
615 | 615 | |
616 | 616 | $ref = dol_sanitizeFileName($newref); |
617 | 617 | $pdf_path = $dir_output."/".$ref.".pdf"; |
618 | - if (!dol_is_file($pdf_path)||(is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0 && !$arraydefaultmessage->joinfiles)) { |
|
618 | + if (!dol_is_file($pdf_path) || (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0 && !$arraydefaultmessage->joinfiles)) { |
|
619 | 619 | // We can't add PDF as it is not generated yet. |
620 | 620 | $filepdf = ''; |
621 | 621 | } else { |
@@ -340,7 +340,7 @@ |
||
340 | 340 | $staticrecruitmentcandidature = new RecruitmentCandidature($db); |
341 | 341 | $staticrecruitmentjobposition = new RecruitmentJobPosition($db); |
342 | 342 | $sql = "SELECT rc.rowid, rc.ref, rc.email, rc.lastname, rc.firstname, rc.date_creation, rc.tms, rc.status,"; |
343 | - $sql.= " rp.rowid as jobid, rp.ref as jobref, rp.label"; |
|
343 | + $sql .= " rp.rowid as jobid, rp.ref as jobref, rp.label"; |
|
344 | 344 | $sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc"; |
345 | 345 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as rp ON rc.fk_recruitmentjobposition = rp.rowid"; |
346 | 346 | if (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$socid) { |