Commit Graph

6367 Commits

Author SHA1 Message Date
lLefevre 4bdeb8dce7 // Add translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16653 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 15:43:49 +00:00
lLefevre 1728cd923b // Fix a display error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16652 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 15:37:33 +00:00
vAugagneur 96bf42e183 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16651 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 15:36:11 +00:00
vChabot 90a3cc6a45 // fixing SQL #PSCFV-3366
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16650 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 15:28:23 +00:00
rGaillard 7149dacb74 [-] BO: Fix PSCFV-2994
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16648 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 14:43:44 +00:00
lLefevre a30d9539a2 // Remove Smarty comments for use checkbox button
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16647 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 14:17:38 +00:00
lLefevre f8117d50ce // Add translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16646 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 13:02:25 +00:00
vAugagneur 22d1771142 //Added more info on category for shop configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16645 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 12:58:58 +00:00
rGaillard 793cdb720c // Small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16644 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 12:11:48 +00:00
dMetzger 8d8593d3de // #PSCFV-3434 but still need to refresh the page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16643 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 12:03:32 +00:00
dMetzger 9158cadf6c // Small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16642 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 11:36:09 +00:00
vChabot 2366a2cc8a // fixing condition on "add root category" URL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16641 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 10:04:05 +00:00
rGaillard 100703b2f8 // Small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16640 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 09:58:49 +00:00
mDeflotte 24421b248f // Normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16639 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 09:44:52 +00:00
mDeflotte 7767a81011 // Remove block my account from left column
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16638 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 09:23:07 +00:00
lLefevre a920359f1d // Performance when use getLinkRewrite() for categories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16637 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 09:15:53 +00:00
mDeflotte 66dc8389dd [-] BO : #PSCFV-3366 - Not possible to create customizable fields on multishop context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16635 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 08:15:35 +00:00
lLefevre 218236c1ee [-] TR : fix #PSCFV-3403 : check if is an object before loading stock data
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16634 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 07:45:00 +00:00
mDeflotte f0c11404bb // Blocklayered - Fix bug with ajax call on the BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16632 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 07:30:07 +00:00
dMetzger e930b5d08f // Perfs improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16629 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 16:32:44 +00:00
rGaillard 0f56795f2f // Increase typewatch wait time on backoffice orders PSCFV-3349
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16628 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 12:46:29 +00:00
rGaillard ea35da0a1a // Small fix context is all when multishop is not activated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16627 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 12:33:43 +00:00
lLefevre fce1d9a60d [-] TR : fix #PSCFV-3436
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16625 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 12:23:51 +00:00
fBrignoli f4d03c95db [-] FO : Bug Fixed #PSCFV-3417 - Wrong total order price calculation with tax disabled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16624 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 12:18:10 +00:00
lLefevre a22276d161 [-] TR : fix #PSCFV-3425
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16623 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 10:01:03 +00:00
rGaillard d16dfdab01 [-] BO: Fix PSCFV-3315 bad invoice after deleting a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16622 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 09:47:09 +00:00
vAugagneur 62c3e09cc6 [+] BO : added new cool feature
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16619 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 09:30:30 +00:00
rGaillard b37a36eba5 [*] Core: you can now associate modules to order states in order to add extra mail vars
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16618 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 09:18:41 +00:00
dMetzger 58f7fb1c03 [-] MO : blockcart retrocompatibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16617 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 08:43:21 +00:00
fBrignoli cd14749055 [-] FO : Bug Fixed #PSCFV-3407 - Only index page allows an empty url_rewrite
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16616 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 08:40:16 +00:00
dMetzger 656f87440d [-] MO : blockadvertising update did not update the image extension #PSCFV-3355
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16615 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 07:58:27 +00:00
mDeflotte b57854c3da [-] FO : #PSCFV-3388 - Fix bug with js product combination id
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16614 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 07:15:16 +00:00
rGaillard 22d4e61e54 // Fix currency storage in backoffice orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16611 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-30 15:32:22 +00:00
rGaillard 2ce01cc89e [-] BO: Fix PSCFV-3345 display of prices with a currency different than default on backoffice orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16610 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-30 15:24:29 +00:00
aFolletete 78a39a3fbc [-] BO : fixed bug #PSCFV-3376 - BO - Dashboard - Information message wich is sending to a forbidden access page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16609 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-30 15:16:18 +00:00
dMetzger 8f2f4b3be4 // Translation fixed #PSCFV-3419
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16607 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-30 14:48:08 +00:00
dMetzger 121d9abc2c [-] BO : you could not remove a gift once it had been set #PSCFV-3420
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16606 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-30 14:35:59 +00:00
rGaillard ee34eeab59 [-] BO: Fix PSCFV-3217 SQL error on Instant Stock Status
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16604 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-30 13:38:35 +00:00
vChabot 7c9d4ee5db [-] FO : BugFix : #PSCFV-3283 : Customer group deleted when updating personnal informations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16601 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-30 12:21:52 +00:00
lLefevre d62949ed65 [-] TR : fix #PSCFV-3374
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16599 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-27 14:14:07 +00:00
lLefevre 356348f90a // Fix a mistake
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16598 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-27 13:49:22 +00:00
mDeflotte a3f9f55291 [-] FO : #PSCFV-3362 - Order detail ajax call must use SSL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16597 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-27 13:43:34 +00:00
vAugagneur aebc243b87 [-] BO : fixed bug #PSCFV-3383
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16596 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-27 12:36:02 +00:00
vAugagneur c45bbc958c [-] BO : fixed bug #PSCFV-3142
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16590 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 14:18:01 +00:00
mDeflotte 1384d579d4 [-] FO : #PSCFV-3365 - Add missing vars assigned to the tpl on refreshing carrier durring account creation on the OPC
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16589 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 14:06:01 +00:00
lLefevre 57ff2be0e5 [-] TR : fix #PSCFV-3358
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16588 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 14:05:50 +00:00
vAugagneur 116221b382 //fixed bug "this product does not exist in this shop."
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16587 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 14:03:08 +00:00
mDeflotte 0835613ee2 [-] FO : #PSCFV-3365 - Add missing vars assigned to the tpl on refreshing carrier durring account creation on the OPC
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16586 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 13:58:58 +00:00
vChabot f07f7712af // fixing sql error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16585 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 13:56:20 +00:00
vChabot 7fca32e3dc [-] BO : BugFix : #PSCFV-3334 : Price Rules : Catalog Price Rules - In condition group when you want to make a condition with categories, in the list appears every categories from every stores
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16584 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 13:52:05 +00:00