dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,680 Commits 9 Branches 19 Tags
b36947f364b20afe2ab4483d03a0bb8f736aec1d
Commit Graph

1565 Commits

Author SHA1 Message Date
mDeflotte b36947f364 [-] BO : #PSTEST-661 - Fix bug with non-assigned context 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13029 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-06 14:19:39 +00:00
bMancone d51002f6fe // Improved Supply Order States 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13027 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-06 14:11:29 +00:00
tDidierjean e3c9f3f8ea // Remove unused dynamic method call in AdminController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13020 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-06 13:25:34 +00:00
bMancone cdbb18038c // Fixed #PSTEST-643 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13017 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-06 10:49:55 +00:00
mDeflotte 56ba4a183b [-] BO : #PSTEST-659 - On creating group, table is not prefixed because of a bad parameter to the method DB::insert 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13011 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-06 09:51:45 +00:00
vChabot 9ef6be204a // Part of Code Review multishipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13008 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-06 09:28:35 +00:00
dMetzger 9fa90c4183 [-] BO : wrong error message was displayed on cart rules deletion PSTEST-644 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12998 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-03 16:17:02 +00:00
vChabot ce35fc7311 // Code Review Invoices V&V 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12993 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-03 15:55:53 +00:00
fSerny 23a3f50adb // Small fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12988 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-03 15:31:17 +00:00
mMarinetti 402874d24b // fix retrocompatibility in Tab.php related to _GET tab/controller 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12973 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-03 13:49:01 +00:00
rMalie 3ca7fb1ee2 // Fix translations in AdminControllers from modules #PSFV-397 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12972 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-03 13:31:51 +00:00
rMalie 3eda780670 // Fix some LIKE with _ 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12970 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-03 12:09:28 +00:00
vAugagneur 53cb367de7 //fixed small bug redirect 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12965 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-03 10:31:11 +00:00
mDeflotte fe1b3e7ee9 // Add a "@since 1.5.0" 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12964 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-03 10:05:38 +00:00
mDeflotte 14c318bead [*] BO : #PSTEST-381 - Checkbox "Send available products first" must not be present if there is only product "out of stock", or to check states of virtual products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12962 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-03 09:46:34 +00:00
vChabot a5a8df50b2 // url UTF8 fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12957 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-03 09:32:35 +00:00
vChabot 57a5260700 // replace $_POST by Tools::getValue 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12956 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-03 09:32:12 +00:00
mDeflotte 791cc22ce0 [*] BO : #PSTEST-624 - On creating group, automaticaly assign the new groups to all carriers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12952 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-03 08:59:46 +00:00
mDeflotte 2151238e24 [-] BO : #PSTEST-618 - Carriers price was not good on order creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12950 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-03 08:20:06 +00:00
rGaillard 132bb576c8 // Fix dispatcher links 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12946 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-02 18:43:17 +00:00
vChabot 182a7ba786 // update category multishop works fine 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12942 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-02 17:10:54 +00:00
vAugagneur 0cf4dd69d0 //small bug #PSTEST-632 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12940 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-02 17:01:30 +00:00
fSerny eb82ff8642 // Small fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12937 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-02 15:30:34 +00:00
rMalie cf0a9d02c1 // Add support of different mysql port for mysqli and pdo 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12930 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-02 13:50:27 +00:00
mDeflotte cca93f2c6d // Fix Bug with function ShopUrl::getMainShopDomainSSL 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12925 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-02 10:40:20 +00:00
fSerny d1afff824a [*] BO : Each module hooked on displayAdminProductsExtra add a Product Tab 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12924 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-02 10:39:17 +00:00
rMalie 4197ae40dc // Fix multilang on multishop #PSTEST-588 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12923 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-02 10:27:58 +00:00
fBrignoli 3f67f95a5c // norm 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12911 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-01 15:56:39 +00:00
fBrignoli d89dbcecc3 // code review 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12910 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-01 15:54:57 +00:00
vChabot bc5fd75a6e // fix about PS_CUSTOMER_GROUP (replacing value 3 by PS_CUSTOMER_GROUP) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12906 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-01 15:25:59 +00:00
fGaillard 10ff23f804 [*] FO : Better gesture of product discounts. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12904 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-01 15:12:26 +00:00
aFolletete 5615dca5c1 [-] Classes : fixed bug #PSTEST-550 - Add current_state attribute on Order class 
[~] Deprecated : OrderHistory::getLastOrderState()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12898 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-01 14:34:17 +00:00
rMalie 131efc02f8 // Merge AdminController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12888 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-01 10:14:46 +00:00
rMalie 846eb566c8 // Fix adminhome and clean Dispatcher 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12883 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-01 09:56:02 +00:00
rMalie 1435f340ef // Revert unfinished job on collections 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12882 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-01 09:55:41 +00:00
rMalie 9739089c32 [*] classes : new module architecture 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12872 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 16:57:19 +00:00
vChabot b36be68154 // order_by improved 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12868 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 15:33:10 +00:00
vChabot 781e4ec0e5 // norm fix 
// rename Shop::has_dependency() in Shop::hasDependency()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12864 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 15:28:43 +00:00
vChabot 34d6f4b9cb // norm fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12859 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 15:15:01 +00:00
vChabot 8c45f904a0 [*] BO : you can set positions to categories using multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12856 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 15:11:27 +00:00
aFolletete 22483a0320 [-] Classes : fixed bug #PSTEST-549 - Clean useless code 
[-] BO : fixed bug on sorting feature on AdminOrdersController
// Clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12850 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 14:34:59 +00:00
mDeflotte 2d4a9167fa // Bug Fix : use the PS_COUNTRY_DEFAULT to calculate shipping fees 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12837 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 10:50:24 +00:00
mDeflotte f567b36d0f // Fix bug with product ordering by manufaturer name on the function Tools::getProductsOrder 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12824 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 08:30:49 +00:00
mDeflotte 0b3984f8ca [-] BO : #PSTEST-595 - Fix Bug with image uploading 
[-] BO : #PSTEST-596 - Fix Bug with image uploading
[-] BO : #PSTEST-597 - Fix Bug with image uploading

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12822 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 08:26:33 +00:00
mDeflotte 0bbdc8a47b // Fix bug with product ordering by manufaturer name on the function Tools::getProductOrder 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12821 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 08:17:24 +00:00
rMalie 2c7cd17ecb // Tab::getIdFromClassName() is now not sensible to case 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12804 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 14:09:34 +00:00
rMalie e5d5443cbe // Fix assignements in if() on AdminTab 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12803 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 14:08:36 +00:00
rGaillard 099d5165ba // Fix PSTEST-396 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12797 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 13:21:12 +00:00
fGaillard 1c6357c1d9 [*] TR : #PSTEST-553 : Replaced can't with cannot 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12796 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 12:54:32 +00:00
bMancone 78087fee18 // Fixed #PSTEST-598 #PSTEST-599 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12791 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 12:24:25 +00:00