Commit Graph

7047 Commits

Author SHA1 Message Date
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Laurent Destailleur
11e11c99b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-27 12:12:07 +02:00
Laurent Destailleur
bbd2f05e3a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
2022-06-27 12:11:40 +02:00
Laurent Destailleur
bec187b9b4
Merge pull request #21370 from atm-lena/develop_FIX_TransferCorrectionStock_Extrafields
FIX : don't display product's extrafields for transer / correction stock
2022-06-27 11:45:31 +02:00
Laurent Destailleur
d6aa53168c
Merge pull request #21379 from cfoellmann/PR/fix-disable-product-accounting
fix PRODUCT_DISABLE_ACCOUNTING
2022-06-27 11:33:42 +02:00
Laurent Destailleur
149fc6ed83
Update list.php 2022-06-27 11:26:57 +02:00
Laurent Destailleur
834d129634
Update product.class.php 2022-06-27 11:11:43 +02:00
BB2A Anthony Berton
f3b3e97d49 Recursive call if there is childs to child 2022-06-27 08:51:12 +02:00
BB2A Anthony Berton
ebe8e34249 total init 2022-06-27 08:49:27 +02:00
BB2A Anthony Berton
550c57d53e FIX - php V8 composition card 2022-06-27 08:45:38 +02:00
Christian Foellmann
082c7091fc fix PRODUCT_DISABLE_ACCOUNTING + STOCK_SUPPORT_SERVICES on products/services list page 2022-06-26 15:47:24 +02:00
Christian Foellmann
b65c9f4ead fix PRODUCT_DISABLE_ACCOUNTING - hide fields on product/card view 2022-06-25 15:04:28 +02:00
Laurent Destailleur
14832bb543 FIX timeout due to too many the same request 2022-06-25 04:15:04 +02:00
atm-lena
9d1b1c2c82 FIX : don't display product's extrafields for transer / correction stock 2022-06-24 12:12:22 +02:00
Laurent Destailleur
e0cfeedae7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-23 13:14:14 +02:00
Laurent Destailleur
3179fd13d8 FIX #21303 2022-06-23 13:07:53 +02:00
Laurent Destailleur
5627d7ff9d Fix token 2022-06-23 12:45:28 +02:00
Laurent Destailleur
f4997d052d
Merge pull request #21326 from defrance/patch-209
php V8 warning, no soc associated with storage
2022-06-23 12:39:05 +02:00
Laurent Destailleur
540cd43596
Merge branch 'develop' into patch-210 2022-06-23 12:37:47 +02:00
Laurent Destailleur
b2603c9b53 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/fournisseurs.php
2022-06-23 12:26:26 +02:00
Laurent Destailleur
c0240ae996 Merge 2022-06-23 12:24:34 +02:00
Frédéric France
287f868fbb use getDolGlobalString 2022-06-22 08:36:24 +02:00
Frédéric France
62c171c26d isModEnabled 2022-06-21 20:54:28 +02:00
atm-lena
a94e39f0f4 Merge branch '14.0' of https://github.com/Dolibarr/dolibarr into 14.0_FIX_productfournprice_saveextrafieldsvalues 2022-06-21 16:38:09 +02:00
atm-lena
d99adae850 Product Fourn Price : fix error save extrafields values 2022-06-21 16:34:23 +02:00
BENKE Charlene
88cab8b8e7
Update card.php 2022-06-20 15:41:19 +02:00
BENKE Charlene
fcc23909b3
Update card.php 2022-06-20 15:39:11 +02:00
BENKE Charlene
67021bfd31
php V8 warning 2022-06-20 15:32:04 +02:00
BENKE Charlene
955f14e299
php V8 warning, no soc associated with storage 2022-06-20 15:25:47 +02:00
Laurent Destailleur
8ee30e067f Rename var 2022-06-20 02:23:37 +02:00
Laurent Destailleur
e97f021380 Fix #yogosha11295 2022-06-19 19:02:16 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
Laurent Destailleur
b2bc6059df Fix test 2022-06-12 18:55:16 +02:00
Laurent Destailleur
f0d0bf6442
Update api_products.class.php 2022-06-12 18:52:43 +02:00
ptibogxiv
727fb63833
Fix php 8 compatibility 2022-06-12 14:21:14 +02:00
Laurent Destailleur
c2fe5de852
Merge pull request #21195 from frederic34/useismodenabled
use isModEnabled function
2022-06-12 11:56:31 +02:00
Laurent Destailleur
04d625cccf
Merge pull request #21213 from rycks/15_add_invoice_template_in_product_used_list
#21212 : add template invoices stats on products card
2022-06-12 11:46:17 +02:00
Eric Seigne
c23b5947b3 #21212 : add template invoices stats on products card 2022-06-12 11:05:12 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
0b8179d7ef use isModEnabled function 2022-06-09 22:49:48 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
3bb8e9cdda Debug v16 2022-06-09 12:07:35 +02:00
Laurent Destailleur
b5a1ded537
Merge branch 'develop' into 15_fix_reception_stock_move 2022-06-09 02:41:51 +02:00
Laurent Destailleur
1f26dee554 Fix deprecated functions 2022-06-08 17:19:12 +02:00
Francis Appels
c9049a9c85 Fix non numeric warning 2022-06-08 12:38:50 +02:00
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