Commit Graph

5733 Commits

Author SHA1 Message Date
Rémi Gaillard 7a65f478b6 // miss ; 2013-06-14 11:48:27 +02: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
Kevin Granger b0eaf8124c [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:19:50 +02:00
Kevin Granger 86ef69c9ba [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:03:34 +02:00
Vincent Augagneur 518998ded2 //added bootstrap in BO 2013-06-13 16:35:14 +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 534c10562f [*] Installer : added cookie mode instead of session for the installer 2013-06-13 15:28:16 +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 5bf4c17f4a [-] WS: Fix webservice sort for multishop fields #PSCFV-5634 2013-06-13 12:01:51 +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
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
Rémi Gaillard 1688c7b0e6 [-] FO: Fix no image displayed for products in the cart when it was added from another store in multishop #PSCFV-9385 2013-06-07 15:37:38 +02:00
Damien Metzger 0e75dbdbf8 [*] BO : attributes taken into account for the language entity in the localization packs 2013-06-06 18:53:51 +02:00
Rémi Gaillard b51641ca49 [-] WS: Fix memory leak when getting synopsis 2013-06-06 16:59:03 +02:00
Rémi Gaillard ba1c4b9f3a [-] FO: http page should be redirected to http when accessed with https #PSCFV-9212 2013-06-04 16:27:47 +02:00
Rémi Gaillard 4c5b060e92 [-] Core: Hook actionPaymentConfirmation should also be called for PS_OS_WS_PAYMENT order statuse 2013-06-04 12:08:31 +02:00
Rémi Gaillard 88369ef1f6 [-] FO: Fix Category::getSubCategories() default group used #PSCFV-9356 2013-06-03 18:18:54 +02:00
Rémi Gaillard 6d84d5833d [-] FO: Fix Order::getOrdersTotalPaid() reference is now a string #PSCFV-9342 2013-06-03 11:49:55 +02:00
gRoussac ff2c3725d3 [-] Bo : Fix #PSCFV-9306 report of #PSCFI-7115 Add a new specific price = faulty validation 2013-05-31 18:10:41 +02:00
gRoussac f84e8331de Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-31 17:39:55 +02:00
gRoussac 5a1440efe4 [-] Fix bug #PSCFI-5839 delete attached file from curstomer thread deletion 2013-05-31 17:39:34 +02:00
Francois Gaillard dfac99dc64 [-] Classes : Db classe fixed (check InnoDB support MySQL >= 5.6) 2013-05-30 16:23:24 +02:00
Rémi Gaillard 8ecc6313c1 [-] BO: Fix combinations duplication on multishop with context all for the product duplication #PSCFV-9020 2013-05-29 12:08:15 +02:00
Rémi Gaillard 08023b4bc3 [-] FO: Fix Carrier::getDeliveredCountries for multishop #PSCFV-9279 2013-05-28 17:41:20 +02:00
gRoussac cbaae172cd [-] BO : Report of #PSCFI-6790 REQUEST_URI badly recorded 2013-05-28 10:29:51 +02:00
gRoussac a04e6b1a67 [-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link 2013-05-27 18:13:13 +02:00
gRoussac 4eabc11573 [-] PDF : Fix dejavusans font for en lang 2013-05-27 18:13:13 +02:00
gRoussac f8359173be [-] CORE : Report of https://github.com/PrestaShop/PrestaShop-1.4/commit/a6e8a2eda7fe3bab5245df9b98df7b2f6f7d541f 2013-05-27 18:13:13 +02:00
Rémi Gaillard fce9a0e285 // same for attributes and attributegroups 2013-05-27 18:13:13 +02:00
gRoussac 5743696596 [-] FO : Fix bug #PSCFV-9171, can not order with a unactivated country 2013-05-27 18:13:12 +02:00
Francois Gaillard 97e4284f16 [-] BO : Fixed unregistered version field for some modules 2013-05-27 18:12:40 +02:00
Rémi Gaillard 6f901cea37 [-] BO: Fix language deletion with multishop when shops still associate to the language #PSCFV-9244 2013-05-24 11:28:07 +02:00
vAugagneur 220dda354b [-] BO : fixed bug #PSCFV-9178 - is_color_group is not inserted correctly 2013-05-24 10:47:48 +02:00
Vincent Augagneur f234d847fb Merge pull request #444 from PrestaEdit/patch-38
[*] Class: Module / Use method instead of SQL query
2013-05-23 05:21:11 -07:00
Damien Metzger 478dd0d39d [-] Core : fixed URL regexp #PSCFV-8986 2013-05-23 12:13:28 +02:00
Rémi Gaillard 0e45c649d9 [-] FO: Tools::getMediaServer() should return Tools::getShopDomain() instead of Tools::getHttpHost() #PSCFV-9217 2013-05-22 10:42:35 +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 5312290774 [-] BO: Fix PHP warning on orderslip generation without ecotax #PSCFV-8743 2013-05-21 15:25:58 +02:00
PrestaEdit f5828aa49a // use getModuleIdByName() 2013-05-21 13:11:41 +02:00
PrestaEdit 770d925729 [*] Class: Module / Use method instead of SQL query 2013-05-21 13:03:41 +03:00
vAugagneur dc5df43d16 //remove useless comments 2013-05-21 11:28:24 +02:00
Vincent Augagneur 6d6b2ef7d3 Merge pull request #225 from emily-d/development
[-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Red...
2013-05-21 02:27:30 -07:00
vAugagneur 0d4fd0729b //small bug 2013-05-21 10:30:35 +02:00
vAugagneur 3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
vAugagneur ec87deb016 [-] BO : remove deprecated parameter when call Tools::link_rewrite() part 2 2013-05-20 16:39:08 +02:00
vAugagneur 7aef793e65 [-] BO : remove deprecated parameter when call Tools::link_rewrite() 2013-05-20 16:33:12 +02:00