dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,293 Commits 9 Branches 19 Tags
64915d390c1953c6444c6fb57184e13e376ad91a
Commit Graph
8293 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
nezenmoins 64915d390c [-] PDF : Fixed unecessary slash in manufacturer image path test 
In the file_exists test of the manufacturer image path there is an unecessary slash after the constant _PS_MANU_IMG_DIR_, and then we can't display a specific manufacturer image.
 2013-02-11 11:33:06 +01:00
vAugagneur becee63434 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 10:30:38 +01:00
vAugagneur 9e342d5183 [-] BO : fixed bug #PSCFV-7575 - BO shipping price by zones ang weigth error js 2013-02-11 10:30:32 +01:00
Rémi Gaillard ba11328cec [-] BO: Fix #PSCFV-7427 group id used for price computation on order edition 2013-02-08 15:02:15 +01:00
gRoussac c83a0fda3f // small fix on displayError in Admincountries 2013-02-07 18:40:20 +01:00
Damien Metzger 4ab7b7eff4 // Translations 2013-02-07 18:20:19 +01:00
Rémi Gaillard 90462ad746 [-] BO: Fix connection with Addons on AdminModules 2013-02-07 18:01:53 +01:00
Rémi Gaillard 40a81674ba [-] FO: Fix #PSCFV-7714 quantity discounts displaying in product page for specific customer 2013-02-07 16:57:56 +01:00
Rémi Gaillard a6a46e3cce // Disallow click to install steps during process 2013-02-07 16:40:19 +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
Rémi Gaillard 5ba95dddc9 // AdminRequestSql::returnBytes is useless 2013-02-07 14:19:08 +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
Rémi Gaillard 76c80680a2 [-] BO: Forbid to add a pack into a pack 2013-02-06 20:10:59 +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
gRoussac a7588f5cc0 [+] CORE : Add .txt extention to CHANGELOG 2013-02-06 16:46:01 +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
Rémi Gaillard 08d5440c7f // something missing in the last commit 2013-02-06 15:48:16 +01:00
Rémi Gaillard fbf48fadf8 [*] BO: Improvements on customer services - you are now able to create new threads for synced emails 2013-02-06 15:28:57 +01:00
Damien Metzger 85e09e2a0a // Changed default phone number 2013-02-06 14:13:50 +01:00
Rémi Gaillard 19795c1cea [-] FO: Fix fatal error when a customer is deleted and still logged 2013-02-06 11:56:23 +01:00
Damien Metzger 70a5a1247a Merge pull request #253 from Prestaworks/patch-7 
[-] BO : no error message when deleting a manufacturer without address
 2013-02-06 01:14:43 -08: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
Rémi Gaillard 73143db07f [-] MO: Display real price instead of Free for product which are not gifts on blockcart #PSCFV-6423 2013-02-05 18:25:40 +01:00
Rémi Gaillard 604602a6b6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 18:22:58 +01: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
Damien Metzger 38cc7103fb // Fixed conversion commar/dot for floating value in CSV import 2013-02-05 18:09:32 +01:00
Damien Metzger 2df3e7ee8b // Cannot import in a shop that does not exists 2013-02-05 18:09:32 +01:00
Rémi Gaillard 4fe6006e20 [-] BO: Forbid to delete the defaults return statuses 2013-02-05 17:04:17 +01:00
Rémi Gaillard 61265e587f [-] BO: Fix error message for new language creation and iso code not exists 2013-02-05 16:33:29 +01:00
Gregory Roussac 89fba01aa1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 16:13:59 +01:00
sLorenzini b53b7479ab [-] FO: fixed bug rendering Problems in IE6 with default theme - #PSCFV-7628 2013-02-05 15:53:54 +01:00
vAugagneur 2f8f1bf745 //fix small css bug 2013-02-05 15:44:02 +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
gRoussac 2d31bd19e8 [-] TR : Fix #PSCFI-6818 increase input vars in french 2013-02-05 14:18:34 +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 0836efb02f [-] BO: Not allow to give an existing email when editing an employee 2013-02-05 12:20:46 +01:00
gRoussac 6721387e7b [-] CORE : Set default customer group to old default group when upgrading from 1.4.X 2013-02-05 11:53:44 +01:00
Rémi Gaillard 9c31710092 [-] BO: Fix #PSCFV-6497 display of list when deleting customers 2013-02-05 11:27:17 +01:00
Rémi Gaillard a84e91f973 // Fix merge bug 2013-02-05 11:02:05 +01:00
vAugagneur 3f8fce6720 [-] TR : now you can use " or ' in tpl files 2013-02-05 10:59:29 +01:00
Vincent Augagneur 83183a7ee0 Merge pull request #103 from damonsk/patch4 
[*] MO : crossselling - moved javascript include into header hook.
 2013-02-05 01:42:46 -08:00
vAugagneur fb7a82786c [-] CORE : order state preparation now generate delivery slip 2013-02-05 10:15:53 +01:00
vAugagneur 0ceab34c5e //failed to delete buffer. No buffer to delete in PDF 2013-02-05 10:12:00 +01:00
Vincent Augagneur fdf5a4c3e1 Merge pull request #129 from PrestaEdit/Forum-#213412 
[-] BO: don't have the delivery PDF - User can define which statuses sho...
 2013-02-05 00:59:48 -08: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 7ffa731761 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 
Conflicts:
	controllers/admin/AdminLogsController.php
 2013-02-05 09:44:13 +01:00