Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 02:58:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,559 Commits 36 Branches 190 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

572 Commits

Author SHA1 Message Date
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
stickler-ci
b2d18a8e0c Fixing style errors. 2019-11-14 20:56:31 +00:00
Cédric
837c7276ab API New get categories linked to an object 2019-11-14 21:57:21 +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
Frédéric FRANCE
2ea58b11ca wip 2019-11-13 20:36:32 +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
Frédéric FRANCE
05ab4f79ef categories for actioncomm 2019-11-13 18:44:11 +01:00
Cédric
c4c463fb96 camelCaps 2019-11-13 11:36:42 +01:00
stickler-ci
fcb50841cc Fixing style errors. 2019-11-12 17:10:20 +00:00
Cédric
480ac1a926 API New link/unlink products with categories 
Need it for V11 please :)
 2019-11-12 18:08:09 +01:00
Laurent Destailleur
adf5953693 Doc 2019-11-02 15:27: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
7581275316 wip 2019-10-20 11:59:21 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +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
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
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00