Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
119,231 Commits 36 Branches 189 Tags
8b7eaf360e58693a9365544cb1520f28ced7e626
Commit Graph

11706 Commits

Author SHA1 Message Date
Laurent Destailleur
af73f2b683 Fix php8 2022-07-24 14:32:35 +02:00
Laurent Destailleur
c3016c6175 Fix php8 2022-07-24 13:44:47 +02:00
Laurent Destailleur
24f8e9c401 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 18:09:38 +02:00
Anthony Berton
36c0936856 FIX - php8 migration 2022-07-22 17:32:28 +02:00
lvessiller
1f28734a83 FIX resolve conflicts 2022-07-22 08:50:50 +02:00
Anthony Berton
cd6bd2ae4e FIX - php8 migration 2022-07-20 18:39:11 +02:00
stickler-ci
9ef883e7b0 Fixing style errors. 2022-07-20 13:42:33 +00:00
atm-lena
7f1a17bcc9 Change fk_unit service lines management 2022-07-20 15:38:37 +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
8edebcf314 FIX Debug v16 2022-07-18 13:17:46 +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
ad2ced727a Fix php8 2022-07-16 10:59:36 +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
lvessiller
8f338d84b0 FIX resolve conflicts 2022-07-15 17:35:19 +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
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
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
fb96145b49 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 02:05:20 +02:00
Francis Appels
490944baac Fix php 8 warning 2022-07-11 17:29:26 +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
Thomas Negre
c71000aef6 remove useless console.log() 2022-07-11 09:18:03 +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
bd3af19978 Merge pull request #21335 from atm-GregM/NEW_exped_ObjectLink 
NEW add objectLink on expedition
 2022-07-10 19:33:49 +02:00
Laurent Destailleur
9a92c7d9b0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/extrafields.class.php
 2022-07-10 19:28:16 +02:00
Laurent Destailleur
3d226801ba Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-10 19:22:02 +02:00
Laurent Destailleur
3fbaea6a93 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-10 18:25:22 +02:00
Laurent Destailleur
09932000dd FIX online signature works partially on ODT templates. 2022-07-10 18:06:41 +02:00
Francis Appels
6362cdfe2e FIX regression by php8 fix on setVarsFromFetchObj 2022-07-10 13:00:34 +02:00
Laurent Destailleur
ca3cf1de9f NEW Add " as enclusore by default for CSV export. Keep removing CR/LF. 
Fix export of invoice.
 2022-07-10 02:25:46 +02:00
Laurent Destailleur
77e0ca72fe Prepare edition of css for extrafields 2022-07-09 14:39:20 +02:00
Laurent Destailleur
4fdcb43d9c NEW Add extrafield type "IP" to store IP addresses 2022-07-09 12:56:38 +02:00