Commit Graph

6342 Commits

Author SHA1 Message Date
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
vAugagneur 13b93ddaef [-] BO : fixed bug #PSCFV-3338
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16583 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 13:46:19 +00:00
vAugagneur db081565c3 [-] BO : fixed bug #PSCFV-3352
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16582 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 13:03:54 +00:00
mDeflotte 0a30c492fd [-] FO : #PSCFV-3356 - Update delivery price on selecting a free shipping option
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16581 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 12:52:02 +00:00
vAugagneur bca8b9d275 [-] BO : fixed bug #PSCFV-3342
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16580 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 12:07:42 +00:00
lLefevre 6e027b2d19 [-] TR : fix #PSCFV-3229
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16579 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 09:56:43 +00:00
vAugagneur 26624d9f2f [-] BO : fixed bug #PSCFV-3352
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16578 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 09:20:37 +00:00
mDeflotte 02fac949bf [-] BO : #PSCFV-3213 - Fix bug with FO product url on the BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16577 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 08:29:44 +00:00
lLefevre ae796bedfa [-] TR : fix #PSCFV-3253
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16576 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 07:50:24 +00:00
mDeflotte b51a097ae0 [-] FO : #PSCFV-3318 - Guest Tracking retrocompatibility with old theme
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16574 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 15:46:08 +00:00
vAugagneur 9e54583319 [-] BO : fixed bug #PSCFV-3336
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16573 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 15:44:09 +00:00
lLefevre d3529c7d73 // Fix bug when use the combination import by CSV file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16572 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 15:38:10 +00:00
mDeflotte a1d01b0986 [-] FO : #PSCFV-3242 - Add PS version in cookie hach name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16571 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 15:30:47 +00:00
vChabot f03879cdf2 [-] FO : BugFix : #PSCFV-3332 : Error for multiple store products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16570 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 14:23:18 +00:00
fBrignoli d30f381961 [-] BO : Bug fixed related to #PSCFV-2954 - order slip do not include VAT on carriers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16569 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 13:57:15 +00:00
lLefevre 57dcc5b694 // Fix bug when use the product import by CSV file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16568 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 13:53:43 +00:00
aFolletete e056653fed [-] Classes : fixed bug #PSCFV-3260 - Bug when add product to existing order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16567 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 13:53:42 +00:00
mDeflotte ad4c7dec2b [-] FO : #PSCFV-3318 - Guest Tracking must use order reference and not order id
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16566 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 13:00:43 +00:00
mDeflotte f782f88006 [-] FO : #PSCFV-3318 - Guest Tracking must use order reference and not order id
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16565 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 12:11:25 +00:00
fBrignoli bd28cc6e4b [-] MO : Watermark - Bug Fixed #PSCFV-2770 - Watermark is not working
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16564 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 09:30:56 +00:00
lLefevre 9665448bd2 [-] TR : fix #PSCFV-3269 : remove call to PSQL() which is unnecessary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16563 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 09:02:39 +00:00
lLefevre ff0bdb5532 [-] Bo : replace constant _PS_THEME_DIR_ by _PS_MAIL_DIR_ when send a email
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16562 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 08:34:17 +00:00
mDeflotte 6b62f6c3ed // By 1.5.1 we means certainly 1.5.0.1
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16561 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 08:03:42 +00:00
dMetzger 34c85b6114 [-] WS : creation of new product combination returned an error #PSCFV-3333
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16560 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 07:21:23 +00:00
vAugagneur 8b459e499e //remove unused code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16559 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 07:09:36 +00:00
dMetzger a90af8cd44 // Quick patch for multishop_specific / need to be check by vAugagneur #PSCFV-3329
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16556 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-24 17:48:18 +00:00