Commit Graph

3388 Commits

Author SHA1 Message Date
ldestailleur
d1ddf4314e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 13:18:15 +02:00
ldestailleur
c6a5bf3836 Fix CI 2025-06-27 21:30:37 +02:00
ldestailleur
1a5d71319e Fix check on entity is a different security check than check on external
user so code must not be nested.
2025-06-27 16:43:16 +02:00
Florian Mortgat
094dd3a9d1 FIX 21.0: $height and $width can be ints, but also 'auto' (#34636)
* FIX 21.0: $height and $width can be ints, but also 'auto' (which is commonly used), so check for this special value before typecasting

* Update html.form.class.php

* Update html.form.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-27 00:30:00 +02:00
ldestailleur
497d774a21 Fix the selectForFormsList was not using correctly the
ismultientitymanaged. Replace a join with and exists.
2025-06-27 00:21:50 +02:00
ldestailleur
d828828bef CSS 2025-06-25 12:15:17 +02:00
HENRY Florian
931384db35 fix: manage correctly external module object link with myobject@mymodule element type (#34530)
* fix: manage correctly external module object link with myobject@mymodule element type

* add more doc in template module builder

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-21 16:09:54 +02:00
ldestailleur
703d4358a5 Debug v22 2025-06-20 12:34:10 +02:00
ldestailleur
06a5b4947d Fix CI 2025-06-18 15:59:28 +02:00
ldestailleur
8208b1d40f Debug v22 2025-06-17 01:13:09 +02:00
Laurent Destailleur
13f483d7a9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2025-06-14 16:03:56 +02:00
Laurent Destailleur
8d7a5e9945 Debug v22 2025-06-14 15:59:13 +02:00
IC-Nicolas
6474c7fbdd FIX display error (#34494)
* FIX display error

* FIX CI
2025-06-14 11:57:58 +02:00
ldestailleur
81ea4aaa8c Try to fix CI 2025-06-04 16:18:03 +02:00
ldestailleur
6d16d2298c Try fix ci 2025-06-04 15:58:01 +02:00
ldestailleur
36b00c5951 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-02 14:59:18 +02:00
ldestailleur
78d261916f Debug v22 2025-06-02 14:22:47 +02:00
Laurent Destailleur
f9f15a75d6 Fix CI 2025-05-27 16:31:51 +02:00
ldestailleur
094a05b9a5 Debug v22 2025-05-27 14:48:25 +02:00
ldestailleur
c025ae1c83 Clean code 2025-05-26 17:24:27 +02:00
Laurent Destailleur
27371b639d Fix js protection 2025-05-25 20:13:14 +02:00
Laurent Destailleur
fed208b57d Debug v22 2025-05-16 22:39:08 +02:00
Arthur Lenoble
77a5147f6c Option to show stock in products combo in supplier orders (#34106)
Add the constant SUPPLIER_SHOW_STOCK_IN_PRODUCTS_COMBO to show the current stock of the product in the products combo in a supplier order like it's already possible in a customer order
2025-05-12 20:12:30 +02:00
Laurent Destailleur
6c39a9657c NEW Show country flag in list of chart of account 2025-05-12 02:30:30 +02:00
Laurent Destailleur
ceeb5b7a50 Clean code 2025-05-12 01:38:55 +02:00
Laurent Destailleur
7dd95914e8 Clean code 2025-05-12 00:02:59 +02:00
ldestailleur
354a314843 Debug v22 2025-05-10 18:46:55 +02:00
ldestailleur
243d73c49b Fix regression 2025-05-10 18:30:38 +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
52acd2cfac Clean code 2025-05-06 15:20:14 +02:00
ldestailleur
d73d760b53 FIX Hour and min were lost when editing a past event. 2025-05-05 14:26:14 +02:00
ldestailleur
0b7836595c Debug v22 2025-05-04 23:53:34 +02:00
Charlène Benke
7537199598 php warning on delete warehouse (#34041) 2025-05-04 10:43:48 +02:00
ldestailleur
7c99a650e3 Show nb of tags per type 2025-04-26 16:15:52 +02:00
ldestailleur
cc361b2859 css 2025-04-26 03:42:47 +02:00
ldestailleur
cde72d84a0 Refactoring code for better name and fix star extrafield on thirdparty 2025-04-26 03:00:53 +02:00
ldestailleur
efdc4f9a5d Debug v22 2025-04-25 16:43:31 +02:00
ldestailleur
46c9fd064d Look and feel v22 2025-04-25 11:44:15 +02:00
ldestailleur
7db8252225 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-21 13:52:25 +02:00
ldestailleur
ae5750f099 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-21 13:48:05 +02:00
ldestailleur
aa6fd6de5a Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-04-21 13:45:36 +02:00
ldestailleur
0339ee6f1f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-04-21 13:44:08 +02:00
ldestailleur
95d80fd5e8 Debug v22 2025-04-21 11:34:20 +02:00
Frédéric FRANCE
f5b11b78da fix typo (#33920) 2025-04-19 11:46:22 +02:00
Clément
2c3c763871 UIUX Improved ergonomics through UI design (#33868)
* Improved ergonomics through UI design

In IT conventions, the Cancel button is on the left and the Create button on the right. On Dolibarr, it's currently the other way round, which is rather counter-intuitive when you reflexively click. Correction to improve the GUI while respecting cultural norms.

* Update html.form.class.php with const

* Update html.form.class.php

* Update html.form.class.php

* Update html.form.class.php

* Update html.form.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-19 02:58:39 +02:00
ldestailleur
3f31c74642 Debug v22 2025-04-16 15:50:37 +02:00
ldestailleur
79e3a2eddf Debug v22 2025-04-14 15:04:26 +02:00
ldestailleur
5bbce37a10 Debug v22 2025-04-10 20:16:08 +02:00
ldestailleur
8cc5bc3e7e NEW The closing reason of invoice appear on tooltip of invoice status 2025-04-09 19:07:31 +02:00
ThomasNgr-OpenDSI
b431b1bc90 FIX sales representatives can affect contacts from thirdparties they are not allowed to see (#33353)
* introduce method User::getAffectedThirdparties()

* Forbid to display thirdparties on contact tab is user has no right to see them

* add control in add_contacts

* fix precommit

* fix phan, phpstan

* fix travis + fix using wrong table

* Forbid to display thirdparties on contact tab is user has no right to see them (more secure way)

* try to fix TRAVIS

* more efficient way to check user is allowed to ad a socpeople

* remove dead code
2025-04-06 19:51:30 +02:00