lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10836 from frederic34/patch-5

Browse Source 
phpcs fix
This commit is contained in:
Laurent Destailleur 2019-03-14 16:47:16 +01:00 committed by GitHub
commit 09d015c14c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/propal.php
View File

@ -519,7 +519,7 @@ print '</table>';
if (empty($conf->facture->enabled)) if (empty($conf->facture->enabled))
{ {
print '<br>'; print '<br>';
print load_fiche_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInProposal"),'',''); print load_fiche_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInProposal"), '', '');
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
@ -601,7 +601,7 @@ if (empty($conf->facture->enabled))
print '<option value="'.$row[0].'"'; print '<option value="'.$row[0].'"';
print $conf->global->FACTURE_CHQ_NUMBER == $row[0] ? ' selected':''; print $conf->global->FACTURE_CHQ_NUMBER == $row[0] ? ' selected':'';
print '>'.$langs->trans("OwnerOfBankAccount",$row[1]).'</option>'; print '>'.$langs->trans("OwnerOfBankAccount", $row[1]).'</option>';
$i++; $i++;
} }

10
htdocs/compta/resultat/result.php
View File

@ -288,13 +288,13 @@ elseif ($modecompta=="BOOKKEEPING")
$j=1; $j=1;
$sommes = array(); $sommes = array();
$totPerAccount = array(); $totPerAccount = array();
if (!is_array($cats) && $cats < 0) { if (! is_array($cats) && $cats < 0) {
setEventMessages(null, $AccCat->errors, 'errors'); setEventMessages(null, $AccCat->errors, 'errors');
} elseif (is_array($cats) && count($cats)>0) { } elseif (is_array($cats) && count($cats)>0) {
foreach ($cats as $cat) // Loop on each group foreach ($cats as $cat) {
{ // Loop on each group
if (!empty($cat['category_type'])) // category calculed if (!empty($cat['category_type'])) {
{ // category calculed
// When we enter here, $sommes was filled by group of accounts // When we enter here, $sommes was filled by group of accounts
$formula = $cat['formula']; $formula = $cat['formula'];