Skip to content

Commit 7e27bed

Browse files
eldyeldy
authored
Merge branch 'develop' into patch-606946
2 parents 6f44755 + 61ddab5 commit 7e27bed

File tree

136 files changed

+639
-456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+639
-456
lines changed

‎ChangeLog‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ The following changes may create regressions for some external modules, but were
3333
* Function img_pdf() has been removed. Replace it with img_picto('', 'pdf.png') if you were using it.
3434
* The method run_trigger() was deprecated 10+ years ago in favor of runTrigger(). It has been removed. Change your trigger file if you still use it.
3535
* Property ->picto of module descriptors must contains the image extension if it is not a font awesome tag. Example: $this->picto="mymoduleimg.png";
36+
* Stock movement API GET method output variable names have been harmonized with POST input parameter names
3637

3738

3839
***** ChangeLog for 22.0.2 compared to 22.0.1 *****

‎dev/build/phpstan/phpstan-baseline.neon‎

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -4182,12 +4182,6 @@ parameters:
41824182
count: 1
41834183
path: ../../../htdocs/contrat/card.php
41844184

4185-
-
4186-
message: '#^Variable \$tmpcode might not be defined\.$#'
4187-
identifier: variable.undefined
4188-
count: 1
4189-
path: ../../../htdocs/contrat/card.php
4190-
41914185
-
41924186
message: '#^Variable \$mesg might not be defined\.$#'
41934187
identifier: variable.undefined
@@ -4224,12 +4218,6 @@ parameters:
42244218
count: 6
42254219
path: ../../../htdocs/contrat/services_list.php
42264220

4227-
-
4228-
message: '#^Property Ticket\:\:\$progress \(int\) in isset\(\) is not nullable\.$#'
4229-
identifier: isset.property
4230-
count: 1
4231-
path: ../../../htdocs/contrat/ticket.php
4232-
42334221
-
42344222
message: '#^Loose comparison using \=\= between 1 and 0 will always evaluate to false\.$#'
42354223
identifier: equal.alwaysFalse
@@ -4284,36 +4272,6 @@ parameters:
42844272
count: 2
42854273
path: ../../../htdocs/core/actions_dellink.inc.php
42864274

4287-
-
4288-
message: '#^Variable \$id might not be defined\.$#'
4289-
identifier: variable.undefined
4290-
count: 4
4291-
path: ../../../htdocs/core/actions_fetchobject.inc.php
4292-
4293-
-
4294-
message: '#^Variable \$hidedesc might not be defined\.$#'
4295-
identifier: variable.undefined
4296-
count: 2
4297-
path: ../../../htdocs/core/actions_lineupdown.inc.php
4298-
4299-
-
4300-
message: '#^Variable \$hidedetails might not be defined\.$#'
4301-
identifier: variable.undefined
4302-
count: 2
4303-
path: ../../../htdocs/core/actions_lineupdown.inc.php
4304-
4305-
-
4306-
message: '#^Variable \$hideref might not be defined\.$#'
4307-
identifier: variable.undefined
4308-
count: 2
4309-
path: ../../../htdocs/core/actions_lineupdown.inc.php
4310-
4311-
-
4312-
message: '#^Variable \$permissiontoedit might not be defined\.$#'
4313-
identifier: variable.undefined
4314-
count: 2
4315-
path: ../../../htdocs/core/actions_lineupdown.inc.php
4316-
43174275
-
43184276
message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
43194277
identifier: function.alreadyNarrowedType
@@ -4362,12 +4320,6 @@ parameters:
43624320
count: 1
43634321
path: ../../../htdocs/core/actions_massactions.inc.php
43644322

4365-
-
4366-
message: '#^Variable \$from might not be defined\.$#'
4367-
identifier: variable.undefined
4368-
count: 5
4369-
path: ../../../htdocs/core/actions_massactions.inc.php
4370-
43714323
-
43724324
message: '#^Variable \$listofobjectthirdparties in empty\(\) always exists and is not falsy\.$#'
43734325
identifier: empty.variable
@@ -4398,30 +4350,6 @@ parameters:
43984350
count: 1
43994351
path: ../../../htdocs/core/actions_sendmails.inc.php
44004352

