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 |
|
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 |
|
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 |
|
Laurent Destailleur
|
171b94fc5c
|
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:24 +01:00 |
|
Laurent Destailleur
|
86094613e8
|
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:06 +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 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Scrutinizer Auto-Fixer
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +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 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +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 |
|
Laurent Destailleur
|
2fe06ddb79
|
Merge pull request #12162 from OPEN-DSI/fix-categories-traduction-backurl
FIX add and modify category translate form with posted values on errors
|
2019-10-17 17:52:34 +02:00 |
|
Laurent Destailleur
|
aff52b0386
|
Update traduction.php
|
2019-10-17 17:52:20 +02:00 |
|
VESSILLER
|
59f6b9168c
|
FIX add and modify category form with posted values on errors
|
2019-10-17 14:47:47 +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 |
|
Laurent Destailleur
|
2b66282b61
|
NEW Code for extrafields uses the new array $extrafields->attributes
|
2019-10-06 14:41:52 +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 |
|
Laurent Destailleur
|
a79c4608d6
|
Merge pull request #11934 from atm-quentin/NEW_stock_categories
NEW Categories/Tags are also available on warehouses
|
2019-09-27 12:41:28 +02:00 |
|
Laurent Destailleur
|
5838fa1229
|
Fix az09 -> aZ09
|
2019-09-24 14:20:45 +02:00 |
|
Laurent Destailleur
|
db334a3b94
|
FIX Var not enough sanitized
|
2019-09-24 14:16:24 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
atm-quentin
|
c09f2d8c4e
|
NEW stock categories
|
2019-09-19 16:21:03 +02:00 |
|
Laurent Destailleur
|
bf104f609a
|
NEW Add pagination on list of object of a category
|
2019-09-10 01:44:36 +02:00 |
|
Laurent Destailleur
|
61cf47aa16
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-10 00:14:07 +02:00 |
|
Laurent Destailleur
|
348ab4765c
|
Fix sql injection
|
2019-09-06 15:20:04 +02:00 |
|
Laurent Destailleur
|
c589fdcb83
|
Code comment
|
2019-09-02 04:39:20 +02:00 |
|
Laurent Destailleur
|
962a853940
|
Code comment
|
2019-09-02 04:02:04 +02:00 |
|
Laurent Destailleur
|
fa476b4994
|
Properties ->libelle_incoterms were renamed into ->label_incoterms
|
2019-06-25 13:00:02 +02:00 |
|
ptibogxiv
|
e4f5ca79f8
|
Fix access category API
|
2019-06-17 19:36:21 +02:00 |
|
Laurent Destailleur
|
21a1e0d7b3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
|
2019-06-04 19:03:27 +02:00 |
|
Laurent Destailleur
|
57cfb4b007
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
|
2019-06-02 12:36:07 +02:00 |
|
Laurent Destailleur
|
3e9fbf0148
|
Update index.php
|
2019-06-02 12:14:07 +02:00 |
|
Maxime Kohlhaas
|
9ab2f44946
|
Fix : missing rights test to display tag create link
|
2019-05-31 15:14:56 +02:00 |
|
Laurent Destailleur
|
11fea03074
|
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
|
2019-05-18 16:04:47 +02:00 |
|
Laurent Destailleur
|
a764a79c1f
|
Fix scrutinizer error
|
2019-05-02 16:08:58 +02:00 |
|
ATM john
|
684879d73c
|
apply appli btn to more elements
|
2019-04-16 21:49:26 +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 |
|