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

1295 Commits

Author SHA1 Message Date
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
0933fefa1d More fontawesome logo 2020-04-06 18:36:33 +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
Laurent Destailleur
b8c2dd6025 Look and feel v12 2020-04-02 15:11:46 +02:00
Laurent Destailleur
386b27a14c Standardize code 2020-04-02 14:32:54 +02:00
Laurent Destailleur
83fdc5b901 Merge pull request #13429 from TobiasSekan/NewTreeViewForSubCategories 
NEW Tree view for sub-categories
 2020-04-02 13:39:43 +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
stickler-ci
2bf054364d Fixing style errors. 2020-03-26 11:48:45 +00:00
Tobias Sekan
7d72fc70c7 New tree-view for sub-categories 2020-03-26 11:36:53 +00:00
Tobias Sekan
c38e16460e Add new category button in sub categories 2020-03-25 10:31: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
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +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
Tobias Sekan
c60e7a4e60 Fix count errror on category view of stocks 2020-02-27 09:02:59 +01:00
Laurent Destailleur
08d85f9acb Merge pull request #13009 from TobiasSekan/NewShowCategoryCount 
NEW Show count of each category elements in category card
 2020-02-05 14:19:37 +01:00
Laurent Destailleur
56012405ff Merge pull request #13006 from TobiasSekan/NewShowUsersOfCategory 
NEW Show list of users in the user category card
 2020-02-05 14:19:06 +01:00
Tobias Sekan
eca0016778 Fix wrong category name on user category card 2020-02-05 14:17:41 +01:00
stickler-ci
24ec364081 Fixing style errors. 2020-02-03 11:10:04 +00:00
Tobias Sekan
90f29c060a New show counts of categories 2020-02-03 12:03:17 +01:00
Tobias Sekan
2f951c0441 New - Show list of users in user category card 2020-02-03 11:01:58 +01:00
Tobias Sekan
7903e0379b Fix wrong category name on user category card 2020-02-03 09:50:44 +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
Laurent Destailleur
07c1a5717e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/facture_situation.php
	htdocs/core/class/html.formother.class.php
 2019-12-23 14:16:34 +01:00
Laurent Destailleur
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
 2019-12-23 14:13:26 +01:00
VESSILLER
558d577309 FIX add and modify category translate form with posted values on errors 2019-12-23 11:53:19 +01:00
Laurent Destailleur
22b7b69c47 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-22 16:01:32 +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
28a172e80f Merge pull request #9823 from bafbes/abb80035 
NEW:Can change destination of "Back to list" using a "backtolist" parameter
 2019-12-19 10:45:08 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
5012a66ecb Update viewcat.php 2019-12-18 12:29:52 +01:00