2
0
forked from Wavyzz/dolibarr
Commit Graph

103 Commits

Author SHA1 Message Date
kamel
1418fd7054 NEW : Update variants to standard card and list 2022-03-18 15:38:44 +01:00
Laurent Destailleur
626a5b90f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-16 21:23:45 +01:00
Laurent Destailleur
c3733a92e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
2022-02-16 21:22:49 +01:00
Quentin VIAL-GOUTEYRON
82b3d89923 FIX wieght is loose if it's comma on combinations 2022-02-15 11:31:09 +01:00
Laurent Destailleur
142e9473c5 Responsive 2021-11-07 18:28:59 +01:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
000c32c137 FIx #18313 2021-08-02 20:20:52 +02:00
Laurent Destailleur
7e95c5ec20 Clean code 2021-06-08 11:40:50 +02:00
Laurent Destailleur
11fa523070 FIX CWE-269 2021-05-21 15:54:11 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
f6145a119f Fix #yogosha5679 2021-03-20 18:58:34 +01:00
stickler-ci
2cbdbf4f60 Fixing style errors. 2021-02-26 12:12:30 +00:00
Frédéric FRANCE
db871994fb code syntax variants webservice directory 2021-02-26 13:10:10 +01:00
Laurent Destailleur
b80de4aeaf FIX CSRF errors on margin forms 2021-02-02 13:04:41 +01:00
ptibogxiv
94cf393f7f Update combinations.php 2020-12-21 15:43:45 +01:00
Laurent Destailleur
379bca0b61 Clean code 2020-11-30 13:18:23 +01:00
Laurent Destailleur
2de3a3d143 Clean dead code 2020-11-30 13:02:46 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
ATM john
0074160bba Fix var misstake 2020-11-02 10:24:08 +01:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
753e68b5d9 Fix phpcs 2020-09-07 12:18:00 +02:00
Laurent Destailleur
1f58942e11 Fix phpcs 2020-09-07 10:57: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
79802be58b Fix phpcs 2020-08-18 00:29:13 +02:00
Laurent Destailleur
4f93de6d0b Fix phpcs 2020-08-17 23:30:53 +02:00
Laurent Destailleur
6662e216f7 Fix phpcs 2020-08-17 21:59:50 +02:00
Laurent Destailleur
5be10f133c Fix several regressions with variants creation 2020-08-17 13:55:18 +02:00
stickler-ci
1cc673a9c6 Fixing style errors. 2020-08-12 08:53:24 +00:00
John Botella
f0268b4aaf Add declinaison price level 2020-08-12 10:14:29 +02:00
Frédéric FRANCE
ba8cf2b398 add new rule 2020-05-21 09:21:30 +02:00
Frédéric FRANCE
ee6fadd0d5 add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
422e33a68b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php
2020-04-12 17:01:44 +02:00
Maxime Kohlhaas
3f59ca6418 Fix #13576 : links on variants 2020-04-12 10:13:37 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
badc4327c2 Merge branch 'develop' into patch-3 2020-02-21 19:45:33 +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
John Botella
36ccb8b08e Fix folder rename behavior 2020-01-07 14:49:25 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-18 14:20:36 +00:00
Frédéric FRANCE
a76e35848d Update combinations.php 2019-12-12 20:29:16 +01:00
Cédric
45bf3e4df9 Merge branch 'develop' into patch-3 2019-11-28 13:11:52 +01:00
Frédéric FRANCE
18e08420f4 Update combinations.php 2019-11-26 00:01:06 +01:00
Cédric
83de0fa7c1 Add the choice to delete the product linked 2019-11-23 18:03:46 +01:00
Cédric
d647479794 Do not delete product automaticaly (unlink only) 2019-11-23 17:17:25 +01:00
Cédric
31cfc9cd35 Add field reference in form 2019-11-23 17:04:14 +01:00
Cédric
a7f42b3fdf Inject $user for createProductCombination 2019-11-17 01:25:44 +01:00