Commit Graph

1153 Commits

Author SHA1 Message Date
Laurent Destailleur
43ff015157 Fix pb with svg images 2019-12-19 19:09:56 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Frédéric FRANCE
9357bfd98e
doxygen 2019-12-12 08:17:14 +01:00
Frédéric FRANCE
650c9c2e57
Update product.class.php 2019-12-03 16:46:50 +01:00
Laurent Destailleur
a00d011f10
Merge pull request #12609 from frederic34/patch-20
Update product.class.php
2019-12-03 13:18:29 +01:00
Laurent Destailleur
37cee5840a
Merge pull request #12608 from frederic34/patch-19
$id parameter was removed long time ago
2019-12-03 13:17:01 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-03 10:17:29 +00:00
Frédéric FRANCE
ac674aae6a
Update product.class.php 2019-12-02 20:45:28 +01:00
Frédéric FRANCE
579f570abf
$id parameter was removed long time ago 2019-12-02 20:42:48 +01:00
Norbert Penel
89f57d7d3b
add label to combobox
useful for BOM, etc
2019-11-30 23:45:24 +01:00
Laurent Destailleur
3b9d2abcb2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/product.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/list.php
2019-11-29 11:42:08 +01:00
Laurent Destailleur
a4a805f618 Doxygen 2019-11-29 11:32:22 +01:00
Scrutinizer Auto-Fixer
5f99e25c45 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-28 11:36:20 +00:00
Laurent Destailleur
30ea48a715 Fix api for deletion of attributes 2019-11-26 12:58:41 +01:00
Laurent Destailleur
f0e7eaf0cd
Merge pull request #12453 from c3do/patch-3
API New get / add / remove subproducts, attributes and variants
2019-11-22 14:34:54 +01:00
Cédric
e76a112099
Remove unecessary dol_clone in ::putVariant 2019-11-21 23:09:18 +01:00
stickler-ci
821ca724a5 Fixing style errors. 2019-11-21 21:54:51 +00:00
Cédric
1bc8c57d6d
Fix $weight_impact $price_impact 2019-11-21 22:54:13 +01:00
Cédric
5a3f78088e
Fix double deleteAttributeValueByRef 2019-11-21 18:18:11 +01:00
Cédric
351ba58bbe
Fix Superfluous parameter comment 2019-11-21 17:43:40 +01:00
stickler-ci
cfa0860d24 Fixing style errors. 2019-11-21 16:41:45 +00:00
Cédric
416a2f7f1c
FIX putAttributes, ADD putAttributeValue 2019-11-21 17:41:09 +01:00
stickler-ci
0074589b6f Fixing style errors. 2019-11-21 16:24:25 +00:00
Cédric
1068d9a623
FIX deleteAttributeValueByRef / ADD getAttributeValueById, getAttributeValueByRef 2019-11-21 17:23:46 +01:00
stickler-ci
4f747e2eb8 Fixing style errors. 2019-11-21 14:50:47 +00:00
Cédric
d6ba06e271
API New get attribute by ref + security update 2019-11-21 15:50:06 +01:00
stickler-ci
c33506b4cc Fixing style errors. 2019-11-19 13:41:30 +00:00
Cédric
8fbf853b94
Display attributes infos when get product variants 2019-11-19 14:40:50 +01:00
stickler-ci
a17e183da9 Fixing style errors. 2019-11-17 00:18:43 +00:00
Cédric
8c057f1975
API New Product variants 2019-11-17 01:20:15 +01:00
Cédric
256e256f62
Paths and vars: subproducts instead of childs 2019-11-16 12:30:47 +01:00
Cédric
33d4c4b73c
Doc for $child_id 2019-11-16 11:23:50 +01:00
Cédric
04f58f5d32
$includesubproducts and path consistency 2019-11-16 11:17:56 +01:00
stickler-ci
aa7353d3cf Fixing style errors. 2019-11-15 21:18:40 +00:00
Cédric
f620b165d3
API New get / add / remove product childs 2019-11-15 22:17:53 +01:00
Laurent Destailleur
da3a907075
Merge branch 'develop' into fix-product-virtual-stock-stats-sending 2019-11-14 12:16:28 +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
VESSILLER
851cf4f3f3 FIX add product qty in shipment already sent only if reel stock was decremented 2019-11-14 09:52:13 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
614faa07c1
Merge pull request #12427 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
2019-11-14 08:49:53 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
f4aaa8d9bb Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:34:37 +00:00
Philippe GRAND
69e1d0480a add some comment 2019-11-10 12:10:13 +01:00
Laurent Destailleur
274ddaa1be Fix mandatory field 2019-11-09 19:01:03 +01:00
Cédric
4dbf151b15
Inject $user in ProductCombination::updateProperties 2019-11-09 13:29:12 +01:00
Laurent Destailleur
e60fff39d9 Fix phpcs 2019-11-04 20:36:55 +01:00
Laurent Destailleur
8485747713 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 13:37:43 +01:00
Laurent Destailleur
9e69b12847 FIX #12281 2019-11-02 13:37:30 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00