Commit Graph

145227 Commits

Author SHA1 Message Date
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
629533494a Fix error management 2025-05-10 13:08:49 +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
ldestailleur
2536f7bd62 Fix Show invoice ref when invoice is closed in takepos 2025-05-10 11:30:55 +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
Laurent Destailleur
c6b7b3fe3e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-10 00:55:04 +02:00
Laurent Destailleur
016cc298be Fix CI 2025-05-10 00:54:25 +02:00
Mohamed DAOUD
317ddec570 Enhance website config page (#34082)
* enhance website config page

* fix
2025-05-10 00:05:36 +02:00
Laurent Destailleur
db50d918b0 Trans 2025-05-10 00:02:30 +02:00
Eduardo Pulpillo
acc02b3c74 Update users.lang replacing "Dolibarr account" by "External User account" for better white labeling and better readabiility (#34085)
Replace the text for better white labeling and better readability
2025-05-09 23:57:22 +02:00
Laurent Destailleur
e4305ad221 Fix CI 2025-05-09 23:54:44 +02:00
HENRY Florian
9fa7d0c774 new: add hidden const to not add URL link in teicket response whatever public enabeld or not (#34080) 2025-05-09 23:49:06 +02:00
Frédéric FRANCE
b343a7b910 fix input with PRODUCT_USE_UNITS at create step (#34081)
* fix input with PRODUCT_USE_UNITS at create step

* Update card.php

* Update card.php
2025-05-09 23:48:07 +02:00
Noé Cendrier
bd3118375e FIX: fetch main_last_doc for supplier orders (#34079) 2025-05-09 23:46:41 +02:00
Mohamed DAOUD
a10a9a60c7 add some trans keys (#34078) 2025-05-09 23:46:18 +02:00
Frédéric FRANCE
223f0c2763 fix translation (#34086) 2025-05-09 23:46:07 +02:00
ldestailleur
a827287afd NEW Show code of stripe hooks supported in setup page 2025-05-09 16:25:15 +02:00
ldestailleur
8f7142ad76 NEW Use the PhpZipProxy handler to generate ODT files. 2025-05-09 15:47:08 +02:00
ldestailleur
3bf7cc01fd Code comment 2025-05-09 15:39:07 +02:00
ldestailleur
68029a71ef NEW autofix mysqldump command for backup when path is wrong 2025-05-09 11:13:49 +02:00
ldestailleur
46ac3d5b12 FIX Backport fix of substition of thirdparty info in notification 2025-05-07 14:53:51 +02:00
ldestailleur
912fe653b9 Look and feel v21 2025-05-07 13:57:40 +02:00
ldestailleur
e536d2e550 Fix missing property in tooltip 2025-05-07 13:11:09 +02:00
ldestailleur
1ec8036cc6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-05-07 11:32:25 +02:00
ldestailleur
b555aed819 The API to create a website account /idthirdparty/accounts/site is now
POST (instead of PUT) and to update is PUT (instead of PATCH).
2025-05-07 11:28:30 +02:00
William Mead
384a4f3984 QUAL Updated third party API PHPDoc (#34077)
* Updated and cleaned PHPDoc. Added contributor details.

* Updated and cleaned PHPDoc

* Cleaned PHPDoc

* Cleaned PHPDoc

* Cleaned PHPDoc

* Cleaned PHPDoc

* Cleaned PHPDoc

* Cleaned PHPDoc

* Added contributor details
2025-05-07 11:20:14 +02:00
Frédéric FRANCE
f48d3d6e41 fix unexisting picto (#34076)
* fix unexisting picto

* fix unexisting picto
2025-05-07 11:18:37 +02:00
atm-irvine
dea5209fef fix: removed useless redefined var in cabyprodserv (#34068) 2025-05-07 03:29:54 +02:00
sonikf
7322b9cd93 NEW Add option to create simple shipment of non origin. SQL part (#34071)
* NEW Add description

* NEW Add description in llx_expeditiondet
2025-05-06 22:12:43 +02:00
Frédéric FRANCE
32fdfa771c fix CI (#34072)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-06 22:08:23 +02:00
ldestailleur
b7754d5dc6 CSS 2025-05-06 21:43:52 +02:00
ldestailleur
75ad941797 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-06 21:23:45 +02:00
ldestailleur
43be2676ea Fix CI 2025-05-06 21:23:38 +02:00
github-actions[bot]
5701fe7fce PHPStan > Update baseline (#34070)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-05-06 21:22:19 +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
084bc9af3c Use the getValidPayment to detect payment modules 2025-05-06 14:32:48 +02:00
ldestailleur
6a22102155 Use the getValidPayment to detect payment modules 2025-05-06 14:26:30 +02:00
ldestailleur
50b722905f CSS 2025-05-06 13:26:51 +02:00
ldestailleur
c320b52e09 Debug v22 2025-05-06 13:15:07 +02:00
ldestailleur
a841a0ba1e Debug v22 2025-05-06 13:02:08 +02:00
ldestailleur
0136a794c9 Add a new page type "Setup" for website module. 2025-05-06 12:52:31 +02:00
ldestailleur
2e3b4fc1b3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-06 12:32:48 +02:00
ldestailleur
0189f7e1bd Fix trans 2025-05-06 12:30:51 +02:00
Jon Bendtsen
474cb2e54e NEW: endpoints DELETE event atteendee by ID or REF (#33986)
* pricate function _fetch that fetches the attendee data based on either (row)id or referece

* NEW: endpoints DELETE event atteendee by ID or REF

* fix missing }

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-06 12:28:48 +02:00
Laurent Destailleur (aka Eldy)
b85bfc40f4 Fix phpunit 2025-05-06 11:59:08 +02:00