lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
94,240 Commits 43 Branches 150 Tags 886 MiB
97ca6895d8
Commit Graph

2582 Commits

Author SHA1 Message Date
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
ad906fc508 Fix use SVG logo instead of PNG 2020-05-15 12:43:48 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
 2020-05-11 19:43:06 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
Laurent Destailleur
4c04ace9d8 fix reset of session 2020-05-06 15:39:07 +02:00
Laurent Destailleur
5e6b7fb6b4 Show message after pass reset 2020-05-06 15:36:14 +02:00
Laurent Destailleur
485896614b Add message during password reset 2020-05-06 15:30:00 +02:00
Laurent Destailleur
1ec8b31e46 Fix remove action param in url to allow a second try without the error 
message
 2020-05-06 15:15:12 +02:00
Laurent Destailleur
abdb0cc8c0 Fix use correct trackid 2020-05-06 15:03:57 +02:00
Laurent Destailleur
e7ae9c752e Fix missing trackid 2020-05-06 14:48:02 +02:00
Laurent Destailleur
bfd4ebd49d FIX Changing password message not visible if a background is set 2020-05-06 14:28:24 +02:00
Laurent Destailleur
6ec6a4465a FIX Setup of thirdparty or contact for external users 2020-04-29 20:21:17 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Laurent Destailleur
3ed11f374a Look and feel v12 2020-04-24 23:56:57 +02:00
Scrutinizer Auto-Fixer
548f3007cf Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-23 16:55:10 +00:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
b6786c515a picto 2020-04-22 22:12:53 +02:00
Laurent Destailleur
a7641cdb90 CSS 2020-04-22 22:02:25 +02:00
Laurent Destailleur
f52408cec1 Look and feel v12 2020-04-22 00:55:38 +02:00
Laurent Destailleur
5c573e197b Look and feel v12 2020-04-22 00:50:04 +02:00
Frédéric FRANCE
86e5713233
Update card.php 2020-04-21 16:26:02 +02:00
Frédéric FRANCE
d3c5173c5b
Update usergroup.class.php 2020-04-21 16:14:38 +02:00
Laurent Destailleur
16e46c672c Clean code 2020-04-20 15:06:27 +02:00
Laurent Destailleur
08260cb7a4 Look and feel 2020-04-19 15:52:43 +02:00
Laurent Destailleur
0a3d570583 Look and feel v12 2020-04-19 14:29:18 +02:00
Laurent Destailleur
d3598380da Fix do not use hard coded link 2020-04-19 14:23:31 +02:00
Laurent Destailleur
200c29bd14 Fix some regression with new architecture for groups 2020-04-19 14:19:34 +02:00
Laurent Destailleur
01f96b35ed Fix reposition 2020-04-18 16:50:36 +02:00
Laurent Destailleur
19815850c0 Look and feel v12 
Fix error report
 2020-04-18 16:48:49 +02:00
Laurent Destailleur
ae80b09327
Merge pull request #13598 from atm-maxime/new_fields_on_group 
New : refactor UserGroup module with new common way
 2020-04-18 16:26:58 +02:00
Laurent Destailleur
9c792060a2
Merge pull request #13623 from ptibogxiv/patch-331 
NEW API filter user by category
 2020-04-16 01:01:04 +02:00
stickler-ci
a098dab5a9 Fixing style errors. 2020-04-15 16:32:07 +00:00
ptibogxiv
be4a5ccd2f
NEW API filter user by category 2020-04-15 18:30:13 +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
stickler-ci
92b6b6e1f5 Fixing style errors. 2020-04-13 17:16:14 +00:00
Maxime Kohlhaas
b8a0b4b6e4 New class UserGroup works with common functions now 2020-04-13 19:03:48 +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
Maxime Kohlhaas
26befa3b93 New fields on usergroup object + card uses common tpl 2020-04-13 15:38:50 +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
f69aaa242b Fix scrutinizer 2020-04-13 13:10:15 +02:00
Laurent Destailleur
596ba8d679 Clean deprecated code. 2020-04-13 01:10:35 +02:00
Laurent Destailleur
239ae78b28 Look and feel v12 2020-04-12 18:36:22 +02:00
Laurent Destailleur
92b6b1a042 Look and feel v12 2020-04-12 18:13:43 +02:00
Laurent Destailleur
e18d6bd6b8 Look and feel v12 2020-04-12 17:28:10 +02:00
stickler-ci
9744efc3ec Fixing style errors. 2020-04-11 15:12:11 +00:00
Maxime Kohlhaas
d842a436ae New display of user bank account : same way as on thirdparty 2020-04-11 17:06:50 +02:00
Laurent Destailleur
069fb27ced Look and feel v12 2020-04-10 12:27:34 +02:00
Laurent Destailleur
68022fb916 css 2020-04-10 12:08:37 +02:00
Laurent Destailleur
5ff981bf61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/perms.php
 2020-04-10 12:04:21 +02:00
