Commit Graph

5172 Commits

Author SHA1 Message Date
dMetzger 7cb052a52b [-] FO : improvements with OPC, Cart Rules and refresh #PSCFV-377 #PSCFV-2196
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15118 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 14:36:53 +00:00
lLefevre 1f4a6f1623 [-] BO : fix #PSCFV-2212
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15114 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 14:21:21 +00:00
vAugagneur ab408ad848 [-] BO : fixed bug #PSCFV-2259 - "Contact options" section is missing from Customers > Contacts page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15113 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 14:20:13 +00:00
tDidierjean b9497e80a7 [-] BO : fix bug #PSCFV-2231 - blocklink problem when not in multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15112 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 14:10:33 +00:00
lLefevre 08ee61a806 [-] BO : #PSCFV-2214 : Change the order of localizations packs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15111 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 14:09:43 +00:00
vChabot b063156757 [-] FO : BugFix : #PSCFV-2208 : Params link from CMS page link are incorrect (only one char instead of a sentence)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15110 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 14:06:58 +00:00
rGaillard 7df7f7aac4 [+] BO: The customizable products are now usable in the BackOffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15109 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 14:04:13 +00:00
mMarinetti 643f8c3d11 // svn:keywords property added for index.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15108 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 14:03:30 +00:00
vChabot e82d429f4c // normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15107 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 13:49:49 +00:00
lLefevre 05aefa5256 [-] BO : #PSCFV-2186 : Find the good translation when a module is overrided
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15106 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 13:45:33 +00:00
vAugagneur b0090db2c8 [-] BO : fixed bug #PSCFV-2256 - Error when duplicate a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15105 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 13:40:54 +00:00
tDidierjean 0416403b37 [-] BO : fix bug #PSCFV-2251 - http_build_query must fix arg_separator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15104 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 13:39:19 +00:00
vChabot 807252f5af [-] FO : BugFix : #PSCFV-2243 : CCC optimization on scripts compile each script two times
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15103 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 13:30:12 +00:00
dMetzger cdcf54b40e // Debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15102 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 13:28:26 +00:00
tDidierjean dbb931aea8 [-] BO : fix bug #PSCFV-2237 - Broken SQL Request in Product->getAccessories()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15101 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 13:15:37 +00:00
dMetzger 2bd2416cc0 [-] BO : there was some row doubled in the cart rules because of the multi-shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15099 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 12:50:24 +00:00
lLefevre 771c75de15 [-] BO : #PSCFV-2248 : translations for the back office
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15098 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 12:19:15 +00:00
tDidierjean 9926b29d87 [-] BO : fix bug #PSCFV-2188 - imported products with combinations are not added to cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15097 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 12:02:48 +00:00
dMetzger 59eeabee98 [-] BO : changed state iso code max length #PSCFV-2220
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15096 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 12:00:50 +00:00
lLefevre 7654470c9c // Added translations errors
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15095 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 11:48:03 +00:00
lLefevre eccb5b7da2 [*] MO : change calls method Tools::displayError() by $name_module->l() && Translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15094 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 10:06:23 +00:00
fSerny 8947a4be80 [-] FO : Center column is now in full size when left column is not displayed #PSCFV-1497
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15093 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 09:50:33 +00:00
vChabot 605b69f8c1 [-] FO : BugFix : #PSCFV-2221 : Column 'price' in order clause is ambiguous by filtering search result
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15092 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 09:32:43 +00:00
tDidierjean 70ca2d47c3 // remove deprecated method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15091 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 09:29:52 +00:00
vChabot 534bbd4d99 [-] FO : BugFix : #PSCFV-2198 : Unable to edit customer account in front
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15090 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 09:21:19 +00:00
vAugagneur 5057379ded [-] BO : fixed bug #PSCFV-2217 - Assign new zone in BO > Localisation > States generate an error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15089 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 09:02:02 +00:00
mMarinetti afc8da619b // fix translations of products and categories (new admin tabs)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15088 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 08:52:32 +00:00
fBrignoli 5776e365de [-] FO : Invalid voucher name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15087 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 08:41:26 +00:00
vChabot 6810a92164 // delete confirm message when updating module configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15086 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 08:29:07 +00:00
vAugagneur 73a5cc497d //small fix #PSCFV-2139
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15085 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 08:27:40 +00:00
rGaillard 4dd85be713 [-] BO: Fix the pictures link customized datas
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15084 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-07 16:00:54 +00:00
tDidierjean 9fd31eff19 [-] BO : fix bug #PSCFV-1597 - image upload size display
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15083 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-07 14:04:11 +00:00
tDidierjean f0626d1acc [-] BO : fix bug #PSCFV-2169 - broken toolbar
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15082 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-07 13:16:55 +00:00
tDidierjean 273b2b0063 [-] BO : fix bug #PSCFV-2230 - some tables are not cleaned when deleting products during import
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15081 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-07 12:49:52 +00:00
fSerny 8411d6df8d [-] BO : Bug with slash on modules description - #PSCFV-2146
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15080 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-07 10:08:35 +00:00
fBrignoli 18b04fbd72 [-] BO : Bug Fixed #PSCFV-1475 - Multishop themes pictures not configurable
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15079 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-07 10:02:56 +00:00
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