@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | } |
253 | 253 | } |
254 | 254 | if (empty($error)) { |
255 | - header("Location: card.php?id=" . $object->id); |
|
255 | + header("Location: card.php?id=".$object->id); |
|
256 | 256 | exit; |
257 | 257 | } |
258 | 258 | } |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | } else { |
308 | 308 | $result = $object->fetch($id); |
309 | 309 | |
310 | - $object->amount = $amount; |
|
310 | + $object->amount = $amount; |
|
311 | 311 | |
312 | 312 | $result = $object->update($user); |
313 | 313 | if ($result <= 0) { |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | |
470 | 470 | // Auto create payment |
471 | 471 | print '<tr><td><label for="auto_create_paiement">'.$langs->trans('AutomaticCreationPayment').'</label></td>'; |
472 | - print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_payment) ? '' : 'checked="checked"') . ' value="1"></td></tr>'."\n"; |
|
472 | + print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" '.(empty($auto_create_payment) ? '' : 'checked="checked"').' value="1"></td></tr>'."\n"; |
|
473 | 473 | |
474 | 474 | print '<tr class="hide_if_no_auto_create_payment">'; |
475 | 475 | print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>'; |
@@ -609,9 +609,9 @@ discard block |
||
609 | 609 | print '</td></tr>'; |
610 | 610 | |
611 | 611 | if ($action == 'edit') { |
612 | - print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . price($object->amount) . '"></td></tr>'; |
|
612 | + print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.price($object->amount).'"></td></tr>'; |
|
613 | 613 | } else { |
614 | - print '<tr><td>' . $langs->trans("Amount") . '</td><td>' . price($object->amount) . '</td></tr>'; |
|
614 | + print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>'; |
|
615 | 615 | } |
616 | 616 | |
617 | 617 | // Mode of payment |
@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | $month_current = dol_print_date(dol_now(), "%m"); |
53 | 53 | $year_start = $year - $nbofyear + (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1); |
54 | 54 | } |
55 | -$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
56 | -$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
55 | +$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
56 | +$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
57 | 57 | |
58 | 58 | // We define date_start and date_end |
59 | 59 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | $sql .= " AND b.doc_type = 'customer_invoice'"; |
256 | 256 | $sql .= " AND aa.entity = ".$conf->entity; |
257 | 257 | $sql .= " AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'"; |
258 | - $sql .= " AND aa.pcg_type = 'INCOME'"; // TODO Be able to use a custom group |
|
258 | + $sql .= " AND aa.pcg_type = 'INCOME'"; // TODO Be able to use a custom group |
|
259 | 259 | } |
260 | 260 | $sql .= " GROUP BY dm"; |
261 | 261 | $sql .= " ORDER BY dm"; |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | $this->type_payment = $obj->fk_typepayment; |
307 | 307 | $this->num_payment = $obj->num_payment; |
308 | 308 | $this->label = $obj->label; |
309 | - $this->note = $obj->note_private; // For backward compatibility |
|
309 | + $this->note = $obj->note_private; // For backward compatibility |
|
310 | 310 | $this->note_private = $obj->note_private; |
311 | 311 | $this->subledger_account = $obj->subledger_account; |
312 | 312 | $this->accountancy_code = $obj->accountancy_code; |
@@ -486,7 +486,7 @@ discard block |
||
486 | 486 | $sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : 0); |
487 | 487 | $sql .= ", ".((int) $user->id); |
488 | 488 | $sql .= ", '".$this->db->idate($now)."'"; |
489 | - $sql .= ", NULL"; // Filled later |
|
489 | + $sql .= ", NULL"; // Filled later |
|
490 | 490 | $sql .= ", ".((int) $conf->entity); |
491 | 491 | $sql .= ")"; |
492 | 492 |
@@ -45,8 +45,8 @@ |
||
45 | 45 | |
46 | 46 | const STATUS_DRAFT = 0; |
47 | 47 | const STATUS_NOT_USED = 1; |
48 | - const STATUS_CREDITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type |
|
49 | - const STATUS_DEBITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type |
|
48 | + const STATUS_CREDITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type |
|
49 | + const STATUS_DEBITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type |
|
50 | 50 | const STATUS_REJECTED = 3; |
51 | 51 | |
52 | 52 |
@@ -124,8 +124,8 @@ |
||
124 | 124 | // Ref customer |
125 | 125 | //$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', 0, 1); |
126 | 126 | //$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', null, null, '', 1); |
127 | - $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1); |
|
128 | - $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1); |
|
127 | + $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1); |
|
128 | + $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1); |
|
129 | 129 | // Thirdparty |
130 | 130 | $morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'customer'); |
131 | 131 | // Project |
@@ -142,12 +142,12 @@ |
||
142 | 142 | $messagewarning .= '</div>'; |
143 | 143 | |
144 | 144 | if ($result <= 0 && $edituser->error == 'USERNOTFOUND') { |
145 | - usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
145 | + usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
146 | 146 | $message .= $messagewarning; |
147 | 147 | $username = ''; |
148 | 148 | } else { |
149 | 149 | if (empty($edituser->email)) { |
150 | - usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
150 | + usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
151 | 151 | $message .= $messagewarning; |
152 | 152 | } else { |
153 | 153 | $newpassword = $edituser->setPassword($user, '', 1); |
@@ -42,7 +42,7 @@ |
||
42 | 42 | |
43 | 43 | $type = GETPOST('type', 'alpha'); |
44 | 44 | $value = GETPOST('value', 'alpha'); |
45 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
45 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
46 | 46 | |
47 | 47 | $label = GETPOST('label', 'alpha'); |
48 | 48 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -199,12 +199,12 @@ discard block |
||
199 | 199 | print '<div class="div-table-responsive-no-min">'; |
200 | 200 | print '<table class="noborder centpercent">'; |
201 | 201 | print '<tr class="liste_titre">'; |
202 | -print getTitleFieldOfList('Name', 0, $_SERVER['PHP_SELF'], 'name', '', $param, '', $sortfield, $sortorder, '') . "\n"; |
|
202 | +print getTitleFieldOfList('Name', 0, $_SERVER['PHP_SELF'], 'name', '', $param, '', $sortfield, $sortorder, '')."\n"; |
|
203 | 203 | print getTitleFieldOfList("Value", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder); |
204 | 204 | print getTitleFieldOfList("Comment", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder); |
205 | -print getTitleFieldOfList('DateModificationShort', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ') . "\n"; |
|
205 | +print getTitleFieldOfList('DateModificationShort', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n"; |
|
206 | 206 | if (isModEnabled('multicompany') && !$user->entity) { |
207 | - print getTitleFieldOfList('Entity', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ') . "\n"; |
|
207 | + print getTitleFieldOfList('Entity', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n"; |
|
208 | 208 | } |
209 | 209 | print getTitleFieldOfList("", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center '); |
210 | 210 | print "</tr>\n"; |
@@ -227,12 +227,12 @@ discard block |
||
227 | 227 | // Limit to superadmin |
228 | 228 | if (isModEnabled('multicompany') && !$user->entity) { |
229 | 229 | print '<td>'; |
230 | - print '<input type="text" class="flat" size="1" name="entity" value="' . $conf->entity . '">'; |
|
230 | + print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">'; |
|
231 | 231 | print '</td>'; |
232 | 232 | print '<td class="center">'; |
233 | 233 | } else { |
234 | 234 | print '<td class="center">'; |
235 | - print '<input type="hidden" name="entity" value="' . $conf->entity . '">'; |
|
235 | + print '<input type="hidden" name="entity" value="'.$conf->entity.'">'; |
|
236 | 236 | } |
237 | 237 | print '<input type="submit" class="button button-add small" id="add" name="add" value="'.$langs->trans("Add").'">'; |
238 | 238 | print "</td>\n"; |
@@ -56,8 +56,8 @@ |
||
56 | 56 | |
57 | 57 | // Permissions |
58 | 58 | $permissionnote = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); // Used by the include of actions_setnotes.inc.php |
59 | -$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
60 | -$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
59 | +$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
60 | +$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
61 | 61 | |
62 | 62 | |
63 | 63 | /* |