Laurent Destailleur
874cbcefc7 Fix permission to close a proposal or order was not correctly used 
#13547
 2020-04-10 11:54:14 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
 2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Laurent Destailleur
6a60678186 Look and feel v12 2020-04-09 16:36:39 +02:00
Laurent Destailleur
b1c5490a74 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_add.tpl.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2020-04-05 04:03:53 +02:00
Laurent Destailleur
165df931f1 Complete fix #13491 2020-04-05 03:14:12 +02:00
Laurent Destailleur
a8710c2109
Merge pull request #13481 from frederic34/patch-6 
fix tooltip for  list.php
 2020-04-05 02:40:10 +02:00
Laurent Destailleur
98d2db440a Complete tooltip 2020-04-02 21:34:51 +02:00
Frédéric FRANCE
a55d1fca0a
Update list.php 2020-04-02 14:33:49 +02:00
Laurent Destailleur
84cda962c1 Clean dead code 2020-04-02 12:03:29 +02:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-23 14:54:02 +00:00
Laurent Destailleur
bf10ad2041
Merge pull request #13357 from dolibit-ut/patch-17 
Update
 2020-03-18 18:31:52 +01:00
Laurent Destailleur
9525289488 Fix return code of some API 2020-03-17 13:50:20 +01:00
UT from dolibit
1491414d5b
Update 
1. add   $help_url  |DE:Modul_Benutzer
2. change comment  'Creation d'un champ optionnel' -> 'Creation of an optional field'
3. change comment  'Edition d'un champ optionnel ' ->  'Editing an optional field'
 2020-03-16 13:34:12 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
054ffb7547 Depreciate variables not used by Dolibarr. 2020-03-06 14:38:06 +01:00
Laurent Destailleur
2c477c7169 Fix doxygen 2020-02-20 13:54:41 +01:00
Laurent Destailleur
dacf896f80 FIX Can read salary if permission + user under hierarchy 2020-02-18 23:44:36 +01:00
oscim
b0016764c4 Update bank.php 
For authorize line manager to see wages paid
 2020-02-18 22:59:56 +01:00
Laurent Destailleur
b9e522114e
Merge pull request #13123 from oscim/patch-21 
Update bank.php
 2020-02-18 22:56:45 +01:00
Laurent Destailleur
97b4f68e48
Update bank.php 2020-02-18 22:56:37 +01:00
Laurent Destailleur
a6b0fec90b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee FIX duplicate class name into some log lines 2020-02-17 12:34:00 +01:00
oscim
d1652ee9e3
Update bank.php 
For authorize line manager to see wages paid
 2020-02-17 11:18:34 +01:00
Laurent Destailleur
52aebce789 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-16 18:16:05 +01:00
Laurent Destailleur
7cdfc3ca65 FIX HTML Injection 2020-02-16 12:55:32 +01:00
Scrutinizer Auto-Fixer
17010478ba Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 09:44:08 +00:00
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modUser.class.php
 2020-02-12 20:30:20 +01:00
Laurent Destailleur
e74df397eb FIX #13094 2020-02-12 17:28:18 +01:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2020-02-11 16:52:58 +01:00
Laurent Destailleur
8645fd8946 FIX CVE-2019–17223 FIX #13053 2020-02-09 18:28:57 +01:00
Laurent Destailleur
716f765ce1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
 2020-02-08 16:00:06 +01:00
Laurent Destailleur
85c4013a0d Update card.php 2020-02-08 14:52:02 +01:00
Regis Houssin
45ba23da3e FIX #13028 2020-02-07 08:53:05 +01:00
Laurent Destailleur
8ab96447c7 Page of permissions is cleaner now 2020-02-05 21:31:28 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +01:00
Laurent Destailleur
c015707cbc Fix Only dolibarr logos are in root of theme 2020-02-05 14:14:59 +01:00
Laurent Destailleur
37617bbce8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 03:48:27 +01:00
Laurent Destailleur
b3a50bd4b0 FIX #12874 2020-02-03 03:47:45 +01:00
Laurent Destailleur
fc47fa5ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/element.php
 2020-02-03 02:58:45 +01:00