4401-
-
4402-
message: '#^Variable \$contact might not be defined\.$#'
4403-
identifier: variable.undefined
4404-
count: 5
4405-
path: ../../../htdocs/core/actions_sendmails.inc.php
4406-
4407-
-
4408-
message: '#^Variable \$from might not be defined\.$#'
4409-
identifier: variable.undefined
4410-
count: 6
4411-
path: ../../../htdocs/core/actions_sendmails.inc.php
4412-
4413-
-
4414-
message: '#^Variable \$result might not be defined\.$#'
4415-
identifier: variable.undefined
4416-
count: 1
4417-
path: ../../../htdocs/core/actions_sendmails.inc.php
4418-
4419-
-
4420-
message: '#^Variable \$thirdparty might not be defined\.$#'
4421-
identifier: variable.undefined
4422-
count: 6
4423-
path: ../../../htdocs/core/actions_sendmails.inc.php
4424-
44254353
-
44264354
message: '#^Call to function is_array\(\) with array\<mixed\> will always evaluate to true\.$#'
44274355
identifier: function.alreadyNarrowedType
@@ -12912,12 +12840,6 @@ parameters:
1291212840
count: 1
1291312841
path: ../../../htdocs/projet/comment.php
1291412842

12915-
-
12916-
message: '#^Call to function method_exists\(\) with Project and ''fetchComments'' will always evaluate to true\.$#'
12917-
identifier: function.alreadyNarrowedType
12918-
count: 1
12919-
path: ../../../htdocs/projet/contact.php
12920-
1292112843
-
1292212844
message: '#^Call to function method_exists\(\) with Project and ''fetchComments'' will always evaluate to true\.$#'
1292312845
identifier: function.alreadyNarrowedType
@@ -15600,24 +15522,12 @@ parameters:
1560015522
count: 2
1560115523
path: ../../../htdocs/ticket/class/ticket.class.php
1560215524

15603-
-
15604-
message: '#^Property Ticket\:\:\$progress \(int\) in isset\(\) is not nullable\.$#'
15605-
identifier: isset.property
15606-
count: 4
15607-
path: ../../../htdocs/ticket/class/ticket.class.php
15608-
1560915525
-
1561015526
message: '#^Property Ticket\:\:\$severity_code \(string\) in isset\(\) is not nullable\.$#'
1561115527
identifier: isset.property
1561215528
count: 4
1561315529
path: ../../../htdocs/ticket/class/ticket.class.php
1561415530

15615-
-
15616-
message: '#^Property Ticket\:\:\$status \(int\) in isset\(\) is not nullable\.$#'
15617-
identifier: isset.property
15618-
count: 4
15619-
path: ../../../htdocs/ticket/class/ticket.class.php
15620-
1562115531
-
1562215532
message: '#^Property Ticket\:\:\$subject \(string\) in isset\(\) is not nullable\.$#'
1562315533
identifier: isset.property

