Commit Graph

90521 Commits

Author SHA1 Message Date
Florian HENRY
6a4e01de1d fix review 2020-10-15 08:36:04 +02:00
Florian HENRY
0597768ea8 fix review 2020-10-15 08:28:38 +02:00
Florian HENRY
109d1ab801 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-15 08:25:46 +02:00
Laurent Destailleur
9cc8e6ac99 Fix intracommreport 2020-10-14 20:25:02 +02:00
Laurent Destailleur
0908ac5867 Fix phpcs 2020-10-14 20:18:07 +02:00
Laurent Destailleur
20d5098ce2 Fix regression in dol_getdate() 2020-10-14 19:42:17 +02:00
Laurent Destailleur
bc1ad96ad1 FIX #14993 2020-10-14 19:28:59 +02:00
Laurent Destailleur
a8eeb7099a Fix style of online help when page available. 2020-10-14 19:01:37 +02:00
Laurent Destailleur
9162e1fe96
Merge pull request #15020 from defrance/patch-159
NEW If specific help page is available, we change color of icon
2020-10-14 18:53:44 +02:00
Laurent Destailleur
f4ef8a3285
Use class instead of hard coded style 2020-10-14 18:52:41 +02:00
stickler-ci
05ac7c91c7 Fixing style errors. 2020-10-14 16:25:23 +00:00
Florian HENRY
174bc67744 Merge branch 'dev_add_dict_NatureOfProductType' of github.com:FHenry/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:23:11 +02:00
Florian HENRY
4fd32325d6 cast int 2020-10-14 18:22:55 +02:00
stickler-ci
ee631e629f Fixing style errors. 2020-10-14 16:22:11 +00:00
Florian HENRY
9c3988da5c add show empty 2020-10-14 18:19:41 +02:00
Florian HENRY
bcb98d1d67 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:16:34 +02:00
Florian HENRY
dfa2625de7 Merge branch 'dev_add_dict_NatureOfProductType' of github.com:FHenry/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:16:19 +02:00
Florian HENRY
50a9bd368c review 2020-10-14 18:15:48 +02:00
BENKE Charlene
1af3881796
If specific help present we change color of icon 2020-10-14 18:08:31 +02:00
Laurent Destailleur
1e2fd359ac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-14 18:03:19 +02:00
Laurent Destailleur
fc69b88923 Update doc 2020-10-14 18:03:02 +02:00
Laurent Destailleur
034d3d7072
Merge pull request #15014 from amunaadh/develop
[Tests-only] Added API tests for add users feature
2020-10-14 17:54:51 +02:00
Laurent Destailleur
bb367a4489
Update dict.php 2020-10-14 17:40:27 +02:00
Laurent Destailleur
c079076488
Merge pull request #15010 from bafbes/abb120147
fix:allow const files loading from modules inside custom folders
2020-10-14 17:39:08 +02:00
Laurent Destailleur
a2a6ddaa66
Merge pull request #15008 from TobiasSekan/SelectableColumnsOnSalesTaxesList
NEW Selectable columns on sales tax list
2020-10-14 17:37:23 +02:00
Laurent Destailleur
afc0460a7f
Merge pull request #15006 from davidNDU/clone/develop
Model Builder template/class/myobject.class.php faulty SQL statement
2020-10-14 17:36:13 +02:00
Laurent Destailleur
a0f7aad591
Merge pull request #15019 from ATM-Nicolas/new_ecm_src_object_fields
NEW : Fill ECM src object fields in dol_add_file_process
2020-10-14 17:35:29 +02:00
Laurent Destailleur
ba001803ed
Update files.lib.php 2020-10-14 17:35:14 +02:00
Laurent Destailleur
820bf5b393
Merge pull request #15011 from bafbes/abb120348
fix:boolean values in showinputfield function are 1 and 0 not 'on' and 'off'
2020-10-14 17:18:02 +02:00
Laurent Destailleur
ee19f3fc94
Update actions_addupdatedelete.inc.php 2020-10-14 17:16:35 +02:00
Laurent Destailleur
bfe760ffcb
Merge pull request #15012 from bafbes/abb120349
fix:two fields with same ids
2020-10-14 17:15:24 +02:00
Laurent Destailleur
57aabfb3c5
Merge pull request #15013 from FHenry/dev_objectrefferent_for_BOM
NEW display stat for BOM on "object referent"/linked Object product tab
2020-10-14 17:14:47 +02:00
Laurent Destailleur
e423bbf823 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-14 17:11:58 +02:00
Laurent Destailleur
e8ea7125e5 Removed the FIXME. The dol_getdate can now use a timezone. 2020-10-14 17:11:22 +02:00
ATM-Nicolas
98eb11be62 NEW : Fill ECM src object fields in dol_add_file_process 2020-10-14 16:59:05 +02:00
Florian HENRY
fd1fa1c777 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 16:39:54 +02:00
Florian HENRY
7d09f22afa add correct import and dict edition 2020-10-14 16:39:42 +02:00
Florian HENRY
940d478aec UI and db OK 2020-10-14 15:54:48 +02:00
Laurent Destailleur
3cf2b6b5eb Doc comment. 2020-10-14 15:01:50 +02:00
Laurent Destailleur
fe19eea540
Merge pull request #15007 from hregis/develop_bug2
FIX avoid spaces in file name
2020-10-14 14:45:40 +02:00
Florian HENRY
90df353f0c fix number of lines 2020-10-14 14:30:07 +02:00
Florian HENRY
a2ef7bc61e add select 2020-10-14 14:26:40 +02:00
Laurent Destailleur
a0b17635fd NEW When creating a user from a member linked to a thirdparty, you can
decide if it is an internal or external (default) user.
2020-10-14 14:02:07 +02:00
Florian HENRY
fdf81b2458 Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM 2020-10-14 12:26:18 +02:00
Florian HENRY
2d1d76b5a3 add credentials 2020-10-14 12:26:10 +02:00
Florian HENRY
77de8c242c commit add table 2020-10-14 12:24:35 +02:00
Laurent Destailleur
02fcee5d94 Fix make the default sender email mandatory into setup (if not defined,
no emails can be sent).
2020-10-14 12:21:31 +02:00
Florian HENRY
ca37827e72 Merge branch 'dev_objectrefferent_for_BOM' of github.com:FHenry/dolibarr into dev_objectrefferent_for_BOM 2020-10-14 11:20:48 +02:00
Florian HENRY
14a3e30270 fix travis 2020-10-14 11:20:27 +02:00
stickler-ci
8bfb04ea7f Fixing style errors. 2020-10-14 08:34:30 +00:00