Commit Graph

1722 Commits

Author SHA1 Message Date
bMancone 5d06b01a59 // Fixed revision 13573
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13677 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 13:13:47 +00:00
rMalie d7f60335e4 // Clean copy_from_front data
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13675 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 12:45:36 +00:00
vAugagneur bad7d8c586 [-] BO : fixed bug in contact message with html
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13673 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 11:05:21 +00:00
rGaillard f9ce0f8fc3 // Fix tax rules group with search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13672 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 10:33:16 +00:00
rMalie 4cb395eabc // Fix shop association in helper form for group shops #PSTEST-865
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13671 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 10:10:07 +00:00
mDeflotte 929af2c340 // Fix bug with getPaginationLink and undefined php_self
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13668 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 09:49:37 +00:00
rMalie e5b646b0f8 // Fix multishop context in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13648 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 17:14:33 +00:00
rMalie ac890a4fb1 // Fix auth issues for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13647 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 17:03:58 +00:00
mDeflotte 9b0b2c4aa3 [-] FO : #PSFV-553 - Fix bugs with pager and ordering with some controllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13642 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 16:34:32 +00:00
dMetzger f6b91055d5 [+] BO : added a new option for the products : do they appear in the catalog, in the search, both or neither
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13638 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 15:55:40 +00:00
mDeflotte 12b15722d5 // Normalization: replacing spaces by tabulations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13635 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 15:43:43 +00:00
vChabot 78334a05a6 // id_category_default fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13634 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 15:42:48 +00:00
mDeflotte b29da30828 // Fix bug with id_tax_roules_group associated to it old table.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13630 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 15:38:35 +00:00
rGaillard 4a9e286ec9 // Fix bug which allow to create multi specific price with same parameters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13627 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 15:32:57 +00:00
rMalie e422445e65 // Display of payment modules per shop #PSTEST-833
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13625 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 15:18:51 +00:00
vChabot 02d98b237e // id_category_default is now for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13624 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 13:53:52 +00:00
rMalie 587c649517 // Fix module activation on multishop during installation #PSTEST-839 #PSTEST-877
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13623 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 13:29:32 +00:00
rMalie c03e8fa1d6 // Fix multishop on CMS (INNER JOIN instead of LEFT JOIN)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13622 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 13:20:25 +00:00
rMalie d821d474e0 // Fix multishop on Category->getChildren()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13621 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 13:15:02 +00:00
rMalie 4ee2698992 // Replace shop->addSqlAssociation() by static call
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13620 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 13:07:51 +00:00
rMalie c2cef61a5a // Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13618 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 12:15:30 +00:00
rMalie 1c2f174bdb // Improve multishop_context in AdminController and rename shop->getListOfID() by Shop::getContextListShopID()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13615 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 09:49:19 +00:00
rGaillard 7fde51894d // tax rules product and carriers shop association in webservices
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13600 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-24 11:12:12 +00:00
rMalie 6e6c69e617 // Fix getContextType()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13596 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-24 10:11:01 +00:00
rGaillard 8596c81daf // Fix sql request
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13595 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-24 10:07:38 +00:00
mDeflotte 7e5c73c277 [-] FO : #PSFV-569 - Fix bug with instant search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13593 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-24 09:52:37 +00:00
rMalie d3a7ead1e2 // Fix shop->id in Carrier
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13589 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-24 09:34:54 +00:00
rGaillard 2408b4ac5f [+] Core : products and carriers tax rules are associated to shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13586 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-24 09:26:18 +00:00
rMalie 69e2cf95d6 // Restore shop context in shop list and can filter shop pages per group shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13579 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-24 08:58:21 +00:00
rMalie 7b62fef1ee // Fix shop context call
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13578 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-24 08:51:52 +00:00
dMetzger 319309528a [-] FO : automatic refresh of the cart when a cart rule is added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13577 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 18:24:23 +00:00
tDidierjean c8b409c86a // Fix bug with missing default value for date
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13575 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 17:04:18 +00:00
rMalie 2454cd7863 // Welcome 2012²
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 16:33:10 +00:00
rMalie 53e7fe3230 // Improve multishop API
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13568 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 15:54:10 +00:00
dMetzger be71b2ddb1 [-] FO : cart rule fix (product restrictions mixing attributes and other criteria)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13567 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 15:54:05 +00:00
rMalie b24dcffc9c // Improve multishop API
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13566 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 15:39:44 +00:00
aFolletete cb7965c53f // Fixed bug #PSTEST-752
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13564 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 15:22:17 +00:00
lLefevre e0805b1b96 [-] BO : #PSTEST-795 : Display date from and date to filters in list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13563 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 15:19:02 +00:00
dMetzger 5339d45d07 [+] BO : BO width can now be fixed or flexible (you can set it up in your employee account)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13560 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 14:42:23 +00:00
vSchoener 2a760a56b4 [+] CORE : Module properly upgraded with message even if no file upgrade file exist, add 'upgrade' button
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13551 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 11:02:35 +00:00
tDidierjean 4944752edd [-] BO : fix bug #PSFV-534 - Button toolbar disappear after save if errors
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13549 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 10:34:56 +00:00
rMalie c8e9f1f029 // Change RIGHT to LEFT join in shop association
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13543 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 08:34:46 +00:00
fGaillard f4e9c87cc6 [-] BO : #PSFV-492 : BugFix CMS pages & categories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13540 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 16:57:51 +00:00
bMancone eb83936f23 // Improved SupplyOrders : states & history of reception
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13539 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 16:49:54 +00:00
bMancone 4233289528 // Fixed AdminController : existence of default_value was not accurate
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13536 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 16:01:18 +00:00
mDeflotte a53e9c5e60 // Removing attribute 'preselect_country' and use 'default_value' instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13531 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 14:27:32 +00:00
rMalie 4e6628cbfd // Remove $display_multishop_toolbar and add instead $multishop_context to manage shop context per admin controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13530 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 14:25:28 +00:00
dMetzger 7e73e088e5 [-] FO : ajax cart now display cart rules correctly #PSTEST-724
// Small addition to the controller override

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13527 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 11:02:49 +00:00
mDeflotte ee8111c803 [-] FO : #PSCFI-4733 - Pagination creates pages that should not exist (and duplicate content)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13521 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 09:33:03 +00:00
aKorczak 48a3d631c3 [-] WS : Fix bug from 1.4 Groups for entity customers API
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13517 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-21 17:14:06 +00:00