lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

433 Commits

Author SHA1 Message Date
Laurent Destailleur
b35db6b9dd Clean code managing canvas 2020-09-18 06:02:52 +02:00
ptibogxiv
08d7973b4a
Update list.php 2020-09-17 22:10:22 +02:00
ptibogxiv
cbd511fbb4
Update list.php 2020-09-17 16:16:35 +02:00
ptibogxiv
8284d0ee06
FIx product list 
fix mistake if fk_state empty
 2020-09-17 11:41:53 +02:00
Laurent Destailleur
5daba4b0ed
Merge pull request #14752 from ptibogxiv/patch-360 
NEW filter product list by country and/or state/province
 2020-09-17 11:21:23 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
ptibogxiv
6f564c1937
NEW filter product list by country and/or state/province 2020-09-16 12:34:07 +02:00
Laurent Destailleur
b7b1de4580 Fix position of GPAO must be after Product. 
CSS
 2020-09-15 02:41:08 +02:00
Laurent Destailleur
0d124730a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/list.php
 2020-09-10 18:05:18 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Florian Mortgat
4a60725f6c FIX: round stock value on product list 2020-09-08 16:42:41 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
6f7b65d9f2 css 2020-08-07 20:44:49 +02:00
Laurent Destailleur
aa699bacc6 css 2020-08-07 20:10:31 +02:00
Laurent Destailleur
4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent_emails.php
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
	htdocs/product/traduction.php
 2020-08-04 13:51:11 +02:00
Laurent Destailleur
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
stickler-ci
fd34908c17 Fixing style errors. 2020-07-24 11:42:18 +00:00
Romain DESCHAMPS
c370241afd
add costprice in fields of the list 2020-07-24 13:40:06 +02:00
Laurent Destailleur
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +02:00
Laurent Destailleur
b75700cc0b Fix virtualstock activation when MRP module is on 2020-06-05 10:27:34 +02:00
Laurent Destailleur
b6308f6dfa Fix phpcs 2020-05-26 01:16:18 +02:00
Laurent Destailleur
ab176cd078
Merge pull request #13937 from frederic34/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 
add new rule
 2020-05-26 00:20:12 +02:00
Laurent Destailleur
4d13fa532f
Merge pull request #13852 from bb2a/MultiPriceInListe 
Add columns for multiprices in product list
 2020-05-25 22:50:16 +02:00
Laurent Destailleur
49c4ed5a08
Update list.php 2020-05-25 22:50:00 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
a25ed0e041
add new rule 2020-05-21 01:56:06 +02:00
stickler-ci
e3afa65880 Fixing style errors. 2020-05-14 09:38:27 +00:00
Anthony Berton
36b63ed921 Update list.php 2020-05-14 11:37:26 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
 2020-05-11 19:43:06 +02:00
Anthony Berton
52b47fd598 Update list.php 2020-05-09 00:28:23 +02:00
stickler-ci
c2dff7dfed Fixing style errors. 2020-05-08 20:46:06 +00:00
Anthony Berton
a87d9cd740 Update list.php 2020-05-08 22:41:49 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
Laurent Destailleur
cdc8eb27fb Look and feel v12 2020-04-12 21:45:43 +02:00
Laurent Destailleur
549b126eff Look and feel v12 2020-04-12 21:36:57 +02:00
Laurent Destailleur
4f442905b2 A new way to navigate between pages in list is available 2020-03-17 03:31:58 +01:00
Alexandre SPANGARO
6982997de5 Fix error 2020-03-01 05:09:57 +01:00
Alexandre SPANGARO
d9b9913e8a NEW: Accountancy - Add mode intra & export for product or service bought 2020-03-01 04:52:12 +01:00
Laurent Destailleur
8879672122 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-29 12:52:18 +01:00
VESSILLER
8eff3162a9 FIX undefined function measuringUnitString in product list 2020-02-29 12:47:48 +01:00
Laurent Destailleur
cab228ebbe Fix condition 2020-02-10 15:54:46 +01:00
Laurent Destailleur
bb40dbe1c3 Fix label of field 2020-02-10 15:53:28 +01:00
BENKE Charlene
40ac2d5cbd
Add finished field on list 2020-02-10 14:34:00 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
839f1b83fd
Merge pull request #12901 from OPEN-DSI/new-product-list-units-columns 
NEW columns units in product list
 2020-01-22 13:55:50 +01:00
Laurent Destailleur
7e08dc17af Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 20:51:22 +01:00
Laurent Destailleur
fd02ed4317 Fix label 2020-01-21 20:50:58 +01:00
VESSILLER
8a348d533b NEW only show units columns in product list (not in service list) 2020-01-21 17:29:45 +01:00
VESSILLER
70122411eb FIX label Volume in comment 2020-01-21 11:02:14 +01:00
VESSILLER
0278cef2d7 NEW columns units in product list 2020-01-21 10:33:27 +01:00
VESSILLER
53ddbc1eb5 FIX remove repeated sql fields in product list 2020-01-15 16:24:04 +01:00
Laurent Destailleur
ad7da80353
Merge pull request #12479 from OPEN-DSI/new-product-list-units 
NEW add units in product list
 2020-01-15 14:09:50 +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
