Commit Graph

27969 Commits

Author SHA1 Message Date
Anthony Berton
cd6bd2ae4e FIX - php8 migration 2022-07-20 18:39:11 +02:00
Laurent Destailleur
dbdf0edfc3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-19 19:14:58 +02:00
Marc de Lima Lucio
b827f476e5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_product_supplier_list_hook 2022-07-19 13:21:47 +02:00
Marc de Lima Lucio
a691c8ebe9 FIX: remove useless hookmanager init 2022-07-19 12:31:13 +02:00
Laurent Destailleur
f983857e0d
Merge pull request #21513 from Easya-Solutions/fix-inventory-getnomurl-options-with-select-for-forms
FIX product filter in inventory list

> @eldy Some parameters for "getNomUrl" exist at lines 7623 and 7624 of "commonobject.class.php" file : '$getnomurlparam = (empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]); $getnomurlparam2 = (empty($InfoFieldList[4]) ? '' : $InfoFieldList[4]);"
> 
> I introduced a new attribute in fileds of the object class : "get_name_url_params" to separate "options" used in "selectForForms()" method.
> 
> But I don't know if it's a good way to implement it ?

Looks good to me
2022-07-19 01:20:10 +02:00
Laurent Destailleur
e0869738d3
Merge pull request #21520 from thomas-Ngr/14.0_fix_mailing_html_signature
fix signature style in email template
2022-07-19 00:58:44 +02:00
Marc de Lima Lucio
53812c9f13 NEW: hook to modify supplier product html select 2022-07-18 17:29:49 +02:00
Laurent Destailleur
9b9d65562f Fix css 2022-07-18 14:51:03 +02:00
Laurent Destailleur
95ee25660e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-18 13:16:25 +02:00
Laurent Destailleur
076d93452f FIX Debug v16 2022-07-18 11:59:22 +02:00
Thomas Negre
0ac68c8635 fix signature style in email template 2022-07-18 09:55:54 +02:00
Laurent Destailleur
2e42f45c99 FIX php8 2022-07-16 12:02:17 +02:00
Laurent Destailleur
1855236027 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
2022-07-16 02:26:35 +02:00
Laurent Destailleur
a423f8685a php8 2022-07-16 02:23:30 +02:00
Laurent Destailleur
a864771974 Debug 2022-07-15 15:51:55 +02:00
Laurent Destailleur
1d0ba05e90 Debug 2022-07-15 15:35:45 +02:00
Laurent Destailleur
b000ee7c50 NEW Add API for partnership module
Debug module builder
2022-07-15 13:41:02 +02:00
lvessiller
e5877cb2e3 FIX product filter in inventory list (Issue #21504) 2022-07-15 09:33:27 +02:00
Laurent Destailleur
4f54fb4f00 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-14 11:54:30 +02:00
Laurent Destailleur
3e6e4cc428 FIX php8 2022-07-14 10:58:51 +02:00
Laurent Destailleur
75693ce34a FIX php8 2022-07-14 10:56:55 +02:00
Laurent Destailleur
97acf949fc Clean message on email limit 2022-07-13 13:39:16 +02:00
Laurent Destailleur
abd3f272fa Fix backtopage after a cancel 2022-07-12 19:17:44 +02:00
Laurent Destailleur
8422d3079c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 19:10:08 +02:00
Laurent Destailleur
e6cf329596 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-12 19:09:16 +02:00
Laurent Destailleur
6c1b22eb48 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-07-12 19:08:15 +02:00
Laurent Destailleur
dfb5bb0936 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-12 19:07:35 +02:00
Laurent Destailleur
aa3f77e7cc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-12 17:54:03 +02:00
Laurent Destailleur
c2712242be Fix css 2022-07-12 17:42:20 +02:00
Laurent Destailleur
c804469082 FIX Export of website must not export .old and .back files 2022-07-12 11:20:34 +02:00
Laurent Destailleur
9abff2ff07 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 10:57:11 +02:00
Laurent Destailleur
cf5825687e Debug v16 2022-07-12 10:56:03 +02:00
Laurent Destailleur
98b686b531 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 02:16:54 +02:00
Laurent Destailleur
1f87f515ad Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 02:05:55 +02:00
Laurent Destailleur
fb96145b49 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 02:05:20 +02:00
Laurent Destailleur
fe99e6c136 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-11 19:59:48 +02:00
Laurent Destailleur
85a0ae1236 Fix token for ping 2022-07-11 19:59:15 +02:00
Laurent Destailleur
4f9211d3e5 Fix link 2022-07-11 19:24:55 +02:00
Laurent Destailleur
661b863314
Merge pull request #21490 from Hystepik/develop#2
Close #19587 : box_action order by to datep
2022-07-11 17:48:56 +02:00
Francis Appels
490944baac Fix php 8 warning 2022-07-11 17:29:26 +02:00
stickler-ci
afefc369ed Fixing style errors. 2022-07-11 10:06:31 +00:00
Yoan Mollard
39c9eb8708 Fix: fetch the right amount for membership payment
It was defaulting to 9.99
2022-07-11 12:03:24 +02:00
stickler-ci
3434460cc3 Fixing style errors. 2022-07-11 09:55:39 +00:00
atm-lena
851416a61e No display extrafield line on PDF if empty 2022-07-11 11:48:37 +02:00
lmarcouiller
ce2bf519d5 Close #19587 : box_action order by to datep 2022-07-11 11:22:19 +02:00
Laurent Destailleur
e29df476e6
Merge branch 'develop' into membership-rework 2022-07-11 10:56:31 +02:00
Laurent Destailleur
30dff96ef4 Fix var_dump 2022-07-11 01:27:19 +02:00
Laurent Destailleur
bce8e28372
Merge pull request #21352 from badre-agtaib/new-#19511
New #19511
2022-07-10 19:49:35 +02:00
Laurent Destailleur
2ce695f939 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-10 19:48:20 +02:00
Laurent Destailleur
e9b3d436ca css 2022-07-10 19:47:36 +02:00