Commit Graph

22877 Commits

Author SHA1 Message Date
Laurent Destailleur
549b2eb99c Add log for a test 2020-11-08 12:56:53 +01:00
Laurent Destailleur
451432d73c Merge pull request #15139 from dvdwalker/develop
Update to allow importing extrafileds on Product Supplier Price
2020-11-08 12:40:53 +01:00
Laurent Destailleur
310123fe33 Merge pull request #15331 from Ahuahuachi/develop
NEW Allow disable multiple file upload in form_attach_new_file method
2020-11-08 12:38:29 +01:00
Laurent Destailleur
e103503bb1 Fix warning php8 2020-11-08 12:34:45 +01:00
Alfredo Altamirano
f57c6dd25e Add $disablemulti option to form_attach_new_file method
This new option allows to disable multiple file upload for use on specific upload forms
2020-11-07 18:03:55 -06:00
Laurent Destailleur
9d3a25e2a3 Doxygen 2020-11-08 00:35:10 +01:00
Laurent Destailleur
129c53342a Fix warning 2020-11-07 20:01:28 +01:00
Laurent Destailleur
d8eb9f8096 Merge pull request #15259 from frederic34/show_ticket_messaging
optimize show_ticket_messaging
2020-11-07 19:07:44 +01:00
Laurent Destailleur
c071dd254b Fix warning 2020-11-07 14:35:28 +01:00
Laurent Destailleur
a72107ce06 Fix regression 2020-11-07 14:33:21 +01:00
Laurent Destailleur
2fdba3ad46 Fix warning 2020-11-07 12:53:52 +01:00
Laurent Destailleur
b386faebd8 Add noopenenr on links to dolibarr website 2020-11-07 12:49:38 +01:00
Laurent Destailleur
62ba731823 Fix the follow/nofollow was not propagated 2020-11-07 12:47:42 +01:00
Laurent Destailleur
2da6fc1ef0 Remove warning 2020-11-07 12:06:14 +01:00
Laurent Destailleur
ea4ad24ac5 Fix doc 2020-11-07 02:14:17 +01:00
Laurent Destailleur
b3b70b1585 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-07 01:19:32 +01:00
Laurent Destailleur
fe8d93f72d Fix phpcs 2020-11-07 01:17:54 +01:00
Laurent Destailleur
eba73101b9 Merge pull request #15210 from frederic34/zapieruser
work on zapier
2020-11-06 18:49:23 +01:00
Laurent Destailleur
c097e140cc Fix php8 2020-11-06 15:41:34 +01:00
lvessiller
4ddff7173f NEW include tpl for loading lang file for extra fields in list 2020-11-06 12:19:45 +01:00
atm-lena
047785b273 FIX - Don't display inactive users in birthday box and soc card 2020-11-06 11:58:36 +01:00
Laurent Destailleur
ac6f8e4e7c Debug v13 2020-11-06 11:52:48 +01:00
Laurent Destailleur
4535d81964 Fix CSS for holiday. Fix #15266 2020-11-05 19:09:58 +01:00
Laurent Destailleur
38f1431534 HOLIDAY_HIDE_FOR_NON_SALARIES replaces !HOLIDAY_FOR_NON_SALARIES_TOO 2020-11-05 19:01:00 +01:00
Frédéric FRANCE
5d90611795 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-05 14:42:37 +01:00
Laurent Destailleur
a313c35f5b Fix php8 2020-11-05 11:29:23 +01:00
Laurent Destailleur
1d9aacc7da Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commoninvoice.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
2020-11-05 09:51:28 +01:00
Laurent Destailleur
9380ea4bc5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-05 09:43:38 +01:00
Laurent Destailleur
a5328f4230 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-05 09:43:28 +01:00
Laurent Destailleur
6bb598498e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-11-05 09:42:51 +01:00
Laurent Destailleur
c6b293673f Merge pull request #15299 from fappels/13_update_commonobject
Update commonobject.
2020-11-05 09:08:12 +01:00
Laurent Destailleur
824b778d51 Update commonobject.class.php 2020-11-05 09:07:06 +01:00
Frédéric FRANCE
b534dd57d9 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-05 08:29:35 +01:00
Laurent Destailleur
4b7c8a0d1d Merge pull request #15291 from prietojc/12.0_patch-1
FIX force payment mode to withdraw
2020-11-04 20:36:29 +01:00
Laurent Destailleur
00d4d0db23 Fix phpcs 2020-11-04 20:35:24 +01:00
Francis Appels
5866facf11 Update commonobject.
Don't think $fk_delivery_address is deprecated, also no alternative indicated.
Switch of implode paramenters.
showInputField preselected value for array type can be array.
2020-11-04 20:31:55 +01:00
Frédéric FRANCE
6e7448a1d0 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-04 19:00:10 +01:00
Laurent Destailleur
9e509a805a Merge pull request #15289 from frederic34/patch-16
can't input two lines address
2020-11-04 18:55:08 +01:00
Laurent Destailleur
32ed5cc07f Merge pull request #15286 from frederic34/patch-15
The function each() has been deprecated: 7.2
2020-11-04 18:36:49 +01:00
Laurent Destailleur
38d88ced0b Debug the security page 2020-11-04 16:07:59 +01:00
Laurent Destailleur
7294a47ef5 Fix generation of user from member, contact, applications for job 2020-11-04 13:33:52 +01:00
jcp
1f483d7c28 Fix force payment mode to create withdrawal 2020-11-04 11:43:03 +01:00
Frédéric FRANCE
7c7a1b5512 Update functions.lib.php 2020-11-04 09:45:02 +01:00
Frédéric FRANCE
7caac9ebe7 The function each() has been deprecated: 7.2 2020-11-03 21:35:23 +01:00
jcp
bae05bbe7d Fix computed import 2020-11-03 18:43:03 +01:00
Laurent Destailleur
508683b9f0 Clean duplicated code 2020-11-03 14:52:04 +01:00
Laurent Destailleur
b0e2d40533 Debug and fix v13 2020-11-03 14:19:54 +01:00
Frédéric FRANCE
d84be819da Merge remote-tracking branch 'upstream/develop' into show_ticket_messaging 2020-11-02 12:50:42 +01:00
Laurent Destailleur
7bba8a4616 Merge pull request #15261 from frederic34/patch-6
doxygen
2020-11-02 11:42:53 +01:00
Laurent Destailleur
5f290e0de1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-02 11:41:19 +01:00