Commit Graph

112767 Commits

Author SHA1 Message Date
Laurent Destailleur
c7721563c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-14 17:00:01 +02:00
Laurent Destailleur
f3fcb7a48a Fix insertion of email templates 2021-09-14 16:59:49 +02:00
Erik van Berkum
f9f6eef7c3
Merge branch 'Dolibarr:develop' into develop 2021-09-14 17:06:56 +09:00
Christian Foellmann
c967c5c6d4 fix cancel redirects on product,warehouse cards 2021-09-14 08:46:07 +02:00
Alexandre SPANGARO
cb37c42b5e NEW Customer invoice template list - Add input date from/to 2021-09-14 04:50:05 +02:00
javieralapps4up
e1203d115a
Update list.php 2021-09-14 02:22:30 +02:00
javieralapps4up
0763846805
Bug: #18670 date, account and payment type are lost when sorting by any field
Filtereds $date, $search_account and $search_paymenttype are not saved when sorting by any field
2021-09-14 02:15:22 +02:00
javieralapps4up
d7126e8d24
Update list.php
$search_account and $search_paymenttype are not saved when sorting by any field
2021-09-14 01:49:24 +02:00
Alexandre SPANGARO
eae4269745 Merge branch '14p19' of https://github.com/aspangaro/dolibarr into 14p19 2021-09-13 21:32:55 +02:00
Alexandre SPANGARO
42543ba005 Add alpha key 2021-09-13 21:29:31 +02:00
stickler-ci
6368ba9a6e Fixing style errors. 2021-09-13 19:21:53 +00:00
Alexandre SPANGARO
44f4f9e288 Merge branch '14.0' into 14p19 2021-09-13 21:13:26 +02:00
Alexandre SPANGARO
fe241cc71f FIX Accountancy - Format Quadra export - Missing line type C (act account) 2021-09-13 21:12:39 +02:00
ptibogxiv
0ad8dc2838
Update knowledgerecord.class.php 2021-09-13 19:01:25 +02:00
Laurent Destailleur
7420e6ab9a
Merge pull request #18693 from FHenry/14_fix_ldap_limit
fix: User class fetch method if LDAP Search LIMIT must be after ORDER BY
2021-09-13 17:04:43 +02:00
Julien Gainza
65c4a21898 FIX move fetch_optionnal into $ac_static->fetch() 2021-09-13 16:35:13 +02:00
Laurent Destailleur
1ec9d08557
Merge pull request #18701 from aspangaro/14p18
FIX Accountancy - Trunc code_journal to 2 in format XIMPORT (Ciel, Sage50)
2021-09-13 16:33:43 +02:00
Laurent Destailleur
41f627b80d Prepare 14.0.3 2021-09-13 16:33:16 +02:00
Laurent Destailleur
283f37a364 Trans 2021-09-13 16:32:24 +02:00
lmarcouiller
324af09415 Close #18692 : Possibility to move directories in ecm 2021-09-13 15:57:21 +02:00
Alexandre SPANGARO
d7236fad99 Merge branch '14.0' into 14p18 2021-09-13 14:51:17 +02:00
Alexandre SPANGARO
3ee258fefc FIX Accountancy - Trunc code_journal to 2 in format XIMPORT (Ciel, Sage50) 2021-09-13 14:08:41 +02:00
lmarcouiller
977fa99681 update knowledgemanagement.key name 2021-09-13 11:39:08 +02:00
lmarcouiller
35ca516ef6 update knowledgerecord_card 2021-09-13 11:24:43 +02:00
lmarcouiller
4762fd9c2e Close #18678 : Implemention of tags/categories KM 2021-09-13 11:22:55 +02:00
Florian HENRY
d464922d71 fix: LDAP Search LIMIT must be after ORDER BY 2021-09-13 09:44:54 +02:00
atm-florian
9ec72acaa0 FIX: apply eldy's suggestion to not overwrite existing extrafields of $line
(cf. PR#18167)
2021-09-13 08:58:24 +02:00
Laurent Destailleur
ce9a10bd90 Fix description of some options 2021-09-13 03:43:25 +02:00
Laurent Destailleur
3ea617ef68 Fix missing trans 2021-09-13 03:07:57 +02:00
Laurent Destailleur
e89f2ffb38 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-13 03:00:04 +02:00
Laurent Destailleur
5869975ed1 Fix phpcs 2021-09-13 02:59:09 +02:00
Laurent Destailleur
549a3baa76 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-13 02:48:03 +02:00
Laurent Destailleur
900af89827 Fix filename 2021-09-13 02:47:27 +02:00
Laurent Destailleur
bbacb4e740 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-13 02:45:00 +02:00
Laurent Destailleur
63767b1e31 Fix compression if buildzip is provided must be in zip format. 2021-09-13 02:42:55 +02:00
Laurent Destailleur
5756f0cfdf Fix code syntax 2021-09-13 01:36:18 +02:00
Laurent Destailleur
a974af131b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-13 01:32:35 +02:00
Laurent Destailleur
7deed57410 Fix scrutinizer errors 2021-09-13 01:32:20 +02:00
Laurent Destailleur
6fd191b01a Update doc 2021-09-13 01:22:53 +02:00
Laurent Destailleur
201e46f34b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-13 01:18:37 +02:00
Laurent Destailleur
7efd810d57 Clean code 2021-09-13 01:18:24 +02:00
Laurent Destailleur
b26b9bde1b
Merge pull request #18686 from frederic34/patch-2
doxygen
2021-09-13 01:03:21 +02:00
Laurent Destailleur
669213a6db
Merge pull request #18685 from frederic34/patch-1
doxygen
2021-09-13 01:03:13 +02:00
stickler-ci
e424df6447 Fixing style errors. 2021-09-12 12:15:33 +00:00
lainwir3d
2fe85f2a86 CLOSE #18689 REST API module: add api key generate / modify right. 2021-09-12 15:47:56 +04:00
Laurent Destailleur
6353987b15 css 2021-09-12 02:04:02 +02:00
Laurent Destailleur
ce33f39bb0 Clean code. Menu must be greyed in get_menudiv 2021-09-11 15:43:26 +02:00
Frédéric FRANCE
88cba08475
doxygen 2021-09-11 09:52:21 +02:00
Frédéric FRANCE
5658c7daea
doxygen 2021-09-11 09:49:01 +02:00
Laurent Destailleur
c005a20cc0 Fix ldap with ssl 2021-09-11 03:27:59 +02:00