Commit Graph

759 Commits

Author SHA1 Message Date
Marc de Lima Lucio
96eddc1729 NEW: dev tools: add github webhook handler to auto-assign pull requests (#34579)
* NEW: dev tools: add github webhook handle to auto-assign pull requests

* FIX: ci

* FIX: comment

* FIX: ci

* FIX: forgotten param + ci

* FIX: ci

* FIX: ci
2025-06-20 15:45:31 +02:00
Laurent Destailleur
144854769a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-06-13 16:27:57 +02:00
Laurent Destailleur
cf1c5bc370 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-13 16:24:52 +02:00
Laurent Destailleur
d66cd9027a Remove warning 2025-06-13 16:22:57 +02:00
MDW
32cec00447 Qual: Update phan baseline (#34302)
# Qual: Update phan baseline

Update baseline wrt fixed notices.
2025-06-04 14:43:40 +02:00
Yannis Hoareau
1301cd36a1 NEW Subtotal module (#33502)
* Changes to follow mvc logic

* Reworked admin page and form to add lines

* Reworked adding line logic

* Adding options when editing subtotal lines

* Fix translations

* Fixed errors/displays and started pdf

* Color for subtotals pdf lines

* FIX display of subtotal totht

* Added pdf azur for propal

* Fix duplicate translation

* Added subtotal support for facture pdf

* Added subtotal support for commande pdf

* Improve UI/translations

* Restored old pdf

* Info to warn user for unsupported pdf

* Added title lines VAT rate and discount support

This is meant for future feature wich is block mass changing vat rate
and discount percentage

* Working on block apply vat and discount

* Added buttons for block actions

* Handle editing vat and discount for subtotal lines

* Editing vat and discount for subtotal lines bloc working

* Added possibility to move by block

* Updated adding and updating a subtotal line

* Improved vat and discount block update

* Improvement for block vat/discount and line edition

Editing a title line edits the corresponding subtotal line

* Improvement for moving by block

* Bad tile or st line placement managing

* Improved bad title or st line placement managing

* Adding subtotal line improved

Adding a subtotal line adds it right under its corresponding title

* Improved deleting subtotal line

Added possibility to choose if you want to delete the corresponding
subtotal line when deleting a title line

* Preventing too high level titles to be created

* Create and update line errors managing

* Improved bad title or st line placement managing

* Improved st line creation

* improve headers

* fix bad block placement managing

* fix adding st line not working if duplicates titles

* fix translations

* Fix block update

* FIX special chars bug

If special char like " ' " was used in title it could be converted to
special char entity.

* Prepare for pdf options

Pdf options like page break befor title should be shown as a picto if activated on a subtotal line on a document

* Added option managing

* Improved subtotal options and PDF integration

* Code refactor

* Action name/Error managment/PDF refreshing

When adding or updating a subtotal line

* Reformat

* Reworked subtotal options database managment

* Changed access to special code

* Remove unecessary call to php trait

* Changed definition of subtotals special code constant

* Reworked align on PDF

* Removed unecessary function and improved error managment

* Typo fix and removed treated todos

* Post typo changed for to better match subtotals names

* Disabled edit if status is not draft

* Changed way subtotals options are stored

* Added view managing when creating a document form an other

* Improved creating document from an other

Can check subtotals lines with table head checkbox and removed highlight
class for better UI.

* Make include of subtotals tpl more clear

* Manage centered or justified case

If user chose to center or justify, we don't change nothing

* Improved pdf

* Removed unecessary code block

* optimisation

* Code sniffer fix

* Code sniffer fix

* Code sniffer fix

* Code sniffer fix

* Code sniffer fix and added missing translation

* Fix php code sniffer

* Reload page when setup saved on subtotals admin page

* Fix php code sniffer

* pjan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* php warning fix

* php warning fix

* php phan fix

* php phan fix

* php phan fix

* Fix bug admin page not loading because of const not defined

* php phan fix

* php phan fix

* FIX subtotals admin page display

* php phan fix

* FIX php phan

* Fix bugs and langs

* Fix bug pdf align

* Replace include by require

* Add headers to avoid refreshing and adding unwanted lines

* Fix phan

* Add GETPOST check for security

* Fix phan

* Fix phan

* Fix phan

* Subtotal option when creating a document from another

* Fix phan

* Add field subtotal options for subtotal lines

* Fix phan

* Fix phan

* Fix phan

* Update to follow mvc

* Fix php phan

* Fix php phan

* Fix phpstan/phan

* Fix phpstan

* Fix phpstan

* Fix phpstan

* Fix phpstan

* Fix phpstan

* Update to switch to extraparams

* Update to switch to extraparams

* Retrieve extraparams from db to objectline

* Modified last things to switch to extraparams

* Cleaning unnecessary code lines

* Fix php-stan

* Section subtotal in extraparams to differentiate if needed for further devs

* Fix phan

* Keep extraparams when creating from another object

* Change default value to false when creating a subtotal line

* Fix clone would not keep extraparams in new object

* Fix dark subtotal line background color

Fix when a subtotal background color is too dark and edit pencil or
delete trash could not be seen

* Fix typo

* Fix typo

* Added subtotals for facturerec

* Fix precommit

* Added extraparams when creating rec from fac and other way

* Fix phan

* Fix objectline null

* Desactivating block vat / discount update for facturerec

* reformating code

* Added expeditions for subtotal

* Save extraparams for shipping lines

* Display of subtotals lines in shipments

* Display when creating facture from shipments

* Improve display of lines and invoice creation from shipments

* Fix error if missing line rang

* Deleted duplicate

* Added deletion of subtotal line in shipping documents

* Not including subtotal lines if there is no product line in between

* Update get subtotal lines in shipment docs to disable

* Delete possibility to edit subtotal lines in shipments

* Handle pdf for shipment

* Handle conf stock or shipment supporting services

* Fix precommit

* Fix duplicate name creating bug

* Fix bug where id could be changed by the line id and would create bug

* Deleted subtotal lines when STOCK_SUPPORTS_SERVICES is enabled and block would only have service lines

* Disable shipments in admin modules

Shimpements subtotals lines are only created from commands

* Fixing phan and stan

* Deleted unused template and phan fix

* Fix phan

* Fix phan

* Fix phan

* FIX: phan

* Fix template bug

If document was not in subtotal scope and would use a template used by
subtotal it would create an error.

* Fix php-stan

* Fix bad display when modules and confs were activated

* Fix php codesniffer

* Excluding subtotal lines when mass updating

* Fix shipments service lines exluded + showing subtotal line with specific configs

* Fix line display with situation invoices + bug block line update

* Added ODT managment

This works with invoices but has not been tested with other documents

* Fix bug when editing VAT/discount by block

* Fix error raised when subtotal line added

Subtotal line had no fk_product and raised the error but we want this
line to have no fk product

* Fix precommit

* Added ODT template for documents that uses subtotals

This template can be usefull to understand how to create an odt template
using subtotals module

* Fix phan

* Fix phan

* fix: buttons showing in bad document status

* clean: unwanted commited files

* add: table examples to use with subtotals on ODT templates

* fix: Unwanted print of value when creating a document from another

* feat: renaming for better understanding

* feat: Improved templates for documents related to subtotals

---------

Co-authored-by: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-10 02:44:31 +02:00
MDW
b731d14d6e Qual: update phan baseline.txt (#33926)
* Qual: update phan baseline.txt

# Qual: update phan baseline.txt

- Updated the phan baseline:
  Removed entries for 'htdocs/commande/card.php',
'htdocs/core/class/commonsocialnetworks.class.php', 'htdocs/fourn/facture/paiement.php',
and 'htdocs/public/project/index.php'
- Corrected phan notice in 'htdocs/core/class/commoninvoice.class.php' - new since last baseline update.

* Suppose object has CommonSocialNetworks trait (for phan)
2025-04-20 13:21:48 +02:00
ldestailleur
4ee210236a Fix detect security fixes in git log 2025-04-14 09:27:20 +02:00
ldestailleur
f13282c5c9 Fix report security fix 2025-04-10 12:48:12 +02:00
ldestailleur
9a80025dd5 FIX #33727 Sec 2025-04-09 11:03:48 +02:00
ldestailleur
60a16da101 Set mx nb of process for phpstan apstats 2025-04-02 22:46:15 +02:00
ldestailleur
2020e902e0 Fix php conf file 2025-04-02 22:31:27 +02:00
ldestailleur
e057d87333 Fix mem 2025-04-02 22:26:26 +02:00
ldestailleur
6c9922ca36 Fix mem 2025-04-02 18:53:54 +02:00
ldestailleur
1c84b79369 Fix conf file 2025-04-02 15:07:44 +02:00
ldestailleur
a1f19dd6da Fix link 2025-04-02 14:23:36 +02:00
MDW
6fe1effa5e Qual: Fix PhanTypeMismatchArgumentNullable notices (#33684) 2025-04-02 11:35:53 +02:00
ldestailleur
facf32c5a9 Clean code 2025-03-25 13:40:42 +01:00
MDW
8669993ecf Qual: Fix phan notices (compta/prel..fichinter) (#33485)
* Qual: Fix phan notices (asset..compta/paiement)

* Qual: Fix phan notices (compta/prel..fichinter)
2025-03-19 15:21:48 +01:00
MDW
0cc1aa6d80 Qual: Fix phan notices (asset..compta/paiement) (#33484)
* Qual: Fix phan notices (accountancy, adherents)

* Qual: Fix phan notices (admin)

* Qual: Fix phan notices (asset..compta/paiement)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-16 20:45:04 +01:00
MDW
2c95fba2ee Qual: Fix phan notices (admin) (#33483)
* Qual: Fix phan notices (accountancy, adherents)

* Qual: Fix phan notices (admin)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-16 20:21:22 +01:00
ldestailleur
ef5880d642 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-16 15:35:39 +01:00
ldestailleur
86bebced1b Typo 2025-03-16 15:35:29 +01:00
MDW
69fdccf2a4 Qual: Fix phan notices (accountancy, adherents) (#33480) 2025-03-16 15:19:54 +01:00
MDW
c3104905b3 Qual: Fix phan notices (html/core) (#33474)
* FIX: Replace compromised tj-actions/changed-files

# FIX: Replace compromised tj-actions/changed-files

See https://www.stepsecurity.io/blog/harden-runner-detection-tj-actions-changed-files-action-is-compromised .

* Add changed php file for test

* Qual: Fix phan notices (html/core)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-15 16:34:35 +01:00
MDW
9dcf7fa0f5 Qual:Fix phan notices (multiple) (#33465) 2025-03-15 11:26:19 +01:00
MDW
2cd6459d10 Qual: Fix phan notices (*card) (#33450) 2025-03-14 17:25:11 +01:00
MDW
ef11cdeb45 Qual: Fix phan notices (pdf_* related) (#33445) 2025-03-13 23:05:15 +01:00
MDW
d362fbfe73 Qual: Fix phan notices (htdocs/fourn) (#33432)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-13 10:43:04 +01:00
MDW
d64298f6c1 Qual: Fix phan notices (htdocs/compta) (#33427) 2025-03-12 20:41:50 +01:00
MDW
1d32f66d35 Qual: Fix triggers (#33406)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-12 19:21:51 +01:00
ldestailleur
f4bee4810e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-11 10:45:36 +01:00
ldestailleur
63dd269dfa SEC FIX Reflected XSS reported by 柏天浩 2025-03-11 10:43:25 +01:00
MDW
ee9e89efaa Qual: Fix phan notices (facture/3 + filefunc.inc) (#33383)
* Qual: Fix PhanMismatchType

* Finalize rename of $attrV into $value

* Correct getGlobalString into getGlobalInt

* Do not require some fields in the 'title' definition of $cols

* Qual: Fix phan notices (core/lib)

* Qual: Fix phan (contrat)

* Qual: Fix phan notices (facture/3 + filefunc.in)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 01:59:34 +01:00
MDW
a0f71fbe76 Qual: Fix phan notices (core/lib) (#33379)
* Qual: Fix PhanMismatchType

* Finalize rename of $attrV into $value

* Correct getGlobalString into getGlobalInt

* Do not require some fields in the 'title' definition of $cols

* Qual: Fix phan notices (core/lib)
2025-03-11 01:43:54 +01:00
MDW
c0f533865f Fix CI: Do not require some fields in the 'title' definition of $cols (#33399)
* Qual: Fix PhanMismatchType

* Finalize rename of $attrV into $value

* Correct getGlobalString into getGlobalInt

* Do not require some fields in the 'title' definition of $cols
2025-03-11 01:42:49 +01:00
MDW
988fc75ca2 Qual: Fix phan notices (emailcollector, bookkeeping) (#33375)
* Qual: Fix phan notices (mostly propal)

* Fix some const arguments to Form::select_dolusers()

* Update phan baseline

* Qual: Fix phan notices (propal)

* Qual: Fix phan notices (emailcollector, bookkeeping)
2025-03-10 15:47:55 +01:00
MDW
56e354e112 Qual: Fix phan notices (facture/2) 2025-03-05 21:17:58 +01:00
MDW
04fd52cd70 Update baseline 2025-03-05 13:32:45 +01:00
MDW
f625f8de60 Qual: Fix api phan notices 2025-03-05 13:22:08 +01:00
MDW
4096d0ee2f Qual: Fix phan notices for commande 2025-03-05 12:15:14 +01:00
MDW
b91f457afb Update phan baseline 2025-03-05 12:15:13 +01:00
MDW
157cb410ef Update baseline 2025-03-02 20:49:47 +01:00
MDW
035ede5874 Qual: Fix phan notices in API classes 2025-03-02 20:49:46 +01:00
MDW
c18f84d948 Update phan baseline 2025-03-01 12:05:48 +01:00
MDW
586a28f879 Qual: Fix new false positives in hookmanager 2025-03-01 11:48:30 +01:00
MDW
746dc67556 Qual: Allow notices for functions.lib.php 2025-03-01 11:48:29 +01:00
MDW
116913abeb Qual: Fix unmatchedArgment* 2025-03-01 11:48:28 +01:00
Laurent Destailleur
f89e238223 Merge pull request #33249 from mdeweerd/phan/website
Qual: Fix phan notices (website)
2025-03-01 00:41:03 +01:00
Laurent Destailleur
3badfffd9f Merge pull request #33267 from mdeweerd/fix/phan/dolibarrmodules
Qual: Fix DolibarrModules::_init phpdoc type
2025-03-01 00:17:09 +01:00