Laurent Destailleur
|
48e34c2069
|
Add int
|
2020-09-12 15:53:18 +02:00 |
|
Cédric
|
3209708e30
|
Update ProductCombination.class.php
|
2020-09-10 13:56:58 +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 |
|
stickler-ci
|
61903a1079
|
Fixing style errors.
|
2020-09-07 15:24:35 +00:00 |
|
Cédric
|
5992641360
|
Merge branch 'develop' into patch-3
|
2020-09-07 17:22:18 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
Laurent Destailleur
|
2218994958
|
FIX Duplicate encoding on error message
|
2019-05-29 09:51:45 +02:00 |
|
Laurent Destailleur
|
eafc35b00f
|
Look and feel v10
|
2019-05-21 13:27:45 +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 |
|
John BOTELLA
|
f296093f8d
|
fix travis
|
2019-05-10 15:52:46 +02:00 |
|
Laurent Destailleur
|
684e09fdcd
|
NEW Add function isValidVATID()
|
2019-04-23 22:49:33 +02:00 |
|