Commit Graph

2119 Commits

Author SHA1 Message Date
tDidierjean 86bf178c51 // objectmodel fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15286 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 15:21:52 +00:00
lLefevre d8b5cf93f3 [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15279 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 14:38:07 +00:00
rMalie 7e1a6d9677 // Revert revision 15263
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15277 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 14:16:54 +00:00
fBrignoli 820ebe40ad // fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15276 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 14:15:08 +00:00
fBrignoli 0bcc55a096 [-] BO : Bug fixed #PSCFV-1975 - Combination import + multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15268 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 12:55:07 +00:00
vAugagneur 50a7847b2b [-] FO : fixed bug #PSCFV-1286 - live edit bug when module name contains "_"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15266 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 12:21:10 +00:00
lLefevre 897c6acb82 [-] FO : #PSCFV-2151 : Translations of errors are connected width sprintf()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15265 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 11:45:41 +00:00
rMalie dea9b17296 // Improve language links in dispatcher #PSCFV-1765
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15263 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 09:47:07 +00:00
fSerny 6c79f4803b [-] BO : Bug fix on module extract zip - #PSCFI-5335
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15262 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 09:40:26 +00:00
vAugagneur 9785afd5a2 //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15260 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 09:29:15 +00:00
vAugagneur 392c0f51d3 [-] BO : fixed bug #PSCFV-2285 - Unable to activate/deactivate a product from list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15248 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 08:10:19 +00:00
tDidierjean 65dc076142 [-] Classes : fix bug #PSCFV-2309 - Unable to override Shop::asso_tables
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15247 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 08:09:12 +00:00
vChabot 20f0360c27 [-] BO : BugFix : #PSCFV-2308 : Missing WHERE clause in Manufacturer::getManufacturers()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15244 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 07:46:46 +00:00
fBrignoli b8587fab0f [-] PDF : Incorrect Order Return title
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15236 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 15:23:49 +00:00
gCharmes e00ea0ee24 [-] FO : #PSCFV-2306 : Fixed duplicate meta title on manufacturer page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15234 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 15:18:33 +00:00
fSerny 73fcd280f5 [-] PROJECT : Deleting duplicate hook - #PSCFV-163
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15231 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 14:34:57 +00:00
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
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
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
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
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
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
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
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
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
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 a54244de89 // Hide "my shop" in quick select if no url created for shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15162 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 10:04:44 +00:00
vAugagneur e472fd98d6 //move all module classes in module sub-folder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15154 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 09:32:04 +00:00
vSchoener 2c8eb3fa4e [-] BO : Delete accounting
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15153 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 09:30:04 +00:00
aFolletete 47cfd2b9f9 [-] BO : fixed bug #PSCFV-1296 - Can't add a product in order (BO)
// Fix backward compatibility issue with updateQty method

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15152 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 09:29:46 +00:00
dMetzger 8f6c9671f5 // Replaced array_uintersect by a custom function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15150 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 09:09:03 +00:00
rMalie 14e44efe75 // Improve Shop::getTotalShops()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15147 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 08:59:07 +00:00
rMalie 5a6fe7aff2 // Set context to single shop if an employee have auth on only one shop #PSCFV-2182
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15144 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 08:50:39 +00:00
mDeflotte ca6c08c36c [-] BO : #PSCFV-2276 - Fix bug on changing status of a order with virtual products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15140 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 07:45:22 +00:00
vAugagneur 4f3e19ed5f //remove mobile theme
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15138 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 20:57:15 +00:00
rMalie 0a0f47efbb // Fix my-account meta #PSCFV-1440
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15136 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 16:56:49 +00:00
rMalie ccfef659c9 // Multishop interface reworked
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15121 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 15:05:39 +00:00
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