Commit Graph

89109 Commits

Author SHA1 Message Date
Laurent Destailleur
d143bd8aec FIX #13589 missing price_level in import of thirdparties 2020-04-14 21:22:08 +02:00
stickler-ci
cbf6afb4a0 Fixing style errors. 2020-04-14 12:13:38 +00:00
ATM john
b70cd84402 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-14 14:11:12 +02:00
Sekan, Tobias
3482d24ee7 Fix not working ATOM feeds 2020-04-14 10:45:52 +02:00
oscim
f4c346cdbb
Update llx_commandedet.key.sql
add external key
2020-04-14 07:48:34 +02:00
Tobias Sekan
2e0e95df85
Merge pull request #15 from Dolibarr/develop
pull from develop
2020-04-14 07:27:13 +02:00
Josep Lluís
eda398b1cb
FIX translation key ErrorPrefixRequired
The correct translation key is ErrorPrefixRequired
2020-04-14 07:01:53 +02:00
Laurent Destailleur
8363b1a50e fix search 2020-04-14 00:03:13 +02:00
Laurent Destailleur
f8f4b748ee Update exemple 2020-04-13 23:21:28 +02:00
Laurent Destailleur
5772057723 Page to import template easier to understand. 2020-04-13 22:52:34 +02:00
stickler-ci
92b6b6e1f5 Fixing style errors. 2020-04-13 17:16:14 +00:00
Maxime Kohlhaas
261e6cbc52 Fix delete extrafield test 2020-04-13 19:08:03 +02:00
Maxime Kohlhaas
b8a0b4b6e4 New class UserGroup works with common functions now 2020-04-13 19:03:48 +02:00
Maxime Kohlhaas
2e004e93ea Commonobject : delete extrafields + syslog 2020-04-13 19:02:19 +02:00
Laurent Destailleur
dc86f9528d Fix MRP module 2020-04-13 18:10:20 +02:00
Laurent Destailleur
0878ee3a0f Look and feel v12 2020-04-13 17:55:25 +02:00
Laurent Destailleur
2c4bb867b3 FIX #12996 2020-04-13 17:36:12 +02:00
Laurent Destailleur
98235e726a
Merge pull request #13597 from ptibogxiv/patch-328
NEW setup template email notification
2020-04-13 17:35:49 +02:00
stickler-ci
3a029001f4 Fixing style errors. 2020-04-13 14:23:29 +00:00
Laurent Destailleur
7178fbc358
Merge pull request #12399 from defrance/patch-145
NEW add PDF certificate if present on document folder
2020-04-13 16:23:10 +02:00
Laurent Destailleur
8c8a8263dd
Merge branch 'develop' into patch-145 2020-04-13 16:22:19 +02:00
Laurent Destailleur
99cbb273c8
Update pdf_crabe.modules.php 2020-04-13 16:21:47 +02:00
ptibogxiv
e589642120
NEW setup template email notification 2020-04-13 16:20:22 +02:00
Laurent Destailleur
76fd1fb105 FIX #12996 2020-04-13 16:13:02 +02:00
Laurent Destailleur
f2704036cd FIX #13517 2020-04-13 16:00:41 +02:00
Laurent Destailleur
e02ac3b518 Trans 2020-04-13 15:57:25 +02:00
Laurent Destailleur
6e92eb4397 Fix descriptor of module was visible for external module only 2020-04-13 15:43:37 +02:00
Maxime Kohlhaas
26befa3b93 New fields on usergroup object + card uses common tpl 2020-04-13 15:38:50 +02:00
Laurent Destailleur
2d59991113 Fix translation 2020-04-13 15:32:14 +02:00
Laurent Destailleur
fcf467989d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expedition/class/api_shipments.class.php
2020-04-13 15:16:55 +02:00
Laurent Destailleur
c3b11561eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/ajax/objectonoff.php
2020-04-13 15:14:35 +02:00
Laurent Destailleur
73f2132dca Clsoe #13464 Try implementation to allow use of objectonoff for most
modules.
2020-04-13 15:13:39 +02:00
Laurent Destailleur
ceab7f9ce3 Clsoe #13464 Try implementation to allow use of objectonoff for most
modules.
2020-04-13 15:12:26 +02:00
Laurent Destailleur
236898f4e7 FIX #13503 2020-04-13 14:55:37 +02:00
Laurent Destailleur
a72b262f5b FIx #13592
Conflicts:
	htdocs/compta/bank/line.php
2020-04-13 14:52:06 +02:00
Laurent Destailleur
4ab3bf99ec FIx #13592 2020-04-13 14:50:55 +02:00
Laurent Destailleur
b54e3fb18c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-13 14:39:10 +02:00
Laurent Destailleur
f726fcdcd8 FIX #13593 2020-04-13 14:32:15 +02:00
Laurent Destailleur
1c6faf79a9 FIX #13595 2020-04-13 14:23:57 +02:00
Laurent Destailleur
057a4517c9 Fix rss 2020-04-13 13:38:57 +02:00
Laurent Destailleur
93a3a03dd2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-13 13:32:25 +02:00
Laurent Destailleur
862977bd94 Fix css 2020-04-13 13:32:09 +02:00
Laurent Destailleur
6bc87d6277
Merge pull request #13591 from TobiasSekan/ShowActiveBoxStateOfRssFeed
NEW Show active widget state of a RSS feed
2020-04-13 13:29:40 +02:00
Laurent Destailleur
36669739f3
Update external_rss.php 2020-04-13 13:29:23 +02:00
Laurent Destailleur
9adb1b0dac
Merge pull request #13590 from frederic34/patch-1
create rum with api when create thirdparty bank account
2020-04-13 13:26:22 +02:00
Laurent Destailleur
dbfe68dca8
Merge pull request #13596 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
2020-04-13 13:25:37 +02:00
Scrutinizer Auto-Fixer
387ea73bf3 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-13 11:24:42 +00:00
Laurent Destailleur
3424c33af1 Fix scrutinizer 2020-04-13 13:23:28 +02:00
Laurent Destailleur
f69aaa242b Fix scrutinizer 2020-04-13 13:10:15 +02:00
Laurent Destailleur
02e4d2ef54 css 2020-04-13 13:03:08 +02:00