Commit Graph

279 Commits

Author SHA1 Message Date
VESSILLER
8eff3162a9 FIX undefined function measuringUnitString in product list 2020-02-29 12:47:48 +01:00
Laurent Destailleur
fd02ed4317 Fix label 2020-01-21 20:50:58 +01:00
Laurent Destailleur
d97a59ac4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	ChangeLog
	htdocs/comm/remise.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/variants/combinations.php
2020-01-10 14:25:26 +01:00
Laurent Destailleur
c4d62e0ea3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/list.php
2020-01-10 13:51:29 +01:00
Dev2a
2d67c2365f Fix Check right for service for arrayofmassaction
if product module disable, threre is no action for service
2020-01-07 18:59:58 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Scrutinizer Auto-Fixer
4debd71281 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-06 08:26:49 +00:00
Florian Mortgat
139419c3e8 FIX 10.0: do not display single-letter values (indicating duration unit without value) in product list
(this fix exists in develop)
2019-12-05 10:38:03 +01:00
Laurent Destailleur
bde917d7fc Fix responsive 2019-12-04 15:09:20 +01:00
Laurent Destailleur
3b9d2abcb2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/product.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/list.php
2019-11-29 11:42:08 +01:00
Laurent Destailleur
3acd0bc2ff FIX Reduce number of request for list of products 2019-11-29 11:32:09 +01:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
da00591bba Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/product.lib.php
	htdocs/expedition/card.php
	htdocs/product/list.php
2019-10-23 04:04:32 +02:00
gauthier
44ced0cbeb FIX : if we search something with global search, and after with form fields, we want to stay on Products AND Services list 2019-10-22 16:11:59 +02:00
Laurent Destailleur
0cd451ef1a Fix show duration in list of services 2019-10-14 15:06:21 +02:00
Laurent Destailleur
9922ff39ca Fix show duration in list of services 2019-10-14 15:01:37 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Laurent Destailleur
d8a8c4fbe6 Look and feel v11. Picto are fontawesome. 2019-10-02 18:36:36 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
VESSILLER
44fa2e4cd1 NEW multiselect with checkbox in categories/tags search for product list 2019-09-13 12:23:34 +02:00
Jean Traullé
c84f1baf17 Fix #11683 Correct links to create a new product or service from search results 2019-08-31 00:18:53 +02:00
Jean Traullé
4bed1b9a3d Fix #11683 Correct links to create a new product or service from search results 2019-08-15 22:21:31 +02:00
atm-quentin
bd2f5ba037 FIX Replace conf by hidden conf editable by user 2019-07-26 14:16:54 +02:00
atm-quentin
0ff121e7f1 add some new field on global search 2019-07-24 09:42:52 +02:00
atm-quentin
5a385bf1cc ADD extrafields on global search 2019-07-24 09:41:02 +02:00
Laurent Destailleur
a7bd734ece Rename ->produit into ->product. Still permissions to rename. 2019-06-24 21:18:49 +02:00
Laurent Destailleur
6975e18233 Fix phpcs 2019-06-20 13:59:04 +02:00
Alexandre SPANGARO
47c2f6fac4 NEW Add column VAT rate in product list 2019-06-19 21:35:35 +02:00
Josep Lluís
bb0313a1a4 Fix Hide disabled fields
Hide disabled fields in product list
2019-06-07 15:23:20 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +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
75646e365d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contrat/list.php
	htdocs/contrat/services_list.php
	htdocs/expensereport/list.php
	htdocs/product/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/projet/list.php
2019-05-13 12:28:16 +02:00
Laurent Destailleur
9242c1a630 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	ChangeLog
	htdocs/contrat/services_list.php
	htdocs/core/lib/files.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
2019-05-13 12:22:14 +02:00
Juanjo Menent
f4ca6916cd Merge remote-tracking branch 'upstream/7.0' into 8.0
# Conflicts:
#	htdocs/contrat/services_list.php
#	htdocs/expensereport/list.php
#	htdocs/projet/list.php
2019-05-11 17:31:23 +02:00
Juanjo Menent
dc9f8a349f Fix: missing GETPOST params 2019-05-11 16:50:31 +02:00
Laurent Destailleur
3def11d5c9 Standardize translation 2019-05-10 19:32:46 +02:00
Laurent Destailleur
aaeb7dc9d6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/holiday.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
2019-05-10 17:45:33 +02:00
Laurent Destailleur
95326c3d63 Update list.php 2019-05-10 16:27:38 +02:00
John BOTELLA
f296093f8d fix travis 2019-05-10 15:52:46 +02:00
Juanjo Menent
2df026b903 FIX: #11032 2019-05-09 20:59:22 +02:00
Laurent Destailleur
15dc5f9d23 Fix css 2019-05-04 16:46:09 +02:00
ptibogxiv
61f2b84f5f FIX : error with call IsInEEC 2019-04-28 00:49:21 +02:00
Laurent Destailleur
e5c2027dbb NEW Add accounting code for eec sales and export sales on products 2019-04-25 01:16:29 +02:00
John BOTELLA
7372e8c610 Appli function to links 2019-04-15 15:47:36 +02:00
Laurent Destailleur
3cfeba0113 Standardize code 2019-04-09 01:23:27 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
5891d0a056 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/list.php
	htdocs/projet/list.php
2019-04-04 17:45:02 +02:00