Commit Graph

5264 Commits

Author SHA1 Message Date
mDeflotte 65d2eb5ff1 // Change var name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15225 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 13:41:16 +00:00
tDidierjean bf27e6a93a // small js fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15224 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 13:39:08 +00:00
mDeflotte 0e110bca8e [-] FO : #PSCFV-1463 - Fix bug on removing a product where one is a free gift
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15223 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 13:33:02 +00:00
mDeflotte 1d20c351b5 [-] FO : #PSCFV-1463 - Disallow removing free product from the blockcart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15222 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 13:29:13 +00:00
tDidierjean 310457f39b [-] BO : fix #PSCFV-2177 - js bug with default supplier selection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15221 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 12:49:57 +00:00
rMalie 81f9cbe324 [+] MO: modules can now have override classes installed automatically #PSCFV-2036 (thank to phrasespot)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15220 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 12:41:30 +00:00
dMetzger 7d5c554ab2 // Details
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15219 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 12:37:30 +00:00
mDeflotte a4ed3d0092 [-] FO : #PSCFV-1792 - Fix bug with attribute check_access of the method Category::getProducts()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15218 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 12:10:22 +00:00
bMancone c04c4be710 // Fixed #PSCFV-2252
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15216 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 10:12:36 +00:00
bMancone 33cb7fc589 // Fixed #PSCFV-2175
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15214 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 10:00:16 +00:00
rMalie f91dc64cad // Fix admin controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15212 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 09:55:21 +00:00
tDidierjean 403d22ac5c [-] BO : fix #PSCFV-2302 - import: bug with truncate confirmation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15211 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 09:47:57 +00:00
mDeflotte 6847dba653 // Fix bug with pagination
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15210 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 09:47:11 +00:00
vChabot be7522cbbc [-] BO : BugFix : #PSCFV-2300 : Bug on categories position
// When multishop is not enabled in the BO, you can't change the position of your categories
// When multishop is enabled in the BO, you can change the positions of your categories in the BO, but the positions of the categories on the front do not change.

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15209 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 09:33:08 +00:00
fBrignoli bfa41957e2 [*] PDF : Cart rules are now displayed as a "product line"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15207 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 09:17:54 +00:00
mDeflotte 692bc3d89c // Allow non-latin characters to the password + change limit from 32 to 255.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15206 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 08:54:36 +00:00
mDeflotte 65e1c37b5b [-] FO : #PSCFV-2282 - Allow "+" in email address during account creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15205 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 08:40:00 +00:00
tDidierjean a9ff8c9d09 [-] BO : fix #PSCFV-2299 - Unknown gender issue
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15204 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 08:39:27 +00:00
lLefevre 184e6df73c [-] BO : #PSCFV-2295 : remove the duplicate errors message && refactoring zip code insert
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15203 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 08:37:58 +00:00
vChabot ff28a5fdd6 // fix about #PSCFV-2221 : standardize corrections
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15202 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 08:11:08 +00:00
bLeveque 67ffd0ce27 [-] Core : Fixed bug #PSCFV-586 - index.php was deleted during the Smarty Cache deletion
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15201 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 01:21:09 +00:00
bLeveque 041ff2c215 [-] INSTALLER : Fixed bug #PSCFV-372 - Added phone number for German, Spanish and Italian
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15200 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 00:28:12 +00:00
bLeveque 307e296355 [-] FO : Fixed bug PSCFV-564 related to Google Maps API (Added "region" parameter)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15199 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 00:13:52 +00:00
gCharmes c5e434bd01 [-] FO : #FSCFV-903 : Add Mail confirmation sending when subscribing to the newsletter via Accont creation or edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15198 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 19:51:09 +00:00
mBertholino 11dfb5bd67 [-] BO : #PSCFV-2255 - overide helper/options in admin-dev/themes/.../stores
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15197 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 18:48:43 +00:00
jObregon 1a3f109962 [-] BO : #PSCFV-2279 Removed alert if token is invalid.
// Trimmed trailing spaces

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15196 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 18:44:10 +00:00
gCharmes 3675224eda [-] BO : Add check to avoid redefine _PS_BASE_URL_ on the admin init
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15195 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 17:16:06 +00:00
jObregon bbf4d3c1f8 [-] MO : #PSCFV-2261 Check if the id_product is set
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15194 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 17:08:42 +00:00
gCharmes bad9d94820 [-] FO : #PSCFV-2211 : Make sure _PS_BASE_URL_ is defined
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15193 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 16:59:05 +00:00
lLefevre 20f7718a9c [-] BO : #PSCFV-1786 : fix size logo for PDF invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15192 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 16:30:32 +00:00
vChabot 630e92cda3 // fix like #PSCFV-2292 and #PSCFV-2221
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15191 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 16:08:19 +00:00
vChabot 7f6b866f40 [-] BO : BugFix : #PSCFV-2292 : Column 'price' in order clause is ambiguous by filtering manufacturer product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15189 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 16:05:07 +00:00
fBrignoli 783fcb5fa0 // previous fix fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15188 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 15:51:05 +00:00
lLefevre bf17db5463 [-] BO : #PSCFV-731 : change type int by string for zipcode_from and zipcode_to
&& check this zip codes
 && display errors
 && normalize

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15187 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 15:50:44 +00:00
rMalie 172a330268 // Overrides
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15186 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 15:21:16 +00:00
jObregon 876e0ebedf // Code standards
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15185 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 15:12:39 +00:00
jObregon 825b3a0057 [-] BO : Check if store is set.
[-] BO : #PSCFV-2164 Added description for Cache options, and fixed links
[-] FO : #PSCFV-2138 Removed * on Home Phone (it's not a required field)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15184 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 15:04:16 +00:00
fGaillard 49c37d0d39 [-] Classes : #PSCFI-4973 : Bug fix mail receiver was null
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15183 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 15:02:19 +00:00
fBrignoli 74f7841fae [-] BO : Multiple cart rules should be save in order total discount
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15181 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 14:57:33 +00:00
vChabot 219d0c5606 // little fix render admin category tree with selectedCat var
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15180 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 14:43:20 +00:00
vAugagneur 3a02688ad1 //added translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15179 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 14:39:42 +00:00
mDeflotte 9ae0b2a42e [*] FO : #PSCFV-1463 & #PSCFV-1258 - Gift products and standard products are now displayed on seperate lines
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15177 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 14:37:14 +00:00
vAugagneur 68172a996e [-] MO : fixed bug #PSCFV-2270 - fixe part 2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15176 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 14:30:04 +00:00
vChabot d968158b55 [-] BO : BugFix : #PSCFV-2209 : Multishop : cannot delete shops with dependencies
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15175 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 14:09:11 +00:00
tDidierjean cf002df6f2 [-] FO : fix #PSCFV-548 - when ordering out of stock downloadable product, the download is not available in order history
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15174 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 13:54:05 +00:00
aFolletete 8a766fb104 // clean code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15171 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 13:33:38 +00:00
aFolletete c1b590804a // Fix uses of $cookie var in CompareProduct
// Fix little issue on Geolocation
[-] FO : Fix issue on compare product when cookie->id_compare value is invalid

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15170 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 13:32:56 +00:00
rMalie 0fe8ad5f90 // Fix notice in AdminShopController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15169 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 13:16:07 +00:00
lLefevre 199f1a5036 // Fix normalize and replace $_GET and $_POST by Tools::isSubmit() in CMS's controllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15168 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 12:50:26 +00:00
rMalie 644ea248be // Admin translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15167 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 12:38:43 +00:00