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 |
|
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 |
|
Scrutinizer Auto-Fixer
|
e8083e2a65
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-23 14:54:02 +00:00 |
|
Laurent Destailleur
|
badc4327c2
|
Merge branch 'develop' into patch-3
|
2020-02-21 19:45:33 +01:00 |
|
Scrutinizer Auto-Fixer
|
fd48877dc6
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-18 22:47:25 +00:00 |
|
Laurent Destailleur
|
f4f3efec62
|
Fight against $_POST
|
2020-02-16 19:33:58 +01:00 |
|
Laurent Destailleur
|
18f2b09fb1
|
Debug v11
|
2020-01-20 12:25:25 +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
|
9e4fb8d4fe
|
doxygen
|
2019-12-15 10:02:20 +01: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 |
|
Laurent Destailleur
|
30ea48a715
|
Fix api for deletion of attributes
|
2019-11-26 12:58:41 +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 |
|
stickler-ci
|
7a3f6c362d
|
Fixing style errors.
|
2019-11-23 15:23:31 +00:00 |
|
Cédric
|
6086ecef86
|
Can add already existing product as variant
ONLY if the reference is forced
|
2019-11-23 16:14:21 +01:00 |
|
Cédric
|
3aef39c64d
|
New can customize the reference of a combination
|
2019-11-23 13:45:58 +01:00 |
|
Cédric
|
398f0e00f7
|
inject $user for createProductCombination
|
2019-11-17 01:27:23 +01:00 |
|
Cédric
|
a7f42b3fdf
|
Inject $user for createProductCombination
|
2019-11-17 01:25:44 +01:00 |
|
Cédric
|
40e4af234d
|
Inject $user instead of global var
|
2019-11-17 01:24:07 +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 |
|
Laurent Destailleur
|
c02cd80b75
|
Clean code
|
2019-11-12 10:11:30 +01:00 |
|
Cédric
|
df4bcdcb94
|
Edit updateProperties to inject $user
|
2019-11-09 14:13:14 +01:00 |
|
Laurent Destailleur
|
5d41268d1e
|
CSS
|
2019-11-04 19:28:04 +01: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 |
|