‎dev/tools/phan/baseline.txt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ return [
1717
// PhanTypeInvalidDimOffset : 15+ occurrences
1818
// PhanTypeMismatchDimFetch : 10+ occurrences
1919
// PhanUndeclaredMethod : 7 occurrences
20-
// PhanPossiblyUndeclaredGlobalVariable : 6 occurrences
2120
// PhanTypeArraySuspiciousNull : 5 occurrences
2221
// PhanTypeExpectedObjectPropAccess : 5 occurrences
2322
// PhanPluginDuplicateArrayKey : 4 occurrences
2423
// PhanPluginUndeclaredVariableIsset : 2 occurrences
24+
// PhanPossiblyUndeclaredGlobalVariable : 2 occurrences
2525
// PhanTypeMismatchArgumentProbablyReal : 2 occurrences
2626
// PhanParamTooMany : 1 occurrence
2727
// PhanPossiblyUndeclaredVariable : 1 occurrence
@@ -69,10 +69,9 @@ return [
6969
'htdocs/compta/tva/clients.php' => ['PhanTypeArraySuspiciousNull', 'PhanTypeInvalidDimOffset', 'PhanTypeMismatchArgument'],
7070
'htdocs/compta/tva/index.php' => ['PhanTypeMismatchArgument'],
7171
'htdocs/compta/tva/quadri_detail.php' => ['PhanTypeMismatchArgument'],
72-
'htdocs/contrat/card.php' => ['PhanUndeclaredGlobalVariable'],
7372
'htdocs/core/actions_addupdatedelete.inc.php' => ['PhanUndeclaredProperty'],
7473
'htdocs/core/actions_massactions.inc.php' => ['PhanUndeclaredProperty'],
75-
'htdocs/core/actions_sendmails.inc.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
74+
'htdocs/core/actions_sendmails.inc.php' => ['PhanUndeclaredProperty'],
7675
'htdocs/core/ajax/ajaxdirtree.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty', 'PhanUndeclaredGlobalVariable'],
7776
'htdocs/core/ajax/selectobject.php' => ['PhanTypeMismatchArgumentNullable'],
7877
'htdocs/core/class/CMailFile.class.php' => ['PhanTypeMismatchArgument'],
@@ -139,7 +138,6 @@ return [
139138
'htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
140139
'htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
141140
'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanPluginDuplicateArrayKey'],
142-
'htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php' => ['PhanTypeMismatchArgumentNullable'],
143141
'htdocs/core/modules/workstation/mod_workstation_advanced.php' => ['PhanUndeclaredProperty'],
144142
'htdocs/core/multicompany_page.php' => ['PhanTypeMismatchArgument'],
145143
'htdocs/core/tpl/extrafields_view.tpl.php' => ['PhanUndeclaredProperty'],
@@ -160,7 +158,6 @@ return [
160158
'htdocs/expensereport/card.php' => ['PhanUndeclaredProperty'],
161159
'htdocs/expensereport/class/expensereport.class.php' => ['PhanTypeMismatchArgument'],
162160
'htdocs/expensereport/payment/info.php' => ['PhanUndeclaredGlobalVariable'],
163-
'htdocs/externalsite/frames.php' => ['PhanUndeclaredGlobalVariable'],
164161
'htdocs/fichinter/card-rec.php' => ['PhanUndeclaredGlobalVariable'],
165162
'htdocs/fichinter/class/api_interventions.class.php' => ['PhanUndeclaredProperty'],
166163
'htdocs/fichinter/class/fichinterrec.class.php' => ['PhanUndeclaredProperty'],

‎htdocs/adherents/class/subscription.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class Subscription extends CommonObject
9898
public $fk_bank;
9999

100100
/**
101-
* @var array<string,array{type:string,label:string,langfile?:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>|string,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,cssview?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>|string,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}> Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
101+
* @var array<string,array{type:string,label:string,langfile?:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>|string,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,cssview?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>|string,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>,searchmulti?:int<0,1>}> Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
102102
*/
103103
public $fields = array(
104104
'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),

‎htdocs/admin/delais.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@
325325
$str_mode_enabled = $str_mode_percentage;
326326
}
327327
print '<br><a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';
328-
print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.(getDolGlobalString('MAIN_USE_METEO_WITH_PERCENTAGE') ? $conf->global->MAIN_USE_METEO_WITH_PERCENTAGE : '').'" />';
328+
print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.getDolGlobalString('MAIN_USE_METEO_WITH_PERCENTAGE').'" />';
329329

330330
print '<br><br>';
331331
} else {

‎htdocs/admin/ihm.php‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
2-
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <[email protected]>
3-
* Copyright (C) 2004-2015 Laurent Destailleur <[email protected]>
4-
* Copyright (C) 2005-2017 Regis Houssin <[email protected]>
5-
* Copyright (C) 2016 Juanjo Menent <[email protected]>
6-
* Copyright (C) 2018 Ferran Marcet <[email protected]>
7-
* Copyright (C) 2021 Alexandre Spangaro <[email protected]>
8-
* Copyright (C) 2021-2023 Anthony Berton <[email protected]>
9-
* Copyright (C) 2023 Eric Seigne <[email protected]>
2+
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <[email protected]>
3+
* Copyright (C) 2004-2015 Laurent Destailleur <[email protected]>
4+
* Copyright (C) 2005-2017 Regis Houssin <[email protected]>
5+
* Copyright (C) 2016 Juanjo Menent <[email protected]>
6+
* Copyright (C) 2018 Ferran Marcet <[email protected]>
7+
* Copyright (C) 2021-2025 Alexandre Spangaro <[email protected]>
8+
* Copyright (C) 2021-2023 Anthony Berton <[email protected]>
9+
* Copyright (C) 2023 Eric Seigne <[email protected]>
1010
* Copyright (C) 2024 MDW <[email protected]>
11-
* Copyright (C) 2024-2025 Frédéric France <[email protected]>
11+
* Copyright (C) 2024-2025 Frédéric France <[email protected]>
1212
*
1313
* This program is free software; you can redistribute it and/or modify
1414
* it under the terms of the GNU General Public License as published by
@@ -658,6 +658,12 @@
658658
print ajax_constantonoff("MAIN_DISABLE_BLOCK_HOLIDAY", array(), $conf->entity, 0, 0, 0, 0, 0, 0, '_red', 'dashboard');
659659
print '</td>';
660660
print '</tr>';
661+
662+
// Block mrp
663+
print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockMrp') . '</td><td>';
664+
print ajax_constantonoff("MAIN_DISABLE_BLOCK_MRP", array(), $conf->entity, 0, 0, 0, 0, 0, 0, '_red', 'dashboard');
665+
print '</td>';
666+
print '</tr>';
661667
}
662668

663669
print '</table>' . "\n";

‎htdocs/admin/limits.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219

220220
print '<tr class="oddeven"><td>';
221221
print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
222-
print '</td><td align="right">'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : (getDolGlobalString('MAIN_ROUNDING_RULE_TOT') ? $conf->global->MAIN_ROUNDING_RULE_TOT : '')).'</td></tr>';
222+
print '</td><td align="right">'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : getDolGlobalString('MAIN_ROUNDING_RULE_TOT')).'</td></tr>';
223223

