Commit Graph

2420 Commits

Author SHA1 Message Date
dMetzger 61d4e45a1a [-] BO : fixed problem with case sensitive path #PSCFV-3179
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16381 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-12 15:15:12 +00:00
dMetzger aabef58c30 [-] BO : fixed alt text for duplication #PSCFV-3180
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16380 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-12 15:12:29 +00:00
vChabot 65858ff28c [-] BO : BugFix : #PSCFV-3178 : Attributes are duplicated in the attribute value creation form dropdown list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16378 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-12 14:42:18 +00:00
mDeflotte dc35aaa83c [-] BO : #PSCFV-3000 - Send an email on changing an order from the BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16372 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-12 12:05:19 +00:00
lLefevre 9bc7869e2b [*] TR : update English translations key for Errors
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16371 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-12 10:14:41 +00:00
lLefevre 75cbe6f6ec [*] TR : update English translations key for Back Office
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16369 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-12 10:04:56 +00:00
vChabot 6723ecce83 [-] BO : BugFix : #PSCFV-3069 : OrderDetail->purchase_supplier_price is not saved in DB
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16361 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-12 08:01:04 +00:00
dMetzger d975f571b3 [-] BO : patch to grid engines fixed #PSCFV-3153
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16360 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-12 07:44:54 +00:00
dMetzger 5761c8af29 [-] BO : fixed access rights in employee permissions #PSCFV-3157
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16359 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-12 07:33:27 +00:00
fBrignoli 71d5f6fbe5 [-] BO : Bug Fixed #PSCFV-3090 - Outstanding exception in the outstanding tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16356 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 16:28:40 +00:00
rGaillard f39226c85e // Fix some bug on advanced stock management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16353 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 15:46:39 +00:00
rGaillard d6937e9d94 // Fix bad variable name on PaymentModule.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16350 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 15:30:18 +00:00
rGaillard 2eaea9cb80 [-] FO: Fix dispatcher which not allow underscores on rewrited urls
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16349 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 15:09:51 +00:00
gCharmes c5a85a4cfa [-] BO : Fix the graph engine path
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16347 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 14:38:58 +00:00
lLefevre b0f363bcc3 [-] BO : fix #PSCFV-3022
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16344 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 14:16:28 +00:00
dMetzger 9fae45b209 [-] BO : advanced stock management should not appear when the advanced stock management is deactivated #PSCFV-3141
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16338 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 12:47:29 +00:00
dMetzger 2acb3d6f5f // Improvement of the fix of a previous bug #PSCFV-2804
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16337 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 12:43:28 +00:00
dMetzger 15a5e7fa6c [*] FO : better management in the priority between the cart rules #PSCFV-2804
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16332 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 10:07:16 +00:00
vChabot b08fb5ab7f [-] BO : BugFix : #PSCFV-3033 : attributes and values in multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16328 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 09:13:56 +00:00
vChabot 8bf12a6daa [-] BO : BugFix : #PSCFV-3033 : features in multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16327 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 08:52:53 +00:00
mDeflotte b2a616aba3 [-] FO : #PSCFV-3121 - New JS vars baseUri. This vars must be used instead of baseDir for ajax queries.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16326 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 08:48:28 +00:00
lLefevre 2016c46568 [*] BO : #PSCFV-2671 : Added a new currency format for Switzerland
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16324 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 08:20:23 +00:00
vSchoener 8c0a47ef3a [-] CORE : Fixed bug #PSCFV-2862. onclick evet properly calle.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16317 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-10 15:52:52 +00:00
mDeflotte 2f17afcc30 [-] FO : #PSCFV-3034 - Add return quantity to order detail
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16312 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-10 14:09:18 +00:00
rGaillard 4f7f921120 [-] FO: Fix lang links when url rewrite is not activated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16308 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-10 13:29:02 +00:00
dMetzger b284210026 // Payment module now fully use the context #PSCFV-2845
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16306 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-10 12:54:33 +00:00
dMetzger a37c3bfea2 // Block advertising module rewritten for multistore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16304 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-10 10:05:14 +00:00
dMetzger 744a221075 // Changed the way the multistore associations are loaded, far from perfect, but still better and overridable
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16295 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-10 07:11:16 +00:00
mDeflotte e8b686d928 [-] BO : #PSCFV-3112 - Fix bug with payment by cheque and multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16294 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 16:30:12 +00:00
dMetzger 649cb9af43 // Changed the name of a multishop variable to multishop_specific, in order to avoid confusion
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16293 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 15:48:22 +00:00
rGaillard 8343cb58d5 [-] BO: Fix combinations creation on multistore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16292 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 15:41:07 +00:00
vChabot 7c160a8073 [-] BO : BugFix : #PSCFV-2965 : Localization : updating default currency does not change currency on BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16289 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 14:18:12 +00:00
dMetzger 647070205b [*] BO : Added an override capability for the admin templates
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16288 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 14:12:37 +00:00
lLefevre 0296058d15 [-] BO : fix #PSCFV-3117
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16287 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 14:03:43 +00:00
dMetzger c51c83edc0 [*] BO : added a new Validate method "isPercentage"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16285 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 13:05:31 +00:00
dMetzger acc15c9e55 [-] BO : you do not need to add the admin controller in the core, the override directory is enough
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16284 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 12:56:51 +00:00
dMetzger 9074e8ed52 [*] BO : updated the "risk" class to the new 1.5 system (+several improvments)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16281 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 12:35:11 +00:00
fBrignoli e802d2669a // clean
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16278 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 09:59:03 +00:00
fBrignoli 6d3bed914a [-] BO : Undefined tax calculator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16277 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 09:48:58 +00:00
fBrignoli ce3e408315 [-] PDF : Bug Fixed #PSCFV-2735 - Missing tax details in order slip
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16275 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 09:35:58 +00:00
lLefevre a5f5a7fad7 [-] BO : #PSCFV-3039 : Add customer thread when i have a order message
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16271 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 08:46:11 +00:00
mDeflotte b8cf0fe3e4 [-] FO : #PSCFV-3100 - With OPC shpping cost are not refreshed correctly
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16270 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 08:07:46 +00:00
vAugagneur 099ad93161 //small multi-store fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16265 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-06 15:07:18 +00:00
lLefevre 5de4802237 // Fix small bug when the product are not weight
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16257 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-06 08:49:13 +00:00
mDeflotte 7a2eeea33f [-] FO : #PSCFV-3016 - Fix bug on removing quantity of a product with a customisation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16253 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-06 07:40:32 +00:00
lLefevre 991938edad [-] BO : #PSCFV-3036 : fix bug and fix notice and fix deprecated function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16248 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-05 15:35:13 +00:00
vAugagneur 2128d67569 //small fix on total_paid_real
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16246 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-05 15:23:45 +00:00
dMetzger 64648e0826 [-] BO : Fixed SQL crash with an empty shop list #PSCFV-2946
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16243 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-05 14:18:22 +00:00
mDeflotte 923216dfa4 [-] BO : #PSCFV-3066 - Fix bug on selecting delivery option
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16238 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-05 13:20:38 +00:00
mDeflotte a1311dba2d [-] BO : #PSCFV-3055 - Part 1 : Improving displaying of resume cart (payment step)
[-] BO : #PSCFV-3055 - Part 1 : If there is a rules with free shipping, shipping prices are not displayed

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16234 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-05 12:40:40 +00:00