2
0
forked from Wavyzz/dolibarr
Commit Graph

938 Commits

Author SHA1 Message Date
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