VESSILLER
35f02c5165 NEW add width and height measures in product list 2019-11-25 10:25:09 +01:00
VESSILLER
b7517377a7 FIX goup by unit label in product list 2019-11-20 15:00:34 +01:00
VESSILLER
38b083b766 FIX unit translate in product list if null 2019-11-20 14:43:29 +01:00
VESSILLER
0a125f73b5 NEW add units in product list 2019-11-20 14:21:35 +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
Laurent Destailleur
9c7464d157 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/list.php
	htdocs/societe/card.php
 2019-04-04 17:42:12 +02:00
Laurent Destailleur
fa95f5575c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/product/list.php
 2019-04-04 17:41:22 +02:00
Laurent Destailleur
eaf9a2402a Fix length of label 2019-04-04 17:39:51 +02:00
Laurent Destailleur
e79204e81a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/product/list.php
 2019-04-04 17:13:52 +02:00
Laurent Destailleur
4489db2a70 Fix field surface/weight not loaded 2019-04-04 17:06:26 +02:00
Laurent Destailleur
8fe1be1a67 Removed deprecated use of string in dol_print_date(). Only date allowed. 2019-04-01 19:27:34 +02:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode 2019-03-14 17:48:44 +01:00
Laurent Destailleur
4c75e6644d Fix css 2019-03-07 21:57:03 +01:00
Laurent Destailleur
3b48808916
Update list.php 2019-03-04 16:13:38 +01:00
futurehousestore
b710a41707
Update list.php 
Display full product name
 2019-03-03 16:23:10 +00:00
atm-quentin
f51b89def3 NEW supplier buyprice barcode 2019-02-27 09:22:34 +01:00
Frédéric FRANCE
a1d2d3bddc
replace html code by html5 2019-02-24 11:18:55 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +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
Francis Appels
9227d9fe9b Show product dimensions in product list tooltip. 2019-01-22 12:42:02 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate 2018-12-14 15:44:46 +01:00
ptibogxiv
310dc46113
Update list.php 2018-11-29 13:44:42 +01:00
ptibogxiv
31e3b82ca6
Fix duration display product/service in list.php 2018-11-29 13:44:10 +01:00
Thibault Descamps
c2e5a29246 NEW redirect if only one result on global search on card 2018-11-22 11:36:30 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
 2018-10-24 03:35:44 +02:00
Laurent Destailleur
7bb5e7c31f Fix responsive 2018-10-23 11:52:21 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00
Juanjo Menent
c2814948fb Fix: name of fields used into the search criteria must always start with "search_" 2018-10-15 11:48:55 +02:00
Maxime Kohlhaas
af813f8214 Fix missing status_batch var on product lists #9606 2018-10-14 19:55:25 +02:00
Maxime Kohlhaas
d4d921b1cc Add massaction generate on main lists 2018-10-14 16:27:59 +02:00
Juanjo Menent
ab55ff2e2c New: works with variants: 
- Make the checkbox working correctly
 2018-10-11 15:44:23 +02:00
Juanjo Menent
58be4ac7a3 New: works with variants: 
- Hide child products into list if PRODUIT_ATTRIBUTES_HIDECHILD is activated
 2018-10-11 12:36:10 +02:00
atm-quentin
52717dbb65 NEW debut rename stock conf 2018-10-03 18:05:22 +02:00
Frédéric FRANCE
c76a33fb4f
remove superfluous spaces 2018-08-21 20:12:27 +02:00
Laurent Destailleur
c25a968c72
Update list.php 2018-08-21 12:15:47 +02:00
Laurent Destailleur
a10b4da6ac
Update list.php 2018-08-21 12:13:07 +02:00
Laurent Destailleur
a73d2447d9
Update list.php 2018-08-21 12:10:05 +02:00
ptibogxiv
d5aed3394d
fix duration display for service in list.php 2018-08-20 09:52:59 +02:00
Philippe GRAND
57f51fda3e Standardize 2018-08-15 12:48:13 +02:00
Laurent Destailleur
52dee71b39 Responsive 2018-07-12 18:06:06 +02:00
Regis Houssin
f3d213bab8 Fix: remove old code 2018-06-30 11:05:13 +02:00
Regis Houssin
debec3d175 Fix: remove old code of canvas 
Conflicts:
	htdocs/product/list.php
 2018-06-30 11:03:02 +02:00
Regis Houssin
3a26443546 Fix: remove unused code 
Conflicts:
	htdocs/product/list.php
 2018-06-30 10:53:40 +02:00
Regis Houssin
f998f64db0 Works on use new list engine instead template for canvas 
Conflicts:
	htdocs/product/list.php
 2018-06-30 10:52:26 +02:00