dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,989 Commits 9 Branches 19 Tags
0af76e01fb303fa6eeb7ee7a78755d2bc8dfd708
Commit Graph

90 Commits

Author SHA1 Message Date
Kevin Granger
9eefcfd058 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/modules.css
	admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/Autoload.php
	classes/Carrier.php
	classes/Product.php
	classes/ProductSale.php
	classes/Tools.php
	classes/Validate.php
	classes/tax/TaxRulesTaxManager.php
	controllers/admin/AdminPPreferencesController.php
	controllers/admin/AdminPerformanceController.php
	install-dev/install_version.php
	js/admin_carrier_wizard.js
	modules/blockcategories/blockcategories.php
	modules/blocklayered/blocklayered.php
	modules/statsequipment/statsequipment.php
	modules/statsproduct/statsproduct.php
	modules/watermark/watermark.php
	themes/default/address.tpl
	themes/default/authentication.tpl
	themes/default/category.tpl
	themes/default/contact-form.tpl
	themes/default/css/history.css
	themes/default/header.tpl
	themes/default/js/cart-summary.js
	themes/default/js/product.js
	themes/default/mobile/order-detail.tpl
	themes/default/modules/blocksearch/blocksearch.tpl
	themes/default/modules/productcomments/productcomments.tpl
	themes/default/order-carrier.tpl
	themes/default/order-detail.tpl
	themes/default/order-opc-new-account.tpl
	themes/default/product.tpl
 2013-11-21 17:43:51 +01:00
gRoussac
fee461fdf1 [*] FO : Set cache for StockAvailable::getQuantityAvailableByProduct 2013-11-11 01:00:55 +01:00
Rémi Gaillard
c6997bd525 // move clear cache of color list 2013-10-22 11:09:55 +02:00
Rémi Gaillard
1316bd7e1f // add check stock value for color list if needed 2013-10-11 14:11:12 +02:00
gRoussac
fcc2930693 [-] BO : Remove duplicate sql insert in setProductOutOfStock in monoshop 2013-10-09 09:19:22 +02:00
gRoussac
f30bc80485 [-] BO : Remove duplicate sql insert in setProductOutOfStock in monoshop 2013-10-01 10:48:17 +02:00
Rémi Gaillard
31c94caebc [-] BO: Fix out of stock creation with multishop and stock sharing 2013-09-11 16:22:13 +02:00
Damien Metzger
168759a383 // Stock performance optimization 2013-07-31 18:46:45 +02:00
Rémi Gaillard
f60daa5ee5 // PR-313 2013-03-11 10:55:56 +01:00
Rémi Gaillard
6470573f4a [-] BO: Fix #PSCFV-8068 stock available total cache after deleting a combination 2013-03-01 14:55:47 +01:00
Rémi Gaillard
d0074ed724 [-] Core: Hook actionUpdateQuantity was not called for product without attributes which depends on the physical stock 2013-01-16 14:08:33 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
rGaillard
5cd5eff316 [-] Core: StockAvaible::updateQuantity should return a value 2012-11-06 10:54:05 +00:00
rGaillard
a92d92347a // Don't set stockavailable to 0 if stock management is enabled but not configured for the product 2012-10-23 08:18:31 +00:00
rGaillard
7c76c6048d // Fix for quantities update 2012-10-22 16:40:10 +00:00
rGaillard
2a2f33ede2 // Fix #PSCFV-5166 2012-10-22 16:10:49 +00:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
rGaillard
7ee95c63f6 // Fix #PSCFV-4628 2012-10-02 18:57:39 +00:00
rGaillard
710cbea17b [*] WS: management of stockavailables 2012-09-25 10:11:51 +00:00
rGaillard
968b2cc88f // The END 2012-09-13 18:20:47 +00:00
dMetzger
6dcd71399f // Added security check in stock available 2012-09-13 16:11:06 +00:00
rGaillard
4184b1431f // Fix PSCFV-3962 2012-09-10 09:04:37 +00:00
dMetzger
17988ab511 // Opti 2012-08-31 12:16:15 +00:00
rGaillard
b6f6fb1475 // Fix random bugs with stock 2012-08-03 17:15:19 +00:00
rGaillard
ae5acf0be9 [-] Core: Fix PSCFV-3092 2012-08-03 14:40:31 +00:00
rGaillard
d85f9ebb9b [-] BO: Fix some bugs on advanced stock management 2012-07-16 18:29:34 +00:00
rGaillard
d902b62c91 [-] Core: Fix PSCFV-2695 advanced stock management fix when you have no warehouse 2012-07-16 09:54:01 +00:00
rGaillard
f581544632 [-] BO: Fix bugs with stock management 2012-06-25 14:46:03 +00:00
rGaillard
06c56b34d7 // Cookies subdomain & bug fix on stocks 2012-06-21 16:11:30 +00:00
rGaillard
21939edce0 // Fix many bug with stock 2012-06-21 10:41:11 +00:00
rGaillard
17fb637ff5 // Optimizations and clean ajax.php 2012-06-19 16:47:04 +00:00
mDeflotte
a2bc63ca21 [-] BO : #PSCFV-2790 - Fix bug with Stock Advanced 2012-06-15 09:39:50 +00:00
rGaillard
0a1e9d2124 // Performance optimizations 2012-06-14 14:11:11 +00:00
mDeflotte
bc5409ceda [-] Project : #PSCFV-2790 - Fix bug with stock synchronization 2012-06-13 12:18:15 +00:00
rMalie
68e252fd4c // Fix double cast of denis 2012-06-12 12:59:59 +00:00
rMalie
2563a93845 // Fix depends_on_stock on Adminproducts #PSCFV-2698 2012-06-07 09:14:16 +00:00
rGaillard
ee70b85d6b // Improve performance and bug fixes 2012-06-06 16:22:48 +00:00
rMalie
2f5dd84019 // Fix out of stock on combinations with no quantity (thank you Brice <3) 2012-05-30 13:48:23 +00:00
tDidierjean
08cd24f218 [-] BO : fix #PSCFV-2545 - can't change product out of stock order status 2012-05-23 16:38:33 +00:00
rGaillard
38c27068e4 // Fix product bug when no quantity was added for new products attributes 2012-05-21 14:00:17 +00:00
rGaillard
5bd8345d81 // Fix product stocks on multishop 2012-05-18 14:32:29 +00:00
rMalie
3a2bb555eb // Some optimization #PI-121 2012-04-18 09:57:19 +00:00
rMalie
49869aaaaf // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
vChabot
7dbaaf6d96 // little fix about product import and quantity setup 2012-03-28 15:31:25 +00:00
bMancone
1ff1f00dab // Updated mailalerts module 2012-03-01 13:32:16 +00:00
bMancone
63493b444a // Fixed #PSTEST-804 2012-02-28 15:35:37 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
61f51b280b // Improve multishop API 2012-02-23 15:54:10 +00:00