Commit Graph

2846 Commits

Author SHA1 Message Date
github-actions[bot]
b2b3100ed3 PHPStan > Update baseline (#34584)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-19 14:59:26 +02:00
ldestailleur
8c99c91015 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-19 12:51:00 +02:00
ldestailleur
b8695702dd Fix DOC 2025-06-19 12:50:49 +02:00
Frédéric FRANCE
a089aa2409 fix missing translation (#34578) 2025-06-19 12:41:29 +02:00
ldestailleur
9c2da8b9b6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-19 11:31:44 +02:00
github-actions[bot]
55a8d9ff26 PHPStan > Update baseline (#34536)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-16 20:23:29 +02:00
github-actions[bot]
3145f76182 PHPStan > Update baseline (#34503)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-14 15:05:21 +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
Laurent Destailleur
58ae48c520 Doc 2025-06-13 15:49:34 +02:00
github-actions[bot]
ede7784c1c PHPStan > Update baseline (#34408)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-13 00:22:55 +02:00
github-actions[bot]
b9683888e6 PHPStan > Update baseline (#34382)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-10 14:41:22 +02:00
github-actions[bot]
6401faf7d4 PHPStan > Update baseline (#34362)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-05 18:27:48 +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
github-actions[bot]
88c77bf6c4 PHPStan > Update baseline (#34316)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-04 13:39:06 +02:00
github-actions[bot]
b6bb5c0e99 PHPStan > Update baseline (#34256)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-05-27 19:32:28 +02:00
github-actions[bot]
db858032bc PHPStan > Update baseline (#34247)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-05-22 15:44:58 +02:00
github-actions[bot]
888a28b687 PHPStan > Update baseline (#34158)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-05-15 18:05:59 +02:00
ldestailleur
54e8128475 Doc 2025-05-15 11:48:04 +02:00
ldestailleur
d9bb03e3b7 Update doc 2025-05-15 11:36:07 +02:00
Frédéric FRANCE
801ea9dc5a fix translation (#34154) 2025-05-15 10:13:24 +02:00
Frédéric FRANCE
296970ca64 fix translation (#34153) 2025-05-14 18:07:59 +02:00
github-actions[bot]
5ecaeb2861 PHPStan > Update baseline (#34147)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-05-14 14:31:43 +02:00
github-actions[bot]
37b4e77b63 PHPStan > Update baseline (#34126)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-05-14 13:01:21 +02:00
ldestailleur
bdd5bc0b86 Doc 2025-05-14 10:23:17 +02:00
ldestailleur
da87582b70 Prepare v22 2025-05-12 16:35:51 +02:00
ldestailleur
86e625be0e Debug v22 2025-05-12 10:59:01 +02:00
Laurent Destailleur
dae2597a90 Fix CI 2025-05-11 00:14:25 +02:00
ldestailleur
15672801c2 Doc 2025-05-10 18:21:55 +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
github-actions[bot]
5701fe7fce PHPStan > Update baseline (#34070)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-05-06 21:22:19 +02:00
Frédéric FRANCE
153ce2672a fix login translation (#34057) 2025-05-05 20:15:57 +02:00
Frédéric FRANCE
931cdf278b fix cron missing translation (#34058)
* fix cron missing translation

* fix cron missing translation

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-05 20:14:53 +02:00
Frédéric FRANCE
ff3cec75d0 fix translations (#34055) 2025-05-05 20:13:55 +02:00
Frédéric FRANCE
76f5a8ac90 fix translation account (#34060)
* fix translation account

* fix translation account
2025-05-05 20:13:03 +02:00
github-actions[bot]
8bec4db5e5 PHPStan > Update baseline (#34054)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-05-04 18:40:56 +02:00
Frédéric FRANCE
b95b074922 fix missing translations (#34025)
* fix missing translations

* fix missing translations

* fix missing translations

* fix missing translations
2025-05-04 11:25:18 +02:00
Frédéric FRANCE
ce84eb8da0 fix missing translation (#34034)
* fix missing translation

* fix missing translation
2025-05-04 10:47:40 +02:00
github-actions[bot]
9e98e02f29 PHPStan > Update baseline (#34019)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-04-29 14:51:35 +02:00
Frédéric FRANCE
57aa02f0f4 Fix missing translation (#34014)
* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation
2025-04-29 10:53:52 +02:00
Frédéric FRANCE
d994442f34 fix missing translation (#34004)
* fix missing translation

* fix missing translation
2025-04-29 06:38:10 +02:00
ldestailleur
4c70e0035f Fix CI 2025-04-26 01:32:40 +02:00
github-actions[bot]
ea827c3806 PHPStan > Update baseline (#33969)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-04-24 15:39:16 +02:00
github-actions[bot]
615b81005f PHPStan > Update baseline (#33936)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-04-22 11:44:43 +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
github-actions[bot]
45d06857d6 PHPStan > Update baseline (#33925)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-04-20 00:50:26 +02:00
Frédéric FRANCE
ce7269aa07 fix missing translation (#33921)
* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation
2025-04-19 11:46:57 +02:00
ldestailleur
2a7b9a2466 WIP mail layout 2025-04-17 00:27:52 +02:00
github-actions[bot]
d236e52d5c PHPStan > Update baseline (#33873)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-16 19:00:01 +02:00