Commit Graph

12618 Commits

Author SHA1 Message Date
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
ldestailleur
2dd6ccd2d9 Debug v22 2025-05-05 15:24:04 +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
ldestailleur
9873a98c36 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-26 20:17:39 +02:00
ldestailleur
5507459381 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-26 20:17:08 +02:00
ldestailleur
80cdcf4d62 WIP Addapage to edit all categories. 2025-04-26 13:16:07 +02:00
Mohamed DAOUD
13222f6102 NEW Add public page for donation module (#33978)
* add donation publique page

* add trans keys

* fix trans

* fix

* Fix CI

* fix CI

* fix CI
2025-04-26 01:20:45 +02:00
ldestailleur
8623843a05 FIX DetecHTML on upload file from filemanager fails due to need to lock
(no reason to need to lock file to read it).
2025-04-25 19:58:47 +02:00
ldestailleur
f1e8191e7b FIX DetecHTML on upload file from filemanager fails due to need to lock
(no reason to need to lock file to read it).
2025-04-25 19:54:53 +02:00
ldestailleur
9b3f315c14 Add option MAIN_ALLOW_WYSIWYG_EVEN_ON_UNSECURED_EXTERNAL_HTTP_URL to
allow tests
2025-04-25 19:08:56 +02:00
Can Arslan
76a89cad00 fix: give user access for file if user has 'all' permission of the module (#33957) 2025-04-23 23:32:23 +02:00
ThomasNgr-OpenDSI
3c37f28d50 NEW ticket : display files linked to actioncomm (#32325)
* modify ecmfiles to link ecmfile to actioncomm

* ticket : link files to actioncomm

* display linked files in actioncomm cards

* Various fix (pre-commit, phpstan, usw.)
2025-04-22 12:44:57 +02:00
Laurent Destailleur
4a76256f1b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-21 19:35:50 +02:00
Laurent Destailleur
2f16a642cb Doc 2025-04-21 19:35:10 +02:00
Laurent Destailleur
4b7f850979 Use dolEncrypt for pass encryption 2025-04-21 18:48:48 +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
MDW
69e3d4b5df UIUX: Interpret first token as thousands separator 21.500,00 (when French, ...). (#33832)
* Qual: Add testcase for price2num to convert '21.500,00' in FR

* NEW: Accept numbers like 1.213,00 in locales with whitespace/empty thousands separator

# NEW: Accept numbers like 1.213,00 in locales with whitespace/empty thousands separator

- Graceful handling of comma and dot as decimal points and thousands separators in the `price2num` function.
- Improved the `getNonEmptyString` function to include proper indentation and spacing (automatic).

* Add testcases for price2num

* en_US tests for invalid prices, add doc for price2num regex

* Restore lost test to validate compatibility

* Update FunctionsLibTest.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-21 11:57:13 +02:00
Laurent Destailleur
6ef600e991 WIP option WEBSITE_EXPORT_SQL_ON_SEVERAL_LINES 2025-04-19 02:43:44 +02:00
Etienne BENDER
531003887f fix(supplier_proposal): enforce class name in getElementProperties() (#33887) 2025-04-18 14:21:16 +02:00
ldestailleur
941ccf5ec7 Debug v22 2025-04-18 13:33:55 +02:00
Laurent Destailleur
6f6a5f6f4d Look and feel v22 2025-04-17 19:58:48 +02:00
ldestailleur
9f3281cf1d WIP mail layout 2025-04-17 00:56:22 +02:00
Frédéric FRANCE
de763b4b43 clean code of order (#33880)
* clean code of order

* clean code of order

* clean code of order

* clean code of order
2025-04-16 21:09:45 +02:00
Regis Houssin
483112810e FIX avoid sql error when a comment is after without comma (#33758)
* FIX avoid sql error when a comment is after without comma

* FIX syntax error

* Update admin.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-16 20:00:13 +02:00
Jon Bendtsen
772337d162 redoing PR Api objectlinks #33738 (#33781)
* redoing PR Api objectlinks #33738

* loading objectlinks api from main api folder

* bringing $FIELDS up to develop branch standard

* trying to tell phan the expected array types

* phan return and input type specifications

* trying to fix 'Method ObjectLink::_makeobject() should return int but return statement is missing.'

* trying to return an ObjecTLink

* get returns an ObjectLink object

* making sure that function _makeobject always has an return

* making sure deleteByValues always has a return statement

* remove empty line

* making sure getByValues always has a return value

* trying to fix phan for _validate

* no < around objectlink

* trying to fix some phan and phan-stan errors

* public variable target should be fk_target

* making TRIGGER_PREFIX more like in core/class/commonobject.class.php

* trying to save and use the notrigger value

* typecast objectlink fk_source and fk_target to string in the hope that they are later made correctly to int

* whitespace to trigger a build of my branch

* back to being int - because that is what they are

* trying to typecast

* trying to help PHPStan to validate fk_source and fk_target

* trying to use  the same way as  are used

* splitting  over multiple lines

* Fix: update ObjectLink return type in API methods

### FIX: Update ObjectLink return type in API methods

- Updated the return type of several methods from `ObjectLink` to `Object` to reflect a return type compatible with Luracast/Restler

* fix: refactor field setting in ObjectLinks class

# Fix: Refactor field setting in ObjectLinks class

- Removed the static `$INTFIELDS` array and moved its logic to a new private
method `_setObjectLinkField`.
- Updated `create`, `getByValues`, and `deleteByValues` methods to use
`_setObjectLinkField` for setting fields.
- Cleaned up the code by removing redundant field validation and type casting
logic.

* noting that relation type can both be string and null

* escaping strings before parsing them to the database

* -> not global

* trying to fix phpstan errors by flipping so the string part is first

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: MDW <mdeweerd@users.noreply.github.com>
2025-04-16 14:49:39 +02:00