Laurent Destailleur
8098456f67 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 02:52:46 +01:00
Laurent Destailleur
90cde17bdb FIX #12986 2020-02-03 02:48:05 +01:00
Scrutinizer Auto-Fixer
9781c20f84 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-02 18:34:09 +00:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
be2d6494a7 FIX #12908 2020-01-28 21:23:05 +01:00
Laurent Destailleur
d3411a79ef Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:44 +01:00
Laurent Destailleur
0c666ee73b Fix reponsive 2020-01-22 12:46:01 +01:00
Laurent Destailleur
7a0bff06b9 Fix reponsive 2020-01-22 12:44:10 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
9e6fb7b2f1 Look and feel v11 2020-01-07 14:55:31 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
Laurent Destailleur
39737c7c4b Fix opacity on text with a href links inside 
Fix var not defined
 2019-12-22 13:19:14 +01:00
Laurent Destailleur
e8db3a2aa0 Fix look and feel v11 2019-12-19 10:17:20 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Laurent Destailleur
8b57e9fcf0
Merge pull request #12697 from bb2a/patch-7 
Full name in uppercase on creation and modification
 2019-12-14 14:00:09 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
stickler-ci
31b09f433f Fixing style errors. 2019-12-12 16:29:11 +00:00
Anthony Berton
68a1b12fba
Update user.class.php 2019-12-12 17:27:24 +01:00
Frédéric FRANCE
12f84d8254
doxygen 2019-12-11 23:04:27 +01:00
Frédéric FRANCE
66805a502a
doxygen 2019-12-11 22:53:57 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo 2019-12-11 19:11:13 +01:00
Laurent Destailleur
2fd6c690c0
Merge pull request #12632 from atm-florianm/FIX_10.0_restore_filter_values_when_returning_to_list_from_card 
FIX 10.0: add URL param "restore_last_search_values=1" to all backlinks pointing to lists
 2019-12-09 15:59:55 +01:00
Frédéric FRANCE
6366a2a606
doxygen 2019-12-06 18:05:16 +01:00
Laurent Destailleur
22f575dad0
Merge pull request #12633 from atm-lena/FIX_getrights_request 
FIX getrights() request
 2019-12-06 16:22:47 +01:00
Frédéric FRANCE
d9bfa62367
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-05 21:47:42 +01:00
atm-lena
486f598067 FIX getrights() request 2019-12-05 16:11:12 +01:00
Florian Mortgat
3f6715a377 FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list 2019-12-05 15:34:41 +01:00
Laurent Destailleur
06de7f968f Fix class not found 2019-12-05 14:06:03 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Laurent Destailleur
41a176ce72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/remx.php
	htdocs/core/modules/modStripe.class.php
	htdocs/product/stock/replenish.php
	htdocs/stripe/payout.php
 2019-12-03 13:58:15 +01:00
Laurent Destailleur
eb5a2bd1a5 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/user/card.php
 2019-12-03 13:52:42 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
John Botella
4a33ee60f8 Fix user card : use comma in amounts inputs 2019-12-02 10:34:14 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Laurent Destailleur
d58bb5f66b Fix link to user 2019-11-28 16:16:55 +01:00
ptibogxiv
825349e07e
Update api_users.class.php 2019-11-27 16:04:52 +01:00
stickler-ci
bba4ed02d2 Fixing style errors. 2019-11-26 20:36:30 +00:00
ptibogxiv
bc1f9f5aaa
Update api_users.class.php 2019-11-26 21:34:45 +01:00
ptibogxiv
27d6071a73
NEW add list of group and object group API 2019-11-26 21:33:42 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-26 08:10:40 +01:00
Laurent Destailleur
14450d8b79 psr 2019-11-22 15:21:21 +01:00
Scrutinizer Auto-Fixer
e36ee63ab6 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-22 13:16:38 +00:00
Frédéric FRANCE
d182eee4bf
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-19 23:26:00 +01:00
Laurent Destailleur
5d7a1f1265 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/en_US/stocks.lang
 2019-11-19 19:02:14 +01:00
