 mMarinetti
|
08a389a760
|
// fix product edition textarea rte
// minor fix warning if admin translation file doesnt exists
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10304 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 23:06:45 +00:00 |
|
|
tDidierjean
|
9e8d16ad6a
|
// fix position in list for products, product images. still need to fix display after change position product images
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10302 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 19:47:07 +00:00 |
|
|
mMarinetti
|
70c92e1d38
|
// fix translations / retrocompat in AdminController and config/smartyadmin.config.inc.php (AdminTranslationsController will follow)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10301 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 19:10:13 +00:00 |
|
|
tDidierjean
|
3f12f6b83f
|
// fix BO search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10300 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 19:02:42 +00:00 |
|
|
tDidierjean
|
07b109e003
|
// Fix AdminCarriers list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10299 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 18:37:31 +00:00 |
|
|
rGaillard
|
53d85ae134
|
// Shop association improvements
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10298 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 17:13:36 +00:00 |
|
|
rGaillard
|
d57b3cbcd7
|
// Fix multishop association on CMS tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10297 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 16:47:34 +00:00 |
|
|
dMetzger
|
8fdcb10f78
|
// BO : cart rules form improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10294 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 16:18:04 +00:00 |
|
|
rGaillard
|
14cb2b1ef0
|
// Miss on last commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10293 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 16:10:20 +00:00 |
|
|
dMetzger
|
a98752eb22
|
// Vouchers are shrinkable again (must be tested more thoroughly)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10292 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 15:53:31 +00:00 |
|
|
rGaillard
|
e4096bf943
|
// Constructor of OrderDetail correctly call parent constructor
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10291 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 15:51:33 +00:00 |
|
|
dMetzger
|
db15eec68b
|
// BO : cart rules form improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10290 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 14:50:20 +00:00 |
|
|
rGaillard
|
a25cc16f28
|
// Module configuration is now displayed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10289 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-19 15:03:20 +00:00 |
|
|
rGaillard
|
a318ca610f
|
// Add missing }
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10288 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-19 14:10:22 +00:00 |
|
|
rGaillard
|
bc160bb762
|
// Fix many smarty notices
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10287 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-19 13:48:31 +00:00 |
|
|
tDidierjean
|
58c35a2152
|
// HelperForm : 'p' replaced by 'desc'
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10286 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 18:27:48 +00:00 |
|
|
dSevere
|
226230f58b
|
// Supply Orders : Move ajax product search in the controller -> ajaxProcessSearchProduct()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10283 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 16:57:10 +00:00 |
|
|
rGaillard
|
96b9355d9d
|
// Add method method getGlobalValue on Configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10282 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 16:46:56 +00:00 |
|
|
mMarinetti
|
d6ef55b5ed
|
// fix adminProducts > images
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10281 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 16:42:51 +00:00 |
|
|
rGaillard
|
c7310f3899
|
//Block advertising multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10280 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 16:38:33 +00:00 |
|
|
dSevere
|
a24764b9b3
|
// Suppliers : Manage multiple suppliers for a product / product attribute + integration with supply orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10279 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 16:29:50 +00:00 |
|
|
fSerny
|
928e0a5625
|
[*] BO : New module interface tab now all html is in tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10278 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 16:14:43 +00:00 |
|
|
lLefevre
|
1bf46b362c
|
// fix delete var no_back and multiple call method initToolbarTitle
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10277 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 16:05:46 +00:00 |
|
|
tDidierjean
|
fd90a0313d
|
// Fix AdminThemesController thumbnails
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10275 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 15:30:22 +00:00 |
|
|
rGaillard
|
4cdc2c23db
|
// Fix smarty cache
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10274 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 15:10:23 +00:00 |
|
|
lLefevre
|
716acbaffa
|
// fix delete assign token in AdminController.php, use function smarty {getAdminToken tab=''}
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10273 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 15:00:58 +00:00 |
|
|
lLefevre
|
d723813173
|
// fixed bug assign var smarty and delete content.tpl for AdminGeolocationController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10272 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 14:49:02 +00:00 |
|
|
lLefevre
|
ae4a223509
|
// fix added toolbar in HelperOptions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10271 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 14:22:53 +00:00 |
|
|
mDeflotte
|
eda71ac8fb
|
// BugFix with carrier module and multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10267 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 14:14:06 +00:00 |
|
|
tDidierjean
|
174be2bfce
|
// fix module tab dispatch
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10266 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 14:10:23 +00:00 |
|
|
tDidierjean
|
d9cb7eb475
|
// Remove unused attributeLang
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10265 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 14:09:17 +00:00 |
|
|
vSchoener
|
6ae7ef6cbb
|
// Update Accounting, handle errors for Date and fix bug when default_account_number isn't set at all
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10264 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 13:19:13 +00:00 |
|
|
mDeflotte
|
eae6b9f67b
|
// Bug with carrier table creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10263 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 13:03:09 +00:00 |
|
|
mDeflotte
|
107bd4f779
|
[-] allow_seperated_package need to be an int and not a boolean on class cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10262 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 12:49:25 +00:00 |
|
|
lLefevre
|
e42cb899ef
|
// fix bug list_skip_action
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10260 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 11:57:33 +00:00 |
|
|
mDeflotte
|
5e6ab08a00
|
// Merging multishipping branche on 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10259 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 11:13:31 +00:00 |
|
|
tDidierjean
|
8a1bd2eb2d
|
// Remove <img> from confirmation messages
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10258 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 11:00:37 +00:00 |
|
|
vChabot
|
5d825bbbc1
|
// little fix about carrier with unidentified group
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10256 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 10:54:16 +00:00 |
|
|
lLefevre
|
611b4f7bde
|
//fix change initForm() method in AdminSlipController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10255 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 10:51:27 +00:00 |
|
|
tDidierjean
|
90a53b4cf1
|
// Change customer group for unidentified customers when getting carriers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10254 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 10:50:42 +00:00 |
|
|
lLefevre
|
df543a4f14
|
//fix added toolbar in AdminInvoicesController and change initForm() method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10250 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 10:28:21 +00:00 |
|
|
tDidierjean
|
dd01f32fad
|
// Remove BO themes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10249 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 10:27:07 +00:00 |
|
|
tDidierjean
|
40339f1add
|
[-] Classes : fix dispatcher for FO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10246 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 10:10:07 +00:00 |
|
|
fBrignoli
|
7fc0c2330b
|
// additional comment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10243 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 09:32:49 +00:00 |
|
|
mMarinetti
|
b8812a4161
|
// sql query improvement for $feature->nbFeatures()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10240 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-17 18:54:17 +00:00 |
|
|
mMarinetti
|
5ef065bbca
|
[+] BO : #PSFV-94 - AdminProduct form features
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10239 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-17 18:52:54 +00:00 |
|
|
mMarinetti
|
2eb10a760f
|
// removed unused code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10238 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-17 18:47:32 +00:00 |
|
|
mMarinetti
|
11f41ed9c2
|
// small fix on admininformation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10237 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-17 18:46:27 +00:00 |
|
|
tDidierjean
|
740ac7c843
|
// AdminTab compatibility: Dispatcher for BO now search tabs in database, not on the disk. AdminTabs now uses the new BO theme.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10236 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-17 18:15:07 +00:00 |
|
|
tDidierjean
|
60272fbce4
|
// Fix AdminEmailsController settings update and test mail
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10235 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-17 17:39:27 +00:00 |
|