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

255 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
Kevin Granger
889a2006ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/message.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/favorites.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
	admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/combinations.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/ProductSale.php
	classes/helper/HelperList.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminCustomersController.php
	controllers/admin/AdminMetaController.php
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminProductsController.php
	controllers/front/ParentOrderController.php
	install-dev/theme/views/welcome.phtml
	modules/blocknewproducts/blocknewproducts.php
	modules/blocktopmenu/blocktopmenu.php
	modules/importerosc/importerosc.php
	modules/mailalerts/mailalerts.php
	modules/shopimporter/shopimporter.php
	modules/statsstock/statsstock.php
	themes/default/css/product_list.css
 2013-11-04 14:43:01 +01:00
Rémi Gaillard
c6997bd525 // move clear cache of color list 2013-10-22 11:09:55 +02:00
gRoussac
af9182dad5 [-] CORE , follow up b87e934a66 and a10dcab6e7 2013-10-14 10:51:17 +02:00
kiropowered
a10dcab6e7 Update StockMvt.php 
Fix bug if product have attribute
 2013-10-12 14:28:27 +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
Jérôme Nadaud
b87e934a66 [-] BO : FixBug #PSCFV-8060 Error getting last quantity and price in stock mouvement 2013-07-22 14:58:55 +02:00
Rémi Gaillard
fe5a54cfcc [-] Core: Fix StockManager::getProductRealQuantities() per warehouse with some orderstatuses #PSCFV-9219 2013-05-22 10:30:57 +02:00
Rémi Gaillard
dff200ac9d [-] Core: Fix StockManager::getProductRealQuantities() for refunded quantities on non delivered orders 2013-05-14 09:53:33 +02:00
Rémi Gaillard
fe8070cde2 // PR-313 2013-03-11 10:55:56 +01:00
Rémi Gaillard
f23447e3d3 [-] BO: Fix #PSCFV-8068 stock available total cache after deleting a combination 2013-03-01 14:55:47 +01:00
Rémi Gaillard
b9fec8eb0c // Fix merge bug 2013-02-05 11:02:05 +01:00
Rémi Gaillard
969e5d5bb5 [-] Core: Hook actionUpdateQuantity was not called for product without attributes which depends on the physical stock 2013-01-16 14:08:33 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
rGaillard
eac368cf10 [-] Core: Fix #PSCFV-5327 the computation of real stock quantities was bad sometimes 2012-11-16 13:38:32 +00:00
rGaillard
9499476837 [-] BO : Fix carrier association listing on warehouse form 2012-11-06 15:23:57 +00:00
rGaillard
02177e6b1a [-] Core: StockAvaible::updateQuantity should return a value 2012-11-06 10:54:05 +00:00
rGaillard
0eafc88cbd // 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
abb97f8c29 // Fix for quantities update 2012-10-22 16:40:10 +00:00
rGaillard
f0bff6d8da // Fix #PSCFV-5166 2012-10-22 16:10:49 +00:00
rGaillard
b88a0e4b98 [-] Core: Fix #PSCFV-4737 2012-10-17 13:45:27 +00:00
lLefevre
ece74e27c2 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre
07ca3c5258 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
f6297b081d [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
rGaillard
90650a8f55 // Fix #PSCFV-4628 2012-10-02 18:57:39 +00:00
rGaillard
6a6cc86c11 [*] WS: management of stockavailables 2012-09-25 10:11:51 +00:00
rGaillard
80fd92a59c // The END 2012-09-13 18:20:47 +00:00
dMetzger
c5e83da407 // Added security check in stock available 2012-09-13 16:11:06 +00:00
rGaillard
4d10f557d7 // Fix PSCFV-3962 2012-09-10 09:04:37 +00:00
rGaillard
a52ab4211f // Small fix 2012-08-31 12:58:52 +00:00
dMetzger
f5bcab7459 // Opti 2012-08-31 12:16:15 +00:00
rGaillard
15566942f5 [-] BO: fix PSCFV-3468 bad real quantity was displayed on Instant Stock Status 2012-08-06 09:44:07 +00:00
rGaillard
4a4b0a23d4 // Fix random bugs with stock 2012-08-03 17:15:19 +00:00
rGaillard
844b97318e [-] Core: Fix PSCFV-3092 2012-08-03 14:40:31 +00:00
rGaillard
10d148782a [-] BO: Fix some bugs on advanced stock management 2012-07-16 18:29:34 +00:00
rGaillard
d36105a60a [-] Core: Fix PSCFV-2695 advanced stock management fix when you have no warehouse 2012-07-16 09:54:01 +00:00
rGaillard
78bfe42a87 // Fix some bug on advanced stock management 2012-07-11 15:46:39 +00:00
rGaillard
836aac77de [-] BO: Fix bugs with stock management 2012-06-25 14:46:03 +00:00
rGaillard
cc441b4c1b // Cookies subdomain & bug fix on stocks 2012-06-21 16:11:30 +00:00
rGaillard
5040e9539d // Fix many bug with stock 2012-06-21 10:41:11 +00:00
rGaillard
6b85e6a641 // Optimizations and clean ajax.php 2012-06-19 16:47:04 +00:00