Commit Graph

94275 Commits

Author SHA1 Message Date
Laurent Destailleur
c36f231f41
Update card.php 2021-05-17 07:34:56 +02:00
Maxime Kohlhaas
1fbd53993f Fix missing substitutionarray on ticket presend 2021-05-16 19:07:36 +02:00
Laurent Destailleur
8971fde420 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 23:49:59 +02:00
Laurent Destailleur
f84817f0f6 FIX rss module on servers with allow_url_fopen=0 2021-05-11 23:49:33 +02:00
Laurent Destailleur
4ec763a436
Merge pull request #17497 from Hystepik/develop_v13#2
Fix #17491 : date extrafield filter works well now
2021-05-11 21:15:50 +02:00
Laurent Destailleur
d576e56129
Merge pull request #17526 from daraelmin/daraelmin-V13-DarkMode-1
Fix #17114 dark display for enabled module in dark mode
2021-05-11 20:44:24 +02:00
Laurent Destailleur
c0689b3884 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 20:18:43 +02:00
Laurent Destailleur
c3b5491805 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 20:18:36 +02:00
Laurent Destailleur
8dc1e1cb33 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-11 20:17:24 +02:00
Laurent Destailleur
3683461c40 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	.travis.yml
	htdocs/societe/consumption.php
2021-05-11 20:17:15 +02:00
Laurent Destailleur
b5c88d5817 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-05-11 20:15:32 +02:00
Laurent Destailleur
c2fa19a0b4 fix phpcs 2021-05-11 20:15:20 +02:00
Laurent Destailleur
6591c3f50e
Merge pull request #17538 from AlexisLaurier/fix/restrictedAreaPaymentFournDelete
bug fix - deletion of invoice supplier payment
2021-05-11 19:27:05 +02:00
Laurent Destailleur
8336f56b40
Merge pull request #17539 from AlexisLaurier/fix/elephantClientCodeVerifDispoMultiEntity
add entity check on verif_dispo mod_codeclient_elephant
2021-05-11 19:13:17 +02:00
Laurent Destailleur
82400ca2a5
Merge pull request #17542 from atm-john/patch-2
FIX : var case
2021-05-11 18:43:57 +02:00
Laurent Destailleur
ce8d6c77ed
Merge pull request #17565 from ksar-ksar/patch-4
FIX #13955
2021-05-11 18:09:14 +02:00
Laurent Destailleur
9971aee835
Merge pull request #17576 from atm-lena/12.0_FIX_AddHook_ExtrafieldsUpdate
Add Hook Extrafields Update - init extrafieldssdao
2021-05-11 17:53:21 +02:00
atm-lena
8fb474c687 Add Hook Extrafields Update - init extrafieldssdao 2021-05-11 11:35:54 +02:00
Laurent Destailleur
fc1feb6dfe Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-10 21:06:59 +02:00
Laurent Destailleur
837c828b1d Prepare 13.0.3 2021-05-10 21:06:48 +02:00
Laurent Destailleur
4417792b2f Prepare 13.0.3 2021-05-10 21:04:38 +02:00
ksar
107374748e
FIX #13955 2021-05-10 15:42:24 +02:00
lmarcouiller
d293be56ce Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#2 2021-05-10 10:41:56 +02:00
John BOTELLA
2fda3b1b46
FIX ; var case
On this page $datePrint is not used but $dateprint yes
2021-05-08 13:53:20 +02:00
Alexis LAURIER
e4a430f638 add entity check on verif_dispo mod_codeclient_elephant 2021-05-08 10:24:08 +02:00
Alexis LAURIER
d04c741a3b add payment_fourn delete proper check into security.lib 2021-05-08 09:12:17 +02:00
Laurent Destailleur
f5e1cd5fcc Fix phpunit 2021-05-07 18:22:18 +02:00
Laurent Destailleur
907ea1a8bd Fix sql error 2021-05-07 18:21:11 +02:00
Laurent Destailleur
97ca6895d8 Missing profid1 and 2 in get API 2021-05-07 15:50:07 +02:00
Laurent Destailleur
1cf46f9ae9 cast int 2021-05-07 15:11:28 +02:00
daraelmin
cb793cb762
Fix #17114 dark display for enabled module in dark mode 2021-05-07 13:19:02 +02:00
daraelmin
078f586299
@daraelmin Add enabled module color in var 2021-05-07 13:15:22 +02:00
stickler-ci
d108496c67 Fixing style errors. 2021-05-07 07:47:49 +00:00
lmarcouiller
c39dbd81b3 Fix #17491 : Update of fix date extrafield filter 2021-05-07 09:47:15 +02:00
lmarcouiller
5dcdb06e91 Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#2 2021-05-07 09:46:37 +02:00
Laurent Destailleur
3090c124f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-06 16:59:06 +02:00
Laurent Destailleur
8410f4a9c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/societe/consumption.php
	htdocs/user/class/user.class.php
2021-05-06 16:57:49 +02:00
Laurent Destailleur
f6f4968af6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/societe/consumption.php
2021-05-06 16:52:36 +02:00
Laurent Destailleur
a26d00428e
Merge pull request #17444 from Hystepik/develop_v13#1
Fix #17361 : change of llx_export_model type to varchar(64)
2021-05-06 16:48:46 +02:00
Laurent Destailleur
824a601014
Merge pull request #17507 from atm-john/11.0_fix_search_accent_in_description
FIX : search accented words in product description (consumption page)
2021-05-06 16:45:21 +02:00
Laurent Destailleur
0dbd68564c
Merge pull request #17493 from FHenry/13_fix_bank_url_merge_account
FIX: merge thirparty also work for bank URL entry
2021-05-06 16:39:13 +02:00
Laurent Destailleur
7386a223e8
Update account.class.php 2021-05-06 16:38:34 +02:00
Laurent Destailleur
9ce23ac6b2
Merge pull request #17494 from atm-john/fix_not_enabled_email_template
FIX saving template email
2021-05-06 16:22:19 +02:00
Laurent Destailleur
a4d93424dc
Merge pull request #17498 from marc-dll/FIX_11.0_pgsql_where_boolean
FIX: pgsql: prevent 'WHERE 1'
2021-05-06 15:58:41 +02:00
Laurent Destailleur
21ce99338b
Merge pull request #17504 from FHenry/13.0
fix missing token
2021-05-06 15:57:45 +02:00
Laurent Destailleur
7bd6cdbf59
Merge pull request #17505 from FHenry/13_fix_webdavlink
fix: allow webdavs link type
2021-05-06 15:56:55 +02:00
ATM john
63292255cc Fix search accented words in product description 2021-05-05 18:45:23 +02:00
Florian HENRY
adc8620506 fix: allow webdavs link type 2021-05-05 17:14:58 +02:00
Florian HENRY
e62c6be54c Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-05-05 17:06:03 +02:00
Florian HENRY
7857da4db7 fix missing token 2021-05-05 17:05:51 +02:00