 vChabot
|
e3722a71e0
|
// little fix Shop class condition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15815 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 09:43:25 +00:00 |
|
|
mDeflotte
|
0cf1fc870c
|
// Fix bug with bad SQL request on changing state of an order paid by check
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15810 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 09:09:51 +00:00 |
|
|
mDeflotte
|
ea601eb639
|
[-] BO : #PSCFV-2542 - Fix bug : Unable to translate PaymentModule : some email terms are still in english
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15808 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 09:07:30 +00:00 |
|
|
rMalie
|
e01aa221ff
|
// Fix SSL with multishop #PSCFV-2646
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15806 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 08:59:10 +00:00 |
|
|
rMalie
|
4f4ac2f26c
|
// Fix SSL with multishop #PSCFV-2646
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15805 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 08:52:42 +00:00 |
|
|
fBrignoli
|
00047b3bea
|
// toolbar one more time
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15804 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 08:41:31 +00:00 |
|
|
dMetzger
|
564903dfdf
|
// Fixed #PSCFV-2605
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15803 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 08:23:28 +00:00 |
|
|
rMalie
|
b6f84715b6
|
// Hide checkbox in configuration multishop when employee manage only 1 shop #PSCFV-2649
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15800 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 07:49:20 +00:00 |
|
|
mDeflotte
|
d02787dc97
|
[-] Project : #PSCFV-2633 #PSCFV-2622 - Fix problems with multishipping and order payment & invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15797 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-01 15:40:32 +00:00 |
|
|
vAugagneur
|
c7705ea34e
|
[-] BO : fixed bug #PSCFV-2624 - Error after deleting supplier associated with a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15789 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-01 09:16:40 +00:00 |
|
|
rMalie
|
f6059f0a67
|
// Webservice getters are now multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15785 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-01 07:45:41 +00:00 |
|
|
fBrignoli
|
f5ce714fd3
|
// perf
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15776 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-31 13:48:40 +00:00 |
|
|
rMalie
|
d9e8899473
|
// Fix out of stock on combinations with no quantity (thank you Brice <3)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15766 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 13:48:23 +00:00 |
|
|
rMalie
|
c9484e29b2
|
// The capacity of enable / disable shops and shop groups is temporary disabled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15760 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 12:30:08 +00:00 |
|
|
rMalie
|
0857f92f7a
|
// Norm and doc for Shop class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15756 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 09:50:10 +00:00 |
|
|
dMetzger
|
04985181e3
|
// Cart rule display in cart summary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15755 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 09:29:55 +00:00 |
|
|
rMalie
|
5cc66edb28
|
// Filter list of entities per shop in admin if employee is not super admin #PSCFV-2525
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15749 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 08:22:48 +00:00 |
|
|
rMalie
|
e59a4da65d
|
// Automatically duplicate some shop data if the primary data is checked (E.g. export carriers langs if carrier is checked) #PSCFV-2616
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15748 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 08:06:57 +00:00 |
|
|
mDeflotte
|
ed228a12b4
|
// Fix bug with || instead of a &&
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15745 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 07:14:21 +00:00 |
|
|
lLefevre
|
77c458b6a9
|
[-] BO : #PSCFV-2553 : fix bug html for email order_conf.html
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15744 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-29 16:37:28 +00:00 |
|
|
lLefevre
|
db0320537c
|
[-] BO : #PSCFV-2583 fix customers which are displaying in notifications
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15741 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-29 14:11:55 +00:00 |
|
|
fBrignoli
|
ec368446f4
|
[-] BO : Bug Fixed #PSCFV-2555 - AdminController with Options: Add new button turns into Save
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15738 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-29 13:24:35 +00:00 |
|
|
lLefevre
|
74e2464cd1
|
[-] BO : #PSCFV-2591 : fix translations in bankwire module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15737 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-29 12:50:59 +00:00 |
|
|
rGaillard
|
37b31eeeeb
|
// Fix smarty cache
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15733 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-29 12:06:17 +00:00 |
|
|
rMalie
|
855f72be70
|
// Fix Shop::isFeatureActive() #PSCFV-2609
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15732 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-29 12:05:13 +00:00 |
|
|
rGaillard
|
1ce10c7355
|
// Clear smarty cache on entities updates
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15730 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-29 10:33:53 +00:00 |
|
|
rGaillard
|
4980999ef5
|
[*] MO: Improve performance with smarty cache on blocktopmenu
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15725 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-29 09:28:53 +00:00 |
|
|
rMalie
|
9de076b775
|
// Fix customer thread notifications for multishop #PSCFV-2546
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15724 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-29 09:03:12 +00:00 |
|
|
mDeflotte
|
24bc3d6427
|
// Bad PHP docs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15722 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-29 08:59:01 +00:00 |
|
|
fSerny
|
ea07cfacfc
|
[-] BO : Warnings while getting modules logo has been fixed - Bug #PSCFV-2602
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15720 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-29 08:54:23 +00:00 |
|
|
rGaillard
|
74f5b513af
|
// Performance optimizations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15719 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-29 08:32:13 +00:00 |
|
|
vChabot
|
cbf6cd352e
|
// remove var dump
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15712 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-28 13:52:36 +00:00 |
|
|
rMalie
|
cc179c3a49
|
// Allow to force routes #PSCFV-2592
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15711 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-28 13:41:00 +00:00 |
|
|
mDeflotte
|
0133338989
|
[-] Project : #PSCFV-2594 - Allow accent in URL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15705 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-28 09:13:26 +00:00 |
|
|
rMalie
|
a7b4c666ac
|
// Fix products image duplication on multishop mode #PSCFV-2572
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15703 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-28 08:26:33 +00:00 |
|
|
rGaillard
|
5a7b603bca
|
// Miss commit...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15701 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-25 17:14:43 +00:00 |
|
|
rGaillard
|
b953186dbd
|
[-] BO: Fix multishop employee restriction on cart and catalog price rules PSCFV-2505
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15700 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-25 17:12:55 +00:00 |
|
|
mDeflotte
|
401a1ebcaa
|
[-] BO : #PSCFV-2530 - Change warning message
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15694 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-25 14:51:33 +00:00 |
|
|
rMalie
|
34d80f945a
|
// Improve multishop code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15691 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-25 13:37:43 +00:00 |
|
|
dMetzger
|
75430a0b30
|
// Fixed cart rules analysis for empty carts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15684 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-25 11:37:43 +00:00 |
|
|
dMetzger
|
272906de5f
|
[-] FO : Cart products cache fixed (when you remove a product from the cart)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15683 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-25 11:27:33 +00:00 |
|
|
rMalie
|
4182732c2a
|
// Clean hooks name cache when a hook is added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15682 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-25 09:52:59 +00:00 |
|
|
mDeflotte
|
1912c4b543
|
[-] BO : #PSCFV-2562 - Select all categories on creating a new shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15673 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-24 16:44:00 +00:00 |
|
|
lLefevre
|
598ffaee32
|
// Fix translations error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15672 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-24 16:27:16 +00:00 |
|
|
fGaillard
|
49965e89fe
|
// Bug fix payment module (with previous commit)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15661 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-24 13:04:14 +00:00 |
|
|
fGaillard
|
989f3b46c1
|
// Bug fix for payment modules (shops informations on validate order)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15660 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-24 13:01:35 +00:00 |
|
|
lLefevre
|
0517f5438d
|
// Fix translations mails errors for each languages
// Now, Subject for reply_msg.html is translated
// Now use sprintf() in subject mails
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15658 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-24 09:57:48 +00:00 |
|
|
aFolletete
|
24f5a6e099
|
[-] BO : fixed bug #PSCFV-2502 - fixed bug on notification system in back office
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15651 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-23 16:41:02 +00:00 |
|
|
tDidierjean
|
f0dbfc9003
|
[-] BO : fix #PSCFV-2545 - can't change product out of stock order status
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15650 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-23 16:38:33 +00:00 |
|
|
lLefevre
|
3697b4816a
|
// Fix wholesaleprice when you import a combinaison CSV file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15643 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-23 14:27:43 +00:00 |
|