 sThiebaut
|
6bea0782e9
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10953 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:22:27 +00:00 |
|
|
sThiebaut
|
5b1642b26e
|
// maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10952 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:22:04 +00:00 |
|
|
fSerny
|
1a74889015
|
[*] PROJECT - Dynamic hooks in ObjectModel retrieve object in param - Dynamic hooks have been added to AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10951 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:20:40 +00:00 |
|
|
bMancone
|
db15387d07
|
// SupplyOrders : fixed view
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10950 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:18:16 +00:00 |
|
|
dSevere
|
a5c44ac8bc
|
// Update and fix some bugs on stock display on orders in backoffice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10949 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:17:01 +00:00 |
|
|
mDeflotte
|
31e90d9031
|
// Retrocompatibility : Now old 1.4 template works with new chechout process. Multishipping cannot be enabled.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10948 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:11:26 +00:00 |
|
|
rMalie
|
07420a2c0d
|
// Fix comment typo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10946 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:03:07 +00:00 |
|
|
rMalie
|
8d0f1e156d
|
// Test PDO as first choice in Db class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10945 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:01:48 +00:00 |
|
|
sThiebaut
|
30de26176b
|
// fixed bug on category count
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10944 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:52:27 +00:00 |
|
|
rMalie
|
1fc3cdf043
|
// Add missing override classes / controllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10943 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:51:26 +00:00 |
|
|
bMancone
|
b94606e103
|
// StockMvt : added the name of the warehouse for the CSV export
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10942 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:50:47 +00:00 |
|
|
rMalie
|
394aeab269
|
// Fix missing Core suffix for some classes / controllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10941 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:49:05 +00:00 |
|
|
bMancone
|
7576b8f407
|
// SupplyOrders: fixed products loaded under a particular threshold. StockMvt: CSV export
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10940 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:46:49 +00:00 |
|
|
vSchoener
|
6255d67944
|
[-] MO : CarrierCompare, merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10938 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:26:59 +00:00 |
|
|
vChabot
|
c0ee7a1306
|
// removing group_module_restriction table to set every restrictions in an only table : module_group
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10936 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:17:42 +00:00 |
|
|
fBrignoli
|
fc865e4986
|
// merge trunk r10863
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10935 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:09:08 +00:00 |
|
|
aNiassy
|
4831413af0
|
[-] #PSCFI-4325 : Modified " followup_1.txt ". It wasn't the same subject that followup_1.html
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10934 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:04:19 +00:00 |
|
|
fSerny
|
ce91cd792c
|
[-] PROJECT : You can now execute hook in the tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10932 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:49:56 +00:00 |
|
|
lLefevre
|
42b200b870
|
// small modification
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10930 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:36:26 +00:00 |
|
|
rMalie
|
ca79a68011
|
// Fix table / identifier for Module class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10929 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:35:21 +00:00 |
|
|
rGaillard
|
dac14bf3be
|
// Fix bug on processSave
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10928 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:33:43 +00:00 |
|
|
mDeflotte
|
db38a475f1
|
// BugFix in Product compare
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10927 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:30:01 +00:00 |
|
|
bMancone
|
07bac9c56b
|
// AdminSupplyOrders: fixed permissions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10926 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:11:24 +00:00 |
|
|
dSevere
|
a75ca6c40a
|
// Update and fix some bugs on front and admin itnerfaces relative to available quantities functionnality
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10925 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:11:21 +00:00 |
|
|
bMancone
|
558c008ece
|
// Fixed buttons as asked.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10924 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:08:58 +00:00 |
|
|
bMancone
|
772e739829
|
// Updated comment for object definition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10923 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:06:59 +00:00 |
|
|
rMalie
|
6cefe4465d
|
// Remove $langMultiShop from all classes, and add 'multishop' in $definition instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10922 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:04:09 +00:00 |
|
|
mDeflotte
|
5586dcdc3d
|
// BugFix Radio button don't work properly
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10921 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 14:52:46 +00:00 |
|
|
bMancone
|
01b6c28569
|
// SupplyOrders: CSV
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10920 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 14:50:48 +00:00 |
|
|
vKham
|
22fe972530
|
// add images css sprites for icon page stats
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10919 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 14:34:44 +00:00 |
|
|
lLefevre
|
5b7da70eb9
|
// adding edit action for combination in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10918 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 14:24:59 +00:00 |
|
|
tDidierjean
|
b25401ce9e
|
// Fix missing values in installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10916 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 14:10:09 +00:00 |
|
|
mDeflotte
|
e6d6e35b4d
|
// New template for the blocklayered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10915 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 14:08:13 +00:00 |
|
|
rMalie
|
d56cb00d8d
|
// Remove Module->templateAssign() from modules (use $this->smarty->assign() instead)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10914 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 14:04:35 +00:00 |
|
|
rMalie
|
2644f4b88d
|
// Add Collection in Category::getAllChildren()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10913 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 13:56:24 +00:00 |
|
|
rMalie
|
86683a963e
|
// Remove $table and $identifier property from all classes, and add static $definition instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10912 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 13:56:03 +00:00 |
|
|
mMarinetti
|
05ceb6ea96
|
// fix live_edit when not using multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10911 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 13:53:50 +00:00 |
|
|
mMarinetti
|
9ba2f9b023
|
// theme norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10910 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 13:45:24 +00:00 |
|
|
mMarinetti
|
9527d10ffe
|
// fix module blocknewsletter new theme
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10909 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 13:42:25 +00:00 |
|
|
sThiebaut
|
7d91e29519
|
// maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10908 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 13:41:40 +00:00 |
|
|
sThiebaut
|
fe8a28ed54
|
// maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10907 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 13:40:51 +00:00 |
|
|
fSerny
|
a50b0af067
|
[-] PROJECT : isHookableOn function is now retrocompatible with old hook
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10905 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 12:56:43 +00:00 |
|
|
aFolletete
|
2e8abff9a9
|
// add restriction on addition and edition of an order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10904 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 11:27:26 +00:00 |
|
|
lLefevre
|
9e6940eb4e
|
// adding button in toolbar for AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10903 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 11:15:21 +00:00 |
|
|
mDeflotte
|
6f1ecda602
|
// Fixing some problem with new theme and multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10902 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 10:57:44 +00:00 |
|
|
vSchoener
|
941ecdac62
|
[-] MO : Mondialrelay, merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10901 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 10:54:40 +00:00 |
|
|
vSchoener
|
a2230b0161
|
[-] MO : Carriercompare (shipping estimation), merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10900 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 10:54:01 +00:00 |
|
|
vSchoener
|
19656ae993
|
[-] MO : Mondialrelay, merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10898 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 10:46:33 +00:00 |
|
|
aFolletete
|
f7250f76d5
|
// fix bug on Order class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10897 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 10:40:06 +00:00 |
|
|
mMarinetti
|
863ea0d354
|
// module newsletter hook fix + added create table in db_settings_extends.sql
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10896 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 09:37:36 +00:00 |
|