2
0
forked from Wavyzz/dolibarr
Commit Graph

157 Commits

Author SHA1 Message Date
Laurent Destailleur
b28ae5d8d3 Clean code 2023-12-27 12:12:20 +01:00
Frédéric FRANCE
61b79fda17 avoid phpstan error with phpdoc 2023-12-06 15:46:39 +01:00
Laurent Destailleur
619155f65e Fix with php-cs-fixer 2023-12-04 13:53:48 +01:00
Frédéric FRANCE
53c8a3acf8 clean phpdoc for phpstan (#26905) 2023-12-01 19:51:32 +01:00
Laurent Destailleur
075ee02901 Fix php8.2 warnings 2023-11-27 12:08:48 +01:00
Laurent Destailleur
e910c3fa4e CSS 2023-11-16 15:14:01 +01:00
Laurent Destailleur
b65d5c8740 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-05 19:52:54 +01:00
thibdrev
0c9610641c Fix Attributes values shall be ordered by position when retrieved (#26446)
* Fix Attributes values shall be ordered by position when retrieved from the table

The order of attribute values can be modified manually. This is recorded via the "position" key in the table "llx_product_attribute_value".
However, this order is not taken into account when the attribute values are retrieved via the function fetchAllByProductAttribute() from ProductAttributeValue.class.php

* correction d'une coquille
2023-11-03 16:32:31 +01:00
Laurent Destailleur
c2bdb3be90 Fix php8.2 warnings 2023-10-15 18:41:39 +02:00
Laurent Destailleur
91fa48199a Fix warnings 2023-09-10 17:41:22 +02:00
Laurent Destailleur
7ce9bf6b23 Clean code 2023-08-05 15:44:28 +02:00
Laurent Destailleur
e16d944284 Clean code 2023-05-30 13:37:56 +02:00
Laurent Destailleur
e2ec34e1e5 Clean code 2023-05-01 14:33:08 +02:00
Laurent Destailleur
8e98e506f0 Merge pull request #23975 from frederic34/variantdoc
doc
2023-02-20 21:15:57 +01:00
Frédéric FRANCE
3a94290ef7 doc 2023-02-20 20:43:23 +01:00
Frédéric FRANCE
c8de4a35f0 doc 2023-02-20 20:38:10 +01:00
Laurent Destailleur
236b3aa9e8 Revert default type of hooks. Default is now 'addreplace' hooks (and
exception become 'output' hooks, that become deprecated).
2023-01-14 12:28:44 +01:00
Laurent Destailleur
43a0ccce2b Clean code 2023-01-04 11:37:24 +01:00
Laurent Destailleur
ba6374e6be Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-03 15:31:00 +01:00
Laurent Destailleur
8d4e973e00 Fix warnings 2023-01-03 15:29:49 +01:00
Laurent Destailleur
8a4613176c Fix warnings 2022-12-28 16:26:07 +01:00
Laurent Destailleur
198e477142 Debug v17 2022-11-14 12:38:10 +01:00
Laurent Destailleur
6ae8af440f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-15 14:11:04 +02:00
Laurent Destailleur
ccaa23121e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-15 13:57:23 +02:00
Laurent Destailleur
7387e535ef Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-10-15 13:51:50 +02:00
stickler-ci
837573c6ea Fixing style errors. 2022-10-08 05:53:48 +00:00
Regis Houssin
53502ccd70 FIX better fix for compatibility 2022-10-08 07:49:02 +02:00
Laurent Destailleur
13d84e0416 Doc 2022-10-08 00:07:20 +02:00
Frédéric France
835441d437 remove blank line 2022-09-07 20:14:49 +02:00
Philippe GRAND
f172212808 FIX php8 compatibility 2022-08-28 14:43:31 +02:00
Philippe GRAND
0551bfbfa6 FIX php8 compatibility 2022-08-28 14:43:08 +02:00
This Charlène
3e8cb1de57 php V8 warning 2022-07-20 11:31:20 +02:00
This Charlène
8cb1e138de forgotted fields 2022-07-20 11:15:44 +02:00
Laurent Destailleur
9a92c7d9b0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/extrafields.class.php
2022-07-10 19:28:16 +02:00
Laurent Destailleur
3d226801ba Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-10 19:22:02 +02:00
stickler-ci
04fd17347e Fixing style errors. 2022-07-08 07:36:09 +00:00
Gauthier PC portable 024
787f52fd7f FIX : with callback function 2022-07-08 09:32:20 +02:00
Gauthier PC portable 024
77552fa32a FIX : We must remove empty values of $features array in fetchByProductCombination2ValuePairs() because some products can use only several attributes in their variations and not necessarily all. In this case, fetch doesn't work without my correction 2022-07-07 10:17:56 +02:00
Laurent Destailleur
25e70bead8 phpcs 2022-05-18 23:27:26 +02:00
Laurent Destailleur
91d539bbef Clean code of not used method 2022-05-10 14:38:40 +02:00
Laurent Destailleur
95dc25587c Standardize code of the fetch_lines() 2022-03-28 13:50:47 +02:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
2022-03-23 17:26:25 +01:00
Laurent Destailleur
c620757dbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/product/price.php
	htdocs/reception/class/reception.class.php
2022-03-23 17:23:21 +01:00
Laurent Destailleur
32f2499c36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/en_US/propal.lang
	htdocs/product/price.php
	htdocs/projet/card.php
	htdocs/reception/class/reception.class.php
2022-03-23 17:04:31 +01:00
kamel
26a462dce0 NEW : Update variants to standard card and list (permission) 2022-03-18 15:43:32 +01:00
kamel
1418fd7054 NEW : Update variants to standard card and list 2022-03-18 15:38:44 +01:00
Laurent Destailleur
43e7547611 Fix sql errors 2022-03-17 11:49:14 +01:00
Marc de Lima Lucio
e989371651 FIX: better error management at product selling price update 2022-03-08 14:49:26 +01:00
Laurent Destailleur
f5edd25f6d Clean code 2021-11-07 18:14:49 +01:00
Laurent Destailleur
dd2207d6c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
2021-11-06 21:11:05 +01:00