@@ -24,7 +24,7 @@ |
||
| 24 | 24 | |
| 25 | 25 | ob_start(); |
| 26 | 26 | |
| 27 | -require 'config.inc.php'; // This include the main.inc.php |
|
| 27 | +require 'config.inc.php'; // This include the main.inc.php |
|
| 28 | 28 | require 'connector.lib.php'; |
| 29 | 29 | |
| 30 | 30 | if (!$Config['Enabled']) { |
@@ -550,7 +550,7 @@ |
||
| 550 | 550 | $langs->load($reg[1]); |
| 551 | 551 | } |
| 552 | 552 | |
| 553 | - $labeltoshow = preg_replace('/:.*$/', '', $object->label); |
|
| 553 | + $labeltoshow = preg_replace('/:.*$/', '', $object->label); |
|
| 554 | 554 | |
| 555 | 555 | $morehtmlref = '<div class="refidno">'; |
| 556 | 556 | $morehtmlref .= $langs->trans($labeltoshow); |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | print '<tr class="oddeven value">'; |
| 279 | 279 | // Param |
| 280 | 280 | print '<td>'; |
| 281 | -print img_picto('', 'bill', 'class="pictofixedwidth"') . $langs->trans('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT'); |
|
| 281 | +print img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT'); |
|
| 282 | 282 | print '</td>'; |
| 283 | 283 | // Value |
| 284 | 284 | print '<td class="right">'; // Do not force class=right, or it align also the content of the select box |
@@ -288,13 +288,13 @@ discard block |
||
| 288 | 288 | |
| 289 | 289 | if (isModEnabled('societe') && getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT') && getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT') != '-1') { |
| 290 | 290 | print '<tr class="oddeven">'; |
| 291 | - print '<td>' . img_picto('', 'bill', 'class="pictofixedwidth"') . $langs->trans("UseAuxiliaryAccountOnCustomerDeposit") . '</td>'; |
|
| 291 | + print '<td>'.img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("UseAuxiliaryAccountOnCustomerDeposit").'</td>'; |
|
| 292 | 292 | if (getDolGlobalInt('ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT')) { |
| 293 | - print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=0">'; |
|
| 293 | + print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=0">'; |
|
| 294 | 294 | print img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', 'warning'); |
| 295 | 295 | print '</a></td>'; |
| 296 | 296 | } else { |
| 297 | - print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=1">'; |
|
| 297 | + print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=1">'; |
|
| 298 | 298 | print img_picto($langs->trans("Disabled"), 'switch_off'); |
| 299 | 299 | print '</a></td>'; |
| 300 | 300 | } |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | print '<tr class="oddeven value">'; |
| 306 | 306 | // Param |
| 307 | 307 | print '<td>'; |
| 308 | -print img_picto('', 'supplier_invoice', 'class="pictofixedwidth"') . $langs->trans('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'); |
|
| 308 | +print img_picto('', 'supplier_invoice', 'class="pictofixedwidth"').$langs->trans('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'); |
|
| 309 | 309 | print '</td>'; |
| 310 | 310 | // Value |
| 311 | 311 | print '<td class="right">'; // Do not force class=right, or it align also the content of the select box |
@@ -315,13 +315,13 @@ discard block |
||
| 315 | 315 | |
| 316 | 316 | if (isModEnabled('societe') && getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT') && getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT') != '-1') { |
| 317 | 317 | print '<tr class="oddeven">'; |
| 318 | - print '<td>' . img_picto('', 'supplier_invoice', 'class="pictofixedwidth"') . $langs->trans("UseAuxiliaryAccountOnSupplierDeposit") . '</td>'; |
|
| 318 | + print '<td>'.img_picto('', 'supplier_invoice', 'class="pictofixedwidth"').$langs->trans("UseAuxiliaryAccountOnSupplierDeposit").'</td>'; |
|
| 319 | 319 | if (getDolGlobalInt('ACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT')) { |
| 320 | - print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=0">'; |
|
| 320 | + print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=0">'; |
|
| 321 | 321 | print img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', 'warning'); |
| 322 | 322 | print '</a></td>'; |
| 323 | 323 | } else { |
| 324 | - print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=1">'; |
|
| 324 | + print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=1">'; |
|
| 325 | 325 | print img_picto($langs->trans("Disabled"), 'switch_off'); |
| 326 | 326 | print '</a></td>'; |
| 327 | 327 | } |
@@ -100,14 +100,14 @@ |
||
| 100 | 100 | |
| 101 | 101 | // Param |
| 102 | 102 | $label = $langs->trans($key); |
| 103 | - print '<td><label for="' . $key . '">' . $label . '</label></td>'; |
|
| 103 | + print '<td><label for="'.$key.'">'.$label.'</label></td>'; |
|
| 104 | 104 | |
| 105 | 105 | // Value |
| 106 | 106 | print '<td>'; |
| 107 | 107 | if (isModEnabled('accounting')) { |
| 108 | 108 | print $formaccounting->select_account(getDolGlobalString($key), $key, 1, '', 1, 1); |
| 109 | 109 | } else { |
| 110 | - print '<input type="text" size="20" id="' . $key . '" name="' . $key . '" value="' . getDolGlobalString($key) . '">'; |
|
| 110 | + print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">'; |
|
| 111 | 111 | } |
| 112 | 112 | print '</td></tr>'; |
| 113 | 113 | } |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | |
| 57 | 57 | $type = $object->type; |
| 58 | 58 | if (is_numeric($type)) { |
| 59 | - $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility |
|
| 59 | + $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | |
| 48 | 48 | // Get parameters |
| 49 | 49 | $action = GETPOST('action', 'aZ09'); |
| 50 | -$search_prod = GETPOST('search_prod', 'alpha'); |
|
| 50 | +$search_prod = GETPOST('search_prod', 'alpha'); |
|
| 51 | 51 | $cancel = GETPOST('cancel', 'alpha'); |
| 52 | 52 | $search_label = GETPOST('search_label', 'alpha'); |
| 53 | 53 | $search_price = GETPOST('search_price'); |
@@ -95,7 +95,7 @@ |
||
| 95 | 95 | */ |
| 96 | 96 | |
| 97 | 97 | $parameters = array('id'=>$id); |
| 98 | -$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks |
|
| 98 | +$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks |
|
| 99 | 99 | if ($reshook < 0) { |
| 100 | 100 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
| 101 | 101 | } |
@@ -177,7 +177,7 @@ |
||
| 177 | 177 | $facavoir->fetch($facid); |
| 178 | 178 | $invoicecredits[] = $facavoir->getNomUrl(1); |
| 179 | 179 | } |
| 180 | - print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')'; |
|
| 180 | + print ' ('.$langs->transnoentities("InvoiceHasAvoir").implode(',', $invoicecredits).')'; |
|
| 181 | 181 | } |
| 182 | 182 | /* |
| 183 | 183 | if ($facidnext > 0) { |
@@ -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 | |