Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' into phpstan_various_list

Browse Source
This commit is contained in:
Laurent Destailleur
2024-12-09 21:47:59 +01:00
committed by GitHub
parent b4920b2793 1e2f513332
commit fdfff173f4
6 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/phpstan/phpstan-baseline.neon
View File

@@ -4638,12 +4638,6 @@ parameters:
count: 1
path: ../../htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
-
message: '#^Variable \$id might not be defined\.$#'
identifier: variable.undefined
count: 1
path: ../../htdocs/comm/recap-client.php
-
message: '#^If condition is always false\.$#'
identifier: if.alwaysFalse

5
htdocs/comm/recap-client.php
View File

@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
@@ -44,6 +44,7 @@ if (isModEnabled('invoice')) {
// Security check
$socid = GETPOSTINT("socid");
$id = 0;
if ($user->socid > 0) {
$action = '';
$id = $user->socid;

2
htdocs/compta/paiement/class/paiement.class.php
View File

@@ -334,7 +334,7 @@ class Paiement extends CommonObject
if (empty($value)) {
continue;
}
$value_converted = false;
$tmparray = MultiCurrency::getInvoiceRate($key, 'facture');
$invoice_multicurrency_tx = $tmparray['invoice_multicurrency_tx'];
$invoice_multicurrency_code = $tmparray['invoice_multicurrency_code'];

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

@@ -206,7 +206,7 @@ if ($nolinesbefore) {
// Free line
$labelforempty = 1;
print '<span class="prod_entry_mode_free">';
print '<span class="prod_entry_mode_free nowraponall">';
// Show radio for the non predefined product
if ($forceall >= 0 && (isModEnabled("product") || isModEnabled("service"))) {
print '<label for="prod_entry_mode_free">';
@@ -232,7 +232,7 @@ if ($nolinesbefore) {
}
}
$form->select_type_of_lines(GETPOSTISSET("type") ? GETPOST("type", 'alpha', 2) : -1, 'type', $labelforempty, 1, $forceall, '');
$form->select_type_of_lines(GETPOSTISSET("type") ? GETPOST("type", 'alpha', 2) : -1, 'type', $labelforempty, 1, $forceall, 'minwidth200');
print '</span>';
}
// Predefined product/service

6
htdocs/fourn/facture/card.php
View File

@@ -3595,7 +3595,7 @@ if ($action == 'create') {
print '</table>';
// List of payments
// List of payments already done
$totalpaid = 0;
@@ -3649,8 +3649,8 @@ if ($action == 'create') {
print '<table class="noborder paymenttable centpercent">';
print '<tr class="liste_titre">';
print '<td class="liste_titre">'.($object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("PaymentsBack") : $langs->trans('Payments')).'</td>';
print '<td>'.$langs->trans('Date').'</td>';
print '<td>'.$langs->trans('Type').'</td>';
print '<td><span class="hideonsmartphone">'.$langs->trans('Date').'</span></td>';
print '<td><span class="hideonsmartphone">'.$langs->trans('Type').'</span></td>';
if (isModEnabled("bank")) {
print '<td class="right">'.$langs->trans('BankAccount').'</td>';
}

2
htdocs/multicurrency/class/multicurrency.class.php
View File

@@ -592,7 +592,7 @@ class MultiCurrency extends CommonObject
*
* @param int $fk_facture id of facture
* @param string $table facture or facture_fourn
* @return array|bool Rate and code of currency or false if error
* @return array{invoice_multicurrency_tx: float,invoice_multicurrency_code: string}|bool Rate and code of currency or false if error
*/
public static function getInvoiceRate($fk_facture, $table = 'facture')
{