Commit Graph

1599 Commits

Author SHA1 Message Date
Charlène Benke
3ff7e43648 Add parameters 'source' and 'notrigger' to postContact (#35678)
* Add parameters to postContact method

allow to add internal contact

* Add parameters 'source' and 'notrigger' to postContact
2025-10-08 10:58:01 +02:00
Frédéric FRANCE
2078610328 add dolBuildUrl with examples of use (#35549)
* add dol_buildurl with examples of use

* add dol_buildurl with examples of use

* add dol_buildurl with examples of use

* add dol_buildurl with examples of use

* wip

* wip

* add more example

* add more example

* add more example

* add more example

* add more example

* add more example

* add more example

* add example

* add example

* add example

* add example

* add example

* stay in the same area even we are on other area in other tab

* stay in the same area even we are on other area in other tab

* stay in the same area even we are on other area in other tab

* stay in the same area even we are on other area in other tab

* stay in the same area even we are on other area in other tab

* stay in the same area even we are on other area in other tab

* stay in the same area even we are on other area in other tab

* stay in the same area even we are on other area in other tab

* stay in the same area even we are on other area in other tab

* stay in the same area even we are on other area in other tab

* stay in the same area even we are on other area in other tab

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* add example

* add example

* add example

* add example

* add example

* add example

add example

add example

add example

add example

* add example

* add example

add example

add example

add example

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* fix

* wip

* wip

* clean code
2025-10-06 18:17:02 +02:00
Charlène Benke
d1e0efc466 NEW Add getcontacts on api of interventional and proposal (#35589)
* Add getContacts method to retrieve contact information

* Implement getContacts method for proposals

Added a method to retrieve contacts associated with a proposal, including access checks and data cleaning.

* Implement getContacts method for invoices

Added a method to retrieve contacts associated with a specific invoice, including access checks and error handling.

* Update api_proposals.class.php

* Update api_invoices.class.php

* Update api_interventions.class.php

* Update api_interventions.class.php

* Add method to set invoice as draft

* Return contacts directly instead of cleaned data

* Return raw contacts instead of cleaned data

* Combine external and internal contacts in order list

Merge external and internal contacts for orders.

* Change return type from Object to array in API doc

Updated return type in API documentation for contact information.

* Change return type in api_orders.class.php docblock

Updated return type in docblock to reflect array return.

* Change return type from Object to array in API doc

* Update api_orders.class.php

* Update api_interventions.class.php

* Update api_proposals.class.php

* Update api_orders.class.php

* Update api_interventions.class.php

* Update api_interventions.class.php

* Update api_interventions.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-10-04 20:01:57 +02:00
ldestailleur
fbfeb5c978 Clean code 2025-10-04 14:12:46 +02:00
Frédéric FRANCE
925d6f450d add country and custom code in fetch line (#35554)
* add country and custom code in fetch line

* add country and custom code in fetch line

* add country and custom code in fetch line

* add country and custom code in fetch line

* add country and custom code in fetch line

* add country and custom code in fetch line

* add country and custom code in fetch line

* add country and custom code in fetch line

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-29 21:09:06 +02:00
Laurent Destailleur
131d1390bc Debug v23 2025-09-28 22:20:44 +02:00
Frédéric FRANCE
e65b5575b9 clean code (#35462)
* clean code

* clean code

* clean code

* clean code

* clean code
2025-09-24 10:37:26 +02:00
Charlène Benke
496fef63a3 contact deletion in api_orders class for internal and external (#35455)
* contact deletion in api_orders class for internal and external

* Update api_orders.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-23 21:43:39 +02:00
Frédéric FRANCE
c08c7170d2 clean code (#35427)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-22 22:25:00 +02:00
MDW
b3228aa7ce Qual: Fix phan notices (#35406)
* fix CI

* fix

* Qual: Fix newly appeard phan notices

# Qual: Fix newly appeard phan notices

Fix notices that appearce sin a previous phan report - some of these
notices are masked by the current baseline.

---------

Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: Frédéric FRANCE <frederic.france@free.fr>
2025-09-20 15:59:05 +02:00
Frédéric FRANCE
078da229c8 clean code (#35352)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* Clean code

* Clean code

* clean code

* clean code

* clean code

* clean code

* clean code
2025-09-17 14:11:32 +02:00
Frédéric FRANCE
21d50f1a58 clean code expedition class (#35327)
* clean code expedition class

* clean code expedition class

* clean code expedition class

* clean code expedition class

* clean code expedition class

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* clean code
2025-09-15 16:16:22 +02:00
Bradley Jarvis
75c306c05d FIX: Update order line (#35321)
Co-authored-by: brad <brad@endurotags.com.au>
2025-09-12 15:17:05 +02:00
ldestailleur
702d91c65d Clean code 2025-09-11 12:25:22 +02:00
Frédéric FRANCE
e81d5378cd clean code contract class (#35245)
* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code

* clean code

* clean code

* clean code

* clean code

* fix typo

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix
2025-09-10 11:13:18 +02:00
Frédéric FRANCE
ddbae0f6ad Add TRIGGER_PREFIX in order (commande) class (#35268)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-10 10:53:54 +02:00
ldestailleur
97d5025c08 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-07 18:51:58 +02:00
Frédéric FRANCE
617e922a3a fix broken workflows (#35226)
* fix broken workflows

* Update ci-on-push.yml

* Update fournisseur.commande.class.php

* clean code

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-05 12:01:57 +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
cd24808bbf Fix label of tooltip not complete 2025-09-04 17:54:29 +02:00
ldestailleur
d6fa374d84 QUAL: Removed no more used deprecated code 2025-09-03 21:53:43 +02:00
ldestailleur
b7135a24e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-03 16:09:40 +02:00
ldestailleur
0255512c1c The signature of the Sale order ->cancel() method and shipment
->cancel() has been modified to introduce the $user param like for other
methods that modify a status.
2025-09-03 16:08:09 +02:00
Frédéric FRANCE
a1d7b11324 fix doc (#35196) 2025-09-03 12:54:17 +02:00
ldestailleur
ef5f825667 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-08-20 16:52:22 +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
Frédéric FRANCE
e0861b922f normalise doc (#34987)
* normalise doc

* normalise doc

* normalise doc
2025-08-19 11:24:38 +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
Frédéric FRANCE
515fc47422 can insert import_key at order create (#34954)
* can insert import_key at order create

* Update commande.class.php
2025-08-14 19:11:03 +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
7ea3c419aa Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-25 17:00:22 +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
ldestailleur
fa12e7ddeb Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-21 18:47:46 +02:00
ldestailleur
e1f253ac63 Debug v22 2025-07-21 18:38:49 +02:00
ldestailleur
3c6744638b Debug v22 2025-07-21 18:36:13 +02:00
ldestailleur
7dd642faab Missing field $fields 2025-07-21 18:15:43 +02:00
ldestailleur
cf329df785 Debug v22 2025-07-21 18:02:50 +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
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
Noé Cendrier
4fd04e7dc2 FIX: we should ensure Commande::$lines array contains OrderLine objects (#34727) 2025-07-15 06:20:23 +02:00
Noé Cendrier
8ccb6634c9 FIX: we should ensure Commande::$lines array contains OrderLine objects (#34727) 2025-07-15 06:20:06 +02:00
Jyhere
787bd1d278 CHANGE: ternary simplification (#34675) 2025-07-01 20:34:09 +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