From 2eb5bca23ccce4428dc7963a38ca2da17f41e293 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Nov 2024 11:36:05 +0100 Subject: [PATCH 1/4] Fix phan --- build/phpstan/phpstan-baseline.neon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/phpstan/phpstan-baseline.neon b/build/phpstan/phpstan-baseline.neon index 06bd3632cb21d..ad46ed29a8056 100644 --- a/build/phpstan/phpstan-baseline.neon +++ b/build/phpstan/phpstan-baseline.neon @@ -6567,7 +6567,7 @@ parameters: - message: '#^Property CommonObject\:\:\$note_public \(string\) in isset\(\) is not nullable\.$#' identifier: isset.property - count: 2 + count: 3 path: ../../htdocs/compta/facture/class/facture.class.php - From 29ef86a245740b93b96147cf5bf6a783b24c5c3f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Nov 2024 11:51:32 +0100 Subject: [PATCH 2/4] Typo --- ChangeLog | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index cffd1e583bc61..ce5766b2013b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,7 +29,7 @@ FIX: Accountancy - Generate entries of expense report with localtax (#30411) FIX: Accountancy - Not trunc id_import FIX: accounting FEC import (Issue #28306) (#29414) FIX: Add new hidden conf "DISABLE_QTY_OVERWRITTEN" (#28523) -FIX: Add same security test whe nuploading files from API than from GUI (#31114) +FIX: Add same security test when uploading files from API than from GUI (#31114) FIX: Amount of localtaxes in foreign currency was wrong on screen and PDF FIX: an error in a complex else condition FIX: ASSET: annual depreciation starting year (Again ;-)) #26084 (#30040) @@ -49,19 +49,19 @@ FIX: Condition on newDateLimReglement FIX: Conflict with autoload (#30399) FIX: const WORKFLOW_RECEPTION_CLASSIFY_NEWD_INVOICE (#31601) FIX: contact/address title is always "New Contact/Address" even if the contact/address already exists (#29581) -FIX: Display the date according to user language on subsitutions (#29510) +FIX: Display the date according to user language on substitutions (#29510) FIX: Display the real_PMP on inventory when its value is equal to 0 (#22291) FIX: Don't display column when it's out of date (#28271) FIX: email templates for expense report not visible FIX: Error mesg show untranslated extrafield name (#30227) -FIX: Error message overwrited when a error occurs during update of product multilangs (#30841) +FIX: Error message overwrote when a error occurs during update of product multilangs (#30841) FIX: Error When cloning fourn price no default value for tva_tx (#28368) FIX: executeHooks $object default value (#29647) FIX: expedition PDF models using units labels (#30358) FIX: Extrafield following between rec invoice and classic invoice (#31445) FIX: fatal error on loading pictures in attached documents of an event (#30553) FIX: fatal error Unsupported operand types when recording load payment -FIX: Fix bug select columns and acces to the public ticket list from the public ticket card (case when we have connected to another client before, the track id stocked in session overwrite the new track id from the public ticket card) (#31000) +FIX: Fix bug select columns and access to the public ticket list from the public ticket card (case when we have connected to another client before, the track id stocked in session overwrite the new track id from the public ticket card) (#31000) FIX: Fix create shipping with product who have negative stocks on warehouse but the negative stock transfert is allowed (#26217) FIX: Fix save directory for invoice ODT and multientities FIX: group by qty in product margin tab (#29853) @@ -89,7 +89,7 @@ FIX: notification module: for supplier orders (any of the 3 triggers), user can FIX: Not qualified lines for reception (#29473) FIX: not redirect when error occurs on updating card (#29388) FIX: Not trancate the multicurrency rate shown on cards (even if the global MAIN_MAX_DECIMALS_SHOWN is set to 0) (#28211) -FIX: on change ref for bank account attachement are lost (#30529) +FIX: on change ref for bank account attachment are lost (#30529) FIX: Option MAIN_DOC_USE_TIMING can be a string with date format FIX: orders to bill menu (#30179) FIX: Payment on customer invoice - Remove accountid in url if empty for apply default value (#28156) @@ -100,7 +100,7 @@ FIX: php8: Fatal when empty $tmpvat is an empty string (no silent conversion to FIX: PHP 8 warning on output of successful cronjob (#29922) FIX: PHP exception on getSpecialCode (#29646) FIX: php warning global conf (#29478) -FIX: pos: invoice date incorrectly set beacause of timezome mismatches (reverts #36e91da) (#30184) +FIX: pos: invoice date incorrectly set because of timezome mismatches (reverts #36e91da) (#30184) FIX: public project form return an error if SOCIETE_EMAIL_UNIQUE (#29942) FIX: purge files cron: php warnings when rest module enabled (#30919) FIX: PUT /thirdparties/{id} and PUT /contacts/{id} should throw exception if update returns < 0 (#29596) @@ -499,7 +499,7 @@ NEW: No overwrite of optionals during put() contact NEW: Notifications: add Customer Order delivered (ORDER_NEW) in module Notification NEW: Notifications: for Sign or Refused Propal from Online Page NEW: Now we can edit amount on VAT and salaries clone action -NEW: only get openned contact from liste_contact function, to not have acces to closed contact as mail receiver +NEW: only get openned contact from liste_contact function, to not have access to closed contact as mail receiver NEW: Option to manage deposit slips for more payment modes (not only NEW: Option to show column for field and line selection on the left NEW: Orders: add sub total in order list det @@ -2744,7 +2744,7 @@ NEW: add quick dropdown menu in top right menu (experimental with MAIN_USE_TOP_M NEW: add region in export companies and contacts NEW: add rights on margin info on invoice list NEW: add search param for close date on order list -NEW: add show preview for mail attachement on form mail +NEW: add show preview for mail attachment on form mail NEW: add State/Province origin for products NEW: add the workflow interaction close intervention on closing ticket NEW: add tracking number in list and search_all items @@ -4129,7 +4129,7 @@ FIX: access to public interface when origin email has an alias. FIX: Alias name is not into the email recipient label. FIX: allow standalone credit note even if no invoice FIX: an admin can not access his own permissions after enabling advanced permissions -FIX: Attachement of linked files on ticket when sending a message +FIX: Attachment of linked files on ticket when sending a message FIX: avoid non numeric warning FIX: Bad currency var used in stripe for connect FIX: Bad list of ticket on public interface for ticket emailcollector @@ -4925,7 +4925,7 @@ NEW: hidden option to define an invoice template for each invoice type NEW: Highlight lines on lists when they are checked NEW: Notification module support expense report+holiday validation and approval NEW: On customer/supplier card, add simple tooltip to amount boxes -NEW: Page to check if the operations/items created between two dates have attached item(s) and possibility to download all attachements +NEW: Page to check if the operations/items created between two dates have attached item(s) and possibility to download all attachments NEW: possibility to add all rights of all modules in one time NEW: redirect if only one result on global search on card NEW: Permission to ignore price min @@ -6369,7 +6369,7 @@ NEW: No external check of version without explicit click in about page. NEW: ODT docs for USER USERGROUP CONTRACT and PRODUCT class NEW: odt usergroup NEW: On invoices generated by template, we save if invoice come from a source template. -NEW: option to copy into attachement files of events, files send by mail (with auto event creation) +NEW: option to copy into attachment files of events, files send by mail (with auto event creation) NEW: PDF with numbertoword NEW: Permit multiple file upload in linked documents NEW: PHP 7.1 compatibility From 792ff4044effcf84c9e4496e8599b90118ef0c14 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Nov 2024 12:08:46 +0100 Subject: [PATCH 3/4] Typo --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce5766b2013b6..a222f2206ba9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,7 +62,7 @@ FIX: Extrafield following between rec invoice and classic invoice (#31445) FIX: fatal error on loading pictures in attached documents of an event (#30553) FIX: fatal error Unsupported operand types when recording load payment FIX: Fix bug select columns and access to the public ticket list from the public ticket card (case when we have connected to another client before, the track id stocked in session overwrite the new track id from the public ticket card) (#31000) -FIX: Fix create shipping with product who have negative stocks on warehouse but the negative stock transfert is allowed (#26217) +FIX: Fix create shipping with product who have negative stocks on warehouse but the negative stock transfer is allowed (#26217) FIX: Fix save directory for invoice ODT and multientities FIX: group by qty in product margin tab (#29853) FIX: Hierarchy Employee view do not filter on employee = 1 (#29496) @@ -499,7 +499,7 @@ NEW: No overwrite of optionals during put() contact NEW: Notifications: add Customer Order delivered (ORDER_NEW) in module Notification NEW: Notifications: for Sign or Refused Propal from Online Page NEW: Now we can edit amount on VAT and salaries clone action -NEW: only get openned contact from liste_contact function, to not have access to closed contact as mail receiver +NEW: only get open contact from liste_contact function, to not have access to closed contact as mail receiver NEW: Option to manage deposit slips for more payment modes (not only NEW: Option to show column for field and line selection on the left NEW: Orders: add sub total in order list det From 786472febf44dad9155fb354f02bf1441b1e56d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 13 Nov 2024 12:38:21 +0100 Subject: [PATCH 4/4] fix windows-ci.yml (#31791) * fix windows-ci.yml * Update windows-ci.yml --- .github/workflows/windows-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 976a5415a4261..a73f283e2b077 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -57,7 +57,7 @@ jobs: id: cache uses: actions/cache/restore@v4 env: - HASH: ${{ hashFiles('htdocs/install/**') }} + HASH: ${{ hashFiles('htdocs/install/**', 'htdocs/filefunc.inc.php') }} KEY_ROOT: ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }} with: # See https://github.com/actions/cache/issues/1275#issuecomment-1925217178 @@ -72,7 +72,7 @@ jobs: ${{ env.KEY_ROOT }}-${{ env.HASH }}-${{ github.head_ref }}- ${{ env.KEY_ROOT }}-${{ env.HASH }}-${{ github.base_ref }}- ${{ env.KEY_ROOT }}-${{ env.HASH }}- - ${{ env.KEY_ROOT }}- + # ${{ env.KEY_ROOT }}- - name: Setup MariaDB uses: frederic34/setup-mariadb@v1