Commit Graph

2305 Commits

Author SHA1 Message Date
vChabot adcdca708d [-] BO : BugFix : #PSCFV-2761 : Change a default language by shop is not possible
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15966 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-11 13:37:16 +00:00
vAugagneur a0560569a4 [-] CLASSES : fixed bug #PSCFV-2769 - Accolade missing in AdminTab.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15963 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-11 07:33:56 +00:00
lLefevre 062f497b0b [-] BO : #PSCFV-2758 : fix error when use Tools::displayErrors()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15956 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-08 14:54:59 +00:00
vChabot e5db07ad8c [-] BO : BugFix : #PSCFV-2630 : Combination and multishop association issue with shared stock through group shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15928 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-07 14:20:53 +00:00
fBrignoli 3f8477682a [-] PDF : Bug Fixed #PSCFV-2724 - Incorrect SQL query for ecotax breakdown
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15925 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-07 13:27:33 +00:00
lLefevre 133a92fd40 [-] BO : #PSCFV-2716 : Fix memory limit when upload image file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15919 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-07 12:12:41 +00:00
rMalie dde916a786 // Fix useless instance of modules in FrontController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15918 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-07 12:03:54 +00:00
bMancone 090091e4fb // Fixed #PSCFV-2721
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15913 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-07 10:22:08 +00:00
rMalie 5f0fee928c // Fix depends_on_stock on Adminproducts #PSCFV-2698
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15906 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-07 09:14:16 +00:00
fBrignoli 18af073197 [-] CORE : Bug Fixed #PSCFV-2703 - Unable to redirect if one arg contain .php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15902 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-07 08:50:54 +00:00
bMancone a473ef5fbc // Fixed Division by ZERO ...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15899 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-07 08:29:21 +00:00
mDeflotte 28fa816b36 // Fix bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15892 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-07 07:59:31 +00:00
fSerny 18a088efab [-] PROJECT : active field for Object Module is not compliant with multishop :)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15888 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 17:11:49 +00:00
rGaillard ec59cb25c6 // small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15887 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 17:10:24 +00:00
rGaillard 2bce691ae8 // Improve performance and bug fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15882 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 16:22:48 +00:00
aFolletete b373f434ac [-] Classes : fixed bug #PSCFV-2681 - issue with updating of current_state column on order table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15880 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 15:00:52 +00:00
rMalie 88f537c23d // Fix Product::sqlStock() (use restrictions in left join instead of restrictions in where)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15868 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 09:16:03 +00:00
fSerny 49fd8708a1 [+] PROJECT : Add method Module::isEnabled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15866 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 08:58:13 +00:00
vChabot 1c03997f30 [-] BO : BugFix : #PSCFV-2639 : The search autocomplete does not work in multi store mod
// norm

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15865 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 08:32:59 +00:00
rMalie 86ee04e6d7 // category_lang are always duplicated on shop creation #PSCFV-2648
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15842 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 08:48:48 +00:00
mDeflotte 3a0031c60e // Normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15827 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 13:25:57 +00:00
rMalie 649fec49df // Some performance improvement #PSCFV-2658
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15824 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 12:58:52 +00:00
mDeflotte 5dfc0e3824 // Fix little bug (undefined index) on canceling a product (BO order tab)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15823 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 12:26:55 +00:00
vAugagneur 4179bc4d74 //added bulk action for enable or disable item
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15822 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 12:00:09 +00:00
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