Commit Graph

1322 Commits

Author SHA1 Message Date
splohmer
b35994bf93 FIX late customer orders are not shown on start page (#36200)
due to an mismatch of the used variable in hasDelay (status) and the setted variable (statut) the late orders where never shown in the start page as the count was always wrongly zero.
2025-11-11 17:53:40 +01:00
Frédéric FRANCE
18c29d0e40 fix tva can be sometimes string instead float (#35835) 2025-10-18 19:12:01 +02:00
HENRY Florian
a69bd1ba56 fix: divided by zero with customer packaging (#35224)
* fix: divided by zero with customer packaging

* fix: divided by zero with customer packaging

* fix: divided by zero with customer packaging

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-05 12:01:26 +02:00
ldestailleur
bdf62918e5 Fix label of tooltip not complete 2025-09-04 17:55:09 +02:00
ldestailleur
263626b2fd Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-20 16:51:05 +02:00
hermans
1fb37db6f6 Bug Fix for issue 34898, default warehause and obj->endbrowid not exist on receipt.class (#34959)
* bug fix for: https://github.com/Dolibarr/dolibarr/issues/34939

* Bug fix for: Dolibarr Issue #34939

* Revert "bug fix for: https://github.com/Dolibarr/dolibarr/issues/34939"

This reverts commit bd4c1ccc41.

* Revert "Bug fix for: Dolibarr Issue #34939"

This reverts commit 8e46f863b9.

* Bug fix for issue https://github.com/Dolibarr/dolibarr/issues/34898

* fix bug on reception setClosed: ->edbrowid is not exist

* Fix missing variable for obj->endbrowid in etDraft,valid,setClosed

* fix white space

* remove white space
2025-08-15 17:26:39 +02:00
ldestailleur
5e31b370f8 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-27 13:54:02 +02:00
ldestailleur
b710c85b07 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-22 13:00:31 +02:00
ldestailleur
d04e8e62c9 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-22 12:56:45 +02:00
atm-adrien
6641e00cd6 FIX : Correct rank when adding line on order (#34764)
* FIX : Correct rank when adding line on order

* FIX : Delete TODO
2025-07-19 00:29:55 +02:00
Noé Cendrier
4fd04e7dc2 FIX: we should ensure Commande::$lines array contains OrderLine objects (#34727) 2025-07-15 06:20:23 +02:00
ldestailleur
1e57bc5af9 Fix CI 2025-06-18 16:09:34 +02:00
ldestailleur
06a5b4947d Fix CI 2025-06-18 15:59:28 +02:00
ldestailleur
5e4f167815 Debug v22 - missing module_source in view mode of card 2025-06-16 23:49:56 +02:00
ldestailleur
9e26f5a98e Debug v22 2025-06-11 12:45:15 +02:00
ldestailleur
d9a2d5262d Fix CI 2025-05-15 10:23:09 +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
d85cea32c0 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-05-05 00:03:49 +02:00
ldestailleur
f70cfeb6d3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-05-05 00:03:09 +02:00
Laurent Destailleur
68cb665d8d Clean code 2025-04-24 17:17:05 +02:00
ThomasNgr-OpenDSI
5e887e8850 Fix : on update of an order line, the TTC price would be used as HT price (#33940)
* Fix : on update of an order line, the TTC price would be used as HT price

* Update commande.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-22 11:48:22 +02:00
lvessiller-opendsi
c85cc3061b NEW shipment kits with dispatcher v2 (#33750)
* NEW shipment kits with dispatcher v2

* Show stock of virtual product on select warehouse when dispatching a shipment

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-16 21:11:58 +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
ldestailleur
6af8298736 Fix related to #33449 2025-04-07 15:46:10 +02:00
ldestailleur
6eb65f383d Clean code 2025-03-16 20:15:52 +01:00
ldestailleur
b4bf192e37 Doc 2025-03-16 20:04:52 +01:00
Laurent Destailleur
aad4a2bc7e Merge branch 'develop' into retrieving-extraparams-for-lines 2025-03-06 04:57:15 +01:00
MDW
4096d0ee2f Qual: Fix phan notices for commande 2025-03-05 12:15:14 +01:00
MDW
acf6b62822 Fix PhanTypeMismatchArgument in commonobject, commande/card, 2025-03-05 12:15:12 +01:00
yannis
cf83c6668e Retrieve extraparams from db to objectline 2025-03-03 16:01:38 +01:00
Mélina JOUM
d2387dd8bc FIX: Success message when add a product line that has packaging 2025-02-24 17:23:34 +01:00
ldestailleur
cabd8a680e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-18 10:25:53 +01:00
Laurent Destailleur (aka Eldy)
9d61b20ecd Fix php stan 2025-02-18 10:24:00 +01:00
Florent Poinsaut
c8cc7884e4 NEW #22848 Fix CI 2025-02-14 14:35:44 +01:00
Florent Poinsaut
ee8791666c NEW #22848 Remove linked categories 2025-02-14 14:32:59 +01:00
Florent Poinsaut
bfed762fe9 NEW Dolibarr#22848 Add order tags 2025-02-14 14:29:49 +01:00
Laurent Destailleur (aka Eldy)
9bc2a3a6bd Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-11 22:24:47 +01:00
Laurent Destailleur (aka Eldy)
d6aac69d90 Debug v21 2025-02-11 16:28:37 +01:00
MDW
928402c847 Qual: Fix phan (project-1) 2025-02-11 00:22:39 +01:00
Laurent Destailleur
e9a3926c7e Fix regression 2025-02-10 19:08:47 +01:00
Laurent Destailleur
95622c22df Close #32670 2025-02-10 18:09:32 +01:00
Laurent Destailleur (aka Eldy)
22fa107077 Clean code 2025-02-06 14:12:06 +01:00
Laurent Destailleur (aka Eldy)
0772222900 QUAL Add get_substitutionarray_each_var_object in phpunit 2025-02-06 12:04:41 +01:00
Laurent Destailleur (aka Eldy)
732f97d73c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-02-05 00:40:06 +01:00
Laurent Destailleur
923649b1ec Merge branch 'develop' into qual/phan.2025.1.19-a 2025-01-30 13:19:39 +01:00
Laurent Destailleur (aka Eldy)
0cbedd4ff0 Fix warnings 2025-01-29 19:15:57 +01:00
MDW
e5c385999d Qual: Fix multiple phan notices
# Qual: Fix multiple phan notices

Fix multiple phan notices
2025-01-29 01:41:41 +01:00
Laurent Destailleur
1af487b8b2 Merge pull request #32747 from altairisfr/qty_multiple_sale
NEW: Add the "packaging" feature to round the quantities to some given multiples
2025-01-29 00:50:35 +01:00
Noé Cendrier
966d079019 FIX: implement mdeweerd review 2025-01-28 15:31:08 +01:00
Laurent Destailleur
adae4f0fb3 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-27 01:37:52 +01:00