2
0
forked from Wavyzz/dolibarr
Commit Graph

12442 Commits

Author SHA1 Message Date
Laurent Destailleur
221c27c091 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-09 18:15:59 +02:00
Laurent Destailleur
326c75dc51 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-09 17:58:54 +02:00
Laurent Destailleur
473ddbc53a Merge remote-tracking branch 'origin/19.0' into 20.0 2025-06-09 17:42:02 +02:00
Laurent Destailleur
c444fe3c1f Merge remote-tracking branch 'origin/18.0' into 19.0 2025-06-09 17:25:03 +02:00
ldestailleur
9b1fa240b8 Debug v22 2025-06-07 12:55:07 +02:00
ldestailleur
e9f3fcfb9c Fix allow iframe in WAF for website 2025-06-07 12:44:42 +02:00
Marc de Lima Lucio
35528a5885 FIX: prevent log warning with online signature url (#34361) 2025-06-05 18:29:12 +02:00
ldestailleur
9e5769b8b7 Make the feature "Kanban Grouped By" on opportunities visible by default 2025-06-05 15:49:53 +02:00
kkhelifa-opendsi
6059b0e6f5 FIX: Fix natural search with negative numbers (#34322) 2025-06-04 11:20:03 +02:00
ldestailleur
b5a871bf99 Close #34344 2025-06-04 10:48:29 +02:00
lvessiller-opendsi
ce0f46a483 FIX local taxes text in PDF (#34343) 2025-06-03 17:03:15 +02:00
ldestailleur
f3fb48dcde Debug v22 2025-06-02 20:51:21 +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
492b442c4a Debug v22 2025-05-31 13:43:40 +02:00
ldestailleur
d0111dc240 Debug v22 2025-05-31 13:33:31 +02:00
ldestailleur
6e2ee971e1 Debug v22 2025-05-30 12:23:13 +02:00
Laurent Destailleur
c35965030c Debug v22 2025-05-28 01:16:02 +02:00
Peter Kessen
124ae92f33 Hide Bank Account number and Bank Code when field is empty (#34253)
* Skip empty value cells for bank information

* Save space for bank table when no info is present
2025-05-27 20:11:44 +02:00
atm-irvine
3ec16bdb64 FIX : Missing ol in no escape tags (#34261) 2025-05-27 19:29:32 +02:00
Laurent Destailleur
4ccb3296da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-22 17:06:42 +02:00
Laurent Destailleur
b2f148da50 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-22 17:06:21 +02:00
ldestailleur
4311786e0c Debug v22 2025-05-22 16:32:07 +02:00
atm-irvine
9c66aa29c6 fix(document): use propale instead of propal (#34248) 2025-05-22 15:45:20 +02:00
Laurent Destailleur
c724800a05 Fix permission on conf.php file 2025-05-20 22:01:00 +02:00
Laurent Destailleur
a4657bbbf8 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-05-20 21:59:28 +02:00
Laurent Destailleur
7c2fa3e8a1 Fix CI 2025-05-20 01:09:52 +02:00
Laurent Destailleur
0f4bf91fcd Fix default value of dol_move 2025-05-19 09:45:31 +02:00
Mohamed DAOUD
1ba5736ac7 fix website conf page (#34175)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-17 14:16:46 +02:00
ldestailleur
1370fcc4d4 Fix warning 2025-05-17 14:00:21 +02:00
Laurent Destailleur
d540dd0ab7 Finish option CATEGORY_EDIT_IN_POPUP_NOT_IN_MENU 2025-05-16 17:59:39 +02:00
ldestailleur
1842dd616e Debug refresh of website templates 2025-05-16 11:36:29 +02:00
Mohamed DAOUD
ec63a8f9bb new association template (#34164) 2025-05-16 10:22:04 +02:00
Lucas Marcouiller
935051d803 Fix bad replace to empty string on GETPOST (#34129) 2025-05-14 12:53:21 +02:00
HENRY Florian
fb67acbc7b NEW: add common substitution __PREVIOUS_MONTH_TEXT__ (#34121) 2025-05-13 13:29:24 +02:00
ldestailleur
fe831a315b Fix CI 2025-05-12 19:33:57 +02:00
Laurent Destailleur
7dd95914e8 Clean code 2025-05-12 00:02:59 +02:00
ldestailleur
a674676ded Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-10 13:33:53 +02:00
ldestailleur
d76848351c Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-05-10 13:30:36 +02:00
ldestailleur
ae94c71a10 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-05-10 13:25:31 +02:00
ldestailleur
445f089556 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-05-10 12:53:37 +02:00
ldestailleur
d3d8f02433 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-05-10 12:42:51 +02:00
ldestailleur
b0501b1c35 Fix renering of status of invoice in takepos. Fix use short label. 2025-05-10 12:42:29 +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
Mohamed DAOUD
317ddec570 Enhance website config page (#34082)
* enhance website config page

* fix
2025-05-10 00:05:36 +02:00
ldestailleur
43be2676ea Fix CI 2025-05-06 21:23:38 +02:00
ldestailleur
095905670a Remove BlockUI js plugin. Replaced with few js/css lines. 2025-05-06 19:15:13 +02:00
ldestailleur
6a22102155 Use the getValidPayment to detect payment modules 2025-05-06 14:26:30 +02:00
lvessiller-opendsi
cc78023a44 FIX allow double colon and string obfuscation in dol eval for computed extra fields (#34015)
* FIX allow double colon and string obfuscation in dol eval for computed extra fields

* Update functions.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-06 11:50:28 +02:00
ldestailleur
eadc676edf NEW Add option MAIN_ALLOW_DOUBLE_COLON_IN_DOL_EVAL 2025-05-06 11:10:57 +02:00
atm-irvine
24ef9d1c0d fix: missing classfile for facturerec getElementProperties (#34067) 2025-05-06 10:48:02 +02:00