florian HENRY
010219bf09 fix title pasge linked files user 2019-11-18 19:47:34 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +01:00
Scrutinizer Auto-Fixer
1648fc142e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-16 22:24:29 +00:00
Laurent Destailleur
e7276f9044 Fix scrutinizer error 2019-11-16 23:22:28 +01:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields. 
Fix remove empty id
 2019-11-16 14:38:05 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-16 09:21:57 +01:00
Laurent Destailleur
07be51c2fc
Merge pull request #12447 from hregis/develop_mc 
FIX better look compatibility with Multicompany
 2019-11-16 00:49:37 +01:00
Laurent Destailleur
8a5e1a5a36
Merge pull request #12440 from OPEN-DSI/new-api-users-get-info 
NEW get user connected informations in REST API
 2019-11-16 00:44:41 +01:00
Laurent Destailleur
81aed6a1f7
Merge pull request #12442 from frederic34/patch-7 
doxygen
 2019-11-16 00:39:40 +01:00
Regis Houssin
bb8a4e9efc FIX better look compatibility with Multicompany 2019-11-15 09:02:21 +01:00
Laurent Destailleur
1f5bea01f5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
	htdocs/user/card.php
 2019-11-14 21:30:16 +01:00
Frédéric FRANCE
e73202c2af
Update user.class.php 2019-11-14 18:47:16 +01:00
Frédéric FRANCE
91eb6eb7d7
Update user.class.php 2019-11-14 18:44:18 +01:00
Frédéric FRANCE
1936b11db8
doxygen 2019-11-14 18:40:30 +01:00
VESSILLER
4ea3fe7609 NEW get user connected informations in REST API 2019-11-14 17:57:29 +01:00
Laurent Destailleur
f7ab1498a7 FIX Advisory ID: usd20190053 2019-11-14 17:00:02 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Frédéric FRANCE
446c66da62
use class CONST 2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
df664e790b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-11 23:15:34 +00:00
Scrutinizer Auto-Fixer
2ecfe41810 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 09:53:31 +00:00
Scrutinizer Auto-Fixer
0b406172fd Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-07 11:59:59 +00:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks 
NEW add socialnetworks dictionary
 2019-11-04 21:10:22 +01:00
Laurent Destailleur
aeb2361d2d
Merge pull request #12324 from frederic34/patch-13 
replace societe_id by socid
 2019-11-04 20:57:43 +01:00
Frédéric FRANCE
88ad997eec
Update home.php 2019-11-04 20:29:33 +01:00
Frédéric FRANCE
f6aa9bf220
Update hierarchy.php 2019-11-04 20:28:10 +01:00
Frédéric FRANCE
d59b0a33f3
Fix external/internal status in user tooltip list 2019-11-04 20:16:34 +01:00
Laurent Destailleur
ec8bd6327d Fix css 2019-11-04 18:53:46 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Laurent Destailleur
13c42913d9 Trans 2019-11-02 15:20:35 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
58ffb73627 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019 
add comment
 2019-11-02 11:49:28 +01:00
Laurent Destailleur
f9031cdbfd Clean code 2019-11-02 11:36:48 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Laurent Destailleur
68a4ddceed Look and feel v11 2019-10-31 23:29:17 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-30 20:06:43 +01:00
Philippe GRAND
1a0723c1cd add some comment 2019-10-30 10:13:57 +01:00
Laurent Destailleur
488edec3a8
Merge pull request #12226 from ptibogxiv/patch-271 
NEW add office phone & job on user tooltips
 2019-10-30 03:11:28 +01:00
Frédéric FRANCE
16f58f1eee
clean indent 2019-10-27 10:38:52 +01:00
ptibogxiv
6f52ae80fe
Update user.class.php 2019-10-26 15:01:40 +02:00
ptibogxiv
49f5e54a8b
Update user.class.php 2019-10-25 18:10:04 +02:00
ptibogxiv
7c8efc741e
Update user.class.php 2019-10-25 17:20:09 +02:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02:00
Laurent Destailleur
8858c3e769 Look and feel v11 2019-10-23 21:27:29 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Laurent Destailleur
005b1b12c4 Work on sort of permission per family+module 2019-10-17 19:33:06 +02:00
Laurent Destailleur
de396dc9b3 Clean code for order of modules 2019-10-17 19:21:30 +02:00
Laurent Destailleur
87ec1de78e Start to work on solution to sort permissions by module 2019-10-17 18:43:07 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Frédéric FRANCE
d1d9b1ed85
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-15 09:39:57 +02:00
Frédéric FRANCE
0ae1e8c2a9
Update api_users.class.php 2019-10-13 06:17:57 +02:00
Frédéric FRANCE
f6a2fd6eb8
Update card.php 2019-10-13 06:08:32 +02:00
Frédéric FRANCE
d9ba09bec1
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-12 19:02:24 +02:00
Laurent Destailleur
51383ce6af FIX Reset of password can use email like the login. 2019-10-11 18:42:07 +02:00
Frédéric FRANCE
03bbfc6ad9
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-10 23:24:50 +02:00
Laurent Destailleur
aebae5ff83 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/margins.lang
	htdocs/user/class/user.class.php
 2019-10-10 10:37:17 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 18:30:58 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent De Coninck
