Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
91,506 Commits 36 Branches 189 Tags
eb0fd1674d26a8157ff133173f9177ee6a23e81f
Commit Graph

84 Commits

Author SHA1 Message Date
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
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
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
a7797ba1da clean indent in variants directory 2019-10-26 20:53:39 +02:00
Laurent Destailleur
c4be61c55c FIX Better compatible fix for the trouble of weight / size units 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/card.php
 2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d FIX Better compatible fix for the trouble of weight / size units 2019-10-22 18:36:36 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
fb3d20107c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/exports/export.php
	htdocs/filefunc.inc.php
 2019-10-15 03:51:57 +02:00
Laurent Destailleur
9871dd8770 Debug variants 2019-10-12 15:27:06 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +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
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Laurent Destailleur
014c199173 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
 2019-02-27 01:28:12 +01:00
Laurent Destailleur
6f0d5fcf3f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/variants/combinations.php
 2019-02-27 01:25:25 +01:00
Laurent Destailleur
a48e9fdba4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-27 01:23:26 +01:00
Frédéric FRANCE
167a857f4c replace html code by html5 in contact 2019-02-24 14:47:47 +01:00
Frédéric FRANCE
2ad91213b2 Update combinations.php 2019-02-24 12:09:57 +01:00
Frédéric FRANCE
bc395b247a fix html5 in variant 2019-02-16 08:00:16 +01:00
Frédéric FRANCE
1e43f8e54a PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00