Commit Graph

5386 Commits

Author SHA1 Message Date
tDidierjean e8bedcf49b // fix #PSCFV-2176 js error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15078 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-07 08:44:30 +00:00
mDeflotte cb3850bd9f [-] FO : #PSCFV-2197 - Show which products is assigned to which carrier, when multiple carriers are proposed for the one delivery method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15077 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-04 14:21:02 +00:00
mDeflotte d583f70ac6 // Fix little bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15076 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-04 14:01:41 +00:00
lLefevre 642a8c1436 // Remove code unused
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15075 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-04 13:30:23 +00:00
mDeflotte 207256d960 [-] BO : #PSCFV-858 - Rest to paid warning must be changed if the order is overpaid
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15074 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-04 12:54:29 +00:00
mDeflotte 2d7c83a2d2 [-] FO : #PSCFV-2156 - Avoid undefined index
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15072 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-04 11:31:04 +00:00
dMetzger 1fee05edca [-] BO : in the cart rules, when a reduction is associated to a specific product, the product is automatically added to the restrictions #PSCFV-2195
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15071 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-04 11:05:07 +00:00
tDidierjean 2933edeef6 // fix possibility of duplicate id with textareas in helperform
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15070 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-04 09:38:40 +00:00
lLefevre 4cd51b9b9e [-] BO : translations errors : fix regex
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15068 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-04 09:20:34 +00:00
mDeflotte f25d090958 [-] FO : #PSCFV-2147 - Fix bug with date of delivery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15067 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-04 09:12:02 +00:00
lLefevre 8fcbb6d4fb [-] BO : Translations errors : now the modules files are search recursively
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15066 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-04 09:05:24 +00:00
tDidierjean c6be7c30d9 [-] BO : fix bug #PSCFV-341 - ajax call could be made twice for the same product tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15065 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-04 08:55:16 +00:00
vAugagneur 04e5b13367 //remove useless code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15064 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 16:25:29 +00:00
vAugagneur 4d2df877fa //remove useless code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15063 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 16:25:15 +00:00
tDidierjean 0a3b557228 // #PSCFV-737 : BO - don't display shipping information for virtual order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15062 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 16:16:34 +00:00
mDeflotte 55aa82c00c // Little bug fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15061 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 15:59:15 +00:00
tDidierjean 2e2e7b9897 // Installer: remove id_product_attribute from product_download
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15059 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 15:54:58 +00:00
tDidierjean da26e0301c // update tinyMCE setup on product page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15058 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 15:37:32 +00:00
rGaillard 068f98b5e5 [-] BO: Fix PSCFV-1439 BackOffice order switching language
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15057 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 15:32:41 +00:00
tDidierjean 746f47fef3 [-] BO : fixed #PSCFV-1239 - tinyMCE issue on IE8
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15056 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 15:27:14 +00:00
mDeflotte 9be7d4e389 [-] BO : #PSCFV-71 - Fix bug with currency conversion
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15055 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 15:13:10 +00:00
dMetzger 2c81894949 [-] BO : you cannot create 2 states with the same iso code in the same country anymore #PSCFV-53
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15054 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 15:11:43 +00:00
vChabot b44fad77ce // fix on module when customer is not logged
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15053 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 14:59:17 +00:00
fBrignoli 957d30dba6 // incorrect SQL query
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15052 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 14:48:26 +00:00
vAugagneur 8be2f7be1e //small fix 2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15051 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 14:47:17 +00:00
tDidierjean d1689a5c75 [-] BO : fixed #PSCFV-2190 - error at pack creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15050 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 14:47:03 +00:00
vAugagneur d240fe8b4c //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15049 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 14:45:26 +00:00
vAugagneur 6583f2621b [-] MO : fixed bug #PSCFV-1356 - Module hometexteditor has the same text for each sub multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15048 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 14:39:40 +00:00
fBrignoli fbb3609e6e [-] Installer : Undefined variable due to hook call in objectModel::add()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15047 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 14:19:24 +00:00
dMetzger 9d5d7cc2e5 [-] Core : fixed typo in a SQL query #PSCFV-2189
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15046 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 14:18:01 +00:00
vChabot f4debb57a1 [-] BO : BugFix : #PSCFV-1297 : Multistore: admin cannot delete special price of another shop anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15045 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 14:07:34 +00:00
aFolletete bc219b1182 // clean code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15044 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 13:50:34 +00:00
aFolletete 41184a7620 [-] BO : fixed bug #PSCFV-2180 - Not auto height with long name shop
// Clean HTML, JS, CSS code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15043 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 13:48:58 +00:00
dMetzger cfe25a54e1 // Improvement in the resolution of #PSCFV-2159 (I did not fix the bug, but I fixed a wrong display that hide the real bug)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15042 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 13:14:36 +00:00
tDidierjean 6a9f1510d5 [-] BO : fixed #PSCFV-2176 - missing confirmation when deleting product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15040 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 12:51:09 +00:00
mDeflotte 284c583796 [-] FO : #PSCFV-152 - Check payment method are allowed before displaying them on the checkout page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15039 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 12:45:02 +00:00
tDidierjean e64b14b292 [-] BO : fix #PSCFV-2120 - no product listed in product return form
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15037 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 12:26:21 +00:00
tDidierjean 503bb511d9 [-] Classes : fix #PSCFV-2185 - bad handling of order states for merchandise returns
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15036 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 11:48:40 +00:00
dMetzger dcfc730177 [*] BO : Added a link to the customer group edition on the customer page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15035 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 09:45:19 +00:00
vChabot f9892ed7cd [-] FO : BugFix : #PSCFV-2099 : Block reinsurance doesn't appear in front office (style was not loaded + install fixtures)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15034 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 09:37:42 +00:00
vAugagneur effe71e913 //fixed bug #PSCFV-124
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15033 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 09:28:19 +00:00
mDeflotte e35c56241f // Fix little bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15031 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 09:04:51 +00:00
vAugagneur 79a6a4ad41 //remove useless info
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15030 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 09:02:01 +00:00
mDeflotte 2169016b87 // If an order contain only virtual products, don't set a carrier to the order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15029 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 08:58:35 +00:00
dMetzger 0e2d9240bd [-] MO : retro compatibility fixed with Referral program #PSCFV-1531
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15028 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 08:34:18 +00:00
vAugagneur 8375992d2d [-] BO : fixed bug #PSCFV-727 - added some help
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15027 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 08:26:30 +00:00
mDeflotte f999822533 // Revert class payment module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15026 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 08:21:59 +00:00
mDeflotte 51d58ad3be // Revert a line removed by error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15025 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 08:15:03 +00:00
tDidierjean acd5be25d1 [-] Classes : fix #PSCFV-1218 - Re-ordering customized products don't duplicate the customization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15024 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 08:13:46 +00:00
rMalie d911a3edff // Fix treeview retro compat
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15023 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 08:13:20 +00:00