Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
128,557 Commits 36 Branches 189 Tags
ffcc89d3876b402162bc3c0756b6f415e332fb04
Commit Graph

144 Commits

Author SHA1 Message Date
Laurent Destailleur
7fcd0f9d2d Merge pull request #27613 from thibdrev/patch-4 
fix: phpstan
 2024-01-18 17:46:42 +01:00
thibdrev
6f42317015 fix: phpstan 
htdocs/variants/combinations.php	280	Property ProductCombination::$variation_weight (float) does not accept string.
htdocs/variants/combinations.php	286	Property ProductCombination::$variation_price (float) does not accept string.
htdocs/variants/combinations.php	292	Property ProductCombination::$variation_price (float) does not accept string.
htdocs/variants/combinations.php	302	Property ProductCombinationLevel::$variation_price (float) does not accept string.
 2024-01-18 17:38:46 +01:00
Laurent Destailleur
5d3c775b69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-01-18 12:19:08 +01:00
Laurent Destailleur
8eab0776e4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-16 14:19:02 +01:00
thibdrev
82bc2e2d71 phpstan 
Property ProductCombination2ValuePair::$fk_prod_attr (int) does not accept string.
Property ProductCombination2ValuePair::$fk_prod_attr_val (int) does not accept string.
 2024-01-15 21:22:59 +01:00
MDW
342ab85195 Qual: Spelling htdocs/[q-z]* (#27447) 
# Qual: Fix spelling htdocs/[q-z]*

Probably fixes a bug:

- htdocs/webservices/server_thirdparty.php
  No other occurence of adress found.
  -'adress'=>->adress,- +'address'=>->address,+
 2024-01-12 17:18:52 +01:00
Laurent Destailleur
7d109e9419 Fix phpcs 2023-12-13 12:46:23 +01:00
Laurent Destailleur
e040219fdc Fix phpcs 2023-12-13 12:45:07 +01:00
Laurent Destailleur
619155f65e Fix with php-cs-fixer 2023-12-04 13:53:48 +01:00
Laurent Destailleur
075ee02901 Fix php8.2 warnings 2023-11-27 12:08:48 +01:00
Laurent Destailleur
a0bba05b02 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_orders.class.php
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/class/api_supplier_orders.class.php
	htdocs/fourn/class/fournisseur.facture-rec.class.php
	htdocs/langs/en_US/stocks.lang
 2023-11-17 18:24:53 +01:00
thibdrev
11ed276fe3 fix PRODUCT VARIANTS - Missing translation key for "Combination" (#26618) 
* Add "Attributes" key to en_US/products.lang

* Add "Attributes" key to fr_FR/products.lang

* Change langs->trans('Combination') to lang-trans->trans('Attributes')
 2023-11-16 15:19:51 +01:00
Anthony Berton
46eb35d362 NEW - Add label to price level when changing price (#26240) 
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
 2023-10-18 03:06:56 +02:00
Laurent Destailleur
c2bdb3be90 Fix php8.2 warnings 2023-10-15 18:41:39 +02:00
Laurent Destailleur
11cc0a61da Fix cast of int 2023-09-20 11:59:57 +02:00
Laurent Destailleur
e203346b2a Debug v18 2023-07-10 20:53:19 +02:00
Frédéric France
647708a9bc use user hasRight 2023-06-19 23:05:59 +02:00
kkhelifa
60e793c2e2 FIX: Fix update ref variant product on the combination page of the parent product 2023-04-07 16:55:27 +02:00
Frédéric FRANCE
30aa377528 use isModEnabled 2023-03-08 08:50:19 +01:00
Laurent Destailleur
2168578f2e Fix inline css 2023-02-18 14:00:25 +01:00
T. Mulzer
d8dcb0d101 Solves issue #17181 2023-01-19 17:13:25 +01:00
Laurent Destailleur
8d4e973e00 Fix warnings 2023-01-03 15:29:49 +01:00
Laurent Destailleur
856793b187 Fix scrutinizer warnings 2022-12-28 02:47:37 +01:00
hystepik
27cb4b4d86 Fix: php 8.1 warnings 2022-12-15 14:46:29 +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
Regis Houssin
53502ccd70 FIX better fix for compatibility 2022-10-08 07:49:02 +02:00
Regis Houssin
4bb4d2dc64 FIX remove db object for avoid error with postgresql 2022-10-07 08:54:13 +02:00
Alexandre SPANGARO
8ca01513d5 Use isModEnabled 2022-09-25 06:10:24 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Laurent Destailleur
e0b1ad308b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-08-30 19:38:35 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
40d31d9b8b Update combinations.php 2022-07-24 20:18:10 +02:00
This Charlène
69626875fc PHP - cannot use a scalar as an array warning 
generate an error :  cannot use a scalar as an array warning (even on php V7)
 2022-07-24 20:16:59 +02:00
Laurent Destailleur
083b785ec8 Update combinations.php 2022-07-24 20:13:48 +02:00
This Charlène
54c2cc245d PHP V8 warning 2022-07-20 11:34:01 +02:00
This Charlène
2c898b45e3 PHP - cannot use a scalar as an array warning 
generate an error :  cannot use a scalar as an array warning (even on php V7)
 2022-07-20 11:10:54 +02:00
Faustin
54777f9614 array productCombinations implicitly converted to a boolean 2022-06-13 14:33:23 +02:00
lmarcouiller
207ebc9266 fix php 8.0 warnings 2022-05-11 15:06:11 +02:00
kamel
1418fd7054 NEW : Update variants to standard card and list 2022-03-18 15:38:44 +01:00
Laurent Destailleur
626a5b90f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-16 21:23:45 +01:00
Laurent Destailleur
c3733a92e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 2022-02-16 21:22:49 +01:00
Quentin VIAL-GOUTEYRON
82b3d89923 FIX wieght is loose if it's comma on combinations 2022-02-15 11:31:09 +01:00
Laurent Destailleur
142e9473c5 Responsive 2021-11-07 18:28:59 +01:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
000c32c137 FIx #18313 2021-08-02 20:20:52 +02:00
Laurent Destailleur
7e95c5ec20 Clean code 2021-06-08 11:40:50 +02:00