3198 Commits

Author	SHA1	Message	Date
Rémi Gaillard	372ec5e940	Merge pull request #266 from anat/development ... [+] WS : Add product bundle retrieval from Web services	2013-02-11 08:53:31 -08:00
anat	8400eb53e5	[+] WS : Add product bundle retrieval from Web services	2013-02-11 17:51:18 +01:00
Rémi Gaillard	adecde6ee1	[-] FO: don't load medias if error on product page to avoid JS bugs	2013-02-11 17:33:19 +01:00
Rémi Gaillard	03842da02d	[-] FO: Fix Cart::getDeliveryOption() cache	2013-02-11 16:59:16 +01:00
Rémi Gaillard	7e8d0a27ff	[-] BO: Fix #PSCFV-7462 bad sql request for ordering by price in adminproducts	2013-02-11 15:54:53 +01:00
gRoussac	3bd56273ef	[-] CORe : Fix #PSCFV-7314 unregisterHook and unregisterExceptions in module::uninstall	2013-02-11 12:00:54 +01:00
Rémi Gaillard	7ed1a548a2	[-] FO: Fix infinite loop on overriding Module::getPaymentModules and executing hook on it #PSCFV-7760	2013-02-11 11:45:42 +01:00
Rémi Gaillard	f6d9771de8	[-] FO: Fix #PSCFV-7627 customer group reduction was applied on combinations for unidentified users on the product page	2013-02-07 16:06:32 +01:00
vAugagneur	97481cbe84	Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development	2013-02-07 10:46:37 +01:00
vAugagneur	34870f6c40	//small fix	2013-02-07 10:46:31 +01:00
gRoussac	5e98812e19	[-] CORE : file_put_contents() returns the number of bytes that were written to the file, or FALSE on failure.	2013-02-06 19:21:23 +01:00
Rémi Gaillard	ac686b6b48	// use curl against file_get_contents if allow_url_fopen is disabled for contextual help	2013-02-06 16:36:07 +01:00
Daniel	6c7c571381	Update classes/Manufacturer.php ... Fixed issue with not being able to remove manufacturers if they where missing an address. (Possible after an upgrade)	2013-02-06 11:35:15 +08:00
Damien Metzger	063e6597e3	[-] FO : you need to execute CartRule::autoAddToCart() after CartRule::autoRemoveFromCart(), everytime #PSCFV-7674	2013-02-05 18:19:22 +01:00
Rémi Gaillard	3e0e22f25a	Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development	2013-02-05 15:28:28 +01:00
Rémi Gaillard	d2ba246a08	[-] BO: Don't display delete icon for order carts	2013-02-05 15:28:09 +01:00
Damien Metzger	0052a9a94a	[*] Core : added automatic conversion of ',' into '.' for floating values	2013-02-05 15:02:41 +01:00
vAugagneur	5330f4da40	Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development	2013-02-05 14:16:58 +01:00
vAugagneur	64764c4c1e	//added getWidthSize and getHeightSize method in tpl thanks to @PrestaEdit	2013-02-05 14:16:47 +01:00
Rémi Gaillard	a84e91f973	// Fix merge bug	2013-02-05 11:02:05 +01:00
vAugagneur	0ceab34c5e	//failed to delete buffer. No buffer to delete in PDF	2013-02-05 10:12:00 +01:00
Vincent Augagneur	f8c97d8814	Merge pull request #134 from PrestaEdit/patch-2 ... [-] FO: need id_product_attribute to know quantity	2013-02-05 00:52:50 -08:00
vAugagneur	4ef61eb8f8	[-] BO : error message on install module	2013-02-05 09:41:34 +01:00
vAugagneur	b23aa76d6b	Merge branch 'dispatch_modules' into development	2013-02-04 18:20:24 +01:00
vAugagneur	0de5c242ca	[+] BO : new display of payment modules in payment tab	2013-02-04 18:18:50 +01:00
Damien Metzger	a9106be306	Merge pull request #243 from burhanbvk/patch-3 ... [-] FO : Fixed a typo for ui.droppable dependencies	2013-02-04 09:14:20 -08:00
Rémi Gaillard	d4667abc63	Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development	2013-02-04 16:05:17 +01:00
Rémi Gaillard	1dbf4855cc	[-] BO: Fix id_shop for configuration variables in global context for orders	2013-02-04 16:05:01 +01:00
Damien Metzger	a53163feee	[-] Core : Fixed a lot of issue with free shipping vouchers #PSCFV-7325	2013-02-04 16:00:46 +01:00
Damien Metzger	3c6f17b855	// Voucher cleaning	2013-02-04 16:00:45 +01:00
Damien Metzger	4f180b9b27	[-] FO : fixed voucher display in the customer view #PSCFV-7332	2013-02-04 16:00:45 +01:00
Rémi Gaillard	7bd44ca1b1	[-] BO: get the invoice prefix from the right shop	2013-02-04 15:11:29 +01:00
Rémi Gaillard	ceed2c996a	// PHP_SELF is only index.php	2013-02-04 14:22:59 +01:00
Damien Metzger	3156093542	[-] FO : Fixed voucher value when it exceeds the product total #PSCFV-7421	2013-02-04 11:53:07 +01:00
Damien Metzger	3cf9a1aa21	[-] FO : fixed customer discounts #PSCFV-7479	2013-02-04 11:53:06 +01:00
Burhan	233b579ff6	[-] Fixed a typo for ui.droppable dependencies	2013-02-03 23:49:19 +02:00
Damien Metzger	3617a9089c	Merge pull request #151 from Shagshag/patch-2 ... [-] Core : Wrong parameters for Memcache::addServer	2013-02-01 10:04:33 -08:00
Damien Metzger	8d9f878b34	Merge pull request #164 from Shagshag/patch-7 ... [-] BO : OrderHistory::changeIdOrderState	2013-02-01 10:00:10 -08:00
Rémi Gaillard	f0694639eb	Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development	2013-02-01 18:36:48 +01:00
Rémi Gaillard	5490f6063d	[-] Installer: check create table privileges	2013-02-01 18:36:35 +01:00
Damien Metzger	9589131674	[-] Core : cart rule cache cleared on update	2013-02-01 18:30:32 +01:00
gRoussac	68673f92d1	[-] FO : Fix bug #PSCFI-6864 #PSCFV-6516 Issue with deleted address blocking order process	2013-01-31 19:06:19 +01:00
Rémi Gaillard	9455a7185f	[-] FO: Fix #PSCFV-7530 bad quantity returned displayed on order detail for multiple return	2013-01-31 15:10:52 +01:00
gRoussac	88dc561463	// forgot debug sorry	2013-01-31 11:50:19 +01:00
gRoussac	00047b8ae4	[-] BO : Adresses not deduplicate in orders page	2013-01-31 11:33:37 +01:00
gRoussac	95fa1556e7	// norms	2013-01-30 18:52:52 +01:00
gRoussac	764212a27e	[-] CORE : FIx #PSCFV-3163 getextendedstats returning new keys	2013-01-30 18:47:30 +01:00
gRoussac	439f338fd3	[-] FO : Fix fatal error when memcache is not installed and using Memcached	2013-01-30 17:08:51 +01:00
gRoussac	6b691cb7a8	[-] BO : Fix bug #PSCFI-6902 fatal error when memcache not installed and Memcached previously activated	2013-01-30 16:28:11 +01:00
Damien Metzger	77f854b836	// Fixed hook names	2013-01-30 16:03:37 +01:00