Laurent Destailleur
0212bc5cf2
Try to fix eclipse warnings on doxygen
2020-02-18 22:54:03 +01:00
Laurent Destailleur
97081affdc
Fix perm
2020-02-18 22:50:13 +01:00
Laurent Destailleur
b859d4670a
Fix perm
2020-02-18 22:49:53 +01:00
Laurent Destailleur
ac2b13ea52
Merge pull request #13119 from ptibogxiv/patch-305
...
NEW : api for get user's documents
2020-02-18 22:46:27 +01:00
Laurent Destailleur
2ac064059a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/projet/element.php
2020-02-18 22:40:43 +01:00
Laurent Destailleur
31ae0bc06e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/fourn/commande/index.php
htdocs/product/card.php
2020-02-18 22:38:30 +01:00
root
0dcb83e6bf
referer XSS patches
2020-02-18 22:31:24 +01:00
Laurent Destailleur
5c99355e10
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-18 22:30:31 +01:00
Laurent Destailleur
2069438115
Merge pull request #13125 from 418sec/develop
...
dolibarr - Cross-site Scripting (XSS) - Fix:
2020-02-18 22:29:53 +01:00
Laurent Destailleur
8d9577137a
Merge pull request #13130 from hregis/10.0_mc2
...
FIX Multicompany compatibility
2020-02-18 22:28:15 +01:00
Laurent Destailleur
c60ae7227f
Merge pull request #13126 from atm-gauthier/10.0_fix_if
...
FIX : must be == and not =
2020-02-18 22:18:49 +01:00
Laurent Destailleur
e73b57e969
Merge pull request #13134 from atm-ph/fix_11.0_object_linked_from_supplier_order
...
Fix create supplier invoice from supplier order don't keep source object as linked obkect
2020-02-18 22:18:16 +01:00
Laurent Destailleur
18b99254a1
Experiment ORDER_ENABLE_NEGATIVE
2020-02-18 20:55:22 +01:00
atm-ph
bb64d2d353
Fix create supplier invoice from supplier order don't keep source object as linked obkect
2020-02-18 16:00:12 +01:00
Laurent Destailleur
6a97b1b9c8
css
2020-02-18 13:56:24 +01:00
Laurent Destailleur
24bb61b5e4
FIX Usage of project not available in export.
2020-02-18 12:51:53 +01:00
Laurent Destailleur
b6be42e103
FIX List of viewed projects too large in task widget
2020-02-18 12:40:50 +01:00
Laurent Destailleur
67eb584a7f
FIX Missing field "billed" in export
2020-02-18 12:22:25 +01:00
Laurent Destailleur
7e814e2a08
FIX Menu truncated. Add tooltip to have all content.
2020-02-18 12:01:19 +01:00
Laurent Destailleur
9ce0e6869e
Fix trans
2020-02-18 11:55:39 +01:00
Regis Houssin
110a23623b
FIX an external user can not approved
2020-02-18 11:04:11 +01:00
Laurent Destailleur
b618581692
More ajax button in setup. Can reload after on ajaxonoff.
2020-02-18 09:38:34 +01:00
Regis Houssin
4511cf1060
FIX missing "statut" for getNomUrl() function
2020-02-18 09:03:25 +01:00
Regis Houssin
1034e4a472
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0_mc2
2020-02-18 09:02:35 +01:00
Regis Houssin
f6f0d9d4a2
FIX better method to check user rights AND usergroup rights !
2020-02-18 08:35:51 +01:00
Laurent Destailleur
7b4c674bdc
Fix css
2020-02-17 21:43:53 +01:00
Laurent Destailleur
1d760f0e42
Add MO in project overwiew
2020-02-17 21:24:59 +01:00
Laurent Destailleur
6555f5d74f
More default hmtl tags in restricthtmlonly
2020-02-17 20:55:17 +01:00
Regis Houssin
a5de331410
FIX Multicompany compatibility
2020-02-17 19:13:37 +01:00
Laurent Destailleur
be7bed7063
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-17 14:00:05 +01:00
Laurent Destailleur
e59ac41182
Fix phpcs
2020-02-17 13:59:44 +01:00
Laurent Destailleur
299219891e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-17 12:41:45 +01:00
Laurent Destailleur
25fa83bd06
Fix phpcs
2020-02-17 12:40:26 +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
Laurent Destailleur
1904ae0e82
FIX Type of contact for event does not exists and not supported
...
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-02-17 12:25:51 +01:00
Laurent Destailleur
549bf076d7
Fix prefix of log
2020-02-17 12:22:52 +01:00
Laurent Destailleur
a02f5cde92
FIX Type of contact for event does not exists and not supported
...
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
2020-02-17 12:21:07 +01:00
gauthier
523d09536c
FIX : must be == and not =
2020-02-17 12:20:19 +01:00
Laurent Destailleur
bf281b7dab
Comment
2020-02-17 11:51:49 +01:00
Jamie Slome
2d9162aedb
Merge branch 'develop' into develop
2020-02-17 10:49:41 +00:00
Jamie Slome
1bbe4469f1
Merge pull request #1 from mufeedvh/develop
...
Merging fix - on-behalf of @mufeedvh, executed by huntr.dev (011-php-dolibarr).
2020-02-17 10:33:46 +00:00
Jamie Slome
59572f15a9
Merge pull request #2 from 0xRoM/develop
...
Merging fix - on-behalf of @0xRoM, executed by huntr.dev (011-php-dolibarr).
2020-02-17 10:32:57 +00:00
Laurent Destailleur
4b5cda5cd2
Code comment on OAUth ahtent
2020-02-16 21:16:00 +01:00
Laurent Destailleur
20797920d7
Fix phpcs
2020-02-16 19:35:52 +01:00
Laurent Destailleur
f4f3efec62
Fight against $_POST
2020-02-16 19:33:58 +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
ac7a077c77
FIX Vulnerability in module from modulebuilder. Only fields with type
...
html can contains HTML.
2020-02-16 18:14:10 +01:00
Laurent Destailleur
5b87b12e64
FIX Vulnerability reported by code16
2020-02-16 18:06:25 +01:00
Laurent Destailleur
7cdfc3ca65
FIX HTML Injection
2020-02-16 12:55:32 +01:00
