489 Commits

Author	SHA1	Message	Date
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	be1460e3eb	Fix doxygen	2020-09-07 02:49:39 +02:00
stickler-ci	af91013506	Fixing style errors.	2020-09-06 15:52:02 +00:00
Cédric	03e9e17be4	Merge branch 'develop' into patch-3	2020-09-06 17:50:54 +02:00
Laurent Destailleur	f2a16d860e	Enhance method fetchByFkProductChild()	2020-09-04 14:05:35 +02:00
Laurent Destailleur	4383f1d00c	Update ProductCombination.class.php	2020-09-04 13:50:22 +02:00
stickler-ci	8d6c19a432	Fixing style errors.	2020-09-04 10:10:37 +00:00
Cédric	b841a4354e	NEW ref_ext for Attributes	2020-09-04 12:06:09 +02:00
Cédric	925a1475a1	add ref_ext to ProductCombination.class.php	2020-09-04 11:01:47 +02:00
Laurent Destailleur	9293d1917a	Update ProductCombination.class.php	2020-09-03 12:37:30 +02:00
Laurent Destailleur	1d3c54dd64	Update ProductCombination.class.php	2020-09-03 12:36:57 +02:00
John Botella	cd952f7427	Fix and factor fetch combination price level	2020-09-02 16:24:22 +02: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
Laurent Destailleur	96d4eeb8be	Fix syntax error	2020-08-17 12:24:32 +02:00
Laurent Destailleur	15e7cd0fb3	Fix doxygen	2020-08-17 05:54:22 +02:00
Laurent Destailleur	cf73c2d8e1	Fix travis	2020-08-17 05:26:32 +02:00
Laurent Destailleur	9712e3d28f	Fix travis	2020-08-17 05:09:27 +02:00
Laurent Destailleur	b7c38f4617	Merge pull request #14433 from c3do/patch-1 ... NEW Triggers Attributes and Attributes values	2020-08-16 23:45:32 +02:00
stickler-ci	959ccce777	Fixing style errors.	2020-08-13 09:48:28 +00:00
John Botella	2405082bb1	Merge branch 'develop_declinaison_price_multiple_merge' of github.com:atm-john/dolibarr into develop_declinaison_price_multiple_merge	2020-08-13 11:46:07 +02:00
John Botella	4e1f554c15	Fix - add variation price fallback behavior	2020-08-13 11:43:33 +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
Cédric	3f233a3200	Fix comment params	2020-08-08 23:01:41 +02:00
stickler-ci	d7a65a540e	Fixing style errors.	2020-08-08 20:58:51 +00:00
Cédric	ed1a2cd917	Update 1	2020-08-08 22:45:51 +02:00
Cédric	ef57bb7e84	pass $user to delete functions	2020-08-08 22:14:53 +02:00
Cédric	e73a7c78f7	NEW triggers create, modify, delete	2020-08-08 22:10:50 +02:00
Cédric	bb16564b98	NEW triggers create, modify, delete ... Also modified deleteByFkAttribute() to use the function delete()	2020-08-08 22:08:46 +02:00
Laurent Destailleur	4627f06c70	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-16 22:57:50 +02:00
Laurent Destailleur	b7d835eceb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-06-15 16:10:27 +02:00
Laurent Destailleur	40e16672e3	FIX BlindBoolean SQL injection reported by Christian Weiler ... <sak1.s3curity@gmail.com>	2020-06-15 15:08:52 +02:00
Laurent Destailleur	b763b40d8c	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-12 19:37:27 +02:00
Laurent Destailleur	2c327aae66	Prepare v12	2020-06-12 19:30:23 +02:00
Laurent Destailleur	3b22b6192d	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-05-28 21:36:08 +02:00
Laurent Destailleur	60dfcdba00	Fix var type	2020-05-28 21:29:30 +02:00
Frédéric FRANCE	5aa84c64d0	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-23 18:54:33 +02:00
Frédéric FRANCE	2085ac73e7	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-23 18:34:58 +02:00
Laurent Destailleur	3a15688f17	FIX #13951	2020-05-23 13:53:47 +02:00
Laurent Destailleur	a9b5feb680	Merge branch 'develop' into keep_child_label_if_modified	2020-05-23 13:51:13 +02:00
Laurent Destailleur	83ecbef9bc	FIX #13911 #13940	2020-05-23 13:46:37 +02:00
gael.langlais	dce93197d7	FIX #13908 keep child label if modified by user	2020-05-22 17:58:24 +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	af46108cc4	Look and feel v12	2020-05-17 13:34:16 +02:00
Laurent Destailleur	549b126eff	Look and feel v12	2020-04-12 21:36:57 +02:00