Commit Graph

650 Commits

Author SHA1 Message Date
ldestailleur
4bc5892544 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-24 17:00:53 +02:00
Dylan Bourdere
59ec1a2811 fix ui on multi line subtotal & fix text contrast (#35449)
* fix ui on multi line subtotal & fix text contrast

* extract subtotal pdf logic

* phpcs

* lint

* lint

* refactor

* phpcs

* phpcs

* phpcs

* Update pdf.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-23 23:24:37 +02:00
MDW
b3228aa7ce Qual: Fix phan notices (#35406)
* fix CI

* fix

* Qual: Fix newly appeard phan notices

# Qual: Fix newly appeard phan notices

Fix notices that appearce sin a previous phan report - some of these
notices are masked by the current baseline.

---------

Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: Frédéric FRANCE <frederic.france@free.fr>
2025-09-20 15:59:05 +02:00
ldestailleur
4a363478ae Clean code with rector 2025-09-18 16:26:38 +02:00
ldestailleur
4e83087e28 Fix complete #35368 2025-09-17 15:04:01 +02:00
ldestailleur
92ffba11ca Remove old lang files that are too small (moved into other lang files) 2025-09-11 13:31:34 +02:00
Frédéric FRANCE
0e1478206a clean code (#35229)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-08 01:48:52 +02:00
ldestailleur
aca71e1573 Standardize code 2025-08-10 03:22:19 +02:00
ldestailleur
24efd80bbc Debug v22 2025-06-07 14:31:53 +02:00
ldestailleur
11f9f032d9 Debug v22 2025-06-07 14:15:56 +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
ldestailleur
955a8dab83 Debug v22 2025-04-11 14:20:42 +02:00
ldestailleur
c73eec72d5 Disable spellcheck on textarea to define path of dirs 2025-03-25 14:10:53 +01:00
Mathieu Schiffmann
b9946cef4a NEW #33506 Add a constant to apply a ratio to resize images in ODT templates (#33543)
* CLOSE #33506 add a constant holding the ratio to resize images in ODT templates

A new Dolibarr constant 					MAIN_DOC_ODT_IMAGE_RATIO
is taken in consideration for ODT templates.
This constant holds a number that is multiplied when computing the size of images in ODT templates.
All doc_generic_*_odt_modules.php files have been updated to call the setImage Method with a new parameter $ratio
The method setImage in the file odt.php has been modified to have a new parameter $ratio and use it to compute the image size

* FIX #33506 wrong branch

some other files needed to be changed in the develop branch

* FIX #33506 PR errors fixed

* FIX #33506 codesniffer errors fixed

* QUAL #33506 completed method comment
2025-03-24 16:41:00 +01:00
atm-irvine
80d90a96bc feat(expedition): added project ref on expedition PDF (#33442)
* feat(expedition): added project ref on expedition PDF

* feat(expedition): added project ref on expedition PDF

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-16 20:45:26 +01:00
MDW
ef11cdeb45 Qual: Fix phan notices (pdf_* related) (#33445) 2025-03-13 23:05:15 +01:00
ldestailleur
c9f985f2f9 Clean code 2025-03-10 16:17:29 +01:00
ldestailleur
1bef5ba9b2 Option SHIPPING_PDF_HIDE_QTYTOSHIP supported in merou and espadon
module.
2025-03-10 16:17:18 +01:00
MDW
cf7b7009ae Fix writeHTMLCell arguments 2025-03-05 21:17:57 +01:00
JonathanBtq
ee8fe3a324 New hooks expedition PDF espadon
I add the PrintPDFline hook on expedition espadon PDF
2025-02-28 10:57:36 +01:00
MDW
2130f1395a Qual: Fix phan (product-part-1) implies fixing unit types 2025-02-09 20:14:20 +01:00
MDW
e5b1946bc7 Qual: Fix arguments types on TCPDF/TCPDI calls 2025-02-05 01:43:53 +01:00
MDW
2117c5e550 Qual: Fix setPageOrientation 'autopagebreak' type 2025-02-05 01:43:52 +01:00
MDW
7841b55813 Qual: Fix MultiCell 'fill' argument type 2025-02-05 01:43:50 +01:00
Frédéric France
4616a2f636 fix phpstan 2025-01-27 22:00:15 +01:00
MDW
7aa845efd0 Qual: Fix phan notices 2025-01-24 10:55:57 +01:00
Frédéric France
1652b5b178 fix phpstan 2025-01-11 09:53:00 +01:00
Laurent Destailleur (aka Eldy)
778b07dabd Debug v21 Fix tooltip on setup pages 2024-12-13 17:22:48 +01:00
Mathieu Moulin
d1ded1caa1 Add option to hide only Volume (and keep weight) in shipping PDF - Issue #32030 (#32031)
* Add option to hide only Volume (and keep weight) in shipping PDF

* Fix use of option SHIPPING_PDF_HIDE_VOLUME in shipping lines

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-21 18:05:35 +01:00
Laurent Destailleur
37f15cfb42 NEW Add option to round weight and volumen on shipment pdf 2024-11-06 12:50:24 +01:00
Frédéric FRANCE
6549c6d8fe fix translations (#31585)
* fix translations

* fix translations
2024-10-27 01:29:03 +02:00
Alexandre SPANGARO
0bccfde432 NEW PDF - Add Customer accountancy code (#31544) 2024-10-25 13:43:35 +02:00
Laurent Destailleur
a30da69104 Fix phan 2024-10-20 00:30:59 +02:00
Laurent Destailleur
c70973c0c8 Merge v20 2024-10-19 14:44:55 +02:00
Laurent Destailleur
f9eb82de7f FIX pagebreak when option PDF_ADD_POSITION is set 2024-10-18 18:43:59 +02:00
MDW
33b9479692 Qual: Ignore phan notice for pagebreak property (#31427)
# Qual: Ignore phan notice for pagebreak property

The access to the undeclared pagebreak property is protected with isset().
So these notices are now suppressed.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-17 01:49:43 +02:00
MDW
9677a370e9 Qual: Nullable mysoc hint (#31393)
* Qual: Nullable mysoc hint

# Qual: Nullable mysoc hint

$mysoc can be nullable resulting in issues (#31387) so
it is best to detect these cases with static analysis

* Prevent null assignment
2024-10-17 01:44:54 +02:00
Laurent Destailleur
ce414d29d7 Fix phan 2024-10-17 01:23:23 +02:00
Laurent Destailleur
82f65a6410 NEW Can choose the zip handler to build ODT 2024-10-17 00:31:53 +02:00
Laurent Destailleur
956a039082 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2024-10-16 20:47:12 +02:00
Laurent Destailleur
9ad71b980a NEW Can choose the zip handler to build ODT 2024-10-16 20:46:52 +02:00
Laurent Destailleur
e57ba5aa16 Fix phan 2024-10-15 17:30:07 +02:00
Laurent Destailleur
04ea424979 Removed not used $langs 2024-10-15 16:35:21 +02:00
Laurent Destailleur
231a561712 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-10-15 14:22:46 +02:00
Laurent Destailleur
e731910ede Miscellaneous fix on PDf template (trans, position column, warning) 2024-10-15 14:14:07 +02:00
Laurent Destailleur
86a90692ef FIX Support for PDF_ADD_POSITION was not complete 2024-10-15 00:18:05 +02:00
Laurent Destailleur
530fb167a2 NEW Support option PDF_ADD_POSITION on shipment espadon template 2024-10-14 22:38:51 +02:00
sonikf
c5587519f0 NEW: PDF Add option to print rounded corner frames (#31172)
* NEW: Add option to enable PDF frame rounded corners

* NEW: function printRoundedRect

* NEW PDF frame rounded corners

* New add rounded corners in frames

* New add rounded corners in frames

* Update admin.lang

* fix incoterm frame height

* Update pdf_sponge.modules.php

* fix pre-commit

* fix pre-commit

* fix php-stan (8.2)

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* fix phan php-stan (8.2) declare property

* New add rounded corners in frames

* New add rounded corners in frames

* add phpdoc for corner radius

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* fix php-stan (8.2)

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* fix whitespace

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* New add rounded corners in frames

* fix pre-commit empty line

* fix phan php-stan (8.2)

* fix phan php-stan (8.2)

* fix Travis

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix title color

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan phpdoc

* fix pre-commit

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-04 09:13:44 +02:00
MDW
1834c37c16 Qual: Fix phan notices (#31212)
* Qual: Fix phan notices

# Qual: Fix phan notices

Fix several phan notices related to classes with UnknownObject
classes.

* Qual: Fix phan notices

* Qual: Fix phan notices

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-03 19:40:34 +02:00
Laurent Destailleur
bf697f83eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-09-12 21:50:31 +02:00