Commit Graph

6950 Commits

Author SHA1 Message Date
Rémi Gaillard ec3095ac32 [-] BO: Fix manufacturer addresses duplication #PSCFV-9601 2013-06-28 10:18:49 +02:00
Damien Metzger ce7fe6c128 // Removed @ in front of a function (We need the errors!) #PSCFV-9078 2013-06-27 18:11:57 +02:00
Rémi Gaillard 9bafc25878 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-27 15:41:57 +02:00
Rémi Gaillard 17579de481 [-] FO: Fix #PSCFV-9325 all was included on 301 for root deprecated controllers 2013-06-27 15:41:37 +02:00
gRoussac 13b7bc959e [*] BO : Fix #PSCFV-8504 carrier on invoice and delivery slip 2013-06-27 10:56:50 +02:00
Francois Gaillard b8df8e6fb1 [-] Classes : Db : Fixed $link 2013-06-26 17:39:53 +02:00
Damien Metzger 19ee2c953f [*] IN : removed the possibility to choose his own storage engine, automatically select the best one 2013-06-26 14:26:37 +02:00
Vincent Augagneur 3d2e46b14f [-] FO : fixed bug #PSCFV-9388 - newsletter is required error, showing two times 2013-06-26 11:46:02 +02:00
Vincent Augagneur c5e65e1360 [-] BO - fixed bug #PSCFV-9435 - AdminController - processUpdateOptions does not manage required field correctly in a non-mutltishop context 2013-06-26 11:38:08 +02:00
gRoussac 699053da27 [-] FO : Fix bug #PSCFV-8412 no zipcode for countries when default country has no zip code in adress format 2013-06-25 16:17:58 +02:00
Vincent Augagneur b7c5201ad8 Merge pull request #512 from antoniofr/development
[-] FO : #PSCFV-9532 remove hardcoded unidentified group number
2013-06-25 06:06:05 -07:00
Axome 7f7cd3bdaa [*] BO : Correct Request Sql Manager validate options
Correct Request Sql Manager validate options :
- No size limit for the request
- cutJoin() doesn't work for multiple Join (exemple : LEFT JOIN `XXX ON XXX AND XXX) => Then you can't save the request, even if it work
2013-06-25 11:01:01 +03:00
gRoussac fd3ce0ba6c [-] CORE: Fix bug #PSCFV-9474 missing unity and unit_price_ratio in Cart::getProducts 2013-06-24 17:23:09 +02:00
gRoussac b421d469d2 [-] Fix bug #PSCFV-8109 country creation/activation regarding payment modules restrictions 2013-06-24 16:45:10 +02:00
gRoussac 50c88dc4de [-] BO : Fix bug #PSCFV-7353 can not see the thumb for a scene 2013-06-24 14:50:10 +02:00
Damien Metzger 24d5be445b // Fixed issue with configuration saving after a backup/update or anything linked to the usage of a mysql dump 2013-06-24 14:41:58 +02:00
Vincent Augagneur 41cc67961d [-] CORE : fixed #PSCFV-7451 - error in classes Carrier 2013-06-24 14:40:10 +02:00
Vincent Augagneur 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
Axome f4fc1d3cab [*] BO : AdminControllers : Keep active filter on pagination 2013-06-24 10:57:05 +02:00
gRoussac 7448d17c68 [*] CORE: can not delete class_index.php 2013-06-23 19:53:28 +02:00
Kevin Granger aa8d6d5872 //Porting more components to bootstrap 2013-06-21 17:47:05 +02:00
gRoussac 21d04cb423 [-] BO : Fix bug #PSCFV-9264 bad cancel qty when refund / return 2013-06-20 18:21:55 +02:00
antoniofr f8a40bbb63 [-] FO : #PSCFV-9532 remove hardcoded unidentified group number 2013-06-20 17:29:07 +02:00
Damien Metzger 73800bad09 [-] WS : fixed ?schema=blank (performance issue) 2013-06-19 10:18:54 +02:00
gRoussac 4c4340c9d1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-18 11:32:56 +02:00
gRoussac 6519d3682a [-] CORE : Report of https://github.com/PrestaShop/PrestaShop/pull/504 Thanks @aseques 2013-06-18 11:31:29 +02:00
Kevin Granger 3bdf86e634 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-06-17 19:19:28 +02:00
Rémi Gaillard c5069aaa15 [-] WS: Fix accessories duplication on product update 2013-06-17 18:56:09 +02:00
gRoussac aea53e034a [*] BO : Enable current subtab active class 2013-06-17 18:27:07 +02:00
Damien Metzger 3f0fa3f925 // Fixed warning 2013-06-17 12:15:10 +02:00
Axome 6e383a2d38 Prevent false error for product duplication 2013-06-17 10:16:13 +02:00
Kevin Granger 6648fd3e97 // Reset Bootstrap for backward compatibility 2013-06-14 19:25:18 +02:00
Rémi Gaillard 909a459e5d // miss ; 2013-06-14 11:49:04 +02:00
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