6230c6249e
[-] FO : fixed potential error when you delete a best seller #PSCFV-11167
2013-12-02 09:25:41 +01:00
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
9c5303df1d
// Deactivate customer groups in the install (automatically reactivated if you add a group or set a reduction)
2013-11-21 14:57:55 +01:00
9f1c39a7d6
[*] FO : Added the possibility to deactivate customer groups management (for performances) [part 1]
2013-11-21 12:32:51 +01:00
5f47526ed2
[-] FO : Fixed bug #PSCFV-11076
2013-11-21 12:13:30 +01:00
dd05692400
[-] FO : Fixed errors when calculating most selled products from footer link
2013-11-12 16:36:07 +01:00
a81cde11d6
[-] Classes : ProductSale - Merge fix
2013-11-04 15:35:59 +01:00
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
5fd3ad5adf
[*] FO ProductSale: improves calculation of most selled products when there are a lot of products in shop
2013-10-23 10:55:23 +02:00
aefa821d7f
[*] MO : TM - Blockcart added Layer
2013-10-21 16:55:47 +02:00
67dc7aac04
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/modules/filters.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/orders/form.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
classes/Category.php
classes/controller/AdminController.php
controllers/admin/AdminAttributesGroupsController.php
controllers/admin/AdminFeaturesController.php
controllers/admin/AdminImportController.php
controllers/admin/AdminLogsController.php
install-dev/install_version.php
install-dev/langs/ru/data/tab.xml
js/admin_carrier_wizard.js
modules/loyalty/loyalty.php
2013-10-14 12:21:29 +02:00
d141f5bdc0
// wrong modif on ProductSale
2013-10-04 18:35:30 +02:00
c2bcc5baa1
[*] FO : TM home modules preparation
2013-10-04 18:32:31 +02:00
ecb4ccfdda
// Fix product visibility on Product::getAccessories and ProductSale::getBestSales #PSCFV-9760
2013-10-01 09:56:26 +02:00
601bfa628b
[-] FO :ProductSale::getBestSales() by modified date renders SQL error, thanks @SebSept
2013-08-07 18:10:39 +02:00
2de866eff3
Correct assignation of $order_way parameter
2013-08-05 12:21:19 +02:00
6955594290
[-] FO : fixed bug #PSCFV-9007 - Best sales query has ambigious column when sorted on date_add
2013-06-24 11:43:20 +02:00
1dabfcef6a
[-] BO : Fix bug #PSCFI-7141, wrong quantity and sales number in Product Sales, thankx to @Tuan Tran
2013-04-25 18:02:33 +02:00
828ffb74ad
[-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller
2013-04-18 17:02:45 +02:00
17c9814f63
[-] Core: Fix the listings in multishop context when you have at least a combination on one shop and not on the others and the same for the images
2013-03-20 20:12:28 +01:00
25675b8d38
[-] Core: ProductSale no more takes products with no visibility
...
Fixed bug that's ProductSale is taking products with no visibility, displaying them in module blockbestsellers. But as they have no visibility, we don't want to display them!
2013-02-22 14:12:24 +01:00
064ba453e6
// Welcome 2013
2013-01-04 11:19:03 +01:00
b10b53028f
[-] FO: Fix #PSCFV-6159 order way of best sales
2013-01-03 12:08:29 +01:00
a1db83ef41
//remove svn keyword @version Release: $
2012-11-22 11:57:40 +01:00
779cf350af
// Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files
2012-10-17 09:29:43 +00:00
046b51ab99
// #PSCFV-5017 : update bad licenses in all files
2012-10-17 06:18:59 +00:00
34825cab48
// Fix #PSCFV-4200
2012-09-21 13:50:21 +00:00
3835d068d2
[*] Core: Image covers is now multishop
2012-09-14 14:25:44 +00:00
49869aaaaf
// MERGE product_multistore branch : product fields are now editable per shop
2012-04-17 13:32:12 +00:00
77774d0d94
// id_category_default is now for multishop
2012-02-27 13:53:52 +00:00
9c6b80fabe
// Replace shop->addSqlAssociation() by static call
2012-02-27 13:07:51 +00:00
8f0257fc87
// Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions
2012-02-27 12:15:30 +00:00
41390e9be5
[+] Core : products and carriers tax rules are associated to shop
2012-02-24 09:26:18 +00:00
14e6929565
// Welcome 2012²
2012-02-23 16:33:10 +00:00
eb97902fdd
[*] Classes : table prefix is no longer required in Db::getInstance()->delete() method
2012-02-16 14:54:52 +00:00
211e431586
// Normalize some classes
2012-01-23 15:25:43 +00:00
3a7325c75e
[-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376
2012-01-19 10:14:10 +00:00
f426575405
// Stock Available : Improve BackOffice interfaces with groups of shops management + bugs fix
2011-12-02 17:31:16 +00:00
bfb0101a19
// Stock Available : Improve BackOffice interface + Update all SQL requests relative to StockAvailable + code refactoring on Product Class
2011-12-01 19:09:27 +00:00
e6f45e54a6
// Replace shop->sqlAsso(), shop->sqlLang() and shop->sqlRestriction() with shop->addSqlAssociation(), shop->addSqlRestrictionOnLang() and shop->addSqlRestriction()
2011-10-17 09:46:08 +00:00
3105fc5ddc
// Add stock avaibility
2011-10-13 15:58:29 +00:00
9510337b1d
// Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names
2011-10-10 12:18:56 +00:00
fa88884229
// Fix some bugs on multishop
2011-08-22 13:44:20 +00:00
c17e7c236d
// MERGE with 1.4 r7770
2011-07-28 09:20:57 +00:00
3f9a9e41d7
// id_shop on cart product (for links) + change Shop::sqlAsso() + share_order
2011-07-22 08:57:51 +00:00
73d6f4267b
// Context part 16 (shops)
2011-07-20 12:08:15 +00:00
ba2922a823
// Context part 13
2011-07-19 09:44:10 +00:00
2d77925e7d
// Refactoring of shop class with new context
2011-07-12 16:28:20 +00:00
89920e17fd
// Context part 2
2011-07-12 12:50:00 +00:00
8fc7f11014
2011-07-06 10:54:11 +00:00
Damien Metzger