2
0
forked from Wavyzz/dolibarr

1232 Commits

Author SHA1 Message Date
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
Yamil Esteban Garcia
fc1364db56 NEW add tags on proposals and supplier proposals and in statistics (#35553)
* add own supplier invoice tag filter and bulk insert

add own supplier invoice tag filter and bulk insert

* Update list.php

change format

* Bulk edit commande tags

Bulk edit commande tags

* Label filter orders and supplier order statistics

Label filter orders and supplier order statistics

* Supplier Order Label Filter and Mass Action for Supplier Order Labels

Supplier Order Label Filter and Mass Action for Supplier Order Labels

* Update index.php

change format

* Update list.php

change format

* Update index.php

change format

* Update index.php

change format

* create categories proposal and supplier proposal

create categories proposal and supplier proposal

* adds category insertion to budget

adds category insertion to budget

* Create  table llx_categorie_propal

Create  table llx_categorie_propal

* setCategories method


setCategories method

* bulk add tag and filter tag actions

bulk add tag and filter tag actions

* labels in supplier budget statistics and budgets

labels in supplier budget statistics and budgets

* change format

* adds category insertion to supplier budget

* create supplier budget category table

create supplier budget category table

* create setCategories method

create setCategories method

* add tags in bulk and filter tag actions

add tags in bulk and filter tag actions

* Update card.php

* Update card.php

* Update propal.class.php

* Update index.php

* Update index.php

* Update card.php

* Update supplier_proposal.class.php

* Update list.php

* Update supplier_proposal.class.php

* Update supplier_proposal.class.php

* Update list.php

* Update list.php

* Update card.php

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-10-01 17:37:08 +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
Frédéric FRANCE
8fd4d0332d clean code (#35423)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code
2025-09-21 23:22:33 +02:00
Frédéric FRANCE
d6dce86061 clean code (#35379)
* clean code

* clean code

* clean code

* clean code
2025-09-18 11:08:06 +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
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
ldestailleur
97d5025c08 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-07 18:51:58 +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
d6fa374d84 QUAL: Removed no more used deprecated code 2025-09-03 21:53:43 +02:00
Frédéric FRANCE
a1d7b11324 fix doc (#35196) 2025-09-03 12:54:17 +02:00
ldestailleur
62f761ac71 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-02 12:07:15 +02:00
ldestailleur
6727d0c361 FIX we saw links to object on private not just after a save. 2025-09-02 03:51:08 +02:00
Frédéric FRANCE
b4e01be091 translations fields (#35112) 2025-08-28 13:51:30 +02:00
Frédéric FRANCE
e0861b922f normalise doc (#34987)
* normalise doc

* normalise doc

* normalise doc
2025-08-19 11:24:38 +02:00
moreauftheobald
6c86ad3eae FIX-Develop correct getwarningdelay (#34497)
* replace $conf->module->XXX->gwarning_delay by new function getwarningdelay

* replace $conf->module->XXX->gwarning_delay by new function getwarningdelay

* replace $conf->module->XXX->gwarning_delay by new function getwarningdelay

* FIX- Correct function GetwarningDelay

---------

Co-authored-by: Theobald <f.moreau@theobald-groupe.com>
2025-07-20 19:54:06 +02:00
Laurent Destailleur
4cbc1e012d Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-05 10:51:22 +02:00
Frédéric FRANCE
d77dfc56f9 add date in ajax tooltip of propal (#34606) 2025-06-23 18:21:47 +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
1435c02986 FIX #33958 2025-04-23 23:45:44 +02:00
ldestailleur
7db8252225 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-21 13:52:25 +02:00
ldestailleur
5b8de3560d Fix cast var in sql 2025-04-20 12:38:48 +02:00
Frédéric FRANCE
5d777bbf59 clean code (#33882)
* clean code

* clean code

* clean code

* Update mailtemplate.php
2025-04-18 13:38:03 +02:00
ldestailleur
16e05c08a7 Fix CI 2025-04-07 16:40:15 +02:00
ldestailleur
6af8298736 Fix related to #33449 2025-04-07 15:46:10 +02:00
ldestailleur
fa5c98824f Fix related to #33449 2025-04-07 15:10:51 +02:00
MDW
988fc75ca2 Qual: Fix phan notices (emailcollector, bookkeeping) (#33375)
* Qual: Fix phan notices (mostly propal)

* Fix some const arguments to Form::select_dolusers()

* Update phan baseline

* Qual: Fix phan notices (propal)

* Qual: Fix phan notices (emailcollector, bookkeeping)
2025-03-10 15:47:55 +01:00
Laurent Destailleur
aad4a2bc7e Merge branch 'develop' into retrieving-extraparams-for-lines 2025-03-06 04:57:15 +01:00
ldestailleur
4161418381 Clean name of var 2025-03-05 20:51:50 +01:00
ldestailleur
66484095e0 Clean code from not used global variable 2025-03-05 20:25:12 +01:00
yannis
cf83c6668e Retrieve extraparams from db to objectline 2025-03-03 16:01:38 +01:00
Alexandre SPANGARO
3931aa7675 Propal class - Update SQL 2025-03-02 08:10:24 +01:00
Laurent Destailleur
e3b52283af Merge pull request #33225 from OPEN-DSI/develop_new_customer_price_period_and_discount
NEW: Add management of date begin/end and discount for a customer price (Code)
2025-03-01 00:44:26 +01:00
Kamel Khelifa
ce1b38e984 Corrections 2025-02-28 09:48:29 +01:00
Kamel Khelifa
7ba21bd23d NEW: Add management of date begin/end and discount for a customer price (Code) 2025-02-25 15:09:05 +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
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
MDW
928402c847 Qual: Fix phan (project-1) 2025-02-11 00:22:39 +01:00
Laurent Destailleur
95622c22df Close #32670 2025-02-10 18:09:32 +01:00
MDW
24fa28dfe2 Qual: Fix getKanban phpdoc
# Qual: Fix getKanban phpdoc

Array phpdoc for getKanban corrections.
2025-02-05 01:43:37 +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
Laurent Destailleur
adae4f0fb3 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-27 01:37:52 +01:00
Laurent Destailleur
940e42c1e4 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-27 01:30:34 +01:00
Laurent Destailleur (aka Eldy)
fbe4ccd0e2 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-24 15:25:51 +01:00
Laurent Destailleur
0251c01296 Fix warning 2025-01-23 02:42:06 +01:00
Mélina JOUM
3c2e6140a1 ADD: packaging to round the quantities to some given multiples for the commercials proposals 2025-01-21 09:43:00 +01:00