091df082fc fix the access of the bank account of one user 
There are 3 ways to access this tab :
    1. If the module holiday is enabled
    2. If the module holidays is enabled
    3. If the module expense report is enabled

More over that, the application checks if the user can access the bank
account of the selected user. The application does that twice (logical
^^), first to know if the tab has to be displayed or not. Second time,
when you arrive on the page /user/bank.php to know if you have access
(eg. if you type the url directly).

In this second check, the check of the expense report module was missing
(added by this PR). This caused the following issue: the tab was visible
but when the user clicked on itn, he received an error as he cannot
access the page.
 2019-10-08 08:11:29 +02:00
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 00:07:27 +02:00
Laurent Destailleur
839929f764 FIX #12026 2019-10-07 14:16:47 +02:00
Laurent Destailleur
0bd545e1ca
Merge pull request #12026 from oscim/patch-6 
Fix error in triggers process
 2019-10-07 14:14:36 +02:00
Laurent Destailleur
2bb55200f7 Clean user card 2019-10-07 13:46:13 +02:00
Laurent Destailleur
76aef85ee4
Merge pull request #12015 from atm-maxime/new_validators 
NEW expense request and holiday validator fields
 2019-10-07 13:31:20 +02:00
Laurent Destailleur
6c1c008d09 FIX Look and feel v10 2019-10-06 16:28:10 +02:00
Frédéric FRANCE
ec8569dd85
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-06 15:56:21 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
b83d4eb936 FIX Look and feel v10 2019-10-06 14:57:34 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
stickler-ci
1047a8ea0f Fixing style errors. 2019-10-05 20:25:17 +00:00
Maxime Kohlhaas
2068692f40 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_validators 2019-10-05 22:25:06 +02:00
Maxime Kohlhaas
e70b487c34 Add info about validators saying default is supervisor 2019-10-05 22:22:55 +02:00
Frédéric FRANCE
98023353fe
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 17:21:31 +02:00
oscim
d368bc1b6a
Update user.class.php 
actually the create_from_member method does not require this change
 2019-10-03 15:58:40 +02:00
Laurent Destailleur
b60ee4c18c css 2019-10-03 09:58:49 +02:00
oscim
9f2ac7cae3
Fix error in triggers process 
If methode create_from_contact is called; In process this method containt call create methode, but trigger by action USER_CREATE is called twice. 
the call to the create method should not trigger triggers

same for the create_from_members method
 2019-10-03 09:47:06 +02:00
Frédéric FRANCE
3afb4355a8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-02 18:59:18 +02:00
Laurent Destailleur
d8a8c4fbe6 Look and feel v11. Picto are fontawesome. 2019-10-02 18:36:36 +02:00
Maxime Kohlhaas
6d4f3f308e NEW expense request and holiday validator fields 2019-10-02 08:43:40 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Frédéric FRANCE
2ac908ffcf
work on migration script 2019-10-01 19:59:49 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
b87610adcc
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-30 19:34:35 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-27 08:06:13 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
db334a3b94 FIX Var not enough sanitized 2019-09-24 14:16:24 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
9bf387d43c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/main.inc.php
	htdocs/user/card.php
 2019-09-18 15:12:38 +02:00
Laurent Destailleur
e52788eb75 Fix xss 2019-09-18 14:31:03 +02:00
Laurent Destailleur
771104bc68 Fix XSS 2019-09-18 14:25:53 +02:00
Laurent Destailleur
345ac28c89 Fix js injection 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/user/group/card.php
 2019-09-18 14:21:02 +02:00