@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | } |
36 | 36 | |
37 | 37 | if (isModEnabled('accounting') && !is_object($formaccounting)) { |
38 | - require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; |
|
38 | + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php'; |
|
39 | 39 | $formaccounting = new FormAccounting($db); |
40 | 40 | } |
41 | 41 | |
@@ -63,13 +63,13 @@ discard block |
||
63 | 63 | print '<div class="underbanner clearboth"></div>'; |
64 | 64 | print '<table class="border centpercent tableforfield">'; |
65 | 65 | foreach ($mode_info['fields'] as $field_key => $field_info) { |
66 | - $html_name = $mode_key . '_' . $field_key; |
|
67 | - print '<tr><td class="titlefieldcreate">' . $langs->trans($field_info['label']) . '</td><td colspan="3">'; |
|
66 | + $html_name = $mode_key.'_'.$field_key; |
|
67 | + print '<tr><td class="titlefieldcreate">'.$langs->trans($field_info['label']).'</td><td colspan="3">'; |
|
68 | 68 | $accountancy_code = GETPOSTISSET($html_name) ? GETPOST($html_name, 'aZ09') : (!empty($assetaccountancycodes->accountancy_codes[$mode_key][$field_key]) ? $assetaccountancycodes->accountancy_codes[$mode_key][$field_key] : ''); |
69 | 69 | if (isModEnabled('accounting')) { |
70 | 70 | print $formaccounting->select_account($accountancy_code, $html_name, 1, null, 1, 1, 'minwidth150 maxwidth300', 1); |
71 | 71 | } else { |
72 | - print '<input name="' . $html_name . '" class="maxwidth200" value="' . dol_escape_htmltag($accountancy_code) . '">'; |
|
72 | + print '<input name="'.$html_name.'" class="maxwidth200" value="'.dol_escape_htmltag($accountancy_code).'">'; |
|
73 | 73 | } |
74 | 74 | print '</td></tr>'; |
75 | 75 | } |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | } |
182 | 182 | if (GETPOSTISSET('supplier_invoice_id')) { |
183 | 183 | $object->fields['supplier_invoice_id'] = array('type' => 'integer:FactureFournisseur:fourn/class/fournisseur.facture.class.php:1:entity IN (__SHARED_ENTITIES__)', 'label' => 'SupplierInvoice', 'enabled' => '1', 'noteditable' => '1', 'position' => 280, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'validate' => '1',); |
184 | - print '<input type="hidden" name="supplier_invoice_id" value="' . GETPOST('supplier_invoice_id', 'int') . '">'; |
|
184 | + print '<input type="hidden" name="supplier_invoice_id" value="'.GETPOST('supplier_invoice_id', 'int').'">'; |
|
185 | 185 | } |
186 | 186 | |
187 | 187 | print dol_get_fiche_head(array(), ''); |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | array('type' => 'checkbox', 'name' => 'disposal_depreciated', 'label' => $langs->trans("AssetDisposalDepreciated"), 'value' => $disposal_depreciated), |
285 | 285 | array('type' => 'checkbox', 'name' => 'disposal_subject_to_vat', 'label' => $langs->trans("AssetDisposalSubjectToVat"), 'value' => $disposal_subject_to_vat), |
286 | 286 | ); |
287 | - $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('AssetDisposal'), $langs->trans('AssetConfirmDisposalAsk', $object->ref . ' - ' . $object->label), 'confirm_disposal', $formquestion, 'yes', 1); |
|
287 | + $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('AssetDisposal'), $langs->trans('AssetConfirmDisposalAsk', $object->ref.' - '.$object->label), 'confirm_disposal', $formquestion, 'yes', 1); |
|
288 | 288 | } elseif ($action == 'reopen') { |
289 | 289 | // Re-open |
290 | 290 | // Create an array for form |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | print '<table class="border centpercent tableforfield">'."\n"; |
329 | 329 | |
330 | 330 | // Common attributes |
331 | - $keyforbreak='date_acquisition'; // We change column just before this field |
|
331 | + $keyforbreak = 'date_acquisition'; // We change column just before this field |
|
332 | 332 | //unset($object->fields['fk_project']); // Hide field already shown in banner |
333 | 333 | //unset($object->fields['fk_soc']); // Hide field already shown in banner |
334 | 334 | include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php'; |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | |
347 | 347 | // Buttons for actions |
348 | 348 | if ($action != 'presend' && $action != 'editline') { |
349 | - print '<div class="tabsAction">' . "\n"; |
|
349 | + print '<div class="tabsAction">'."\n"; |
|
350 | 350 | $parameters = array(); |
351 | 351 | $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
352 | 352 | if ($reshook < 0) { |
@@ -356,26 +356,26 @@ discard block |
||
356 | 356 | if (empty($reshook)) { |
357 | 357 | // Send |
358 | 358 | if (empty($user->socid)) { |
359 | - print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init&token=' . newToken() . '#formmailbeforetitle'); |
|
359 | + print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init&token='.newToken().'#formmailbeforetitle'); |
|
360 | 360 | } |
361 | 361 | |
362 | 362 | if ($object->status == $object::STATUS_DRAFT) { |
363 | - print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd); |
|
363 | + print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd); |
|
364 | 364 | } |
365 | 365 | |
366 | 366 | // Clone |
367 | 367 | //print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=clone&token=' . newToken(), '', false && $permissiontoadd); |
368 | 368 | |
369 | 369 | if ($object->status == $object::STATUS_DRAFT) { |
370 | - print dolGetButtonAction($langs->trans('AssetDisposal'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=disposal&token=' . newToken(), '', $permissiontoadd); |
|
370 | + print dolGetButtonAction($langs->trans('AssetDisposal'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disposal&token='.newToken(), '', $permissiontoadd); |
|
371 | 371 | } else { |
372 | - print dolGetButtonAction($langs->trans('ReOpen'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=reopen&token=' . newToken(), '', $permissiontoadd); |
|
372 | + print dolGetButtonAction($langs->trans('ReOpen'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen&token='.newToken(), '', $permissiontoadd); |
|
373 | 373 | } |
374 | 374 | |
375 | 375 | // Delete (need delete permission, or if draft, just need create/modify permission) |
376 | - print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=delete&token=' . newToken(), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd)); |
|
376 | + print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken(), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd)); |
|
377 | 377 | } |
378 | - print '</div>' . "\n"; |
|
378 | + print '</div>'."\n"; |
|
379 | 379 | } |
380 | 380 | |
381 | 381 | // Select mail models is same action as presend |
@@ -234,7 +234,7 @@ |
||
234 | 234 | } |
235 | 235 | } |
236 | 236 | // For the case type is not 'system...' neither 'module', we just check module is on |
237 | - if (! in_array($obj->type, array('system', 'systemauto', 'module', 'moduleauto'))) { |
|
237 | + if (!in_array($obj->type, array('system', 'systemauto', 'module', 'moduleauto'))) { |
|
238 | 238 | $tmpmodule = $obj->module; |
239 | 239 | //var_dump($tmpmodule); |
240 | 240 | if ($tmpmodule && isset($conf->$tmpmodule) && isModEnabled($tmpmodule)) { |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $customerStatic->loadCacheOfProspStatus(); |
126 | 126 | if (!empty($customerStatic->cacheprospectstatus)) { |
127 | 127 | foreach ($customerStatic->cacheprospectstatus as $dataProspectSt) { |
128 | - $this->type_statuscommprospect[$dataProspectSt['id']]=$dataProspectSt['label']; |
|
128 | + $this->type_statuscommprospect[$dataProspectSt['id']] = $dataProspectSt['label']; |
|
129 | 129 | } |
130 | 130 | } else { |
131 | 131 | $this->type_statuscommprospect = array( |
@@ -628,7 +628,7 @@ discard block |
||
628 | 628 | } |
629 | 629 | } elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') { |
630 | 630 | if ($arrayquery['options_'.$key] > 0) { |
631 | - $sqlwhere[]= " (te.".$key." = ".((int) $arrayquery["options_".$key]).")"; |
|
631 | + $sqlwhere[] = " (te.".$key." = ".((int) $arrayquery["options_".$key]).")"; |
|
632 | 632 | } |
633 | 633 | } else { |
634 | 634 | if (is_array($arrayquery['options_'.$key])) { |
@@ -118,7 +118,7 @@ |
||
118 | 118 | if ($action == 'add' && $permissiontoadd) { |
119 | 119 | $object->label = trim($label); |
120 | 120 | $object->type = trim($exporttype); |
121 | - $object->type_declaration = $type_declaration; |
|
121 | + $object->type_declaration = $type_declaration; |
|
122 | 122 | //$object->subscription = (int) $subscription; |
123 | 123 | |
124 | 124 | // Fill array 'array_options' with data from add form |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | public $picto = 'intracommreport'; |
57 | 57 | |
58 | 58 | |
59 | - public $label; // ref ??? |
|
59 | + public $label; // ref ??? |
|
60 | 60 | |
61 | 61 | public $period; |
62 | 62 | |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public $declaration_number; |
69 | 69 | |
70 | - public $type_declaration; // deb or des |
|
70 | + public $type_declaration; // deb or des |
|
71 | 71 | |
72 | 72 | |
73 | 73 | /** |
@@ -95,7 +95,7 @@ |
||
95 | 95 | // Create a line of payments |
96 | 96 | $payment = new PaymentDonation($db); |
97 | 97 | $payment->chid = $chid; |
98 | - $payment->datep = $datepaid; |
|
98 | + $payment->datep = $datepaid; |
|
99 | 99 | $payment->amounts = $amounts; // Tableau de montant |
100 | 100 | $payment->paymenttype = GETPOST("paymenttype", 'int'); |
101 | 101 | $payment->num_payment = GETPOST("num_payment", 'alphanohtml'); |
@@ -81,7 +81,7 @@ |
||
81 | 81 | } |
82 | 82 | $result = restrictedArea($user, 'don', $object->id); |
83 | 83 | |
84 | -$permissiontoadd = $user->rights->don->creer; // Used by the include of actions_dellink.inc.php |
|
84 | +$permissiontoadd = $user->rights->don->creer; // Used by the include of actions_dellink.inc.php |
|
85 | 85 | |
86 | 86 | |
87 | 87 | /* |
@@ -64,8 +64,8 @@ discard block |
||
64 | 64 | |
65 | 65 | public $amounts = array(); // Array of amounts |
66 | 66 | |
67 | - public $fk_typepayment; // Payment mode ID |
|
68 | - public $paymenttype; // Payment mode ID or Code. TODO Use only the code in this field. |
|
67 | + public $fk_typepayment; // Payment mode ID |
|
68 | + public $paymenttype; // Payment mode ID or Code. TODO Use only the code in this field. |
|
69 | 69 | |
70 | 70 | public $num_payment; |
71 | 71 | |
@@ -269,8 +269,8 @@ discard block |
||
269 | 269 | $this->tms = $this->db->jdate($obj->tms); |
270 | 270 | $this->datep = $this->db->jdate($obj->datep); |
271 | 271 | $this->amount = $obj->amount; |
272 | - $this->fk_typepayment = $obj->fk_typepayment; // Id on type of payent |
|
273 | - $this->paymenttype = $obj->fk_typepayment; // Id on type of payment. We should store the code into paymenttype. |
|
272 | + $this->fk_typepayment = $obj->fk_typepayment; // Id on type of payent |
|
273 | + $this->paymenttype = $obj->fk_typepayment; // Id on type of payment. We should store the code into paymenttype. |
|
274 | 274 | $this->num_payment = $obj->num_payment; |
275 | 275 | $this->note_public = $obj->note_public; |
276 | 276 | $this->fk_bank = $obj->fk_bank; |
@@ -688,7 +688,7 @@ discard block |
||
688 | 688 | } |
689 | 689 | |
690 | 690 | global $action; |
691 | - $hookmanager->initHooks(array($this->element . 'dao')); |
|
691 | + $hookmanager->initHooks(array($this->element.'dao')); |
|
692 | 692 | $parameters = array('id'=>$this->id, 'getnomurl' => &$result); |
693 | 693 | $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks |
694 | 694 | if ($reshook > 0) { |