Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-14 08:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix phpcs

Browse Source
This commit is contained in:
Laurent Destailleur
2023-10-16 02:50:05 +02:00
parent 251ccf85ea
commit 0ab330102f
8 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/admin/modules.php
View File

@@ -1157,8 +1157,7 @@ if ($mode == 'marketplace') {
</tbody>
</table>
</div>
<?php
<?php
}
}

2
htdocs/core/class/html.form.class.php
View File

@@ -2250,7 +2250,6 @@ class Form
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return select list of users. Selected users are stored into session.
* List of users are provided into $_SESSION['assignedtouser'].
@@ -2344,6 +2343,7 @@ class Form
return $out;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return select list of resources. Selected resources are stored into session.
* List of resources are provided into $_SESSION['assignedtoresource'].

4
htdocs/core/tpl/contacts.tpl.php
View File

@@ -2,7 +2,7 @@
/* Copyright (C) 2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2013-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015-2016 Charlie BENKE <charlie@patas-monkey.com>
* Copyright (C) 2021 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2021 Frédéric France <frederic.france@netlogic.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -176,7 +176,7 @@ if ($permission) {
</div>
</form>
<?php
<?php
}
print "</div>";

4
htdocs/core/tpl/login.tpl.php
View File

@@ -115,7 +115,7 @@ if (!empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) {
// For example $conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND = 'https://source.unsplash.com/random'
?>
<body class="body bodylogin" style="background-image: url('<?php echo dol_escape_htmltag($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND); ?>'); background-repeat: no-repeat; background-position: center center; background-attachment: fixed; background-size: cover; background-color: #ffffff;">
<?php
<?php
} else {
?>
<body class="body bodylogin"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file=logos/'.urlencode($conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>
@@ -247,7 +247,7 @@ if (!empty($captcha)) {
</span>
</div></div>
<?php
<?php
}
if (!empty($morelogincontent)) {

8
htdocs/core/tpl/objectline_create.tpl.php
View File

@@ -116,7 +116,7 @@ if ($nolinesbefore) {
if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier' || $object->element == 'invoice_supplier_rec') { // We must have same test in printObjectLines
?>
<td class="linecolrefsupplier"><span id="title_fourn_ref"><?php echo $langs->trans('SupplierRef'); ?></span></td>
<?php
<?php
}
?>
<td class="linecolvat right"><span id="title_vat"><?php echo $langs->trans('VAT'); ?></span></td>
@@ -846,13 +846,13 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
?>
console.log("Countries are both IN and states are same, so we revert I into CS in default_vat_code="+default_vat_code);
new_default_vat_code = default_vat_code.replace(/^I\-/, 'C+S-');
<?php
<?php
} elseif ($mysoc->country_code == 'IN' && !empty($object->thirdparty) && $object->thirdparty->country_code == 'IN' && $mysoc->state_code != $object->thirdparty->state_code) {
// We are in India and states differs, we revert the vat code "CS-x" into "I-x"
?>
console.log("Countries are both IN and states differs, so we revert CS into I in default_vat_code="+default_vat_code);
new_default_vat_code = default_vat_code.replace(/^C\+S\-/, 'I-');
<?php
<?php
}
?>
if (new_default_vat_code != default_vat_code && jQuery('#tva_tx option:contains("'+new_default_vat_code+'")').val()) {
@@ -1195,7 +1195,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
<?php if (GETPOST('prod_entry_mode') == 'predef') { // When we submit with a predef product and it fails we must start with predef ?>
setforpredef();
<?php } ?>
<?php } ?>
});
/* Function to set fields visibility after selecting a free product */

2
htdocs/core/tpl/passwordforgotten.tpl.php
View File

@@ -179,7 +179,7 @@ if (!empty($captcha)) {
</span>
</div></div>
<?php
<?php
}
if (!empty($morelogincontent)) {

2
htdocs/core/tpl/passwordreset.tpl.php
View File

@@ -220,7 +220,7 @@ if (!empty($captcha)) {
</span>
</div></div>
<?php
<?php
}
if (!empty($morelogincontent)) {

2
htdocs/modulebuilder/template/test/phpunit/functionnal/MyModuleFunctionalTest.php
View File

@@ -24,7 +24,7 @@
* Put detailed description here.
*/
namespace test\functional;
namespace Dolibarr\test\functional;
use PHPUnit_Extensions_Selenium2TestCase_WebDriverException;