Commit Graph

2094 Commits

Author SHA1 Message Date
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
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
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 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
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
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
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
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
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
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 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
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
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
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
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 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