Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 00:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
128,557 Commits 36 Branches 190 Tags
ffcc89d3876b402162bc3c0756b6f415e332fb04
Commit Graph

372 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
39769482b1 Qual: Fix typing hints for DoliDB (#27484) 
# Qual: Fix typing hints for DoliDB

This should help the static tools for type and method checking.
 2024-01-13 15:50:02 +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
4501872f17 Clean code with rector 2 2024-01-05 04:33:58 +01:00
routmoute
1d38a3b7b8 fix conflict with develop branch 2023-12-29 20:19:17 +01:00
routmoute
48f4e52a22 fix: Display of the list of merged pdf 2023-12-29 02:30:32 +01:00
Laurent Destailleur
b28ae5d8d3 Clean code 2023-12-27 12:12:20 +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
60af6843fd Clean code 2023-12-08 02:05:51 +01:00
Laurent Destailleur
89e1e1b859 Merge pull request #26980 from atm-jonathan/FIX_in_array()_list.php 
FIX in_array() on key
 2023-12-08 01:59:32 +01:00
Frédéric FRANCE
61b79fda17 avoid phpstan error with phpdoc 2023-12-06 15:46:39 +01:00
Jonathan Lescaut
771b735384 FIX in_array() on key 2023-12-05 16:12:18 +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
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
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
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
fd2ccf584b Look and feel v19 2023-10-17 15:27:07 +02:00
Laurent Destailleur
c2bdb3be90 Fix php8.2 warnings 2023-10-15 18:41:39 +02:00
Laurent Destailleur
08ac0e9ee4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-21 12:38:41 +02:00
Laurent Destailleur
11cc0a61da Fix cast of int 2023-09-20 11:59:57 +02:00
Laurent Destailleur
91fa48199a Fix warnings 2023-09-10 17:41:22 +02:00
Laurent Destailleur
e56c1710bb Clean code 2023-08-26 21:49:24 +02:00
Laurent Destailleur
7ce9bf6b23 Clean code 2023-08-05 15:44:28 +02:00
Laurent Destailleur
37beb399d5 Debug v18 2023-07-12 15:02:34 +02:00
Laurent Destailleur
e203346b2a Debug v18 2023-07-10 20:53:19 +02:00
Laurent Destailleur
cb40e2ebd2 Fix warnings 2023-06-28 14:52:44 +02:00
Laurent Destailleur
ef64e1dcfc Debug v18 2023-06-28 11:50:28 +02:00
Frédéric France
647708a9bc use user hasRight 2023-06-19 23:05:59 +02:00
Laurent Destailleur
e16d944284 Clean code 2023-05-30 13:37:56 +02:00
hystepik
46012a6520 fix : php 8.1 warnings 2023-05-16 15:36:27 +02:00
Laurent Destailleur
e2ec34e1e5 Clean code 2023-05-01 14:33:08 +02:00
Laurent Destailleur
4028b5d568 Clean code 2023-04-29 13:13:12 +02:00
Laurent Destailleur
e74c50aa8a Clean code 2023-04-28 16:05:25 +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
Laurent Destailleur
6a470dbcf7 Kanban on inventory list. Look and feel v18 2023-04-01 12:05:29 +02:00
Laurent Destailleur
917d8e7985 Look and feel v18 2023-03-31 00:57:14 +02:00
Frédéric FRANCE
7d1d187148 fix missing comma in sql 2023-03-30 21:31:06 +02:00
Jyhere
ecfa7f1676 FIX: remove obsolete preg_replace for removing commat at the beginning... needed to work 2023-03-16 14:58:44 +01:00
Frédéric FRANCE
30aa377528 use isModEnabled 2023-03-08 08:50:19 +01:00
Laurent Destailleur
523f2cc12c Fix reposition on contract line 2023-03-07 00:08:19 +01:00