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 |
|
Laurent Destailleur
|
6f34a84a9a
|
Update categorie.class.php
|
2019-04-08 13:23:19 +02:00 |
|
Lionel VESSILLER
|
8a220b9da1
|
New categories options in sellist and chbxlist extrafields
|
2019-04-02 11:01:46 +02:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Laurent Destailleur
|
e326c4d579
|
Look and feel v10
|
2019-03-15 10:48:10 +01:00 |
|
Laurent Destailleur
|
86c5dc20e3
|
NEW Can choose the root category to show for TakePOS module
|
2019-03-15 02:12:40 +01:00 |
|
Laurent Destailleur
|
0ef6fd36f9
|
Merge and clean TakePOS CSS
|
2019-03-15 00:49:44 +01:00 |
|
Laurent Destailleur
|
f3ca69522e
|
Fix phpcs
|
2019-03-11 01:41:09 +01:00 |
|
Frédéric FRANCE
|
8743b43fdb
|
add oldcopy of category before updating
|
2019-03-06 18:01:18 +01:00 |
|
Frédéric FRANCE
|
f283782445
|
change visibility
|
2019-03-04 19:57:46 +01:00 |
|
Laurent Destailleur
|
4d5372e98f
|
Merge pull request #10716 from frederic34/patch-3
Update doc in categorie.class.php
|
2019-03-02 18:36:27 +01:00 |
|
Frédéric FRANCE
|
e5e4f90917
|
Update categorie.class.php
|
2019-02-28 20:17:32 +01:00 |
|
Frédéric FRANCE
|
6ee186096c
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-24 23:48:51 +01:00 |
|
Frédéric FRANCE
|
041310c4ee
|
wip
|
2019-02-24 23:47:00 +01:00 |
|
Frédéric FRANCE
|
27218b7087
|
wip
|
2019-02-24 23:32:09 +01:00 |
|
Frédéric FRANCE
|
894123fb06
|
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
|
2019-02-24 20:06:55 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Frédéric FRANCE
|
f5b2cf75f2
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-01 18:31:44 +01:00 |
|
Philippe GRAND
|
1501ce2c9f
|
update with html5 compliant code
|
2019-01-31 13:34:32 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Philippe GRAND
|
4c281f4ff3
|
update with html5 compliant code
|
2019-01-22 13:56:14 +01:00 |
|
Laurent Destailleur
|
2011afe6fb
|
Merge branch 'develop' into actionrefused
|
2018-12-14 15:48:24 +01:00 |
|
Laurent Destailleur
|
fab6dde593
|
Close #9825
|
2018-12-14 10:51:32 +01:00 |
|
Laurent Destailleur
|
eefcf4b708
|
Merge pull request #9822 from bafbes/abb80034
NEW Grant right to child classes to use Category methods
|
2018-12-13 20:21:05 +01:00 |
|
Laurent Destailleur
|
8d4db1d085
|
Fix phpcs
|
2018-11-19 16:35:37 +01:00 |
|
Laurent Destailleur
|
2f87ee6640
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-11-19 15:56:38 +01:00 |
|
Frédéric FRANCE
|
731d19a29b
|
add tooltip to butActionRefused
|
2018-11-13 21:40:17 +01:00 |
|
John BOTELLA
|
c6cf748ba7
|
Fix envent message on upload category picture
|
2018-11-13 14:44:10 +01:00 |
|
Laurent Destailleur
|
84983140b6
|
Merge pull request #9896 from hregis/develop_email
FIX change my deprecated email
|
2018-11-11 17:35:35 +01:00 |
|
Laurent Destailleur
|
ad7ae76cd3
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-11-10 15:51:49 +01:00 |
|
Laurent Destailleur
|
5ec602cafa
|
Merge pull request #9983 from hregis/8.0_bug
FIX missing field "visible"
|
2018-11-10 12:19:35 +01:00 |
|
Regis Houssin
|
ee06f36f4c
|
FIX missing field "visible"
|
2018-11-09 11:36:20 +01:00 |
|
Regis Houssin
|
5d1d77a966
|
FIX missing action "edit" for the hook
|
2018-11-09 10:32:08 +01:00 |
|
Laurent Destailleur
|
4a25317f10
|
Fix security on GETPOST('action'). Param must be sanitized.
|
2018-11-05 20:29:07 +01:00 |
|
Laurent Destailleur
|
c0f4ec5a3e
|
FIX sanitize param $action
|
2018-11-05 17:53:31 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Frédéric FRANCE
|
0171301543
|
code comment categories class
|
2018-10-21 19:19:35 +02:00 |
|
Bahfir Abbes
|
1b60fb7702
|
Update viewcat.php
|
2018-10-19 18:00:24 +01:00 |
|
Abbes Bahfir
|
e95d93e631
|
fix:follow url back link
|
2018-10-19 17:31:46 +01:00 |
|
Abbes Bahfir
|
bfadd39e8c
|
Fix: Grant right to child classes to use Category methods
|
2018-10-19 17:27:38 +01:00 |
|
Frédéric FRANCE
|
db732ddedd
|
code comment
|
2018-10-17 20:36:45 +02:00 |
|
Laurent Destailleur
|
dfe9c05d2f
|
Merge menu entry for tags/categories as submenu of element.
|
2018-10-09 15:26:15 +02:00 |
|
Laurent Destailleur
|
a2a53a32f1
|
FIX Look and feel v8. Missing button "Create category"
|
2018-10-09 14:34:25 +02:00 |
|
Philippe GRAND
|
af0bcb2631
|
Standardize code
|
2018-10-09 09:40:00 +02:00 |
|
Laurent Destailleur
|
09a41fd757
|
Look and feel v8
|
2018-09-19 17:33:50 +02:00 |
|
Laurent Destailleur
|
0b02673ba5
|
Merge pull request #9487 from frederic34/patch-5
Update categorie.class.php
|
2018-09-12 22:03:18 +02:00 |
|
Laurent Destailleur
|
b5b4410e75
|
Duplicate delete
|
2018-09-12 22:02:50 +02:00 |
|
Frédéric FRANCE
|
04d3c7f43b
|
Update categorie.class.php
|
2018-09-12 21:07:54 +02:00 |
|
Frédéric FRANCE
|
65b74ad30f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-04 20:48:35 +02:00 |
|
Philippe GRAND
|
707f8b7312
|
fix merge
|
2018-09-04 14:49:56 +02:00 |
|
Frédéric FRANCE
|
4ea582ad4a
|
move phpcs:ignore
|
2018-09-02 11:12:07 +02:00 |
|
Philippe GRAND
|
5d273960dc
|
fix conflict
|
2018-09-01 22:40:38 +02:00 |
|
Frédéric FRANCE
|
10200374ef
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-09-01 14:06:23 +02:00 |
|
Philippe GRAND
|
b59d49d3b3
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2018-09-01 13:58:33 +02:00 |
|
Frédéric FRANCE
|
57fb3dc2f4
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-09-01 13:52:51 +02:00 |
|
Laurent Destailleur
|
fe06a0a021
|
Merge pull request #9365 from frederic34/patch-23
Update categorie.class.php
|
2018-09-01 13:31:42 +02:00 |
|
Philippe GRAND
|
7354e485b0
|
precise label comment
|
2018-09-01 13:22:08 +02:00 |
|
Philippe GRAND
|
3a8bde227b
|
Standardize and update code
|
2018-08-31 19:26:08 +02:00 |
|
Frédéric FRANCE
|
5833e6c5d8
|
Update categorie.class.php
|
2018-08-31 08:56:00 +02:00 |
|
Philippe GRAND
|
9681dfca1b
|
Fix white spaces
|
2018-08-29 12:23:03 +02:00 |
|
Philippe Grand
|
405f3ca858
|
Update categorie.class.php
|
2018-08-28 10:40:03 +02:00 |
|
Philippe GRAND
|
65af8f902f
|
Update and standardize code
|
2018-08-28 09:44:54 +02:00 |
|
Frédéric FRANCE
|
fe4260a014
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-28 09:34:53 +02:00 |
|
Philippe GRAND
|
2fa82edd39
|
Standardize and update code
|
2018-08-23 17:07:27 +02:00 |
|
Philippe GRAND
|
449ef9c464
|
Update and standardize code
|
2018-08-22 18:12:44 +02:00 |
|
Frédéric FRANCE
|
6b6daf178f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-21 20:57:58 +02:00 |
|
Frédéric FRANCE
|
7bb781eea8
|
function declaration
|
2018-08-15 14:28:34 +02:00 |
|
Frédéric FRANCE
|
3210181a3d
|
rule for private function is different
|
2018-08-14 10:21:34 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Philippe GRAND
|
de70bf983e
|
standardize
|
2018-07-29 13:40:35 +02:00 |
|
Laurent Destailleur
|
982a1ffbaf
|
NEW Automatic position of scroll when creating an extrafield
|
2018-06-30 14:22:05 +02:00 |
|
Frédéric FRANCE
|
a0055174c4
|
loadlangs
|
2018-05-27 09:58:23 +02:00 |
|
Laurent Destailleur
|
c9d23d3930
|
Merge pull request #8783 from grandoc/new_branch_12_05_2018
Clean and update code
|
2018-05-18 08:56:06 +02:00 |
|
Laurent Destailleur
|
ef395fc36b
|
Fix scrutinizer bugs
|
2018-05-16 15:23:52 +02:00 |
|
Philippe GRAND
|
29c735d8bd
|
Clean and update code
|
2018-05-12 10:46:17 +02:00 |
|
Laurent Destailleur
|
363eaf0d72
|
FIX Parameters to triggers must be set into $this->context array.
|
2018-05-05 13:44:49 +02:00 |
|
Laurent Destailleur
|
bdf4c0704b
|
Removed depreaceted not used method Categorie::get_nb_categories()
|
2018-05-05 13:40:45 +02:00 |
|
Laurent Destailleur
|
461ae46cc4
|
FIX When on a high page and searching for a small result, list was not
visible.
|
2018-04-24 11:37:57 +02:00 |
|
Laurent Destailleur
|
8aab183567
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-04-19 14:00:18 +02:00 |
|
Laurent Destailleur
|
6b3e5e2085
|
FIX sanitize setup params
|
2018-04-18 12:19:23 +02:00 |
|
Laurent Destailleur
|
0d0da234b1
|
Lowercase NULL, TRUE, FALSE according to PSR2
|
2018-04-16 13:51:16 +02:00 |
|
Laurent Destailleur
|
be965bdbab
|
Clean code
|
2018-04-13 13:28:48 +02:00 |
|
Laurent Destailleur
|
1521b0595b
|
Clean code
|
2018-04-13 11:03:03 +02:00 |
|
Laurent Destailleur
|
1feee6378f
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-04-11 14:45:52 +02:00 |
|
atm-arnaud
|
0e66d26d06
|
FIX #7730
|
2018-04-10 16:46:36 +02:00 |
|
atm-arnaud
|
d24b36f768
|
FIX #8359
|
2018-04-10 14:10:40 +02:00 |
|
Laurent Destailleur
|
7108f68db9
|
Remove old deprecated hook insertExtraFields. Triggers must be used for
action on CRUD events.
|
2018-04-10 12:03:01 +02:00 |
|
Laurent Destailleur
|
4c9ccb163c
|
Remove deprecated way of working. Use context array instead.
|
2018-03-27 17:58:24 +02:00 |
|
Laurent Destailleur
|
e2cbf903ba
|
Remove deprecated code
|
2018-03-16 10:33:23 +01:00 |
|
Laurent Destailleur
|
5b8006a6bb
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/public/payment/paymentok.php
htdocs/public/paypal/paymentok.php
|
2018-03-08 16:37:17 +01:00 |
|
Regis Houssin
|
0f574579eb
|
Fix: avoid error if type is not numeric
|
2018-03-07 12:27:13 +01:00 |
|
Laurent Destailleur
|
04934cc4aa
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
|
2018-02-27 19:18:43 +01:00 |
|
Laurent Destailleur
|
41638e6dff
|
Fix back link of look and feel v7
|
2018-02-26 09:20:05 +01:00 |
|
Laurent Destailleur
|
82ae65b18d
|
NEW Can get template of email from its label
|
2018-02-23 11:23:36 +01:00 |
|
Laurent Destailleur
|
d8f8e76bee
|
Provide context to trigger
|
2018-02-23 10:39:39 +01:00 |
|
Laurent Destailleur
|
b4446764f8
|
Clean code of deprecated usage
|
2018-02-21 14:48:25 +01:00 |
|
Laurent Destailleur
|
c4130730cb
|
Clean code around fetch_optionals()
|
2018-02-20 19:38:18 +01:00 |
|
Laurent Destailleur
|
60a848de5a
|
Fix bad list of id for supplier categories
|
2018-02-12 04:09:15 +01:00 |
|
Laurent Destailleur
|
f637269a27
|
Fix bad list of id for supplier categories
|
2018-02-12 04:05:13 +01:00 |
|