Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

441 Commits

Author SHA1 Message Date
Laurent Destailleur
c63d54631c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
 2020-08-17 19:59:17 +02:00
Laurent Destailleur
487d26c7db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
 2020-08-17 19:54:23 +02:00
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
43103f40a5 Fix make page of categories of web site working 2020-05-22 00:55:34 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +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
Frédéric FRANCE
a91139f2d8 add user 2020-04-12 00:57:08 +02:00
Frédéric FRANCE
c06cf2eb8d info categorie 2020-04-12 00:47:14 +02:00
Frédéric FRANCE
b05ea6573e info categorie 2020-04-12 00:37:05 +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
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
50790a7f36 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/filefunc.inc.php
 2020-04-05 03:44:06 +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
Laurent Destailleur
647d09050b Clean not required vars 2020-04-04 19:25:36 +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
jribal
7380fa32ec On _checkAccessToResource: category -> categorie 2020-04-02 12:44:50 +02:00
jribal
cae0f210a2 On _checkAccessToResource: category -> categorie 2020-04-01 11:09:40 +01:00
VESSILLER
ac5d2fedc5 NEW add category type from hook 2020-03-20 15:40:46 +01:00
Laurent Destailleur
27cc7ebe33 Fix regression 2020-03-15 12:08:09 +01:00
Laurent Destailleur
55093f9ff2 Merge pull request #13232 from TobiasSekan/NewCategoriesInStocks 
NEW Category filter for warehouse list
 2020-03-02 22:50:08 +01:00
stickler-ci
a6b2531fd0 Fixing style errors. 2020-03-01 13:46:49 +00:00
Sekan, Tobias
0e55495c3e adress feedback 2020-03-01 14:45:51 +01:00
Laurent Destailleur
9def29054d Fix compatibility account->bank_account 2020-02-29 12:46:52 +01:00
Tobias Sekan
a8728f9fcf Update categorie.class.php 2020-02-28 16:14:50 +01:00
stickler-ci
948ac4b99a Fixing style errors. 2020-02-28 15:10:44 +00:00
Tobias Sekan
f2fac96a2c Add helper functions for categories 2020-02-28 16:00:23 +01:00
Laurent Destailleur
1e879126cd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-01-29 19:28:06 +01:00
Laurent Destailleur
1e13f6fd0f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/resource/class/dolresource.class.php
	htdocs/resource/list.php
 2020-01-29 11:44:04 +01:00
VESSILLER
8af5d87e80 FIX regex for include or exclude categories in full arbo 2020-01-28 17:13:09 +01:00
Frédéric FRANCE
90235d0528 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
Frédéric FRANCE
307bad1d2a doxygen todo 2019-12-11 19:11:13 +01:00
Frédéric FRANCE
25ed2b930f Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
Laurent Destailleur
99906ce127 Fix the root category not used for search from POS 2019-11-28 14:29:58 +01:00
Frédéric FRANCE
2e5f539b2a Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +01:00
Laurent Destailleur
023f359328 Fix php compatibility 2019-11-16 23:28:56 +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
Frédéric FRANCE
6784ea9fae Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-16 09:21:57 +01:00
Laurent Destailleur
7af6fa199c Merge pull request #12452 from c3do/patch-2 
Implement categorie field ref_ext
 2019-11-16 00:53:28 +01:00
stickler-ci
17667d6a1b Fixing style errors. 2019-11-15 22:08:56 +00:00
Cédric
4332834ff7 Add all types everywhere 2019-11-15 23:08:25 +01:00
Cédric
71a6836588 Implement categorie field ref_ext 2019-11-15 16:12:35 +01:00
stickler-ci
cc6d8f159b Fixing style errors. 2019-11-15 13:47:40 +00:00
Cédric
fa3c63ea28 API New can include childs when get a category 2019-11-15 14:47:08 +01:00
Frédéric FRANCE
6e97697faa wip 2019-11-14 22:38:37 +01:00
Cédric
0c9b4fe16b Add all types 2019-11-14 22:36:16 +01:00
Cédric
0f907fbc29 $type is mandatory 2019-11-14 22:26:15 +01:00
Cédric
100827ae0b Fix error process 2019-11-14 22:16:08 +01:00
Cédric
88692fe95d Doc for $page 2019-11-14 22:00:46 +01:00