Commit Graph

87108 Commits

Author SHA1 Message Date
ATM john
9a1993f71c Fix retained warranty default value 2020-04-15 10:44:07 +02:00
Maxime Kohlhaas
6e96cbc98d New add personal email and phone on user card 2020-04-15 10:35:21 +02:00
Maxime Kohlhaas
a93a5bd6e1 Merge branch 'new_fields_on_group' of github.com:atm-maxime/dolibarr into new_fields_on_group 2020-04-15 08:45:10 +02:00
Maxime Kohlhaas
7fea2bc557 Update changelog + trigger name change for class UserGroup 2020-04-15 08:44:29 +02:00
Laurent Destailleur
4c4c4f8bd6 Doc 2020-04-15 03:39:40 +02:00
Laurent Destailleur
6e9cbe5b70 Fix RSS for blogs 2020-04-15 03:32:49 +02:00
Laurent Destailleur
53ceef5b6a FIX XSS Vulnerability 2020-04-15 02:32:55 +02:00
Laurent Destailleur
3be426be5b Align sponge and crabe 2020-04-15 02:24:08 +02:00
Laurent Destailleur
1dd951495b Removed hard coded dependency on an external module 2020-04-15 02:20:57 +02:00
stickler-ci
c047cd1608 Fixing style errors. 2020-04-14 20:55:58 +00:00
Josep Lluís
d41cb023eb
NEW bank account tags for invoice ODT template
added tags object_bank_iban and object_bank_bic, useful for ODT invoices when a bank account is assigned
2020-04-14 22:47:40 +02:00
Laurent Destailleur
c337bd91fe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-14 21:58:13 +02:00
Laurent Destailleur
c3b8949e2e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/lib/functions.lib.php
2020-04-14 21:57:20 +02:00
Laurent Destailleur
85bea5a7c4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-14 21:54:27 +02:00
Laurent Destailleur
110787d66a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-14 21:54:16 +02:00
Laurent Destailleur
c6bc619f93
Merge pull request #13601 from joseplluis/patch-6
FIX translation key ErrorPrefixRequired
2020-04-14 21:45:26 +02:00
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