Skip to content

Commit ca8d66a

Browse files
authored
Merge branch '21.0' into patch-57
2 parents 513a1bd + 2dc94a0 commit ca8d66a

File tree

211 files changed

+2407
-1581
lines changed

Some content is hidden

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

211 files changed

+2407
-1581
lines changed

.github/changed-lines-count-labeler.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/workflows/ci-on-pull_request.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ jobs:
2525
# uses: ./.github/workflows/windows-ci.yml
2626
# with:
2727
# gh_event: ${{ github.event_name }}
28-
gh-travis: # Runs travis script on github runner (not on travis)
29-
if: false
30-
# needs: [pre-commit, phan]
31-
# needs: [windows-ci]
32-
secrets: inherit
33-
needs: [pre-commit, phan, phpstan]
34-
uses: ./.github/workflows/gh-travis.yml
35-
with:
36-
gh_event: ${{ github.event_name }}
28+
#gh-travis: # Runs travis script on github runner (not on travis)
29+
# if: false
30+
# # needs: [pre-commit, phan]
31+
# # needs: [windows-ci]
32+
# secrets: inherit
33+
# needs: [pre-commit, phan, phpstan]
34+
# uses: ./.github/workflows/gh-travis.yml
35+
# with:
36+
# gh_event: ${{ github.event_name }}
3737

3838
# Note (not tested, from https://github.com/orgs/community/discussions/38361)
3939
# To cancel jobs if one fails, the following action may help

.github/workflows/ci-on-push.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ jobs:
2525
uses: ./.github/workflows/windows-ci.yml
2626
with:
2727
gh_event: ${{ github.event_name }}
28-
gh-travis: # Runs travis script on github runner (not on travis)
29-
if: false
30-
# needs: [pre-commit, phan]
31-
# needs: [windows-ci]
32-
secrets: inherit
33-
needs: [pre-commit, phan, phpstan]
34-
uses: ./.github/workflows/gh-travis.yml
35-
with:
36-
gh_event: ${{ github.event_name }}
28+
#gh-travis: # Runs travis script on github runner (not on travis)
29+
# if: false
30+
# # needs: [pre-commit, phan]
31+
# # needs: [windows-ci]
32+
# secrets: inherit
33+
# needs: [pre-commit, phan, phpstan]
34+
# uses: ./.github/workflows/gh-travis.yml
35+
# with:
36+
# gh_event: ${{ github.event_name }}
3737

3838
# Note (not tested, from https://github.com/orgs/community/discussions/38361)
3939
# To cancel jobs if one fails, the following action may help

.github/workflows/code_quality_qodana.yml.disabled

Lines changed: 0 additions & 28 deletions
This file was deleted.

.github/workflows/exakat.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ on:
77
- cron: "0 20 1 * *"
88
workflow_dispatch:
99

10+
1011
permissions:
1112
contents: read
1213

14+
1315
jobs:
1416
exakat:
1517
runs-on: ubuntu-latest

.github/workflows/test.yaml

Lines changed: 0 additions & 28 deletions
This file was deleted.

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ before_install:
8585
if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then
8686
sudo apt install unzip apache2 php7.1 php7.1-cli php7.1-curl php7.1-mysql php7.1-pgsql php7.1-gd php7.1-imap php7.1-intl php7.1-ldap php7.1-xml php7.1-mbstring php7.1-xml php7.1-zip libapache2-mod-php7.1
8787
fi
88-
if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then
89-
sudo apt install unzip apache2 php7.1 php7.1-cli php7.1-curl php7.1-mysql php7.1-pgsql php7.1-gd php7.1-imap php7.1-intl php7.1-ldap php7.1-xml php7.1-mbstring php7.1-xml php7.1-zip libapache2-mod-php7.1
90-
fi
9188
if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then
9289
sudo apt install unzip apache2 php8.1 php8.1-cli php8.1-curl php8.1-mysql php8.1-pgsql php8.1-gd php8.1-imap php8.1-intl php8.1-ldap php8.1-xml php8.1-mbstring php8.1-xml php8.1-zip libapache2-mod-php8.1
9390
fi

ChangeLog

Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,146 @@
22
English Dolibarr ChangeLog
33
--------------------------------------------------------------
44

