2
0
forked from Wavyzz/dolibarr
Commit Graph

15399 Commits

Author SHA1 Message Date
ldestailleur
ae06fde2c5 Doc 2025-06-04 14:04:43 +02:00
ldestailleur
7ed8450d8a Fix CI 2025-06-04 10:59:27 +02:00
Günter Lukas
eaf0ec2e30 Fix #34346 - SQL Error (#34347)
* Fix #34346 - SQL Error

* Update commonobject.class.php
2025-06-03 17:05:10 +02:00
ldestailleur
88e75755fa Debug v22 2025-06-02 21:10:45 +02:00
ldestailleur
f3fb48dcde Debug v22 2025-06-02 20:51:21 +02:00
ldestailleur
9135a63867 Debug v22 2025-06-02 17:11:38 +02:00
ldestailleur
7b8223d66a Debug v22 2025-06-02 17:07:25 +02:00
ldestailleur
d543bdcffe Debug v22 2025-06-02 16:59:46 +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
ldestailleur
b3ada81875 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-28 09:57:55 +02:00
ldestailleur
95519edb78 Debug v22 2025-05-28 09:57:46 +02:00
Laurent Destailleur
c35965030c Debug v22 2025-05-28 01:16:02 +02:00
Laurent Destailleur
3c3df0c24d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-28 00:09:40 +02:00
Laurent Destailleur
1b3b123472 Debug v22 2025-05-28 00:09:02 +02:00
Alexandre Janniaux
5daee690a9 hookmanager: early return (#34202)
The line:

        if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks)) {

Needs to be inverted like the following:

        if (!in_array($context, $arrayhooks) && !in_array('all', $arrayhooks)) {

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-27 22:26:58 +02:00
Charlène Benke
51d26108f9 fix typo error (#34186)
contRactid instead of contactid ...

there are some very long weekends sometimes...
2025-05-27 21:18:57 +02:00
Quentin-Seekness
024f266089 Allow insertion of value equals to 0 with int type (#34294)
The issue is that right now we can't insert a value of 0 as an int extrafields (unless the filed is mandatory, wich is not always the case)
2025-05-27 18:55:28 +02:00
Laurent Destailleur
393537d1e4 FIX portal module, prepare to replace duplication of code 2025-05-27 18:47:19 +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
3aaf0ad6f7 Debug v22 2025-05-26 22:17:53 +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
fe25cc8428 FIX #34206 2025-05-22 22:04:30 +02:00
Laurent Destailleur
fed208b57d Debug v22 2025-05-16 22:39:08 +02:00
ldestailleur
847d016a7f Doc 2025-05-15 13:12:06 +02:00
ptibogxiv
88f555ed5e New manage User notifications by API (#34098)
* New manage User notifications by API

* Update api_users.class.php

* Update api_users.class.php

* Update api_users.class.php

* Update api_users.class.php

* Update api_users.class.php

* Update api_users.class.php

* Update api_users.class.php

* fix variable $fk_user notify.class.php

* Update api_users.class.php

* Update api_users.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-14 16:54:33 +02:00
Mohamed DAOUD
6c0d947831 Update html.form.class.php (#34128) 2025-05-14 13:08:54 +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
Lucas Marcouiller
991e6f383a Fix ai feature to edit/set extrafield with ai following step 3 (#34111)
* Fix ai  feature to edit/set extrafield with ai following step 3

* fix formlayoutai page

* fix CI
2025-05-12 19:41:46 +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
62e305f7fa Debug the asset module. Can't delete. 2025-05-10 21:03:27 +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
ldestailleur
45d4e3faaa Better tooltips. 2025-05-10 16:29:32 +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
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
ldestailleur
46ac3d5b12 FIX Backport fix of substition of thirdparty info in notification 2025-05-07 14:53:51 +02:00
ldestailleur
095905670a Remove BlockUI js plugin. Replaced with few js/css lines. 2025-05-06 19:15:13 +02:00
ldestailleur
52acd2cfac Clean code 2025-05-06 15:20:14 +02:00
ldestailleur
0136a794c9 Add a new page type "Setup" for website module. 2025-05-06 12:52:31 +02:00
ldestailleur
5e67ec6376 Fix CI 2025-05-05 21:13:05 +02:00
ldestailleur
8664a3c2c8 Fix CI 2025-05-05 20:30:26 +02:00
ldestailleur
f0eaae6a1d Debug v22 2025-05-05 17:09:24 +02:00