Commit Graph

17096 Commits

Author SHA1 Message Date
Damien Metzger aefc22bb10 [-] BO : fixed quote issue with magic quote in customization in adminorders #PSCFV-9311 2013-06-17 11:40:35 +02:00
Damien Metzger c53d2d04ce [-] BO : fixed parsing of discount value in AdminOrders #PSCFV-9481 2013-06-17 11:16:16 +02:00
Gregory Roussac 3a5a9dea14 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-15 01:57:46 +02:00
Gregory Roussac ce9f262feb [-] BO : Upload image name with trailing slash in name 2013-06-15 01:55:02 +02:00
Damien Metzger 319413ca25 // Added errors to user assistance 2013-06-14 15:08:36 +02:00
Vincent Augagneur 148cb6c123 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-14 15:01:27 +02:00
Vincent Augagneur 6778b17b23 [-] BO - fixed bug #PSCFV-9347 - Saving the E-Mail preferences loses the smtp server password 2013-06-14 15:01:22 +02:00
Damien Metzger eae2a16442 // Removed button hide in contact form (create issues with the back button in the browser for example) 2013-06-14 11:56:47 +02:00
Rémi Gaillard 909a459e5d // miss ; 2013-06-14 11:49:04 +02:00
Damien Metzger 12e13e275f [-] BO : fixed ajax in permissions tab #PSCFV-7442 2013-06-14 11:20:38 +02:00
Vincent Augagneur 2ae0e4f844 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-14 11:17:18 +02:00
Vincent Augagneur ff63e0a28c [-] BO : fixed bug #PSCFV-9405 - Delete file of downloadable product when cancel 2013-06-14 11:17:07 +02:00
Damien Metzger 331dcc4d6e [-] BO : Fixed permission update #PSCFV-7441 2013-06-14 10:48:24 +02:00
Damien Metzger 5493010e67 [-] BO : postcode required in manufacturer address 2013-06-14 10:25:37 +02:00
gRoussac 39320ad866 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-14 10:22:51 +02:00
gRoussac 9260a43d7d [-] INSTALLER : Shown index can return empty array 2013-06-14 10:20:48 +02:00
Damien Metzger ff876034b4 // Fixed display of the image option "legacy system" 2013-06-14 09:57:00 +02:00
Damien Metzger 76f686a95b Merge pull request #496 from matthieume/master
[*] FO : NewProductController: new products page must display latest products first.
2013-06-14 00:28:39 -07:00
Damien Metzger 1a2ee6c8be Merge pull request #489 from axome/core_cartrule_gift_with_same_category_restriction
[-] CORE : CartRule::checkProductRestrictions : A gift product in the same category as its restrictions causes the gift to stay in the cart even if emptied
2013-06-13 10:13:22 -07:00
Damien Metzger cd6f415dc1 [-] BO : fixed link in AdminTracking #PSCFV-7409 2013-06-13 18:38:00 +02:00
Vincent Augagneur 4a1de9bf31 Merge pull request #495 from SebSept/development
[-] BO : fix require path to config.inc.php
2013-06-13 09:07:26 -07:00
Seb 6a2eddd81f [-] BO : fix require path to config.inc.php 2013-06-13 17:59:01 +02:00
Damien Metzger 80908e0a6f [-] MO : do not check the VAT number if the module is disabled #PSCFV-9397 2013-06-13 16:34:34 +02:00
Damien Metzger be0d6f1c6c // Just to be sure that we will not have any regression 2013-06-13 15:35:17 +02:00
Damien Metzger 534c10562f [*] Installer : added cookie mode instead of session for the installer 2013-06-13 15:28:16 +02:00
Rémi Gaillard fafb7fdef7 [-] BO: Fix #PSCFV-8904 bad id_warehouse is stored on ps_address table 2013-06-13 15:05:55 +02:00
Rémi Gaillard f5dfb12e4d [-] BO: association of product attributes on associating a product to another shop #PSCFV-8735 2013-06-13 14:30:21 +02:00
Rémi Gaillard e8288c5d7a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-13 12:02:09 +02:00
Rémi Gaillard 5bf4c17f4a [-] WS: Fix webservice sort for multishop fields #PSCFV-5634 2013-06-13 12:01:51 +02:00
Damien Metzger ecf59957ba [-] FO : fixed pdf template #PSCFV-9430 2013-06-13 11:18:03 +02:00
Damien Metzger babfbaa2d2 // Added missing space in installer 2013-06-13 11:00:01 +02:00
Damien Metzger d6b884b7b5 [-] MO : removed doubled "/" in homeslider template #PSCFV-9439 2013-06-13 10:34:35 +02:00
Damien Metzger e4535e892d [-] MO : fixed editorial issue when the entity does not exist yet for a shop #PSCFV-9442 2013-06-13 10:31:39 +02:00
Damien Metzger a4e6ddf29c [*] MO : blocklayered optimization 2013-06-13 09:42:34 +02:00
Damien Metzger b401ceb9d9 [-] MO : do not truncate order return state in pscleaner #PSCFV-9431 2013-06-13 08:57:31 +02:00
Rémi Gaillard 5d6d06f8fb [-] BO: Fix #PSCFV-9428 features duplicated with multishop on Feature::getFeatures() 2013-06-12 18:24:14 +02:00
Rémi Gaillard 1cd9d1bb7a [-] FO: Fix shop restriction on features #PSCFV-7848 2013-06-12 17:38:46 +02:00
Rémi Gaillard b3a823f876 [-] BO: Fix #PSCFV-7763 Re-inject quantities after deleting a product from a order 2013-06-12 17:08:00 +02:00
Rémi Gaillard 91ececef1a // missing return statement 2013-06-11 12:19:04 +02:00
Rémi Gaillard 7ed9ceb593 [-] BO: Addresses are now totally deleted from the database if not used on a order 2013-06-11 12:18:05 +02:00
MatthieuB cafbed08ee NewProductController: new products page must display latest products first.
Override default configuration values: cause the new products page must
display latest products first.
2013-06-10 21:13:23 +02:00
Rémi Gaillard f3000f6c65 [-] BO: Fix #PSCFV-6657 translations of overriden admin templates 2013-06-10 18:23:59 +02:00
Nicolas Sorosac 72def39102 [-] CORE : CartRule::checkProductRestrictions : A gift product in the same category as its restrictions causes the gift to stay in the cart even if emptied 2013-06-10 17:43:03 +02:00
Rémi Gaillard 1838003353 [-] WS: Fix #PSCFI-7009 product prices on orders with specific prices 2013-06-10 16:59:02 +02:00
Rémi Gaillard d64b5efd10 [-] WS: Fix deletion of product_features on product update #PSCFI-6740 2013-06-10 16:23:16 +02:00
Vincent Augagneur 433e9338d9 //fix notice 2013-06-10 12:16:23 +02:00
Vincent Augagneur 5ec9aa56ac //small fix 2013-06-10 12:15:11 +02:00
Vincent Augagneur 12872fea65 [-] BO - fixed bug #PSCFV-9071 - PS_SHOP_DOMAIN and PS_SHOP_DOMAIN_SSL have not updated after updated Shop domain and SSL domain from Preferences > SEO & URLs 2013-06-10 10:47:57 +02:00
Vincent Augagneur a73326bfb2 [-] FO - fixed bug #PSCFV-9075 2013-06-10 10:22:44 +02:00
Vincent Augagneur 0334f593da [-] FO : fixed bug #PSCFV-9092 - conflict on the company field during account creation 2013-06-10 10:10:56 +02:00