224224
print '</table>';
225225
print '</div>';

‎htdocs/admin/modules.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,8 +1297,8 @@
12971297

12981298
$url = 'https://www.dolistore.com';
12991299

1300-
// Marketplace
1301-
print '<tr class="oddeven">'."\n";
1300+
// Source Marketplace DoliStore
1301+
print '<tr class="oddeven nohover" height="100">'."\n";
13021302
print '<td class="hideonsmartphone center width150 nopaddingleftimp nopaddingrightimp"><a href="'.$url.'" target="_blank" rel="noopener noreferrer external"><img border="0" class="imgautosize imgmaxwidth100" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.svg"></a></td>';
13031303
print '<td class="minwidth500imp smallonsmartphone"><span class="opacitymedium">'.$langs->trans("DoliStoreDesc").'</span><br>';
13041304
print img_picto('', 'url', 'class="pictofixedwidth"').'<a href="'.$url.'" target="_blank" rel="noopener noreferrer external">'.$url.'</a></td>';
@@ -1330,8 +1330,8 @@
13301330

13311331
$url = 'https://github.com/Dolibarr/dolibarr-community-modules';
13321332

1333-
// Community
1334-
print '<tr class="oddeven">'."\n";
1333+
// Source Community github
1334+
print '<tr class="oddeven nohover" height="100">'."\n";
13351335
print '<td class="hideonsmartphone center width150 nopaddingleftimp nopaddingrightimp"><a href="'.$url.'" target="_blank" rel="noopener noreferrer external"><img border="0" class="imgautosize imgmaxwidth100" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg"></a></td>';
13361336
print '<td class="minwidth500imp smallonsmartphone"><span class="opacitymedium">'.$langs->trans("CommunityModulesDesc").'</span><br>';
13371337
print img_picto('', 'url', 'class="pictofixedwidth"').'<a href="'.$url.'" target="_blank" rel="noopener noreferrer external">'.$url.'</a></td>';
@@ -1409,7 +1409,7 @@
14091409
print '<div class="clearboth"></div>';
14101410
?>
14111411
<?php if (!empty($categories_tree)) { ?>
1412-
<div id="category-tree-left">
1412+
<div id="category-tree-left" class="paddingtop">
14131413
<ul class="tree">
14141414
<?php
14151415
print $categories_tree; ?>
@@ -1616,7 +1616,7 @@
16161616
print '<td colspan="3">'.$langs->trans("DevelopYourModuleDesc").'</td>';
16171617
print '</tr>';
16181618

1619-
print '<tr class="oddeven" height="80">'."\n";
1619+
print '<tr class="oddeven nohover" height="100">'."\n";
16201620
print '<td class="center hideonsmartphone">';
16211621
print '<div class="imgmaxheight50 logo_setup"></div>';
16221622
print '</td>';
@@ -1630,7 +1630,7 @@
16301630
print '</td>';
16311631
print '</tr>';
16321632

1633-
print '<tr class="oddeven" height="80">'."\n";
1633+
print '<tr class="oddeven nohover" height="100">'."\n";
16341634
$url = 'https://partners.dolibarr.org';
16351635
print '<td class="center hideonsmartphone">';
16361636
print'<a href="'.$url.'" target="_blank" rel="noopener noreferrer external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner.png"></a>';

‎htdocs/admin/proxy.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ function initfields()
165165
print '<td>'.$langs->trans("MAIN_PROXY_USE").'</td><td class="right">';
166166
print '</td>';
167167
print '<td class="nowrap">';
168-
print $form->selectyesno('MAIN_PROXY_USE', (getDolGlobalString('MAIN_PROXY_USE') ? $conf->global->MAIN_PROXY_USE : 0), 1);
168+
print $form->selectyesno('MAIN_PROXY_USE', getDolGlobalInt('MAIN_PROXY_USE'), 1);
169169
print '</td>';
170170
print '</tr>';
171171

@@ -174,7 +174,7 @@ function initfields()
174174
print '<td>'.$langs->trans("MAIN_PROXY_HOST").'</td><td class="right">';
175175
print '</td>';
176176
print '<td class="nowrap">';
177-
print '<input class="flat" name="MAIN_PROXY_HOST" type="text" size="16" value="'.(getDolGlobalString('MAIN_PROXY_HOST') ? $conf->global->MAIN_PROXY_HOST : '').'">';
177+
print '<input class="flat" name="MAIN_PROXY_HOST" type="text" size="16" value="'.getDolGlobalString('MAIN_PROXY_HOST').'">';
178178
print '</td>';
179179
print '</tr>';
180180

@@ -183,7 +183,7 @@ function initfields()
183183
print '<td>'.$langs->trans("MAIN_PROXY_PORT").'</td><td class="right">';
184184
print '</td>';
185185
print '<td class="nowrap">';
186-
print '<input class="flat" name="MAIN_PROXY_PORT" type="text" size="4" value="'.(getDolGlobalString('MAIN_PROXY_PORT') ? $conf->global->MAIN_PROXY_PORT : '').'">';
186+
print '<input class="flat" name="MAIN_PROXY_PORT" type="text" size="4" value="'.getDolGlobalInt('MAIN_PROXY_PORT').'">';
187187
print '</td>';
188188
print '</tr>';
189189

@@ -192,7 +192,7 @@ function initfields()
192192
print '<td>'.$langs->trans("MAIN_PROXY_USER").'</td><td class="right">';
193193
print '</td>';
194194
print '<td class="nowrap">';
195-
print '<input class="flat" name="MAIN_PROXY_USER" type="text" size="16" value="'.(getDolGlobalString('MAIN_PROXY_USER') ? $conf->global->MAIN_PROXY_USER : '').'">';
195+
print '<input class="flat" name="MAIN_PROXY_USER" type="text" size="16" value="'.getDolGlobalString('MAIN_PROXY_USER').'">';
196196
print '</td>';
197197
print '</tr>';
198198

@@ -201,7 +201,7 @@ function initfields()
201201
print '<td>'.$langs->trans("MAIN_PROXY_PASS").'</td><td class="right">';
202202
print '</td>';
203203
print '<td class="nowrap">';
204-
print '<input class="flat" name="MAIN_PROXY_PASS" type="text" size="16" value="'.(getDolGlobalString('MAIN_PROXY_PASS') ? $conf->global->MAIN_PROXY_PASS : '').'">';
204+
print '<input class="flat" name="MAIN_PROXY_PASS" type="password" size="16" value="'.getDolGlobalString('MAIN_PROXY_PASS').'">';
205205
print '</td>';
206206
print '</tr>';
207207

‎htdocs/admin/taxes.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
print '</tr>';
207207

208208
print '<tr class="oddeven"><td><label for="deadline_day_vat">'.$langs->trans("DeadlineDayVATSubmission").'</label></td><td>';
209-
print '<input placeholder="'.$langs->trans("Example").':21" name="deadline_day_vat" id="deadline_day_vat" class="minwidth200" value="'.(getDolGlobalString('MAIN_INFO_TVA_DAY_DEADLINE_SUBMISSION') ? $conf->global->MAIN_INFO_TVA_DAY_DEADLINE_SUBMISSION : '').'">';
209+
print '<input placeholder="'.$langs->trans("Example").':21" name="deadline_day_vat" id="deadline_day_vat" class="minwidth200" value="'.getDolGlobalString('MAIN_INFO_TVA_DAY_DEADLINE_SUBMISSION').'">';
210210
print '</td></tr>';
211211

212212
$key = 'CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT';

0 commit comments

Comments
 (0)