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 |
|
Laurent Destailleur
|
d232b7a387
|
Merge pull request #12286 from grandoc/new_branch_01_11_2019
add some comment
|
2019-11-02 13:00:23 +01:00 |
|
Laurent Destailleur
|
58ffb73627
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-02 12:59:49 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
Laurent Destailleur
|
c12e66e2a2
|
Merge branch 'develop' into new_branch_01_11_2019
|
2019-11-02 12:00:04 +01:00 |
|
Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
stickler-ci
|
0e260c859b
|
Fixing style errors.
|
2019-11-01 19:28:39 +00:00 |
|
ptibogxiv
|
6f77885686
|
Update api_products.class.php
|
2019-11-01 20:26:39 +01:00 |
|
stickler-ci
|
bc5e6c867f
|
Fixing style errors.
|
2019-11-01 14:37:21 +00:00 |
|
ptibogxiv
|
0f80ba5353
|
FIX prices by customer API
|
2019-11-01 15:36:48 +01:00 |
|
Laurent Destailleur
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
Philippe GRAND
|
07cd656a1c
|
add some comment
|
2019-11-01 10:56:46 +01:00 |
|
Laurent Destailleur
|
68a4ddceed
|
Look and feel v11
|
2019-10-31 23:29:17 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Laurent Destailleur
|
19f97fb23b
|
Merge pull request #12211 from frederic34/patch-2
doxygen product.class.php
|
2019-10-30 03:16:22 +01:00 |
|
Laurent Destailleur
|
8d21144521
|
Beautify select of products in vendor record
|
2019-10-24 20:33:16 +02:00 |
|
Laurent Destailleur
|
443ca85f43
|
NEW Beautify the select of warehouses
|
2019-10-24 19:48:25 +02:00 |
|
Laurent Destailleur
|
31452dad42
|
NEW Beautify the select of warehouses
|
2019-10-24 19:34:28 +02:00 |
|
Frédéric FRANCE
|
5999d8a05a
|
Update product.class.php
|
2019-10-24 16:11:05 +02:00 |
|
Frédéric FRANCE
|
93a8b1d2a3
|
Update product.class.php
|
2019-10-24 16:09:35 +02:00 |
|
Laurent Destailleur
|
2e573fd794
|
Fix save of units
Conflicts:
htdocs/expedition/card.php
htdocs/product/card.php
htdocs/product/class/product.class.php
|
2019-10-23 03:03:55 +02:00 |
|
Laurent Destailleur
|
f0355b3057
|
Debug option PRODUCT_ADD_NET_MEASURE
|
2019-10-23 02:58: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 |
|
Laurent Destailleur
|
e261d63295
|
NEW Can add a button "Create" after combo of object with modulebuilder.
|
2019-10-21 14:44:39 +02:00 |
|
Frédéric FRANCE
|
86f22c4563
|
do not ignore lines with mix od tabs and spaces
|
2019-10-20 17:17:22 +02:00 |
|
Laurent Destailleur
|
05fed5358a
|
Merge pull request #12179 from c3do/develop
NEW Add API to get objects by ref, ref_ext, ...
|
2019-10-20 13:42:18 +02:00 |
|
Laurent Destailleur
|
24dc7fb667
|
Merge pull request #12173 from OPEN-DSI/new-product-clone-customer-prices
NEW add clone customers prices in clone product or service
|
2019-10-20 13:27:50 +02:00 |
|
Frédéric FRANCE
|
7581275316
|
wip
|
2019-10-20 11:59:21 +02:00 |
|
c3do
|
ae3ce37a57
|
copyright mentions
|
2019-10-19 16:45:30 +02:00 |
|
c3do
|
6742700c04
|
Can get product by ref, ref_ext, barcode through API Rest
|
2019-10-19 16:36:11 +02:00 |
|
VESSILLER
|
801092d848
|
NEW add clone customers prices in clone product or service
|
2019-10-18 15:10:22 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
4ca9fddfcc
|
Update product.class.php
|
2019-10-16 14:26:49 +02:00 |
|
Cédric
|
3429cb7c1d
|
New: Update product type with update method
|
2019-10-14 22:42:38 +02:00 |
|
Cédric
|
2257706a30
|
New: Update product type with update method
|
2019-10-14 22:22:20 +02:00 |
|
Laurent Destailleur
|
29384d9a71
|
Merge branch 'develop' into patch-187
|
2019-10-09 13:02:47 +02:00 |
|
ptibogxiv
|
10c29887d6
|
Update product.class.php
|
2019-10-08 16:15:12 +02:00 |
|
ptibogxiv
|
e2d76f6f24
|
Update product.class.php
|
2019-10-08 16:13:59 +02:00 |
|
Laurent Destailleur
|
653958b1a2
|
Merge pull request #11094 from altatof/prodstats
NEW Extend option ORDER_ADD_ORDERS_WITH_PARENT_PROD_IF_INCDEC for all virtual product stats (renamed into PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)
|
2019-10-08 15:12:52 +02:00 |
|
Frédéric FRANCE
|
41cdf0d5a0
|
remove stock data from getsupplierprice
stock data can be retrieved with get
|
2019-10-08 08:19:27 +02:00 |
|
Frédéric FRANCE
|
b895f8a78f
|
api supplier get purchase prices
|
2019-10-05 21:19:55 +02:00 |
|
Frédéric FRANCE
|
10671e3266
|
api supplier price delete
|
2019-10-05 21:15:13 +02:00 |
|
Laurent Destailleur
|
b883a8092a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
|
2019-10-05 19:35:40 +02:00 |
|
altairis
|
85bbf1decb
|
Merge branch 'develop' into prodstats
|
2019-10-04 11:05:36 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Laurent Destailleur
|
d0d884742f
|
FIX #11861 Not consistent code to manage measuring units
|
2019-09-27 19:45:33 +02:00 |
|
Laurent Destailleur
|
ea62ea8c70
|
Merge pull request #11901 from ptibogxiv/patch-263
NEW: delete purchase price API
|
2019-09-27 15:37:21 +02:00 |
|
VESSILLER
|
5f08a649eb
|
FIX empty cache when we want to load specific warehouses in select
Conflicts:
htdocs/product/class/html.formproduct.class.php
|
2019-09-27 15:10:05 +02:00 |
|
Laurent Destailleur
|
8ef227f24a
|
Merge pull request #11902 from OPEN-DSI/fix-formproduct-select-warehouses-cache
FIX empty cache when we want to load specific warehouses in select
|
2019-09-27 14:59:14 +02:00 |
|
Laurent Destailleur
|
6858dce344
|
Rename table for categorie of warehouses
|
2019-09-27 13:28:28 +02:00 |
|
Laurent Destailleur
|
961f2b5165
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
|
2019-09-24 14:25:02 +02:00 |
|
Laurent Destailleur
|
6431e8e16d
|
FIX SQL injection on qty
|
2019-09-24 12:43:44 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
VESSILLER
|
6e806a5aed
|
FIX empty cache when we want to load specific warehouses in select
|
2019-09-16 10:37:55 +02:00 |
|
ptibogxiv
|
ea1baefe9a
|
NEW: delete purchase price API
|
2019-09-15 20:50:18 +02:00 |
|
Laurent Destailleur
|
12d67c5f85
|
Rename api to get all purchase prices
|
2019-09-15 17:18:10 +02:00 |
|
Laurent Destailleur
|
68a3c5b41c
|
Merge pull request #11853 from ptibogxiv/patch-259
NEW add supplier's product list
|
2019-09-15 17:04:17 +02:00 |
|
Laurent Destailleur
|
5d0ba10f34
|
Update api_products.class.php
|
2019-09-15 17:04:08 +02:00 |
|
Laurent Destailleur
|
4a815da993
|
Merge pull request #11854 from OPEN-DSI/new-formproduct-loadWarehouses-stockmin-order
NEW add minimum stock filter in load warehoues for product form
|
2019-09-14 17:09:27 +02:00 |
|
stickler-ci
|
1e8663b1c8
|
Fixing style errors.
|
2019-09-10 18:48:55 +00:00 |
|
ptibogxiv
|
651fbde64d
|
Merge branch 'develop' into patch-187
|
2019-09-10 20:46:54 +02:00 |
|
Laurent Destailleur
|
61cf47aa16
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-10 00:14:07 +02:00 |
|
VESSILLER
|
6a734ea828
|
NEW add minimum stock filter in load warehoues for product form
|
2019-09-09 16:58:20 +02:00 |
|
stickler-ci
|
be66e1bd20
|
Fixing style errors.
|
2019-09-09 14:36:02 +00:00 |
|
ptibogxiv
|
f4a565544f
|
Update api_products.class.php
|
2019-09-09 16:33:12 +02:00 |
|
Laurent Destailleur
|
a5f7211730
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/install/repair.php
|
2019-09-06 16:10:55 +02:00 |
|
Laurent Destailleur
|
348ab4765c
|
Fix sql injection
|
2019-09-06 15:20:04 +02:00 |
|
Laurent Destailleur
|
529dd05226
|
Replace deprecated code
|
2019-09-06 10:53:05 +02:00 |
|
Frédéric FRANCE
|
a5aedacb7e
|
Update productbatch.class.php
|
2019-09-03 16:49:41 +02:00 |
|
Laurent Destailleur
|
ffcea3dfd8
|
Fix phpcs
|
2019-09-03 14:48:06 +02:00 |
|
ptibogxiv
|
d7cc76b94a
|
NEW purchase_prices API
|
2019-08-26 20:10:00 +02:00 |
|
ptibogxiv
|
1b4788c6d0
|
Update product.class.php
|
2019-08-24 14:21:41 +02:00 |
|
ptibogxiv
|
0ce22d68ef
|
Update product.class.php
|
2019-08-10 09:43:26 +02:00 |
|
ptibogxiv
|
4f69be2c2c
|
Update product.class.php
|
2019-08-10 09:12:40 +02:00 |
|
ptibogxiv
|
33cf4d8417
|
Update product.class.php
|
2019-08-10 09:12:15 +02:00 |
|
ptibogxiv
|
3e94b3dc59
|
FIX count negative in stats whithcredit note
|
2019-08-06 16:54:44 +02:00 |
|
ptibogxiv
|
d22c2960b7
|
Update product.class.php
|
2019-08-06 00:14:19 +02:00 |
|
ptibogxiv
|
2d77bfd873
|
Update product.class.php
|
2019-08-04 14:50:25 +02:00 |
|
ptibogxiv
|
c9e481d6f7
|
Update product.class.php
|
2019-08-04 14:09:59 +02:00 |
|
ptibogxiv
|
f5f6882583
|
Update product.class.php
|
2019-08-04 13:42:50 +02:00 |
|
Laurent Destailleur
|
adfbd62f8b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-14 00:44:35 +02:00 |
|
Laurent Destailleur
|
694be619b2
|
Fix doxygen
|
2019-07-11 22:16:32 +02:00 |
|
Laurent Destailleur
|
b065cbc6f8
|
FIX #11446
|
2019-07-04 12:09:04 +02:00 |
|
atm-josselin
|
c24a95b7ad
|
Sanitize at creation of the product instead of the creation of the filepath
|
2019-07-01 09:31:01 +02:00 |
|
Laurent Destailleur
|
b177787f0a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
htdocs/product/class/product.class.php
|
2019-06-29 18:28:51 +02:00 |
|
Laurent Destailleur
|
93b0e45246
|
Fix duplicate class in some cases
|
2019-06-29 02:27:58 +02:00 |
|
Laurent Destailleur
|
36e240a16d
|
NEW Add statistics on product into contracts
|
2019-06-29 02:03:57 +02:00 |
|
Laurent Destailleur
|
3ca258c93d
|
Remove dead code
|
2019-06-24 22:58:21 +02:00 |
|
Laurent Destailleur
|
b202c7eaa0
|
Fix confusion between ->childs and ->childsoncascade
|
2019-06-22 20:17:40 +02:00 |
|
Laurent Destailleur
|
1a6dc83d4c
|
Fix: default accounting account for eec and export sales were not used.
|
2019-06-20 12:25:58 +02:00 |
|
Francis Appels
|
a26c868783
|
Fix scrutinizer bugs
|
2019-06-12 22:05:10 +02:00 |
|
ATM John BOTELLA
|
f714b45efb
|
FIX scrutinizer feedback
|
2019-05-18 15:53:07 +02:00 |
|
Christophe Battarel
|
face07ece1
|
new constant PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC
|
2019-05-01 15:15:20 +02:00 |
|
Laurent Destailleur
|
091132de2f
|
Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
|
2019-04-25 12:11:32 +02:00 |
|
Laurent Destailleur
|
cb08bf6021
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/class/product.class.php
|
2019-04-11 16:25:33 +02:00 |
|
Laurent Destailleur
|
54b3acc997
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/product/class/product.class.php
|
2019-04-11 16:23:56 +02:00 |
|
gauthier
|
9a24007c0a
|
FIX : better test
|
2019-04-11 15:32:50 +02:00 |
|
gauthier
|
524b186959
|
FIX : Product accountancey sell intra code must be visible if main feature level 1
|
2019-04-11 15:19:40 +02:00 |
|
Laurent Destailleur
|
fff9b7db9d
|
Fix doxygen
|
2019-04-04 18:33:12 +02:00 |
|
Laurent Destailleur
|
50395b7dd7
|
New: Input field to search product always visible with focus so you can
use a barcode flasher at any time
|
2019-03-28 18:51:04 +01:00 |
|
Laurent Destailleur
|
1a8902f23e
|
Fix migration for compatibility
|
2019-03-19 12:03:02 +01:00 |
|
Laurent Destailleur
|
1a05cdfaa1
|
Fix regressions in selecting duration of service
|
2019-03-19 11:42:50 +01:00 |
|
Laurent Destailleur
|
3c40d5d30c
|
Merge pull request #10821 from OPEN-DSI/fix-select-measuring-units
Fix measure unit id in select options
|
2019-03-14 14:10:13 +01:00 |
|
Frédéric FRANCE
|
ba749ffc8c
|
Update product.class.php
|
2019-03-14 09:14:29 +01:00 |
|
Lionel VESSILLER
|
17dd88d397
|
Fix measure unit id in select options
|
2019-03-13 14:05:32 +01:00 |
|
Laurent Destailleur
|
3559d600e2
|
Merge pull request #10770 from atm-john/theme_badge_status
Add badge status css part1
|
2019-03-11 20:49:31 +01:00 |
|
John BOTELLA
|
57c6c60118
|
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
|
2019-03-11 14:44:35 +01:00 |
|
Frédéric FRANCE
|
86c1694195
|
update doc in product class
|
2019-03-09 10:36:39 +01:00 |
|
Laurent Destailleur
|
d99f4c1726
|
Fix var not used
|
2019-03-09 01:08:50 +01:00 |
|
Scrutinizer Auto-Fixer
|
68188ffda1
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-03-09 00:02:05 +00:00 |
|
Frédéric FRANCE
|
e845b96f2b
|
Update product.class.php
|
2019-03-07 22:40:16 +01:00 |
|
John BOTELLA
|
ca10b1e403
|
add new dolGetStatus to LibStatut in product class
|
2019-03-07 11:37:54 +01:00 |
|
Laurent Destailleur
|
a426c8e9bf
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/compta/facture/class/facture.class.php
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
htdocs/product/class/product.class.php
|
2019-03-07 11:16:24 +01:00 |
|
Laurent Destailleur
|
b15e00cae7
|
FIX Autodetect buy price for invoices autogenerated with templates.
|
2019-03-06 21:39:09 +01:00 |
|
Frédéric FRANCE
|
f283782445
|
change visibility
|
2019-03-04 19:57:46 +01:00 |
|
Frédéric FRANCE
|
014f69850e
|
add visibility
|
2019-03-01 23:08:57 +01:00 |
|
Frédéric FRANCE
|
bd2e541fd6
|
add visibility
|
2019-03-01 18:28:51 +01:00 |
|
Frédéric FRANCE
|
796ea6f4ea
|
add visibility
|
2019-02-28 23:19:58 +01:00 |
|
Frédéric FRANCE
|
27218b7087
|
wip
|
2019-02-24 23:32:09 +01:00 |
|
Regis Houssin
|
1c3541295b
|
FIX wrong class name "CUnits instead CMeasuringUnits"
|
2019-02-19 09:24:30 +01:00 |
|
florian HENRY
|
37c66c2ece
|
travis
|
2019-02-13 12:32:06 +01:00 |
|
florian HENRY
|
de87321c15
|
fix travcis
|
2019-02-13 10:28:08 +01:00 |
|
florian HENRY
|
5b5f96bafb
|
NEW : measuring unit dictionnary and product size/unit import
|
2019-02-12 16:58:11 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Laurent Destailleur
|
9f7dfe2921
|
Merge pull request #10481 from frederic34/psr2forloop
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
|
2019-02-03 19:11:07 +01:00 |
|
Laurent Destailleur
|
e309261140
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-03 18:19:58 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Laurent Destailleur
|
ebe30f7a0e
|
FIX error report not returned
|
2019-02-01 19:19:23 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Laurent Destailleur
|
cc574852d2
|
Fix phpcs
|
2019-01-26 15:20:36 +01:00 |
|
Laurent Destailleur
|
ab262237b2
|
Merge pull request #10393 from fappels/10_add_product_dimensions
NEW Show product dimensions in product list tooltip.
|
2019-01-26 14:14:03 +01:00 |
|
Laurent Destailleur
|
a5daa25707
|
Move common code to get sell price into a method
|
2019-01-24 19:45:17 +01:00 |
|
Francis Appels
|
9227d9fe9b
|
Show product dimensions in product list tooltip.
|
2019-01-22 12:42:02 +01:00 |
|
Philippe GRAND
|
621b42e8e3
|
update with html5 compliant code
|
2019-01-21 10:02:11 +01:00 |
|
Laurent Destailleur
|
300889f53a
|
# WARNING: head commit changed in the meantime
Fix
|
2019-01-19 13:22:38 +01:00 |
|
Laurent Destailleur
|
2bbaae88d6
|
Fix standardize 'createfromclone' param when cloning
|
2019-01-19 12:46:38 +01:00 |
|
ldestailleur
|
bc00fb177a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-02 19:42:15 +01:00 |
|
JC Prieto
|
99e2f893fd
|
Fix: loadBatchInfo()
|
2019-01-02 19:38:44 +01:00 |
|
Laurent Destailleur
|
5c516fdae2
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
|
2018-12-26 19:43:01 +01:00 |
|
Laurent Destailleur
|
85375495e5
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/public/notice.php
htdocs/user/card.php
|
2018-12-22 19:06:58 +01:00 |
|
Laurent Destailleur
|
850b939ffd
|
FIX CVE-2018-19994
|
2018-12-22 17:03:50 +01:00 |
|
Laurent Destailleur
|
54a4a54afe
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/en_US/banks.lang
|
2018-12-15 20:00:31 +01:00 |
|
Laurent Destailleur
|
27f8096afa
|
Merge branch 'develop' into PR_NEW_reception
|
2018-12-15 12:50:31 +01:00 |
|
Laurent Destailleur
|
88a52aa11d
|
Merge branch 'develop' into develop_mc
|
2018-12-14 15:58:52 +01:00 |
|
BENKE Charlene
|
946d55a7bb
|
fk_default_warehouse not defined
|
2018-12-12 00:41:11 +01:00 |
|
Regis Houssin
|
aaa9a4f47c
|
FIX use getEntity('invoice') instead getEntity('facture')
|
2018-11-15 17:27:49 +01:00 |
|
Laurent Destailleur
|
84983140b6
|
Merge pull request #9896 from hregis/develop_email
FIX change my deprecated email
|
2018-11-11 17:35:35 +01:00 |
|
Frédéric FRANCE
|
20acf440a3
|
Update api_products.class.php
|
2018-11-10 07:55:01 +01:00 |
|
Frédéric FRANCE
|
b271e1a3b0
|
The variable $i seems to be never defined.
|
2018-11-10 07:27:20 +01:00 |
|
Regis Houssin
|
89389baeac
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
|
2018-11-09 15:37:29 +01:00 |
|
Laurent BOUQUET
|
320e7adef7
|
Fix blank lines and whitespace at end of lines
|
2018-11-08 17:09:54 +01:00 |
|
Laurent Bouquet
|
f05b67909b
|
NEW : Add product search from barcode via REST api
|
2018-11-06 12:13:16 +01:00 |
|
Laurent Bouquet
|
cb10da4d41
|
[Core] Add product search from barcode via REST api
|
2018-11-05 23:06:19 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Laurent Destailleur
|
6edaf3a422
|
Merge branch 'develop' into patch-9
|
2018-10-24 12:24:00 +02:00 |
|
Laurent Destailleur
|
2e0de15f95
|
Add public
|
2018-10-24 11:26:50 +02:00 |
|
Laurent Destailleur
|
f0743c55bb
|
Fix phpcs
|
2018-10-24 11:24:10 +02:00 |
|
Frédéric FRANCE
|
2a6478a2c4
|
fix phpcs
|
2018-10-24 08:15:00 +02:00 |
|
Juanjo Menent
|
e40ee879dc
|
New: works with variants:
- If product is variant disable prices modify
- Add function isVariant for knowing if product is a Variant
|
2018-10-23 13:07:09 +02:00 |
|
atm-quentin
|
8442b405b2
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception
|
2018-10-23 10:27:46 +02:00 |
|
Laurent Destailleur
|
6a6a8ae14b
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-10-19 14:29:22 +02:00 |
|
Laurent Destailleur
|
5a1a5548df
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/discount.class.php
htdocs/core/lib/payments.lib.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/societe/class/societe.class.php
|
2018-10-19 14:27:15 +02:00 |
|
Laurent Destailleur
|
de4ead2558
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/accountancy/class/accountancycategory.class.php
htdocs/core/actions_massactions.inc.php
htdocs/product/reassort.php
|
2018-10-19 14:16:53 +02:00 |
|
Ferran Marcet
|
ffde353441
|
FIX When delete a product, llx_product_association rows are not deleted
|
2018-10-17 10:06:06 +02:00 |
|
Ferran Marcet
|
bdae4e1c4d
|
FIX When delete a product, llx_product_association rows are not deleted
|
2018-10-17 10:04:42 +02:00 |
|