Commit Graph

4958 Commits

Author SHA1 Message Date
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
Lenin Rivas
5aa5f88997 NEW Constant ORDER_MASS_ACTION_BILLED_LINK_EXPEDITIONS (#34617)
* NEW Constant ORDER_MASS_ACTION_BILLED_LINK_EXPEDITIONS

* NEW Constant ORDER_MASS_ACTION_BILLED_LINK_EXPEDITIONS

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-18 03:04:42 +02:00
Charlène Benke
1df5ea8456 NEW Add thirdparty search on api list (#34634)
* Add thirdparty search on api list

this change allow to seach element with filter on thirdparty (ex : list of bill of with name of thidparty)

* Update api_orders.class.php

* Update api_invoices.class.php

* Update api_contracts.class.php

* Update api_shipments.class.php

* Update api_interventions.class.php

* Update api_projects.class.php

* Update api_tickets.class.php

* Update api_tickets.class.php

* Update api_projects.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-18 02:35:50 +02:00
ldestailleur
270caf0dcb Debug v22 2025-07-17 19:30:58 +02:00
ldestailleur
423b302a2b Debug v22 2025-07-17 19:30:58 +02:00
ldestailleur
e8b2664921 Debug v22 2025-07-17 19:26:24 +02:00
ldestailleur
a0dc36b613 Debug v22 2025-07-17 19:26:24 +02:00
Noé Cendrier
4fd04e7dc2 FIX: we should ensure Commande::$lines array contains OrderLine objects (#34727) 2025-07-15 06:20:23 +02:00
Laurent Destailleur
ebf4548616 Clean code 2025-07-05 22:52:27 +02:00
Laurent Destailleur
f047007c19 Clean code 2025-07-05 22:48:36 +02:00
Lucas Marcouiller
7572b33f6f Fix clean code + phan warnings (#34688)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-05 10:49:56 +02:00
Laurent Destailleur
723a018759 Debug v22 2025-07-01 22:46:00 +02:00
Jyhere
787bd1d278 CHANGE: ternary simplification (#34675) 2025-07-01 20:34:09 +02:00
Quentin-Seekness
b91b46d898 Filter on search_project lost on next pages (#34646)
The filter on the p.title of the command list doesn't work if you switch result pages. It's simply not kept in the next page url.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-27 00:28:36 +02:00
ldestailleur
9c2da8b9b6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-19 11:31:44 +02:00
ldestailleur
a78e63dbf0 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-19 11:13:59 +02:00
ldestailleur
0ae1f2fb9d Fix CI 2025-06-18 16:53:20 +02:00
ldestailleur
65bb64e9cd Fix CI 2025-06-18 16:24:37 +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
9c9708c9e6 Debug v22 2025-06-16 23:55:52 +02:00
ldestailleur
5e4f167815 Debug v22 - missing module_source in view mode of card 2025-06-16 23:49:56 +02:00
ldestailleur
253c93f7c1 Debug v22 2025-06-16 23:33:11 +02:00
atm-lena
50f9ec8b52 Invoice List : add tag filter (#34521)
* Invoice List : add tag filter

* Invoice List : Add operator to invoice filter

* Add tag filter in order list

* Clean code

---------

Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-15 03:02:13 +02:00
Laurent Destailleur
d1d56fc12b Fix CI 2025-06-14 15:03:13 +02:00
Laurent Destailleur
144854769a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-06-13 16:27:57 +02:00
Maxime Kohlhaas
cbc2cf5063 Fix : thirdparty type was not set on creation form (#34451) 2025-06-13 16:12:30 +02:00
ldestailleur
7ad71279a7 Fix CI 2025-06-11 17:33:07 +02:00
ldestailleur
45c7c7f9bc Fix variable not defined 2025-06-11 17:15:58 +02:00
ldestailleur
9e26f5a98e Debug v22 2025-06-11 12:45:15 +02:00
ldestailleur
b5a871bf99 Close #34344 2025-06-04 10:48:29 +02:00
ldestailleur
094a05b9a5 Debug v22 2025-05-27 14:48:25 +02:00
ldestailleur
d9a2d5262d Fix CI 2025-05-15 10:23:09 +02:00
ldestailleur
20f7898bec Fix test of minimum price 2025-05-13 10:49:36 +02:00
Lenin Rivas
ad10c2581d FIX price_min_ttc (#34120)
* FIX price_min_ttc

* FIX price_min_ttc

* FIX price_min_ttc

* FIX price_min_ttc
2025-05-13 10:36:16 +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
d13cd0f47a Fix CI 2025-05-05 04:36:28 +02:00
Charlène Benke
704910b4b3 NEW Add internal contact of proposal, order and invoice on api call (#34009)
* add internal contact of elements

* Update api_orders.class.php

* Update api_invoices.class.php

* Update api_proposals.class.php

* Update api_orders.class.php

* Fix CI

* Update api_orders.class.php

* Update api_invoices.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-05 02:07:24 +02:00
ldestailleur
6d89c2c033 Clean code. Merge/Close #33995 manually. 2025-05-05 02:04:55 +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
Thibault Parodi
e77b470cad NEW: Add an API endpoint to get properties of a single line of an order (#34045)
* feat: add api get line properties route

* chore: indent with tabs

* chore: preserve original spaces

* chore: tabs instead of space

* fix: return Object instead of array
2025-05-02 22:44:48 +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
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
lvessiller-opendsi
4963639d67 NEW input reason for customer invoice (#33599)
* NEW input reason for customer invoice

* Fix CI error

* Fix format fk_input_reason in array of fileds

* Add invoices in translate key of source dictionary
2025-04-16 01:02:26 +02:00
Alexandre SPANGARO
93478d3216 NEW Order - Add drag & drop file (#33848) 2025-04-15 18:00:24 +02:00
ldestailleur
6af8298736 Fix related to #33449 2025-04-07 15:46:10 +02:00