 bMancone
|
d6470b462b
|
// StockAvailable: synchronizes stock when updating an order (if necessary)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10338 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 11:52:04 +00:00 |
|
|
lLefevre
|
595c1384f4
|
// Fix delete multiple toolbar in AdminPerformanceController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10337 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 11:42:42 +00:00 |
|
|
rGaillard
|
52d4292f76
|
// File missing in last commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10335 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 11:07:37 +00:00 |
|
|
rGaillard
|
9b6824a825
|
// Replacement of AdminTab by AdminController on modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10334 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 11:06:35 +00:00 |
|
|
rMalie
|
9d10de0848
|
// Merge -> 10309
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 11:05:10 +00:00 |
|
|
mDeflotte
|
2537c72189
|
// BugFix assign var carrier_list on dmin product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10332 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 11:04:16 +00:00 |
|
|
bMancone
|
276f493dd7
|
// StockAvailable: updated synchronize() and updated its usage within the different stock controllers when necessary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10331 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 11:01:33 +00:00 |
|
|
mDeflotte
|
0ce1e22813
|
// BugFix with opc and multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10330 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 10:42:14 +00:00 |
|
|
mMarinetti
|
f09017dc73
|
// css harmonization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10329 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 10:29:58 +00:00 |
|
|
lLefevre
|
1cc95bcce1
|
// fix bug : delete submit button and merge fieldset in AdminSearchConfController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10328 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 10:23:19 +00:00 |
|
|
tDidierjean
|
5b908a0844
|
// fix tpl folder detection in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10327 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 10:11:49 +00:00 |
|
|
lLefevre
|
c47131aa9f
|
// fix bug display message error or success in AdminAccessController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10326 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 10:11:38 +00:00 |
|
|
fSerny
|
792452c2e0
|
// Fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10325 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 10:11:27 +00:00 |
|
|
tDidierjean
|
eb5cea2726
|
// Fix translations in BO for tpl folders with underscore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10324 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 09:53:21 +00:00 |
|
|
rGaillard
|
4abe8efd75
|
// Improve AdminGroupShopController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10323 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 09:46:01 +00:00 |
|
|
tDidierjean
|
c16ca27155
|
// Fix price and required display for options
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10320 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 09:34:37 +00:00 |
|
|
lLefevre
|
a918295ae3
|
// fix bug : delete submit button and toolbar not fix in AdminLocalizationController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10319 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 09:33:37 +00:00 |
|
|
vKham
|
c441358b40
|
// new icon for adminhome, adminmodules and header
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10318 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 09:21:26 +00:00 |
|
|
rGaillard
|
f00892539c
|
// Improve AdminShopController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10317 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 09:18:27 +00:00 |
|
|
vKham
|
3f97d4ab2b
|
// css improvement for adminHome and adminModule
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10316 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 09:15:35 +00:00 |
|
|
fBrignoli
|
401722bb0b
|
// missing values for shipping, wrapping, discounts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10315 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 09:07:57 +00:00 |
|
|
rMalie
|
8cb669fb2c
|
// Fix modules ID on <body> for module controller page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10312 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 08:51:47 +00:00 |
|
|
fBrignoli
|
67f4bf47da
|
// weird characters in delivery slip template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10311 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 08:37:01 +00:00 |
|
|
fBrignoli
|
1d47af51d7
|
[-] PDF : TCPDF cache directory is now in PS_CACHE_DIR
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10310 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 08:35:40 +00:00 |
|
|
mDeflotte
|
8add301ef3
|
// Bug with sql query to duplicate product from the cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10308 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 08:12:48 +00:00 |
|
|
mMarinetti
|
4965071c42
|
// fixed parsing and display for back office (fields values)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10306 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 23:50:27 +00:00 |
|
|
mMarinetti
|
2406935d7a
|
// fixed parsing and display for back office translations
// die2Exception in AdminTranslationsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10305 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 23:35:21 +00:00 |
|
|
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 |
|