Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 02:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,710 Commits 36 Branches 191 Tags
4b7de1e5f5cea42b5c70d38fe26d5e94adb51fda
Commit Graph

973 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
0f5bf891e2 Update viewcat.php 2019-12-18 12:29:16 +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
Frédéric FRANCE
c214dd0675 Form select_produits returns void 2019-11-28 21:23:53 +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
b2912e688b Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-27 22:54:05 +01:00
Frédéric FRANCE
5d9d542cd7 Update photos.php 2019-11-25 23:57:10 +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
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields. 
Fix remove empty id
 2019-11-16 14:38:05 +01: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