Commit Graph

6999 Commits

Author SHA1 Message Date
Laurent Destailleur
0f7b84cfae Fix phpcs 2022-06-03 18:20:02 +02:00
Laurent Destailleur
bed0cf8339 Fix phpcs 2022-06-03 18:12:58 +02:00
Laurent Destailleur
cd041c9ea1 Clean code 2022-06-03 02:41:00 +02:00
Laurent Destailleur
cbead0fa5a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/class/productbatch.class.php
2022-06-02 19:39:42 +02:00
Laurent Destailleur
f9f902f7f4 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-02 19:37:47 +02:00
Laurent Destailleur
867168fcf4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-02 19:35:58 +02:00
Laurent Destailleur
12f3c016d3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-02 19:35:03 +02:00
Laurent Destailleur
704266445c Debug v16 2022-06-01 19:45:46 +02:00
Laurent Destailleur
e3fa24fab2
Merge pull request #18283 from atm-gauthier/NEW_stockstransfers
NEW : Stocks transfers objects management
2022-06-01 14:49:21 +02:00
Laurent Destailleur
a7155676af Debug v16 2022-05-31 12:49:03 +02:00
Laurent Destailleur
480452e291 FIX missing filters 2022-05-29 10:35:49 +02:00
Laurent Destailleur
2c9c55bc75 Fix filter on dates 2022-05-28 16:52:39 +02:00
Laurent Destailleur
7ddf4ef315 Fix look and feel v16 2022-05-28 12:50:44 +02:00
Laurent Destailleur
59fcd9de13 Fix trans 2022-05-28 12:36:03 +02:00
Laurent Destailleur
dcfb0679c8 FIX Look and field v16 for list of lot 2022-05-28 12:24:11 +02:00
BENKE Charlene
17c5337312
PHP V8 Warning 2022-05-24 22:53:26 +02:00
Laurent Destailleur
4c10c04f9f
Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search
FIX : regression select extrafield search + fix function name
2022-05-24 21:55:33 +02:00
Laurent Destailleur
13944ea2c0
Merge pull request #20994 from fappels/16_fix_lot_document_management
FIX: Product lot document management should not use batch but ref (is lot id)
2022-05-24 21:39:49 +02:00
Laurent Destailleur
6f83c8c6f3
Update productbatch.class.php 2022-05-24 21:22:14 +02:00
Laurent Destailleur
e89c80651b
Update card.php 2022-05-24 21:09:12 +02:00
atm-greg
8213756c37 fix sql to avoid getting product_stock of another product with same batch 2022-05-24 16:49:55 +02:00
BENKE Charlene
9b50b63850
FIX PHP V8 warning
$sameunits not initialy defined
no default_lang needed (and field not present on stock class
2022-05-23 21:58:29 +02:00
Francis Appels
8574f36e35 dol_dir_list fast mode 2022-05-23 15:25:31 +02:00
Francis Appels
71ed1ec602 Product lot document management should not use batch but ref (is lot id) 2022-05-23 12:07:37 +02:00
Maxime Kohlhaas
6445dd3882
Merge branch 'develop' into NEW_stockstransfers 2022-05-21 16:06:59 +02:00
Maxime Kohlhaas
cff5ec8605 Fix : fields must check module enabled 2022-05-21 00:08:18 +02:00
Laurent Destailleur
5dfd5ed444 css 2022-05-19 12:34:15 +02:00
Laurent Destailleur
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
Laurent Destailleur
308e7a3d9b Fix scrutinizer 2022-05-18 12:40:44 +02:00
Laurent Destailleur
177e8c17fb Fix scrutinizer 2022-05-18 11:23:21 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
c020325587 Debug v16 2022-05-16 19:54:49 +02:00
Laurent Destailleur
4cc1f67632 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/line.php
2022-05-16 16:03:07 +02:00
Laurent Destailleur
c3673bfc3c NEW A public form for to send a message and create a lead is available 2022-05-16 13:05:17 +02:00
Laurent Destailleur
7a361a3bde More info to help debug 2022-05-12 14:28:17 +02:00
lmarcouiller
207ebc9266 fix php 8.0 warnings 2022-05-11 15:06:11 +02:00
Laurent Destailleur
da5cf74a08 Fix total 2022-05-11 10:17:56 +02:00
Gauthier PC portable 024
60defe4108 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-09 13:29:46 +02:00
Laurent Destailleur
f14e614430
Merge pull request #20779 from atm-GregM/develop_new_massaction_extrafield_product
NEW : Add massaction "Edit Extrafield" for Product
2022-05-08 19:15:25 +02:00
Laurent Destailleur
b04ef20708
Merge pull request #20782 from atm-adrien/FIX_move_inventory_column-develop
Fix move inventory column develop
2022-05-08 19:13:26 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2022-05-06 12:46:26 +02:00
Laurent Destailleur
0426be5059 FIX Update of sale price (log not correctly updated)
Conflicts:
	htdocs/product/class/product.class.php
	htdocs/product/price.php
2022-05-06 12:42:45 +02:00
Laurent Destailleur
f222328ff8 FIX Update of sale price (log not correctly updated) 2022-05-06 12:37:18 +02:00
Laurent Destailleur
203c4e8082 Fix bad test 2022-05-06 11:48:15 +02:00
Gauthier PC portable 024
2c840e80fb Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-06 11:41:18 +02:00
Laurent Destailleur
f3a630fd30 Clean code 2022-05-06 05:21:26 +02:00
Laurent Destailleur
583343a171 Clean code 2022-05-06 05:08:54 +02:00
stickler-ci
23ae3af247 Fixing style errors. 2022-05-05 07:38:40 +00:00