5+
***** ChangeLog for 21.0.4 compared to 21.0.3 *****
6+
FIX: #35147 SQL Error on Beluga Export when ExpenseReport is enabled (#35149)
7+
FIX: error when using a code too large in dictionary
8+
FIX: Security when using Advanced Target page of emailing (feature hidden in v21, default in v22+). Possible
9+
SQL injection by users with permission to make and send mass emailing.
10+
11+
12+
***** ChangeLog for 21.0.3 compared to 21.0.2 *****
13+
FIX: #34843 (#34875)
14+
FIX: #34936
15+
FIX: #35005
16+
FIX: #35006 SQL error when using external user
17+
FIX: a Fatal error when a trigger files is not correctly named.
18+
FIX: array for arrayofkeyval is lost in module builder edit of property
19+
FIX: asset: could not select invoice in disposal pop-in (#34725)
20+
FIX: avoid php warning with "$forceFullTextIndexation" (#34881)
21+
FIX: bad consistency on test on permission to disable service
22+
FIX: Can edit status of tasks
23+
FIX: Create public ticket if email need exist. (#34965)
24+
FIX: DA026536: missing <br> in automatic e-mail (#34895)
25+
FIX: extrafields of type "int" not displayed on `projet/tasks.php` (#34896)
26+
FIX: Filter on the balance of leave
27+
FIX: Logo on company is no more visible.
28+
FIX: mailing destination list title (#34929)
29+
FIX: main checkbox left column was before global conf (#34858)
30+
FIX: Missing a column on group permissions
31+
FIX: several minor troubles with modulebuilder
32+
FIX: Test on mandatory product or thirdparty barcode
33+
FIX: trigger mailmanspip when un/linking categories
34+
SEC: Remove functions accepting callable params - Reported by phdwg1410 - CVE-2024-40137
35+
36+
37+
***** ChangeLog for 21.0.2 compared to 21.0.1 *****
38+
39+
FIX: 21.0: $height and $width can be ints, but also 'auto' (#34636)
40+
FIX: #33030 (#34460)
41+
FIX: #33727 Sec
42+
FIX: #33774 #34214
43+
FIX: #33854
44+
FIX: #34313 Accountancy - Export with sources no longer works (#34324)
45+
FIX: (#34448)
46+
FIX: #34541 (#34597)
47+
FIX: #34564 (#34590)
48+
FIX: #34591 FIX: #34692
49+
FIX: #34618 (#34621)
50+
FIX: #34654
51+
FIX: accountancy: bad filter on custom account groups (#34205)
52+
FIX: accountancy balance: keep subtotals when sorting (#34001)
53+
FIX: accountancy closure: if subledger_label is not found, PHP8.2 throws an error. (#34736)
54+
FIX: accountancy: create new french PCG25-DEV accounting system in upgrade (#34036)
55+
FIX: accountancy expensereport journal: php 8.1 warning (#34457)
56+
FIX: accountancy fec export: remove dol_print_date warning (#34363)
57+
FIX: accountancy general ledger: last total not shown if last account group shown has only one entry (#34251)
58+
FIX: accountancy lettering: php8.1 warning (#34469)
59+
FIX: Accountancy - Problem with constant ACCOUNTANCY_COMBO_FOR_AUX (#34414)
60+
FIX: accountancy sales/purchases journal: sql error logged when no invoice in journal (#34339)
61+
FIX: accountancy: warning when account not found in plan (#34030)
62+
FIX: a comment without after a comma create a sql error (#33752)
63+
FIX: Add others allowed tags (table, tr, td) for the prices history table displayed in the link url of the supplier product in supplier product prices list (#34532)
64+
FIX: add payment to bank (#34263)
65+
FIX: allow double colon and string obfuscation in dol eval for computed extra fields (#34015)
66+
FIX: API expense report line comments (v18+) (#34297)
67+
FIX: Approver must be able to approve even if user not in hierarchy.
68+
FIX: asset depreciation: division by zero (#34218)
69+
FIX: asset depreciation: php warnings (#34219)
70+
FIX: avoid sql error when a comment is after without comma (#33758)
71+
FIX: Backport fix of substitution of thirdparty info in notification
72+
FIX: backport of replaceement of thirdparty information on notification
73+
FIX: bad value for company ref crashes canvas feature (#34331)
74+
FIX: bank payment rejection on SEPA (backport commit 100a657) (#33838)
75+
FIX: BankTransfer information in line.php (#34425)
76+
FIX: BankTransfer link in list.php (#34513)
77+
FIX: BankTransfer link in rejets.php (#34424)
78+
FIX: Bug filters (#34546)
79+
FIX: Can set default value of the nature of member
80+
FIX: Can set the default value of nature of thirdparty
81+
FIX: cash control report: php warning (#34358)
82+
FIX: common fields: php warning with select input field (#34495)
83+
FIX: constant PAYMENTBYBANKTRANSFER_ADDDAYS was never saved (#33799)
84+
FIX: creating acredit note from the remain to pay was always 0
85+
FIX: DetecHTML on upload file from filemanager fails due to need to lock
86+
FIX: Disallow special char in name of oauth entries
87+
FIX: do not add a filter on status when doing a global search on project
88+
FIX: Do not allow to force amount for online payment of order
89+
FIX: do not forget extrafields for BOM in export lines (#34020)
90+
FIX: Edition of target of menu entries
91+
FIX: element must be visible to set focus on select input when using default values (#34406)
92+
FIX: email collector: php 8 warning (#34496)
93+
FIX: encoding issues with underscores in mb_convert_encoding functionality (#34411)
94+
FIX: ensure dir exists before trying to move something in it (#34211)
95+
FIX: event info tab: php 8.1 warning (#34458)
96+
FIX: expense report card: mail notifications not sent (#34556)
97+
FIX: expensereport payment list: php warning (#34453)
98+
FIX: expensereport: php warning when generating pdf with multilangs (#34492)
99+
FIX: files lib: multiple php 8.1 warnings (#34462)
100+
FIX: filter agenda on user and resource SQL error (#34580)
101+
FIX: HTML broken by the trunc.
102+
FIX: html title when using custom value
103+
FIX: if filter is set on export for Duree type filed, then there is SQL error (#34616)
104+
FIX: interventions: sql error when signed_status not set (#34515)
105+
FIX: js warning (Backport commit 84d982c) (#34555)
106+
FIX: local taxes text in object line view mode (#34103)
107+
FIX: local taxes text in PDF (#34343)
108+
FIX: mandatory extrafelds on lines are not checked (#34228)
109+
FIX: manufacturing orders: php 8.1 warnings on agenda tab (#34475)
110+
FIX: mass assignment of sale representative
111+
FIX: Missing ol in no escape tags (#34261)
112+
FIX: modification de dates de pièces comptables sur plusieurs entités différentes (#34226)
113+
FIX: oauth: php 8 warnings (#34027)
114+
FIX: online propal sign: double header with logo when custom logo set (#34504)
115+
FIX: Order error translation (#33834)
116+
FIX: page of bom when only bom module is on
117+
FIX: partial result on timespent list (#33855)
118+
FIX: pgsql: boolean fields correctly defined in creation but not in migration (#34215)
119+
FIX: pgsql: case sensitivity in select queries (#34028)
120+
FIX: pgsql: error when creating sequences in migration scripts (#34021)
121+
FIX: PHP 8 Error 500 (#34545)
122+
FIX: prelevement order list: handle case of use by banktransfer module (#33801)
123+
FIX: pre-send mail mass action: keep __EMAIL__ substitution (#34522)
124+
FIX: prevent log warning with online signature url (#34361)
125+
FIX: Product batch series - Title, help url et picto (#34560)
126+
FIX: product multiprices: fatal error on vat update on php 8.2 (#34444)
127+
FIX: product suplier tab: last modif date column was wrongly dependent of module barcode (#34170)
128+
FIX: product translation: redirect after successful action (#34403)
129+
FIX: projects: go back to edit view after cloning (#34221)
130+
FIX: receptions: crash from api because of classes not found (#34523)
131+
FIX: Remove useless amp; after & (#34288)
132+
FIX: select supplier when creating object from project (#33766)
133+
FIX: social contribution payment: correct error reporting (#34002)
134+
FIX: stock control condition in reception delete (#33952)
135+
FIX: Tmparray string not array (#34287)
136+
FIX: Too heavy sql query (#34371)
137+
FIX: try to fix v18 github action workflow (#34439)
138+
FIX: Various payment - List - Can't see payment with subledger account (#34101)
139+
FIX: warehouse list: broken status filter (#33667)
140+
FIX: warnings when printing start/end date on line tpl (#34359)
141+
FIX: wrong multicompany filter (#34714)
142+
FIX: ws detection
143+
144+
5145
***** ChangeLog for 21.0.1 compared to 21.0.0 *****
6146

7147
FIX: #33360
@@ -879,6 +1019,7 @@ FIX: when qty is not an integer, apply price() (#31138)
8791019
FIX: Wrong default PDF model when creating the second situation invoice (#30843)
8801020
FIX: wrong subprice if price base type is TTC (#30887)
8811021

1022+
8821023
***** ChangeLog for 19.0.3 compared to 19.0.2 *****
8831024
FIX: #29403 HRM - Unable to delete a skill in a job Profile (#29779)
8841025
FIX: #29439 incomplete API return (#29796)
@@ -1443,7 +1584,39 @@ The following changes may create regressions for some external modules, but were
14431584
* The load of hook context productdao has been removed before calling loadvirtualstock. Modules must use the context of main parent page or 'all' for all cases.
14441585

14451586

1587+
***** ChangeLog for 18.0.8 compared to 18.0.7 *****
1588+
35 files changed, 647 insertions(+), 298 deletions(-)
1589+
1590+
FIX: #34746 - More complete fix for CVE-2024-40137
1591+
FIX: Correct the calculation of the amount of the current period between the period provided (#35083)
1592+
FIX: Add security test for show terminal selection if no terminal selected when invoice.php is call (#34717)
1593+
FIX: Add security test for show terminal selection if no terminal selected when invoice.php is call
1594+
FIX: missing quick edit for extrafields (baclport commit 4fc66c6) (#35160)
1595+
FIX: Missing sentence part (#35144)
1596+
FIX: set global mysoc and load langs in API access (#35041)
1597+
FIX: set global mysoc and load langs in API access
1598+
FIX: reset mysoc and langs only if entity of API has changed
1599+
FIX: accountancy general ledger: bad handling of hook return (#34029)
1600+
FIX: accountancy general ledger: bad handling of hook return
1601+
FIX: accountancy balance: bad handling of hook return
1602+
FIX: - Fix missing token for disable custom group category for compta report (page /htdocs/accountancy/admin/categories_list.php) (#35084)
1603+
FIX: The combo of custom groups has disappeared (backport v19) (#35016)
1604+
FIX: #34893 (#34897)
1605+
FIX: #34893
1606+
FIX: change error code to USERNOTALLOWEDTOCHANGEPASS
1607+
FIX: asset: could not select invoice in disposal pop-in (#34725)
1608+
FIX: 17.0 SQL syntax error and/or constraint error when calling Facture::update() after a clone (e.g. in a trigger) (#34778)
1609+
FIX: 17.0: when you clone an invoice that was created from a template invoice, the clone should not be linked to the template invoice (#34777)
1610+
FIX: pre-send mail mass action: keep __EMAIL__ substitution (#34522)
1611+
FIX: pre-send mail mass action: keep __EMAIL__ substitution
1612+
FIX: comment
1613+
FIX: massaction email tpl: keep preset
1614+
FIX: loop interrupt if an error occurs in sendEmailsRemindersOnInvoiceDueDate (#34657)
1615+
FIX: #34654
1616+
14461617
***** ChangeLog for 18.0.7 compared to 18.0.6 *****
1618+
138 files changed, 1622 insertions(+), 530 deletions(-)
1619+
14471620
FIX: 17.0 API endpoints "PUT": prevent overwriting all extrafields if only some are supplied in the request cf. PR #29237
14481621
FIX: 17.0 - collisions in cache for dol_getIdFromCode
14491622
FIX: 17.0 - missing error handling for FactureRec::fetch in card-rec.php

build/generate_filelist_xml.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
*/
174174
// Define qualified files (must be same than into generate_filelist_xml.php and in api_setup.class.php)
175175
$regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
176-
$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
176+
$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|escpos-php\/doc|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
177177
$files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
178178

179179
$dir = '';

0 commit comments

Comments
 (0)