Commit Graph

22019 Commits

Author SHA1 Message Date
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
Laurent Destailleur
83a7b19333 Look and feel v13 2020-11-02 11:41:07 +01:00
Frédéric FRANCE
1b992a725f
use assignment 2020-11-02 11:30:07 +01:00
Frédéric FRANCE
0299d0c9cc
doxygen 2020-11-02 10:50:54 +01:00
Laurent Destailleur
f25a6b2e67
Merge pull request #15213 from ATM-Consulting/fix/10.0_delete_action_from_redirect_url_when_reordering_lines
FIX - 10.0 - remove 'action' parameter from redirect URL when reordering lines
2020-11-02 09:41:00 +01:00
Laurent Destailleur
1c15ec9dec
Merge pull request #15258 from frederic34/patch-13
Update mod_codeclient_elephant.php
2020-11-02 09:32:08 +01:00
Laurent Destailleur
94753f4678
Merge pull request #15257 from frederic34/patch-10
Update modules_societe.class.php
2020-11-02 09:30:54 +01:00
Laurent Destailleur
ea3106cd07
Merge pull request #15252 from frederic34/specimencommon
initSpecimenCommon
2020-11-02 09:29:48 +01:00
Laurent Destailleur
878b8f25de
Update commonobject.class.php 2020-11-02 09:29:26 +01:00
Florian Mortgat
400acf9f65 FIX - 10.0 - regex to remove 'action' parameter: taking feedback from PR#15213 into account 2020-11-02 08:26:36 +01:00
Frédéric FRANCE
3cd11c4e8b
optimize show_ticket_messaging 2020-11-02 00:26:26 +01:00
Frédéric FRANCE
802efbe6a7
Update mod_codeclient_elephant.php 2020-11-01 23:30:15 +01:00
Frédéric FRANCE
1ccb5cb2d7
Update mod_codeclient_elephant.php 2020-11-01 23:09:30 +01:00
Frédéric FRANCE
c973faf9a9
Update mod_codeclient_elephant.php 2020-11-01 23:06:35 +01:00
Frédéric FRANCE
cd61e5b0b2
Update modules_societe.class.php 2020-11-01 22:44:09 +01:00
Laurent Destailleur
41965381fd Better compatibility with PHP8 2020-11-01 21:27:56 +01:00
Frédéric FRANCE
a1016d79a2
initSpecimenCommon 2020-11-01 20:33:06 +01:00
Laurent Destailleur
ce7a96cbf1 Add more assertion 2020-11-01 20:11:09 +01:00
Laurent Destailleur
d6b6cacbe5 Removed warning 2020-11-01 20:02:12 +01:00
Laurent Destailleur
a61d317b5c Var not defined 2020-11-01 18:25:21 +01:00
Laurent Destailleur
e0ed89c514 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/compta/facture/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
2020-11-01 17:58:41 +01:00
Laurent Destailleur
72160deef7 FIX #14979 2020-11-01 17:01:26 +01:00
Laurent Destailleur
63a03cdad6 FIX #15208 2020-11-01 14:34:29 +01:00
Frédéric FRANCE
e52b79d586
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-01 14:19:06 +01:00
Laurent Destailleur
4feed10b75
Merge pull request #15246 from hregis/develop_bug2
FIX to avoid error with geoip
2020-11-01 13:54:58 +01:00
Regis Houssin
e19e56e14c FIX to avoid error with geoip 2020-11-01 10:47:54 +01:00
Frédéric FRANCE
d9bf49c5dc
phpcs 2020-10-31 21:04:38 +01:00
Frédéric FRANCE
49390a596c
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 20:33:59 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Laurent Destailleur
f00cdd3e04
Merge pull request #15239 from frederic34/patch-8
fix init auguria menu
2020-10-31 17:30:24 +01:00
Frédéric FRANCE
24cbb6db5f
fix init auguria menu 2020-10-31 17:24:30 +01:00
Frédéric FRANCE
de0f115cbd
Update auguria.lib.php
The variable $classname does not seem to be defined for all execution paths leading up to this point.
2020-10-31 16:56:43 +01:00
Frédéric FRANCE
be4a4cb54b
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 16:10:16 +01:00
Laurent Destailleur
e5a5f37b3f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/bills.lang
2020-10-31 15:09:26 +01:00
Laurent Destailleur
125b94d749
Merge pull request #15234 from frederic34/patch-8
doxygen
2020-10-31 15:05:41 +01:00
Laurent Destailleur
41b938047d Fix doc 2020-10-31 14:51:32 +01:00
stickler-ci
284c9bc6a8 Fixing style errors. 2020-10-31 13:34:01 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
78b94c775b
Update commonobject.class.php 2020-10-31 13:59:46 +01:00
Laurent Destailleur
11f9c4cfbd
Merge pull request #15117 from atm-jpb/develop_editorRate
# New multi-currency exchange rate editor
2020-10-31 13:55:42 +01:00
Laurent Destailleur
1af3709793
Merge pull request #15232 from frederic34/patch-6
doxygen
2020-10-31 13:50:28 +01:00
Laurent Destailleur
2b09b7be8e Fix css 2020-10-31 13:47:50 +01:00
Frédéric FRANCE
85b3b5de36
Update commonobject.class.php 2020-10-31 13:24:09 +01:00
Frédéric FRANCE
a51d135c7b
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 12:57:53 +01:00
Laurent Destailleur
9113ecedfa code comment 2020-10-31 12:55:26 +01:00
Laurent Destailleur
cea61d3b52 Fix var 2020-10-31 12:44:14 +01:00
Laurent Destailleur
623cb54480 Prepare a more complete fix for #15016 2020-10-31 12:30:47 +01:00
Laurent Destailleur
a4d2927f82 Fix for #15016
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
2020-10-31 12:18:54 +01:00
Laurent Destailleur
fcb3245295 Fix for #15016 2020-10-31 12:11:41 +01:00
Frédéric FRANCE
0b9c866825
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 09:08:07 +01:00
Laurent Destailleur
f53483f983 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-31 04:26:23 +01:00
Laurent Destailleur
e42dee3c8e
Merge pull request #15224 from frederic34/apiclean
doxygen
2020-10-31 04:24:53 +01:00
Laurent Destailleur
0a9c7fc577 Look and feel v13 2020-10-31 04:19:22 +01:00
Laurent Destailleur
44f532e1da Fix look and feel v13 2020-10-31 03:50:16 +01:00
Frédéric FRANCE
24ace56110
zapier on ticket create 2020-10-30 21:03:00 +01:00
Frédéric FRANCE
5afab4ba90
zapier on ticket create 2020-10-30 20:57:43 +01:00
Frédéric FRANCE
41e8f0085c
zapier on ticket create 2020-10-30 20:37:23 +01:00
Laurent Destailleur
aafac6f989 Fix box of events 2020-10-30 18:58:40 +01:00
Frédéric FRANCE
8190711342
doxygen 2020-10-30 18:01:01 +01:00