2
0
forked from Wavyzz/dolibarr
Commit Graph

374 Commits

Author SHA1 Message Date
Laurent Destailleur
fe0b1c5ee4 Fix travis 2020-08-14 11:53:54 +02:00
Laurent Destailleur
52f20a1047 Fix travis 2020-08-14 11:52:21 +02:00
Laurent Destailleur
d0c4af5855 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-05 03:42:05 +02:00
ptibogxiv
c7cdb64087 FIX child categories only with good entity rights
fix v9 to develop
display only categories with good entity rights ( intradolibarr or via REST API)
2020-04-04 11:07:48 +02:00
VESSILLER
8af5d87e80 FIX regex for include or exclude categories in full arbo 2020-01-28 17:13:09 +01:00
Laurent Destailleur
7377c30bfe Fix limit 2019-10-08 13:17:13 +02:00
Laurent Destailleur
760783b98b FIX #11942 2019-10-08 13:14:51 +02:00
Laurent Destailleur
c589fdcb83 Code comment 2019-09-02 04:39:20 +02:00
ptibogxiv
e4f5ca79f8 Fix access category API 2019-06-17 19:36:21 +02:00
Laurent Destailleur
a764a79c1f Fix scrutinizer error 2019-05-02 16:08:58 +02:00
Xebax
8d6e6e115d NEW REST API: get the list of objects in a category. 2019-04-15 14:37:06 +02:00
Laurent Destailleur
1274d71a10 Fix phpcs 2019-04-08 16:00:01 +02:00
Laurent Destailleur
6f34a84a9a Update categorie.class.php 2019-04-08 13:23:19 +02:00
Lionel VESSILLER
8a220b9da1 New categories options in sellist and chbxlist extrafields 2019-04-02 11:01:46 +02:00
Laurent Destailleur
86c5dc20e3 NEW Can choose the root category to show for TakePOS module 2019-03-15 02:12:40 +01:00
Laurent Destailleur
0ef6fd36f9 Merge and clean TakePOS CSS 2019-03-15 00:49:44 +01:00
Laurent Destailleur
f3ca69522e Fix phpcs 2019-03-11 01:41:09 +01:00
Frédéric FRANCE
f283782445 change visibility 2019-03-04 19:57:46 +01:00
Laurent Destailleur
4d5372e98f Merge pull request #10716 from frederic34/patch-3
Update doc in categorie.class.php
2019-03-02 18:36:27 +01:00
Frédéric FRANCE
e5e4f90917 Update categorie.class.php 2019-02-28 20:17:32 +01:00
Frédéric FRANCE
6ee186096c Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-24 23:48:51 +01:00
Frédéric FRANCE
041310c4ee wip 2019-02-24 23:47:00 +01:00
Frédéric FRANCE
27218b7087 wip 2019-02-24 23:32:09 +01:00
Frédéric FRANCE
894123fb06 PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
Frédéric FRANCE
1e43f8e54a PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
fab6dde593 Close #9825 2018-12-14 10:51:32 +01:00
Laurent Destailleur
eefcf4b708 Merge pull request #9822 from bafbes/abb80034
NEW Grant right to child classes to use Category methods
2018-12-13 20:21:05 +01:00
Laurent Destailleur
84983140b6 Merge pull request #9896 from hregis/develop_email
FIX change my deprecated email
2018-11-11 17:35:35 +01:00
Laurent Destailleur
ad7ae76cd3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-10 15:51:49 +01:00
Regis Houssin
ee06f36f4c FIX missing field "visible" 2018-11-09 11:36:20 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Frédéric FRANCE
0171301543 code comment categories class 2018-10-21 19:19:35 +02:00
Abbes Bahfir
bfadd39e8c Fix: Grant right to child classes to use Category methods 2018-10-19 17:27:38 +01:00
Frédéric FRANCE
db732ddedd code comment 2018-10-17 20:36:45 +02:00
Philippe GRAND
af0bcb2631 Standardize code 2018-10-09 09:40:00 +02:00
Laurent Destailleur
0b02673ba5 Merge pull request #9487 from frederic34/patch-5
Update categorie.class.php
2018-09-12 22:03:18 +02:00
Laurent Destailleur
b5b4410e75 Duplicate delete 2018-09-12 22:02:50 +02:00
Frédéric FRANCE
04d3c7f43b Update categorie.class.php 2018-09-12 21:07:54 +02:00
Frédéric FRANCE
65b74ad30f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Philippe GRAND
707f8b7312 fix merge 2018-09-04 14:49:56 +02:00
Frédéric FRANCE
4ea582ad4a move phpcs:ignore 2018-09-02 11:12:07 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00